From 47aa0815defae65395b9576d47f641d492b7f7e2 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Sun, 12 Jun 2022 15:30:03 +1000 Subject: [PATCH] Increase gun item sizes (gun nerf) (#8683) --- .../EntitySystems/StorageSystem.Fill.cs | 2 +- .../Catalog/Fills/Boxes/ammunition.yml | 12 ++-- .../Guns/Ammunition/Boxes/caseless_rifle.yml | 2 + .../Guns/Ammunition/Boxes/light_rifle.yml | 2 + .../Weapons/Guns/Ammunition/Boxes/magnum.yml | 2 + .../Weapons/Guns/Ammunition/Boxes/pistol.yml | 2 + .../Weapons/Guns/Ammunition/Boxes/rifle.yml | 2 + .../Ammunition/Magazines/caseless_rifle.yml | 6 ++ .../Guns/Ammunition/Magazines/heavy_rifle.yml | 2 + .../Guns/Ammunition/Magazines/light_rifle.yml | 3 +- .../Guns/Ammunition/Magazines/magnum.yml | 4 ++ .../Guns/Ammunition/Magazines/pistol.yml | 6 ++ .../Guns/Ammunition/Magazines/rifle.yml | 2 + .../Guns/Ammunition/Magazines/shotgun.yml | 2 + .../Weapons/Guns/Ammunition/explosives.yml | 72 ++++++++++--------- .../Weapons/Guns/Battery/battery_guns.yml | 16 ++--- .../Objects/Weapons/Guns/HMGs/hmgs.yml | 2 - .../Weapons/Guns/Launchers/launchers.yml | 5 +- .../Objects/Weapons/Guns/Pistols/pistols.yml | 4 -- .../Weapons/Guns/Revolvers/revolvers.yml | 7 +- .../Objects/Weapons/Guns/Rifles/rifles.yml | 5 +- .../Objects/Weapons/Guns/SMGs/smgs.yml | 6 +- .../Weapons/Guns/Shotguns/shotguns.yml | 8 +-- .../Objects/Weapons/Guns/Snipers/snipers.yml | 2 +- .../Objects/Weapons/Guns/flare_gun.yml | 2 +- 25 files changed, 94 insertions(+), 84 deletions(-) diff --git a/Content.Server/Storage/EntitySystems/StorageSystem.Fill.cs b/Content.Server/Storage/EntitySystems/StorageSystem.Fill.cs index fde7216631..941cd5369c 100644 --- a/Content.Server/Storage/EntitySystems/StorageSystem.Fill.cs +++ b/Content.Server/Storage/EntitySystems/StorageSystem.Fill.cs @@ -31,7 +31,7 @@ public sealed partial class StorageSystem if (serverStorageComp != null && Insert(uid, ent, serverStorageComp)) continue; - Logger.ErrorS("storage", $"Tried to StorageFill {item} inside {uid} but can't."); + Logger.ErrorS("storage", $"Tried to StorageFill {item} inside {ToPrettyString(uid)} but can't."); EntityManager.DeleteEntity(ent); } } diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml index e8a58f8c93..858d84fdf0 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml @@ -143,7 +143,7 @@ - type: StorageFill contents: - id: MagazineMagnumSubMachineGun - amount: 6 + amount: 3 - type: entity name: box of .40 Drozd (high-velocity) magazines @@ -154,7 +154,7 @@ - type: StorageFill contents: - id: MagazineMagnumSubMachineGunHighVelocity - amount: 6 + amount: 3 - type: entity name: box of .40 Drozd (practice) magazines @@ -165,7 +165,7 @@ - type: StorageFill contents: - id: MagazineMagnumSubMachineGunPractice - amount: 6 + amount: 3 - type: entity name: box of .40 Drozd (rubber) magazines @@ -176,7 +176,7 @@ - type: StorageFill contents: - id: MagazineMagnumSubMachineGunRubber - amount: 6 + amount: 3 # Pistol - type: entity @@ -188,7 +188,7 @@ - type: StorageFill contents: - id: MagazinePistolSubMachineGunTopMounted - amount: 6 + amount: 3 - type: entity name: box of Calico .35 auto magazines @@ -199,7 +199,7 @@ - type: StorageFill contents: - id: MagazinePistolCalicoTopMounted - amount: 6 + amount: 3 - type: entity name: box of pistol .35 auto magazines diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml index 9c95735df9..7e68320b77 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml @@ -10,6 +10,8 @@ - CartridgeCaselessRifle proto: CartridgeCaselessRifle capacity: 60 + - type: Item + size: 5 - type: ContainerContainer containers: ballistic-ammo: !type:Container diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml index 06b4800017..d2581f4dde 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml @@ -10,6 +10,8 @@ - CartridgeLightRifle proto: CartridgeLightRifle capacity: 50 + - type: Item + size: 5 - type: ContainerContainer containers: ballistic-ammo: !type:Container diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml index 90297236fa..663c09b678 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml @@ -9,6 +9,8 @@ - CartridgeMagnum proto: CartridgeMagnum capacity: 60 + - type: Item + size: 5 - type: ContainerContainer containers: ballistic-ammo: !type:Container diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml index 8797eabecc..2ab51c8638 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml @@ -10,6 +10,8 @@ - CartridgePistol proto: CartridgePistol capacity: 60 + - type: Item + size: 5 - type: ContainerContainer containers: ballistic-ammo: !type:Container diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml index 49e6dcbef4..06429dbf62 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml @@ -9,6 +9,8 @@ - CartridgeRifle proto: CartridgeRifle capacity: 60 + - type: Item + size: 5 - type: ContainerContainer containers: ballistic-ammo: !type:Container diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml index b05a8416cc..1ca78de9ef 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml @@ -13,6 +13,8 @@ - CartridgeCaselessRifle proto: CartridgeCaselessRifle capacity: 30 + - type: Item + size: 5 - type: ContainerContainer containers: ballistic-ammo: !type:Container @@ -39,6 +41,8 @@ - type: BallisticAmmoProvider proto: CartridgeCaselessRifle capacity: 10 + - type: Item + size: 3 - type: Sprite sprite: Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi layers: @@ -62,6 +66,8 @@ - CartridgeCaselessRifle proto: CartridgeCaselessRifle capacity: 10 + - type: Item + size: 5 - type: Sprite sprite: Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi layers: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml index e425951508..dc05298c84 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml @@ -7,6 +7,8 @@ - type: Tag tags: - MagazineHeavyRifle + - type: Item + size: 10 - type: BallisticAmmoProvider capacity: 100 - type: ContainerContainer diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml index 9183527963..0bb4e4e4e6 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml @@ -14,6 +14,8 @@ - CartridgeLightRifle proto: CartridgeLightRifle capacity: 30 + - type: Item + size: 5 - type: ContainerContainer containers: ballistic-ammo: !type:Container @@ -44,7 +46,6 @@ proto: CartridgeLightRifle capacity: 100 - type: Item - size: 10 - type: Sprite sprite: Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi - type: MagazineVisuals diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml index 3904cc62e8..7229cf2dc9 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml @@ -12,6 +12,8 @@ tags: - CartridgeMagnum capacity: 10 + - type: Item + size: 5 - type: ContainerContainer containers: ballistic-ammo: !type:Container @@ -43,6 +45,8 @@ tags: - CartridgeMagnum capacity: 25 + - type: Item + size: 10 - type: ContainerContainer containers: ballistic-ammo: !type:Container diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml index a93e8daa03..edd8753f18 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml @@ -12,6 +12,8 @@ tags: - CartridgePistol capacity: 10 + - type: Item + size: 5 - type: ContainerContainer containers: ballistic-ammo: !type:Container @@ -43,6 +45,8 @@ tags: - CartridgePistol capacity: 16 + - type: Item + size: 5 - type: ContainerContainer containers: ballistic-ammo: !type:Container @@ -74,6 +78,8 @@ tags: - CartridgePistol capacity: 35 + - type: Item + size: 10 - type: ContainerContainer containers: ballistic-ammo: !type:Container diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml index db7362486e..8b58d6fb4b 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml @@ -8,6 +8,8 @@ - type: Tag tags: - MagazineRifle + - type: Item + size: 5 - type: BallisticAmmoProvider whitelist: tags: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml index 2c1f8a761a..ee20abb7ed 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml @@ -14,6 +14,8 @@ capacity: 8 soundRack: path: /Audio/Weapons/Guns/Cock/smg_cock.ogg + - type: Item + size: 5 - type: ContainerContainer containers: ballistic-ammo: !type:Container diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml index 72adfaf7b8..6a6e3d07e0 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml @@ -1,3 +1,5 @@ +# Rockets + - type: entity id: CartridgeRocket name: PG-7VL grenade @@ -7,6 +9,8 @@ - type: Tag tags: - CartridgeRocket + - type: Item + size: 5 - type: CartridgeAmmo proto: BulletRocket deleteOnSpawn: true @@ -16,17 +20,46 @@ state: rpg - type: entity - id: GrenadeBaton - name: baton grenade + id: CartridgeRocketSlow + name: PG-7VL grenade "Snail-Rocket" + parent: BaseItem + description: A 1.5 warhead designed for the RPG-7 launcher. It's unusually slow. + components: + - type: Tag + tags: + - CartridgeRocket + - type: Item + size: 5 + - type: CartridgeAmmo + proto: BulletWeakRocket + deleteOnSpawn: true + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi + state: frag + +# Grenades + +- type: entity + id: BaseGrenade + name: base grenade parent: BaseItem components: - type: Tag tags: - - Grenade + - Grenade + - type: Item + size: 5 + - type: Sprite + netsync: false + +- type: entity + id: GrenadeBaton + name: baton grenade + parent: BaseGrenade + components: - type: CartridgeAmmo proto: BulletGrenadeBaton - type: Sprite - netsync: false sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi layers: - state: baton @@ -39,15 +72,11 @@ - type: entity id: GrenadeBlast name: blast grenade - parent: BaseItem + parent: BaseGrenade components: - - type: Tag - tags: - - Grenade - type: CartridgeAmmo proto: BulletGrenadeBlast - type: Sprite - netsync: false sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi layers: - state: blast @@ -62,13 +91,9 @@ name: flash grenade parent: BaseItem components: - - type: Tag - tags: - - Grenade - type: CartridgeAmmo proto: BulletGrenadeFlash - type: Sprite - netsync: false sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi layers: - state: flash @@ -83,13 +108,9 @@ name: frag grenade parent: BaseItem components: - - type: Tag - tags: - - Grenade - type: CartridgeAmmo proto: BulletGrenadeFrag - type: Sprite - netsync: false sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi layers: - state: frag @@ -98,20 +119,3 @@ - type: SpentAmmoVisuals state: frag suffix: false - -- type: entity - id: CartridgeRocketSlow - name: PG-7VL grenade "Snail-Rocket" - parent: BaseItem - description: A 1.5 warhead designed for the RPG-7 launcher. It's unusually slow. - components: - - type: Tag - tags: - - CartridgeRocket - - type: CartridgeAmmo - proto: BulletWeakRocket - deleteOnSpawn: true - - type: Sprite - netsync: false - sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi - state: frag diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index c3d6a80eb8..6fd04b32f3 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -5,6 +5,8 @@ components: - type: Sprite netsync: false + - type: Item + size: 50 - type: AmmoCounter - type: Gun fireRate: 2 @@ -37,7 +39,6 @@ map: ["enum.GunVisualLayers.MagUnshaded"] shader: unshaded - type: Item - size: 12 sprite: Objects/Weapons/Guns/Battery/laser_retro.rsi - type: HitscanBatteryAmmoProvider proto: RedLaser @@ -63,7 +64,6 @@ map: ["enum.GunVisualLayers.MagUnshaded"] shader: unshaded - type: Item - size: 48 sprite: Objects/Weapons/Guns/Battery/makeshift.rsi - type: HitscanBatteryAmmoProvider proto: RedLaser @@ -90,7 +90,6 @@ map: ["enum.GunVisualLayers.MagUnshaded"] shader: unshaded - type: Item - size: 24 sprite: Objects/Weapons/Guns/Battery/laser_gun.rsi - type: Gun selectedMode: SemiAuto @@ -115,7 +114,6 @@ map: ["enum.GunVisualLayers.MagUnshaded"] shader: unshaded - type: Item - size: 12 sprite: Objects/Weapons/Guns/Battery/pulse_pistol.rsi - type: Gun selectedMode: SemiAuto @@ -145,7 +143,7 @@ map: ["enum.GunVisualLayers.MagUnshaded"] shader: unshaded - type: Item - size: 24 + size: 10 sprite: Objects/Weapons/Guns/Battery/pulse_carbine.rsi - type: Gun selectedMode: SemiAuto @@ -177,7 +175,6 @@ map: ["enum.GunVisualLayers.MagUnshaded"] shader: unshaded - type: Item - size: 24 sprite: Objects/Weapons/Guns/Battery/pulse_rifle.rsi - type: Gun fireRate: 1.5 @@ -205,7 +202,6 @@ map: ["enum.GunVisualLayers.MagUnshaded"] shader: unshaded - type: Item - size: 24 sprite: Objects/Weapons/Guns/Battery/laser_cannon.rsi - type: Gun fireRate: 1.5 @@ -230,7 +226,6 @@ map: ["enum.GunVisualLayers.MagUnshaded"] shader: unshaded - type: Item - size: 24 sprite: Objects/Weapons/Guns/Battery/xray.rsi - type: Gun soundGunshot: @@ -263,7 +258,7 @@ shader: unshaded - type: Clothing sprite: Objects/Weapons/Guns/Battery/taser.rsi - size: 24 + size: 10 quickEquip: false Slots: - Belt @@ -273,7 +268,7 @@ path: /Audio/Weapons/Guns/Gunshots/taser.ogg - type: ProjectileBatteryAmmoProvider proto: BulletTaser - fireCost: 100 + fireCost: 50 - type: Battery maxCharge: 100 startingCharge: 100 @@ -298,7 +293,6 @@ map: ["enum.GunVisualLayers.MagUnshaded"] shader: unshaded - type: Item - size: 12 sprite: Objects/Weapons/Guns/Battery/antiquelasergun.rsi - type: Gun soundGunshot: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml index bf6fdd7dde..6c793f789c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml @@ -8,7 +8,6 @@ - type: Sprite netsync: false - type: Item - size: 24 - type: Gun fireRate: 20 selectedMode: FullAuto @@ -32,7 +31,6 @@ - state: icon map: ["enum.GunVisualLayers.Base"] - type: Item - size: 24 sprite: Objects/Weapons/Guns/HMGs/minigun.rsi - type: Gun fireRate: 15 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index f99108b346..e7a299f892 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -8,7 +8,7 @@ - type: Sprite netsync: false - type: Item - size: 24 + size: 60 - type: entity name: china lake @@ -22,7 +22,6 @@ - state: icon map: ["enum.GunVisualLayers.Base"] - type: Item - size: 24 sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi - type: Gun fireRate: 1 @@ -55,7 +54,6 @@ - state: mag-0 map: ["enum.GunVisualLayers.Mag"] - type: Item - size: 24 sprite: Objects/Weapons/Guns/Launchers/rocket.rsi - type: Gun fireRate: 0.5 @@ -89,7 +87,6 @@ - state: mag-0 map: ["enum.GunVisualLayers.Mag"] - type: Item - size: 24 sprite: Objects/Weapons/Guns/Launchers/rocket.rsi - type: Gun fireRate: 6 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index 83cf84756a..d8585507b0 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -57,7 +57,6 @@ - type: Sprite sprite: Objects/Weapons/Guns/Pistols/viper.rsi - type: Item - size: 10 sprite: Objects/Weapons/Guns/Pistols/viper.rsi - type: ItemSlots slots: @@ -93,7 +92,6 @@ - state: base map: ["enum.GunVisualLayers.Base"] - type: Item - size: 10 sprite: Objects/Weapons/Guns/Pistols/hm_pistol.rsi - type: Gun selectedMode: SemiAuto @@ -114,7 +112,6 @@ - state: mag-0 map: ["enum.GunVisualLayers.Mag"] - type: Item - size: 10 sprite: Objects/Weapons/Guns/Pistols/cobra.rsi - type: Gun soundGunshot: @@ -154,7 +151,6 @@ - state: mag-0 map: ["enum.GunVisualLayers.Mag"] - type: Item - size: 10 sprite: Objects/Weapons/Guns/Pistols/mk58.rsi - type: Gun fireRate: 5 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml index 844bc0b9e7..b02c9ce7fe 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -8,6 +8,8 @@ - type: Sprite netsync: false state: icon + - type: Item + size: 10 - type: Gun selectedMode: SemiAuto fireRate: 1.5 @@ -41,7 +43,6 @@ map: ["enum.GunVisualLayers.MagUnshaded"] shader: unshaded - type: Item - size: 12 sprite: Objects/Weapons/Guns/Revolvers/deckard.rsi - type: RevolverAmmoProvider capacity: 5 @@ -60,7 +61,6 @@ - type: Sprite sprite: Objects/Weapons/Guns/Revolvers/inspector.rsi - type: Item - size: 12 sprite: Objects/Weapons/Guns/Revolvers/inspector.rsi - type: RevolverAmmoProvider capacity: 6 @@ -74,7 +74,6 @@ - type: Sprite sprite: Objects/Weapons/Guns/Revolvers/mateba.rsi - type: Item - size: 12 sprite: Objects/Weapons/Guns/Revolvers/mateba.rsi - type: RevolverAmmoProvider capacity: 7 @@ -88,7 +87,6 @@ - type: Sprite sprite: Objects/Weapons/Guns/Revolvers/python.rsi - type: Item - size: 12 sprite: Objects/Weapons/Guns/Revolvers/python.rsi - type: entity @@ -100,7 +98,6 @@ - type: Sprite sprite: Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi - type: Item - size: 12 sprite: Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi - type: Gun fireRate: 1 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index 34e73db682..e36cca86e1 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -8,7 +8,7 @@ - type: Sprite netsync: false - type: Item - size: 24 + size: 50 - type: AmmoCounter - type: Gun fireRate: 5 @@ -53,7 +53,6 @@ - state: mag-0 map: ["enum.GunVisualLayers.Mag"] - type: Item - size: 24 sprite: Objects/Weapons/Guns/Rifles/ak.rsi - type: Gun fireRate: 5 @@ -100,7 +99,6 @@ - state: mag-0 map: ["enum.GunVisualLayers.Mag"] - type: Item - size: 24 sprite: Objects/Weapons/Guns/Rifles/carbine.rsi - type: ItemSlots slots: @@ -142,7 +140,6 @@ - state: mag-0 map: ["enum.GunVisualLayers.Mag"] - type: Item - size: 24 sprite: Objects/Weapons/Guns/Rifles/lecter.rsi - type: Gun soundGunshot: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index f7b18dd620..17bf1371ba 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -8,7 +8,7 @@ - type: Sprite netsync: false - type: Item - size: 24 + size: 30 - type: AmmoCounter - type: Gun minAngle: 2 @@ -56,7 +56,6 @@ - state: mag-0 map: ["enum.GunVisualLayers.Mag"] - type: Item - size: 24 sprite: Objects/Weapons/Guns/SMGs/atreides.rsi - type: Gun fireRate: 10 @@ -80,7 +79,6 @@ - state: mag-0 map: ["enum.GunVisualLayers.Mag"] - type: Item - size: 24 sprite: Objects/Weapons/Guns/SMGs/c20r.rsi - type: Gun - type: ChamberMagazineAmmoProvider @@ -105,7 +103,6 @@ - state: mag-0 map: ["enum.GunVisualLayers.Mag"] - type: Item - size: 24 sprite: Objects/Weapons/Guns/SMGs/vector.rsi - type: Gun fireRate: 6 @@ -158,7 +155,6 @@ map: ["enum.GunVisualLayers.MagUnshaded"] shader: unshaded - type: Item - size: 24 sprite: Objects/Weapons/Guns/SMGs/wt550.rsi - type: Gun fireRate: 5 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index 09965dbe2f..a210f7c847 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -11,7 +11,7 @@ - state: icon map: [ "enum.GunVisualLayers.Base" ] - type: Item - size: 24 + size: 30 - type: AmmoCounter - type: Gun fireRate: 2 @@ -49,7 +49,6 @@ map: ["enum.GunVisualLayers.Mag"] - type: Item sprite: Objects/Weapons/Guns/Shotguns/bulldog.rsi - size: 24 - type: Gun fireRate: 2 selectedMode: FullAuto @@ -89,7 +88,6 @@ - type: Sprite sprite: Objects/Weapons/Guns/Shotguns/db_shotgun.rsi - type: Item - size: 24 sprite: Objects/Weapons/Guns/Shotguns/db_shotgun.rsi - type: Gun fireRate: 8 @@ -130,9 +128,9 @@ - type: Sprite sprite: Objects/Weapons/Guns/Shotguns/sawn.rsi - type: Item - size: 15 + size: 10 sprite: Objects/Weapons/Guns/Shotguns/sawn.rsi - type: Gun - fireRate: 8 + fireRate: 4 - type: BallisticAmmoProvider capacity: 2 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index c51942c833..2113c8197c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -11,7 +11,7 @@ - state: base map: ["enum.GunVisualLayers.Base"] - type: Item - size: 24 + size: 30 - type: AmmoCounter - type: Gun fireRate: 1 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml index 67812b6c1f..df2de4e816 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml @@ -10,7 +10,7 @@ - state: icon map: ["enum.GunVisualLayers.Base"] - type: Item - size: 12 + size: 10 sprite: Objects/Weapons/Guns/Shotguns/flaregun.rsi - type: Gun fireRate: 8