diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs index 88e41f6e0e..15b04f9c14 100644 --- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs +++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs @@ -542,7 +542,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem // If the target has stamina and is taking blunt damage, they should also take stamina damage based on their blunt to stamina factor if (damageResult.DamageDict.TryGetValue("Blunt", out var bluntDamage)) { - _stamina.TakeStaminaDamage(target.Value, (bluntDamage * component.BluntStaminaDamageFactor).Float(), visual: false, source: user, with: meleeUid == user ? null : meleeUid); + _stamina.TakeStaminaDamage(target.Value, (bluntDamage * component.BluntStaminaDamageFactor).Float(), visual: false, source: user, with: meleeUid == user ? null : meleeUid, ignoreResist: true); // DeltaV - No Stamina Resistance Doubledipping } if (meleeUid == user) @@ -697,7 +697,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem // If the target has stamina and is taking blunt damage, they should also take stamina damage based on their blunt to stamina factor if (damageResult.DamageDict.TryGetValue("Blunt", out var bluntDamage)) { - _stamina.TakeStaminaDamage(entity, (bluntDamage * component.BluntStaminaDamageFactor).Float(), visual: false, source: user, with: meleeUid == user ? null : meleeUid); + _stamina.TakeStaminaDamage(entity, (bluntDamage * component.BluntStaminaDamageFactor).Float(), visual: false, source: user, with: meleeUid == user ? null : meleeUid, ignoreResist: true); // DeltaV - No Stamina Resistance Doubledipping } appliedDamage += damageResult; diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml index ca8bd3ef87..f76bda97c9 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml @@ -11,7 +11,7 @@ - type: Sprite scale: 1.2, 1.2 - type: PlayerToolModifier - pryTimeMultiplier: 0.6 + pryTimeMultiplier: 0.5 - type: PlayerAccuracyModifier spreadMultiplier: 15 maxSpreadAngle: 180 diff --git a/Resources/ServerInfo/Guidebook/Mobs/_DV/Oni.xml b/Resources/ServerInfo/Guidebook/Mobs/_DV/Oni.xml index 85c1699af0..837bc9f2c2 100644 --- a/Resources/ServerInfo/Guidebook/Mobs/_DV/Oni.xml +++ b/Resources/ServerInfo/Guidebook/Mobs/_DV/Oni.xml @@ -17,7 +17,8 @@ - Due to their big size, they can easily carry, shove, and pull any other morphotypes. - They are harder to shove. - Slightly more stamina than Humans. - - They have an easier time prying open doors, taking around 50% less time than other species. + - Deal [color=#1e90ff]25% more stamina damage[/color], excluding truncheons and similar. + - They have an easier time prying open doors, taking 50% less time than other species. ## Drawbacks - Their accuracy with guns is terrible.