From 8cf6ca78cf3d3b0208ed8a327f1fbd8b222de63f Mon Sep 17 00:00:00 2001 From: UpAndLeaves <92269094+Alpha-Two@users.noreply.github.com> Date: Wed, 7 May 2025 03:03:05 +0100 Subject: [PATCH] Fire damage system fixes (#37241) Fire fixes --- Content.Shared/Atmos/GetFireProtectionEvent.cs | 1 + Content.Shared/Clothing/EntitySystems/FireProtectionSystem.cs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Content.Shared/Atmos/GetFireProtectionEvent.cs b/Content.Shared/Atmos/GetFireProtectionEvent.cs index e243295449..b7a77a8925 100644 --- 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 b6c29b21ad..8db4e1c9d2 100644 --- 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 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; -- 2.51.2