Sanek31 1

Content.Shared/Damage/Components/DamageableComponent.cs

@@ -77,6 +77,9 @@ public sealed partial class DamageableComponent : Component
 
         [DataField]
         public ProtoId<StatusIconPrototype> RottingIcon = "HealthIconRotting";
+
+        [DataField]
+        public float? bypassResistance;
     }
 
     [Serializable, NetSerializable]

Content.Shared/Damage/DamageSpecifier.cs

@@ -125,7 +125,7 @@ public DamageSpecifier(DamageGroupPrototype group, FixedPoint2 value)
         ///     Only applies resistance to a damage type if it is dealing damage, not healing.
         ///     This will never convert damage into healing.
         /// </remarks>
-        public static DamageSpecifier ApplyModifierSet(DamageSpecifier damageSpec, DamageModifierSet modifierSet)
+        public static DamageSpecifier ApplyModifierSet(DamageSpecifier damageSpec, DamageModifierSet modifierSet, float br = 1)
         {
             // Make a copy of the given data. Don't modify the one passed to this function. I did this before, and weapons became
             // duller as you hit walls. Neat, but not FixedPoint2ended. And confusing, when you realize your fists don't work no
@@ -147,10 +147,10 @@ public static DamageSpecifier ApplyModifierSet(DamageSpecifier damageSpec, Damag
                 float newValue = value.Float();
 
                 if (modifierSet.FlatReduction.TryGetValue(key, out var reduction))
-                    newValue = Math.Max(0f, newValue - reduction); // flat reductions can't heal you
+                    newValue = Math.Max(0f, newValue - reduction*br); // flat reductions can't heal you
 
                 if (modifierSet.Coefficients.TryGetValue(key, out var coefficient))
-                    newValue *= coefficient; // coefficients can heal you, e.g. cauterizing bleeding
+                    newValue *= 1-coefficient*br; // coefficients can heal you, e.g. cauterizing bleeding
 
                 if(newValue != 0)
                     newDamage.DamageDict[key] = FixedPoint2.New(newValue);

Content.Shared/Damage/Systems/DamageableSystem.cs

@@ -125,7 +125,7 @@ public void DamageChanged(EntityUid uid, DamageableComponent component, DamageSp
         ///     null if the user had no applicable components that can take damage.
         /// </returns>
         public DamageSpecifier? TryChangeDamage(EntityUid? uid, DamageSpecifier damage, bool ignoreResistances = false,
-            bool interruptsDoAfters = true, DamageableComponent? damageable = null, EntityUid? origin = null)
+            bool interruptsDoAfters = true, DamageableComponent? damageable = null, EntityUid? origin = null, float? bypassResistance = null)
         {
             if (!uid.HasValue || !_damageableQuery.Resolve(uid.Value, ref damageable, false))
             {
@@ -150,9 +150,14 @@ public void DamageChanged(EntityUid uid, DamageableComponent component, DamageSp
                 if (damageable.DamageModifierSetId != null &&
                     _prototypeManager.TryIndex<DamageModifierSetPrototype>(damageable.DamageModifierSetId, out var modifierSet))
                 {
-                    // TODO DAMAGE PERFORMANCE
-                    // use a local private field instead of creating a new dictionary here..
-                    damage = DamageSpecifier.ApplyModifierSet(damage, modifierSet);
+                    if (bypassResistance != null)
+                    {
+                        damage = DamageSpecifier.ApplyModifierSet(damage, modifierSet,(float) bypassResistance);
+                    }
+                    else
+                    {
+                        damage = DamageSpecifier.ApplyModifierSet(damage, modifierSet);
+                    }
                 }
 
                 var ev = new DamageModifyEvent(damage, origin);