]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Minor shotgun changes and comments for future changes (#33512)
authorK-Dynamic <20566341+K-Dynamic@users.noreply.github.com>
Thu, 30 Jan 2025 17:36:12 +0000 (05:36 +1200)
committerGitHub <noreply@github.com>
Thu, 30 Jan 2025 17:36:12 +0000 (09:36 -0800)
* 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

Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml

index a927d880ef9d55771786a2ad9d588eeeaa6eb2fc..c9748a0b6124154ea977010e970d6093ce255f38 100644 (file)
@@ -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
     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
   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
   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:
   - 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
   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
     size: Small
     sprite: Objects/Weapons/Guns/Shotguns/sawn_inhands_64x.rsi
   - type: Gun
-    fireRate: 4
+    fireRate: 3
   - type: BallisticAmmoProvider
     capacity: 2
   - type: Construction