From 1cbfc7d652b7c7cb29a4d8cdcf8f0d48c97dfc81 Mon Sep 17 00:00:00 2001 From: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com> Date: Fri, 31 Jan 2025 05:36:12 +1200 Subject: [PATCH] Minor shotgun changes and comments for future changes (#33512) * kammerer ammo, firerate and comment * bulldog description * enforcer description and comment * DB and sawn-off firerate parity, sawn-off comment * description changes * reduce kammerer firerate again --- .../Weapons/Guns/Shotguns/shotguns.yml | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index a927d880ef..c9748a0b61 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -48,7 +48,7 @@ # Don't parent to BaseWeaponShotgun because it differs significantly parent: [BaseItem, BaseGunWieldable, BaseSyndicateContraband] id: WeaponShotgunBulldog - description: It's a magazine-fed shotgun designed for close quarters combat. Uses .50 shotgun shells. + description: An automatic magazine-fed shotgun for close-quarters combat. Kicks like a mule on steroids. Uses .50 shotgun shells. components: - type: Sprite sprite: Objects/Weapons/Guns/Shotguns/bulldog.rsi @@ -116,7 +116,7 @@ sprite: Objects/Weapons/Guns/Shotguns/db_shotgun_inhands_64x.rsi - type: GunRequiresWield #remove when inaccuracy on spreads is fixed - type: Gun - fireRate: 2 + fireRate: 3 - type: BallisticAmmoProvider capacity: 2 - type: Construction @@ -138,8 +138,8 @@ name: Enforcer parent: [BaseWeaponShotgun, BaseGunWieldable, BaseRestrictedContraband] id: WeaponShotgunEnforcer - description: A premium combat shotgun based on the Kammerer design, featuring an upgraded clip capacity. .50 shotgun shells. - components: + description: A premium semi-automatic shotgun, and the pride of all security forces. Uses .50 shotgun shells. + components: # intend for Enforcer to have wider choke for semi-auto function - type: Sprite sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi - type: Clothing @@ -161,8 +161,8 @@ name: Kammerer parent: [BaseWeaponShotgun, BaseGunWieldable, BaseRestrictedContraband] id: WeaponShotgunKammerer - description: When an old Remington design meets modern materials, this is the result. A favourite weapon of militia forces throughout many worlds. Uses .50 shotgun shells. - components: + description: An old yet faithful design, and a favorite among irregular forces of many worlds. Uses .50 shotgun shells. + components: # intend for Kammerer to have tighter choke for slower fire rate and/or manual cycling - type: Item size: Normal shape: @@ -173,8 +173,8 @@ - type: Clothing sprite: Objects/Weapons/Guns/Shotguns/pump.rsi - type: GunRequiresWield #remove when inaccuracy on spreads is fixed - - type: BallisticAmmoProvider - capacity: 4 + - type: Gun + fireRate: 1 - type: Tag tags: - WeaponShotgunKammerer @@ -184,7 +184,7 @@ parent: [ BaseWeaponShotgun, BaseSecurityBartenderContraband ] id: WeaponShotgunSawn description: Groovy! Uses .50 shotgun shells. - components: + components: # needs to be super inaccurate because you don't need to wield it - type: Sprite sprite: Objects/Weapons/Guns/Shotguns/sawn.rsi - type: Clothing @@ -193,7 +193,7 @@ size: Small sprite: Objects/Weapons/Guns/Shotguns/sawn_inhands_64x.rsi - type: Gun - fireRate: 4 + fireRate: 3 - type: BallisticAmmoProvider capacity: 2 - type: Construction -- 2.51.2