Merge branch 'dev' into main

[core]/es_extended/config.weapons.lua

@@ -976,5 +976,18 @@ Config.Weapons = {
 						{name = 'clip_default', label = TranslateCap('component_clip_default'), hash = `COMPONENT_PRECISIONRIFLE_CLIP_01`},
 				}
 	},
-	{name = 'WEAPON_METALDETECTOR', label = TranslateCap('weapon_metaldetector'), components = {}}
+	{name = 'WEAPON_METALDETECTOR', label = TranslateCap('weapon_metaldetector'), components = {}},
+	{name = 'WEAPON_PISTOLXM3', label = TranslateCap('weapon_pistolxm3'), ammo = {label = TranslateCap('ammo_rounds'), hash = `AMMO_PISTOL`}, tints = Config.DefaultWeaponTints,
+				components = {
+						{name = 'clip_default', label = TranslateCap('component_clip_default'), hash = `COMPONENT_PISTOLXM3_CLIP_01`},
+						{name = 'suppressor', label = TranslateCap('component_suppressor'), hash = `COMPONENT_PISTOLXM3_SUPP`}
+				}
+	},
+	{name = 'WEAPON_ACIDPACKAGE', label = TranslateCap('weapon_acidpackage'), components = {}},
+	{name = 'WEAPON_CANDYCANE', label = TranslateCap('weapon_candycane'), components = {}},
+	{name = 'WEAPON_RAILGUNXM3', label = TranslateCap('weapon_railgunxm3'), ammo = {label = TranslateCap('ammo_rounds'), hash = `AMMO_RAILGUN`}, tints = Config.DefaultWeaponTints, 
+				components = {
+						{name = 'clip_default', label = TranslateCap('component_clip_default'), hash = `COMPONENT_RAILGUNXM3_CLIP_01`},
+				},
+	},
 }

[core]/es_extended/locales/cs.lua

