From a46af58e59b68a3e1f7ccb71b405f18806e0010d Mon Sep 17 00:00:00 2001 From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Date: Mon, 20 Dec 2021 04:39:59 +1300 Subject: [PATCH] Make temperature damage not interrupt do-afters (#5835) --- Content.Server/Temperature/Systems/TemperatureSystem.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content.Server/Temperature/Systems/TemperatureSystem.cs b/Content.Server/Temperature/Systems/TemperatureSystem.cs index ea67419639..b15f32c305 100644 --- a/Content.Server/Temperature/Systems/TemperatureSystem.cs +++ b/Content.Server/Temperature/Systems/TemperatureSystem.cs @@ -172,7 +172,7 @@ namespace Content.Server.Temperature.Systems var diff = Math.Abs(temperature.CurrentTemperature - temperature.HeatDamageThreshold); var tempDamage = c / (1 + a * Math.Pow(Math.E, -heatK * diff)) - y; - _damageableSystem.TryChangeDamage(uid, temperature.HeatDamage * tempDamage); + _damageableSystem.TryChangeDamage(uid, temperature.HeatDamage * tempDamage, interruptsDoAfters: false); } else if (temperature.CurrentTemperature <= temperature.ColdDamageThreshold) { @@ -185,7 +185,7 @@ namespace Content.Server.Temperature.Systems var diff = Math.Abs(temperature.CurrentTemperature - temperature.ColdDamageThreshold); var tempDamage = Math.Sqrt(diff * (Math.Pow(temperature.DamageCap.Double(), 2) / temperature.ColdDamageThreshold)); - _damageableSystem.TryChangeDamage(uid, temperature.ColdDamage * tempDamage); + _damageableSystem.TryChangeDamage(uid, temperature.ColdDamage * tempDamage, interruptsDoAfters: false); } else if (temperature.TakingDamage) {