From 261153683e946b2d347ece8512d982f30177af5b Mon Sep 17 00:00:00 2001 From: Alzore <140123969+Blackern5000@users.noreply.github.com> Date: Fri, 26 Jan 2024 20:56:57 -0600 Subject: [PATCH] Make shotgun slug ammo not useless (#24196) * 20blunt8pierce * ShotgunSlugLathe * Commentbecauseapparentlyitdoesntknowichangedthis * nevermindthereweretwo * 28pierce --- .../Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml | 6 +++--- .../Weapons/Guns/Ammunition/Projectiles/shotgun.yml | 4 ++-- .../Prototypes/Entities/Structures/Machines/lathe.yml | 2 ++ Resources/Prototypes/Recipes/Lathes/security.yml | 7 +++++++ 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml index 1b3a4203cd..3506a0b31f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity id: BaseShellShotgun name: shell (.50) parent: BaseCartridge @@ -47,8 +47,8 @@ map: [ "enum.AmmoVisualLayers.Base" ] - type: CartridgeAmmo proto: PelletShotgunSlug - count: 4 - spread: 5 + count: 1 + spread: 0 - type: SpentAmmoVisuals state: "slug" 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 0971391105..774114f90b 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity id: PelletShotgunSlug name: pellet (.50 slug) noSpawn: true @@ -10,7 +10,7 @@ - type: Projectile damage: types: - Piercing: 8 # Should have the same or less damage than a regular pellet + Piercing: 28 - type: entity id: PelletShotgunBeanbag diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 86671df41f..c920d86701 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -649,6 +649,7 @@ - ForensicPad - RiotShield - ShellShotgun + - ShellShotgunSlug - ShellShotgunFlare - ShellTranquilizer - MagazinePistol @@ -760,6 +761,7 @@ - CartridgePistol - CartridgeMagnum - ShellShotgun + - ShellShotgunSlug - ShellShotgunFlare - ShellTranquilizer - CartridgeLightRifle diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml index dceeb30263..ffa74d460f 100644 --- a/Resources/Prototypes/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/Recipes/Lathes/security.yml @@ -206,6 +206,13 @@ materials: Steel: 20 +- type: latheRecipe + id: ShellShotgunSlug + result: ShellShotgunSlug + completetime: 2 + materials: + Steel: 25 + - type: latheRecipe id: CartridgeMagnum result: CartridgeMagnum -- 2.51.2