From 33b3146d043286c9d1e8f4164f89081937d14cbc Mon Sep 17 00:00:00 2001 From: Echo Date: Wed, 27 Mar 2024 13:15:30 -0700 Subject: [PATCH 1/2] Increase the damage of rubber bullet projectiles MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upstream simply removed all rubber ammunition from the game, but after some discussion, it seems the balance issues are less severe for us. Raising the blunt damage of rubber bullets to exceed that of disablers — without modifying their stamina damage — is not only a more popular balance tweak, but it also ensures they exceed the automatic healing threshold, which should discourage security players from using rubber bullets by default when a disabler will do just fine. --- .../Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml | 2 +- .../Weapons/Guns/Ammunition/Projectiles/light_rifle.yml | 2 +- .../Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml | 4 ++-- .../Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml | 2 +- .../Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml | 6 +++--- .../Objects/Weapons/Guns/Projectiles/projectiles.yml | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml index 5ce0bf82fe9..12808f0a215 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml @@ -29,4 +29,4 @@ - type: Projectile damage: types: - Blunt: 3 + Blunt: 5 # Delta-V: Previously 3. Rubber bullets are otherwise a direct upgrade to disablers. 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 3a0df2ac6c7..791baa2f787 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,7 +29,7 @@ - type: Projectile damage: types: - Blunt: 3 + Blunt: 5 # Delta-V: Previously 3. Rubber bullets are otherwise a direct upgrade to disablers. - type: entity id: BulletLightRifleIncendiary 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 1b5cf7890ba..b70fa1774ea 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml @@ -29,7 +29,7 @@ - type: Projectile damage: types: - Blunt: 3 + Blunt: 9 # Delta-V: Previously 3. Rubber bullets are otherwise a direct upgrade to disablers. More cuz revolver, as below. - type: StaminaDamageOnCollide damage: 35 # 3 hits to stun cuz revolver @@ -44,7 +44,7 @@ types: Blunt: 3 Heat: 32 - + - type: entity id: BulletMagnumAP name: bullet (.45 magnum armor-piercing) 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 086a8dc914f..50217b72002 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml @@ -29,7 +29,7 @@ - type: Projectile damage: types: - Blunt: 3 + Blunt: 5 # Delta-V: Previously 3. Rubber bullets are otherwise a direct upgrade to disablers. - type: entity id: BulletPistolIncendiary 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 2113916cf52..91d38f00975 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml @@ -29,7 +29,7 @@ - type: Projectile damage: types: - Blunt: 3 + Blunt: 5 # Delta-V: Previously 3. Rubber bullets are otherwise a direct upgrade to disablers. - type: entity id: BulletRifleIncendiary @@ -42,7 +42,7 @@ types: Blunt: 2 Heat: 15 - + - type: entity id: BulletRifleUranium parent: BaseBulletUranium @@ -54,4 +54,4 @@ types: Radiation: 7 Piercing: 8 - + diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 935e335c2a4..263529349d0 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -117,7 +117,7 @@ - type: Projectile damage: types: - Blunt: 3 + Blunt: 5 # Delta-V: Previously 3. Rubber bullets are otherwise a direct upgrade to disablers. soundHit: path: /Audio/Weapons/Guns/Hits/snap.ogg - type: StaminaDamageOnCollide From 7c267f5781e4b34dde1b57d9c01ac045ec1cb248 Mon Sep 17 00:00:00 2001 From: Echo Date: Wed, 27 Mar 2024 13:56:04 -0700 Subject: [PATCH 2/2] Increase blunt damage of the Mantis' rubber bullets as well --- .../Objects/Weapons/Guns/Ammunition/Projectiles/special.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/special.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/special.yml index a021e77f0a2..60a320242de 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/special.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/special.yml @@ -29,7 +29,7 @@ - type: Projectile damage: types: - Blunt: 3 + Blunt: 6 - type: StaminaDamageOnCollide damage: 30