@@ -216,6 +216,12 @@ Locales['cs'] = {
 	['weapon_precisionrifle'] = 'Precision Rifle',
 	['weapon_tactilerifle'] = 'Service Carbine',
 
+	-- Drug Wars DLC
+	['weapon_candycane'] = 'Candy Cane', -- not translated
+	['weapon_acidpackage'] = 'Acid Package', -- not translated
+	['weapon_pistolxm3'] = 'WM 29 Pistol', -- not translated
+	['weapon_railgunxm3'] = 'Railgun', -- not translated
+
 	-- Thrown
 	['weapon_ball'] = 'Míček',
 	['weapon_bzgas'] = 'Smrtící slzný plyn',

[core]/es_extended/locales/da.lua

@@ -222,6 +222,12 @@ Locales['da'] = {
 	['weapon_precisionrifle'] = 'Precision Rifle',
 	['weapon_tactilerifle'] = 'Service Carbine',
 
+	-- Drug Wars DLC
+	['weapon_candycane'] = 'Candy Cane', -- not translated
+	['weapon_acidpackage'] = 'Acid Package', -- not translated
+	['weapon_pistolxm3'] = 'WM 29 Pistol', -- not translated
+	['weapon_railgunxm3'] = 'Railgun', -- not translated
+
 	-- Thrown
 	['weapon_ball'] = 'Baseball',
 	['weapon_bzgas'] = 'BZ Gas',

[core]/es_extended/locales/de.lua

@@ -222,6 +222,12 @@ Locales['de'] = {
 	['weapon_precisionrifle'] = 'Präzisionsgewehr',
 	['weapon_tactilerifle'] = 'Service Karabiner',
 
+	-- Drug Wars DLC
+	['weapon_candycane'] = 'Candy Cane', -- not translated
+	['weapon_acidpackage'] = 'Acid Package', -- not translated
+	['weapon_pistolxm3'] = 'WM 29 Pistol', -- not translated
+	['weapon_railgunxm3'] = 'Railgun', -- not translated
+
 	-- Thrown
 	['weapon_ball'] = 'Baseball',
 	['weapon_bzgas'] = 'BZ Gas',

[core]/es_extended/locales/es.lua

@@ -115,6 +115,12 @@ Locales['es'] = {
 
 	-- Weapons
 
+	-- Drug Wars DLC
+	['weapon_candycane'] = 'Candy Cane', -- not translated
+	['weapon_acidpackage'] = 'Acid Package', -- not translated
+	['weapon_pistolxm3'] = 'WM 29 Pistol', -- not translated
+	['weapon_railgunxm3'] = 'Railgun', -- not translated
+
 	-- Melee
 	['weapon_dagger'] = 'Daga',
 	['weapon_bat'] = 'Bate',

[core]/es_extended/locales/fi.lua

@@ -108,6 +108,12 @@ Locales['fi'] = {
 	['locale_digit_grouping_symbol'] = '',
 	['locale_currency'] = '$%s',
 
+	-- Drug Wars DLC
+	['weapon_candycane'] = 'Candy Cane', -- not translated
+	['weapon_acidpackage'] = 'Acid Package', -- not translated
+	['weapon_pistolxm3'] = 'WM 29 Pistol', -- not translated
+	['weapon_railgunxm3'] = 'Railgun', -- not translated
+
 	-- Weapons
 	['weapon_knife'] = 'Veitsi',
 	['weapon_nightstick'] = 'Pamppu',

[core]/es_extended/locales/fr.lua

@@ -196,6 +196,12 @@ Locales['fr'] = {
 	['component_grip'] = 'poignée',
 	['component_luxary_finish'] = 'finition de luxe',
 
+	-- Drug Wars DLC
+	['weapon_candycane'] = 'Candy Cane', -- not translated
+	['weapon_acidpackage'] = 'Acid Package', -- not translated
+	['weapon_pistolxm3'] = 'WM 29 Pistol', -- not translated
+	['weapon_railgunxm3'] = 'Railgun', -- not translated
+
 	-- Weapon Ammo
 	['ammo_rounds'] = 'cartouche(s)',
 	['ammo_shells'] = 'obus',

[core]/es_extended/locales/hu.lua

@@ -222,6 +222,12 @@ Locales["hu"] = {
 	["weapon_precisionrifle"] = "Precision Rifle",
 	["weapon_tactilerifle"] = "Service Carbine",
 
+	-- Drug Wars DLC
+	['weapon_candycane'] = 'Candy Cane', -- not translated
+	['weapon_acidpackage'] = 'Acid Package', -- not translated
+	['weapon_pistolxm3'] = 'WM 29 Pistol', -- not translated
+	['weapon_railgunxm3'] = 'Railgun', -- not translated
+
 	-- Thrown
 	["weapon_ball"] = "Baseball",
 	["weapon_bzgas"] = "BZ Gas",

[core]/es_extended/locales/it.lua

@@ -222,6 +222,12 @@ Locales['it'] = {
 	['weapon_precisionrifle'] = 'Fucile di precisione',
 	['weapon_tactilerifle'] = 'Carabina di servizio',
 
+	-- Drug Wars DLC
+	['weapon_candycane'] = 'Candy Cane', -- not translated
+	['weapon_acidpackage'] = 'Acid Package', -- not translated
+	['weapon_pistolxm3'] = 'WM 29 Pistol', -- not translated
+	['weapon_railgunxm3'] = 'Railgun', -- not translated
+
 	-- Thrown
 	['weapon_ball'] = 'Palla',
 	['weapon_bzgas'] = 'BZ Gas',

[core]/es_extended/locales/nl.lua

@@ -221,6 +221,12 @@ Locales['nl'] = {
     ['weapon_metaldetector'] = 'Metaal Detector',
     ['weapon_precisionrifle'] = 'Precisiegeweer',
     ['weapon_tactilerifle'] = 'Service Carbine',
+
+	-- Drug Wars DLC
+	['weapon_candycane'] = 'Candy Cane', -- not translated
+	['weapon_acidpackage'] = 'Acid Package', -- not translated
+	['weapon_pistolxm3'] = 'WM 29 Pistol', -- not translated
+	['weapon_railgunxm3'] = 'Railgun', -- not translated
   
     -- Thrown
     ['weapon_ball'] = 'Honkbal',

[core]/es_extended/locales/pl.lua

@@ -195,6 +195,12 @@ Locales['pl'] = {
 	['component_grip'] = 'uchwyt',
 	['component_luxary_finish'] = 'luksusowe wykończenie broni',
 
+	-- Drug Wars DLC
+	['weapon_candycane'] = 'Candy Cane', -- not translated
+	['weapon_acidpackage'] = 'Acid Package', -- not translated
+	['weapon_pistolxm3'] = 'WM 29 Pistol', -- not translated
+	['weapon_railgunxm3'] = 'Railgun', -- not translated
+
 	-- Weapon Ammo
 	['ammo_rounds'] = 'nabój/oi',
 	['ammo_shells'] = 'pocisk(ów)',

[core]/es_extended/locales/sl.lua

@@ -221,6 +221,12 @@ Locales['sl'] = {
 	['weapon_metaldetector'] = 'Metal Detector',
 	['weapon_precisionrifle'] = 'Precision Rifle',
 	['weapon_tactilerifle'] = 'Service Carbine',
+
+	-- Drug Wars DLC
+	['weapon_candycane'] = 'Candy Cane', -- not translated
+	['weapon_acidpackage'] = 'Acid Package', -- not translated
+	['weapon_pistolxm3'] = 'WM 29 Pistol', -- not translated
+	['weapon_railgunxm3'] = 'Railgun', -- not translated
   
 	-- Thrown
 	['weapon_ball'] = 'Baseball',

[core]/es_extended/locales/sr.lua

@@ -222,6 +222,12 @@ Locales['sr'] = {
 	['weapon_precisionrifle'] = 'Precision Rifle',
 	['weapon_tactilerifle'] = 'Service Carbine',
 
+	-- Drug Wars DLC
+	['weapon_candycane'] = 'Candy Cane', -- not translated
+	['weapon_acidpackage'] = 'Acid Package', -- not translated
+	['weapon_pistolxm3'] = 'WM 29 Pistol', -- not translated
+	['weapon_railgunxm3'] = 'Railgun', -- not translated
+
 	-- Thrown
 	['weapon_ball'] = 'Baseball',
 	['weapon_bzgas'] = 'BZ Gas',

[core]/es_extended/locales/zh-cn.lua

@@ -222,6 +222,12 @@ Locales['zh-cn'] = {
 	['weapon_precisionrifle'] = '精确步枪',
 	['weapon_tactilerifle'] = '制式卡宾步枪',
 
+	-- Drug Wars DLC
+	['weapon_candycane'] = 'Candy Cane', -- not translated
+	['weapon_acidpackage'] = 'Acid Package', -- not translated
+	['weapon_pistolxm3'] = 'WM 29 Pistol', -- not translated
+	['weapon_railgunxm3'] = 'Railgun', -- not translated
+
 	-- Thrown
 	['weapon_ball'] = '棒球',
 	['weapon_bzgas'] = '毒气弹',