diff --git a/resources/[inventory]/cs_shops/config/config.lua b/resources/[inventory]/cs_shops/config/config.lua index a65e0e91d..a579e582a 100644 --- a/resources/[inventory]/cs_shops/config/config.lua +++ b/resources/[inventory]/cs_shops/config/config.lua @@ -1198,6 +1198,7 @@ CodeStudio.Products = { itemInfo = "", }, + } }, ['police_weapons'] = { @@ -1300,6 +1301,16 @@ CodeStudio.Products = { itemPrice = 0, itemInfo = "Handheld flashlight", }, + ['weapon_colbaton'] = { + itemName = "Teleskopschlagstock", + itemStock = 50, + itemPrice = 0, + itemInfo = "", + }, + + + + } }, ['medic_items'] = { diff --git a/resources/[qb]/qb-core/shared/items.lua b/resources/[qb]/qb-core/shared/items.lua index 8a3211caa..99e5fc811 100644 --- a/resources/[qb]/qb-core/shared/items.lua +++ b/resources/[qb]/qb-core/shared/items.lua @@ -5619,7 +5619,7 @@ QBShared.Items = { name = 'chemiebarrel', image = 'chemie.png', }, - w_me_pocketlight = { + weapon_pocketlight = { type = 'weapon', label = 'kleine Taschenlampe', unique = true, @@ -5627,7 +5627,7 @@ QBShared.Items = { weight = 100, shouldClose = true, description = '', - name = 'w_me_pocketlight', + name = 'weapon_pocketlight', image = 'w_me_pocketlight.png', }, stevens_apfelmustorte = { diff --git a/resources/[qb]/qb-core/shared/weapons.lua b/resources/[qb]/qb-core/shared/weapons.lua index 8544f2fb9..ed2da5989 100644 --- a/resources/[qb]/qb-core/shared/weapons.lua +++ b/resources/[qb]/qb-core/shared/weapons.lua @@ -27,6 +27,7 @@ QBShared.Weapons = { [`weapon_stone_hatchet`] = { name = 'weapon_stone_hatchet', label = 'Stone Hatchet', weapontype = 'Melee', ammotype = nil, damagereason = 'Knifed / Stabbed / Eviscerated' }, [`weapon_candycane`] = { name = 'weapon_candycane', label = 'Candy Cane', weapontype = 'Melee', ammotype = nil, damagereason = 'Melee Killed / Whacked / Executed / Beat down / Musrdered / Battered / Candy Caned' }, [`weapon_colbaton`] = { name = 'weapon_colbaton', label = 'Teleskopschlagstock', weapontype = 'Melee', ammotype = nil, damagereason = 'Melee killed / Whacked / Executed / Beat down / Murdered / Battered' }, + [`weapon_pocketlight`] = { name = 'weapon_pocketlight', label = 'kleine Taschenlampe', weapontype = 'Melee', ammotype = nil, damagereason = 'Melee killed / Whacked / Executed / Beat down / Murdered / Battered' }, -- Handguns [`weapon_pistol`] = { name = 'weapon_pistol', label = 'Pistol', weapontype = 'Pistol', ammotype = 'AMMO_PISTOL', damagereason = 'Pistoled / Blasted / Plugged / Bust a cap in' }, [`weapon_pistol_mk2`] = { name = 'weapon_pistol_mk2', label = 'Pistol Mk2', weapontype = 'Pistol', ammotype = 'AMMO_PISTOL', damagereason = 'Pistoled / Blasted / Plugged / Bust a cap in' },