Fire damage system fixes (#37241)

Fire fixes

diff --git a/Content.Shared/Atmos/GetFireProtectionEvent.cs b/Content.Shared/Atmos/GetFireProtectionEvent.cs
index e243295449a721e0b93181af92e5532859d89030..b7a77a8925d134bbda5da9284d31acae6aeb0390 100644 (file)
--- a/Content.Shared/Atmos/GetFireProtectionEvent.cs
+++ b/Content.Shared/Atmos/GetFireProtectionEvent.cs
@@ -29,5 +29,6 @@ public sealed class GetFireProtectionEvent : EntityEventArgs, IInventoryRelayEve
     public void Reduce(float by)
     {
         Multiplier -= by;
+        Multiplier = MathF.Max(Multiplier, 0f);
     }
 }

diff --git a/Content.Shared/Clothing/EntitySystems/FireProtectionSystem.cs b/Content.Shared/Clothing/EntitySystems/FireProtectionSystem.cs
index b6c29b21ada3e7bc351cda99cc2dbef4c76156d6..8db4e1c9d2b6ba998758b6f847e837fb885a34c3 100644 (file)
--- a/Content.Shared/Clothing/EntitySystems/FireProtectionSystem.cs
+++ b/Content.Shared/Clothing/EntitySystems/FireProtectionSystem.cs
@@ -25,7 +25,7 @@ public sealed class FireProtectionSystem : EntitySystem
 
     private void OnArmorExamine(Entity<FireProtectionComponent> ent, ref ArmorExamineEvent args)
     {
-        var value = MathF.Round((1f - ent.Comp.Reduction) * 100, 1);
+        var value = MathF.Round(ent.Comp.Reduction * 100, 1);
 
         if (value == 0)
             return;