From: vanx <61917534+Vaaankas@users.noreply.github.com> Date: Fri, 5 May 2023 13:37:13 +0000 (+0700) Subject: Rubber bullet rebalance (#13335) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=4642f84ebfaaa5d59fc1c112e73e53c80cae8e54;p=space-station-14.git Rubber bullet rebalance (#13335) Co-authored-by: vanx --- 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 99593e974f..261cfb8c9c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml @@ -41,3 +41,5 @@ damage: types: Blunt: 3 + - type: StaminaDamageOnCollide + damage: 35 # 3 hits to stun cuz revolver 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 c65be95829..c893cdbc11 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml @@ -26,7 +26,7 @@ types: Blunt: 10 - type: StaminaDamageOnCollide - damage: 55 + damage: 55 # 2 hits to stun - type: entity id: PelletShotgun diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 84672c5409..9ea1222510 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -126,7 +126,7 @@ soundHit: path: /Audio/Weapons/Guns/Hits/snap.ogg - type: StaminaDamageOnCollide - damage: 15 + damage: 22 # 5 hits to stun sounds reasonable # Energy projectiles - type: entity