Max/Main
1
0
Fork 0
forked from Simnation/Main
Code Pull requests Activity

Merge branch 'master' of https://git.evolution-state-life.de/Evolution-State-Life/Main

Browse source
This commit is contained in:
EVO 2025-06-30 12:36:01 +02:00
commit c8a8d5f267
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
resources/[qb]/qb-core/shared/items.lua
View file

@ -3299,15 +3299,15 @@ QBShared.Items = {
name = 'bcesandwich',
image = 'bcesandwich.png',
},
w_me_colbaton = {
type = 'item',
weapon_colbaton = {
type = 'weapon',
label = 'Teleskopschlagstock',
unique = true,
useable = true,
weight = 100,
shouldClose = true,
description = '',
name = 'w_me_colbaton',
name = 'weapon_colbaton',
image = 'w_me_colbaton.png',
},
burger = {

2
resources/[qb]/qb-core/shared/weapons.lua
View file

@ -26,7 +26,7 @@ QBShared.Weapons = {
[`weapon_bread`] = { name = 'weapon_bread', label = 'Baquette', weapontype = 'Melee', ammotype = nil, damagereason = 'Melee killed / Whacked / Executed / Beat down / Murdered / Battered' },
[`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' },
[`w_me_colbaton`] = { name = 'w_me_colbaton', label = 'Teleskopschlagstock', weapontype = 'Melee', ammotype = nil, damagereason = 'Melee killed / Whacked / Executed / Beat down / Murdered / Battered' },
[`weapon_colbaton`] = { name = 'weapon_colbaton', label = 'Teleskopschlagstock', 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' },