From: Stomf <5dorkydorks@gmail.com> Date: Tue, 29 Apr 2025 03:13:01 +0000 (-0500) Subject: Buffing slugs and replacing beanbags from the Bulldog bundle (#33517) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=a94d4a09912a0b04b671047424f433bf59dc4565;p=space-station-14.git Buffing slugs and replacing beanbags from the Bulldog bundle (#33517) Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> --- diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index c898b4272c..27bbedec0a 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -34,14 +34,14 @@ 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 @@ -116,7 +116,7 @@ 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: @@ -124,6 +124,8 @@ amount: 4 - id: MagazineShotgun amount: 4 + - id: MagazineShotgunSlug + amount: 1 - id: MagazineLightRifleBox amount: 2 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml index d8c465cf9e..e5120a746f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml @@ -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