From a35a561cf1cff69a820e1cf83abc94c7860a85c5 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Wed, 11 Sep 2024 20:21:44 -0400 Subject: [PATCH 1/2] Longarms Require Wielding --- .../Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml | 1 + .../Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml | 2 ++ .../Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml | 2 ++ .../Entities/Objects/Weapons/Guns/Snipers/snipers.yml | 2 ++ 4 files changed, 7 insertions(+) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml index 49b2eeaada1..a721f254c89 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml @@ -14,6 +14,7 @@ slots: - Back - type: Wieldable + - type: GunRequiresWield - type: GunWieldBonus minAngle: -20 maxAngle: -20 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index c55b2b6b091..2e7265a2c77 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -14,6 +14,8 @@ slots: - Back - suitStorage + - type: Wieldable + - type: GunRequiresWield - type: AmmoCounter - 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 52b05b6d60b..d3d40b73f62 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -19,6 +19,8 @@ - Back - suitStorage - type: AmmoCounter + - type: Wieldable + - type: GunRequiresWield - type: Gun fireRate: 2 selectedMode: SemiAuto diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index adb8e323f4a..36acbe72bd7 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -18,6 +18,8 @@ - Back - suitStorage - type: AmmoCounter + - type: Wieldable + - type: GunRequiresWield - type: Gun fireRate: 0.75 selectedMode: SemiAuto From 9a63a764988b5519c247ff7dd7b2aeecb8f18d90 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Fri, 20 Sep 2024 16:14:06 -0400 Subject: [PATCH 2/2] Update shotguns.yml --- .../Objects/Weapons/Guns/Shotguns/shotguns.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index d3d40b73f62..d1635f49791 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -19,8 +19,6 @@ - Back - suitStorage - type: AmmoCounter - - type: Wieldable - - type: GunRequiresWield - type: Gun fireRate: 2 selectedMode: SemiAuto @@ -79,6 +77,8 @@ soundEmpty: path: /Audio/Weapons/Guns/Empty/empty.ogg fireOnDropChance: 0.3 + - type: Wieldable + - type: GunRequiresWield - type: ItemSlots slots: gun_magazine: @@ -120,6 +120,8 @@ - type: Gun fireRate: 2 fireOnDropChance: 0.5 + - type: Wieldable + - type: GunRequiresWield - type: BallisticAmmoProvider capacity: 2 - type: Construction @@ -148,6 +150,8 @@ - type: Clothing sprite: DeltaV/Objects/Weapons/Guns/Shotguns/enforcer.rsi # Delta-V - type: BallisticAmmoProvider + - type: Wieldable + - type: GunRequiresWield - type: entity parent: WeaponShotgunEnforcer @@ -178,6 +182,8 @@ - type: Tag tags: - WeaponShotgunKammerer + - type: Wieldable + - type: GunRequiresWield - type: entity name: sawn-off shotgun @@ -262,6 +268,8 @@ capacity: 1 - type: StaticPrice price: 0 + - type: Wieldable + - type: GunRequiresWield - type: entity name: improvised shotgun