From 8c2dbedae64bd3cd1d26b94ae5e434bcbae5bb70 Mon Sep 17 00:00:00 2001 From: Perry Fraser Date: Mon, 23 Jun 2025 09:00:47 -0400 Subject: [PATCH] fix: add back ignoreResistance for light attacks (#3997) Was previously there but got clobbered by shitmed merge. --- Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs index 1837257080..88e41f6e0e 100644 --- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs +++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs @@ -535,7 +535,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem RaiseLocalEvent(target.Value, attackedEvent); var modifiedDamage = DamageSpecifier.ApplyModifierSets(damage + hitEvent.BonusDamage + attackedEvent.BonusDamage, hitEvent.ModifiersList); - var damageResult = Damageable.TryChangeDamage(target, modifiedDamage, origin: user, partMultiplier: component.ClickPartDamageMultiplier); // Shitmed Change + var damageResult = Damageable.TryChangeDamage(target, modifiedDamage, origin: user, ignoreResistances: resistanceBypass, partMultiplier: component.ClickPartDamageMultiplier); // Shitmed Change if (damageResult is {Empty: false}) {