From b57be2413e4735a366dd42d30ce85bea4614e4b7 Mon Sep 17 00:00:00 2001 From: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com> Date: Sun, 5 Oct 2025 01:27:19 -0700 Subject: [PATCH] Incendiary rounds do pierce (#39204) * Incendiary rounds do pierce * Address review --------- Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com> --- .../Weapons/Guns/Ammunition/Projectiles/light_rifle.yml | 4 ++-- .../Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml | 4 ++-- .../Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml | 4 ++-- .../Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml | 4 ++-- .../Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml | 4 ++-- .../Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml | 3 ++- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml index 43427c1dac..60640bdd2e 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml @@ -29,8 +29,8 @@ - type: Projectile damage: types: - Blunt: 3 - Heat: 16 + Piercing: 14 + Heat: 5 - type: entity id: BulletLightRifleUranium diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml index b4017fd550..124fa4a93e 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml @@ -29,8 +29,8 @@ - type: Projectile damage: types: - Blunt: 3 - Heat: 32 + Piercing: 26 + Heat: 9 - type: entity id: BulletMagnumAP diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml index 8d146939b7..53917035cb 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml @@ -29,8 +29,8 @@ - type: Projectile damage: types: - Blunt: 2 - Heat: 14 + Piercing: 12 + Heat: 4 - type: entity id: BulletPistolUranium diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml index 497ca9e2a3..84506148b4 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml @@ -29,8 +29,8 @@ - type: Projectile damage: types: - Blunt: 2 - Heat: 15 + Piercing: 12 + Heat: 5 - type: entity id: BulletRifleUranium 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 e5120a746f..ebea6dde5e 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml @@ -68,8 +68,8 @@ - type: Projectile damage: types: - Blunt: 3 - Heat: 7 + Piercing: 7 + Heat: 3 - type: IgnitionSource ignited: true diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 6c39e112bd..2134ac0cbf 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -142,7 +142,8 @@ - type: Projectile damage: types: - Blunt: 14 + Piercing: 10 + Heat: 4 - type: PointLight enabled: true color: "#ff4300" -- 2.51.2