From 80c6650730d3d019b318ca0af8ed1269431746f8 Mon Sep 17 00:00:00 2001 From: Perry Fraser Date: Thu, 10 Jul 2025 03:48:45 -0400 Subject: [PATCH] fix: wide swings with resistanceBypass now bypass resists (#38496) --- Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs index bd44dcfd66..7d0d7577a4 100644 --- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs +++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs @@ -578,6 +578,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem var distance = Math.Min(component.Range, direction.Length()); var damage = GetDamage(meleeUid, user, component); + var resistanceBypass = GetResistanceBypass(meleeUid, user, component); var entities = GetEntityList(ev.Entities); if (entities.Count == 0) @@ -682,7 +683,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem RaiseLocalEvent(entity, attackedEvent); var modifiedDamage = DamageSpecifier.ApplyModifierSets(damage + hitEvent.BonusDamage + attackedEvent.BonusDamage, hitEvent.ModifiersList); - var damageResult = Damageable.TryChangeDamage(entity, modifiedDamage, origin:user); + var damageResult = Damageable.TryChangeDamage(entity, modifiedDamage, origin: user, ignoreResistances: resistanceBypass); if (damageResult != null && damageResult.GetTotal() > FixedPoint2.Zero) { -- 2.51.2