]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Buffing slugs and replacing beanbags from the Bulldog bundle (#33517)
authorStomf <5dorkydorks@gmail.com>
Tue, 29 Apr 2025 03:13:01 +0000 (22:13 -0500)
committerGitHub <noreply@github.com>
Tue, 29 Apr 2025 03:13:01 +0000 (20:13 -0700)
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml

index c898b4272ce551d713cbaf195af81fa064b3403a..27bbedec0a28e76839f04d6885de86c7de7ae368 100644 (file)
   parent: ClothingBackpackDuffelSyndicateBundle
   id: ClothingBackpackDuffelSyndicateFilledShotgun
   name: Bulldog bundle
-  description: "Lean and mean: Contains the popular Bulldog Shotgun and four 12g buckshot drums." #, and a pair of Thermal Imaging Goggles.
+  description: "Lean and mean: Contains the popular Bulldog Shotgun, a 12g slug drum, and four 12g buckshot drums." #, and a pair of Thermal Imaging Goggles.
   components:
   - type: StorageFill
     contents:
       - id: WeaponShotgunBulldog
       - id: MagazineShotgun
-      - id: MagazineShotgun
-      - id: MagazineShotgun
+        amount: 3
+      - id: MagazineShotgunSlug
 #     - id: ThermalImagingGoggles
 
 - type: entity
   parent: ClothingBackpackDuffelSyndicateAmmo
   id: ClothingBackpackDuffelSyndicateAmmoFilled
   name: ammo bundle
-  description: "Reloading! Contains 4 magazines for the C-20r, 4 drums for the Bulldog, and 2 ammo boxes for the L6 SAW."
+  description: "Reloading! Contains 4 magazines for the C-20r, 5 drums for the Bulldog, and 2 ammo boxes for the L6 SAW."
   components:
   - type: StorageFill
     contents:
         amount: 4
       - id: MagazineShotgun
         amount: 4
+      - id: MagazineShotgunSlug
+        amount: 1
       - id: MagazineLightRifleBox
         amount: 2
 
index d8c465cf9e8da705fe3a0bc14f6d37c5ac7822d2..e5120a746f2e3fd4125bc74f6d66fc0d783b9cb6 100644 (file)
@@ -10,7 +10,9 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 28
+        Piercing: 40
+        Structural: 15
+
 
 - type: entity
   id: PelletShotgunBeanbag
@@ -41,6 +43,8 @@
     damage:
       types:
         Piercing: 10
+        Structural: 15
+
 
 - type: entity
   id: PelletShotgunSpread