diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs index 96085ebfda..c28e049a96 100644 --- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs +++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs @@ -6,6 +6,7 @@ using Content.Shared.Administration.Logs; using Content.Shared.CombatMode; using Content.Shared.Damage; using Content.Shared.Damage.Systems; +using Content.Shared.Damage.Components; // WD using Content.Shared.Database; using Content.Shared.FixedPoint; using Content.Shared.Hands; @@ -644,6 +645,11 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem if (!TryComp(user, out var userXform)) return false; + // WD EDIT + if (TryComp(user, out var stamina) && stamina.StaminaDamage >= stamina.CritThreshold) + return false; + // WD EDIT END + var targetMap = GetCoordinates(ev.Coordinates).ToMap(EntityManager, TransformSystem); if (targetMap.MapId != userXform.MapID)