diff --git a/resources/[inventory]/cs_shops/config/config.lua b/resources/[inventory]/cs_shops/config/config.lua index 091273f84..f9651acbb 100644 --- a/resources/[inventory]/cs_shops/config/config.lua +++ b/resources/[inventory]/cs_shops/config/config.lua @@ -1464,7 +1464,7 @@ CodeStudio.Products = { itemPrice = 0, itemInfo = "", }, - ['weapon_combatshotgun'] = { + ['weapon_pumpshotgun_mk2'] = { itemName = "Beanbag Shotgun", itemStock = 50, itemPrice = 0, diff --git a/resources/[inventory]/tgiann-inventory/items/weapons.lua b/resources/[inventory]/tgiann-inventory/items/weapons.lua index d18303b26..9307fa7e2 100644 --- a/resources/[inventory]/tgiann-inventory/items/weapons.lua +++ b/resources/[inventory]/tgiann-inventory/items/weapons.lua @@ -66,8 +66,8 @@ local weaponsList = { weapon_heavyshotgun = { name = 'weapon_heavyshotgun', label = 'Heavy Shotgun', weight = 1000, ammotype = 'AMMO_SHOTGUN', image = 'weapon_heavyshotgun.png', description = 'A large smoothbore gun for firing small shot at short range' }, weapon_dbshotgun = { name = 'weapon_dbshotgun', label = 'Double-barrel Shotgun', weight = 1000, ammotype = 'AMMO_SHOTGUN', image = 'weapon_dbshotgun.png', description = 'A shotgun with two parallel barrels, allowing two single shots to be fired in quick succession' }, weapon_autoshotgun = { name = 'weapon_autoshotgun', label = 'Auto Shotgun', weight = 1000, ammotype = 'AMMO_SHOTGUN', image = 'weapon_autoshotgun.png', description = 'A shotgun capable of rapid continous fire' }, - weapon_pumpshotgun_mk2 = { name = 'weapon_pumpshotgun_mk2', label = 'Pumpshotgun Mk II', weight = 1000, ammotype = 'AMMO_SHOTGUN', image = 'weapon_pumpshotgun_mk2.png', description = 'Pumpshotgun MK2' }, - weapon_combatshotgun = { name = 'weapon_combatshotgun', label = 'Beanbag Shotgun', weight = 1000, ammotype = 'AMMO_BEANBAG', image = 'weapon_combatshotgun.png', description = 'Weapon Combatshotgun' }, + weapon_pumpshotgun_mk2 = { name = 'weapon_pumpshotgun_mk2', label = 'Beanbag Shotgun', weight = 1000, ammotype = 'AMMO_BEANBAG', image = 'weapon_pumpshotgun_mk2.png', description = 'Weniger Tödlich...' }, + weapon_combatshotgun = { name = 'weapon_combatshotgun', label = 'Combat Shotgun', weight = 1000, ammotype = 'AMMO_SHOTGUN', image = 'weapon_combatshotgun.png', description = 'Weapon Combatshotgun' }, -- Assault Rifles weapon_assaultrifle = { name = 'weapon_assaultrifle', label = 'AK 75', weight = 1000, ammotype = 'AMMO_RIFLE', image = 'weapon_assaultrifle.png', description = 'A rapid-fire, magazine-fed automatic rifle designed for infantry use' }, diff --git a/resources/[jobs]/[weapons]/weapons/stream/w_sg_pumpshotgunh4+hi.ytd b/resources/[jobs]/[weapons]/weapons/stream/w_sg_pumpshotgunh4+hi.ytd deleted file mode 100644 index f476f0085..000000000 Binary files a/resources/[jobs]/[weapons]/weapons/stream/w_sg_pumpshotgunh4+hi.ytd and /dev/null differ diff --git a/resources/[jobs]/[weapons]/weapons/stream/w_sg_pumpshotgunh4.ydr b/resources/[jobs]/[weapons]/weapons/stream/w_sg_pumpshotgunh4.ydr deleted file mode 100644 index 906303ca1..000000000 Binary files a/resources/[jobs]/[weapons]/weapons/stream/w_sg_pumpshotgunh4.ydr and /dev/null differ diff --git a/resources/[jobs]/[weapons]/weapons/stream/w_sg_pumpshotgunh4.ytd b/resources/[jobs]/[weapons]/weapons/stream/w_sg_pumpshotgunh4.ytd deleted file mode 100644 index f476f0085..000000000 Binary files a/resources/[jobs]/[weapons]/weapons/stream/w_sg_pumpshotgunh4.ytd and /dev/null differ diff --git a/resources/[jobs]/[weapons]/weapons/stream/w_sg_pumpshotgunh4_hi.ydr b/resources/[jobs]/[weapons]/weapons/stream/w_sg_pumpshotgunh4_hi.ydr deleted file mode 100644 index da8f9648d..000000000 Binary files a/resources/[jobs]/[weapons]/weapons/stream/w_sg_pumpshotgunh4_hi.ydr and /dev/null differ diff --git a/resources/[jobs]/[weapons]/weapons/stream/w_sg_pumpshotgunmk2+hi.ytd b/resources/[jobs]/[weapons]/weapons/stream/w_sg_pumpshotgunmk2+hi.ytd index b360a03ef..f476f0085 100644 Binary files a/resources/[jobs]/[weapons]/weapons/stream/w_sg_pumpshotgunmk2+hi.ytd and b/resources/[jobs]/[weapons]/weapons/stream/w_sg_pumpshotgunmk2+hi.ytd differ diff --git a/resources/[jobs]/[weapons]/weapons/stream/w_sg_pumpshotgunmk2.ydr b/resources/[jobs]/[weapons]/weapons/stream/w_sg_pumpshotgunmk2.ydr index cda62607d..906303ca1 100644 Binary files a/resources/[jobs]/[weapons]/weapons/stream/w_sg_pumpshotgunmk2.ydr and b/resources/[jobs]/[weapons]/weapons/stream/w_sg_pumpshotgunmk2.ydr differ diff --git a/resources/[jobs]/[weapons]/weapons/stream/w_sg_pumpshotgunmk2.ytd b/resources/[jobs]/[weapons]/weapons/stream/w_sg_pumpshotgunmk2.ytd index d84fa56a1..f476f0085 100644 Binary files a/resources/[jobs]/[weapons]/weapons/stream/w_sg_pumpshotgunmk2.ytd and b/resources/[jobs]/[weapons]/weapons/stream/w_sg_pumpshotgunmk2.ytd differ diff --git a/resources/[jobs]/[weapons]/weapons/stream/w_sg_pumpshotgunmk2_hi.ydr b/resources/[jobs]/[weapons]/weapons/stream/w_sg_pumpshotgunmk2_hi.ydr index 991527afb..da8f9648d 100644 Binary files a/resources/[jobs]/[weapons]/weapons/stream/w_sg_pumpshotgunmk2_hi.ydr and b/resources/[jobs]/[weapons]/weapons/stream/w_sg_pumpshotgunmk2_hi.ydr differ