From 12d3b4a32639568bd7aae4f8c22064f9a4efa248 Mon Sep 17 00:00:00 2001 From: Slava0135 <40753025+Slava0135@users.noreply.github.com> Date: Tue, 13 Jun 2023 15:59:07 +0300 Subject: [PATCH] ignore resistances in temperature system (#17301) --- 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 b28e7909ec..6e422765e0 100644 --- a/Content.Server/Temperature/Systems/TemperatureSystem.cs +++ b/Content.Server/Temperature/Systems/TemperatureSystem.cs @@ -199,7 +199,7 @@ namespace Content.Server.Temperature.Systems var diff = Math.Abs(temperature.CurrentTemperature - heatDamageThreshold); var tempDamage = c / (1 + a * Math.Pow(Math.E, -heatK * diff)) - y; - _damageableSystem.TryChangeDamage(uid, temperature.HeatDamage * tempDamage, interruptsDoAfters: false); + _damageableSystem.TryChangeDamage(uid, temperature.HeatDamage * tempDamage, ignoreResistances: true, interruptsDoAfters: false); } else if (temperature.CurrentTemperature <= coldDamageThreshold) { @@ -213,7 +213,7 @@ namespace Content.Server.Temperature.Systems var diff = Math.Abs(temperature.CurrentTemperature - coldDamageThreshold); var tempDamage = Math.Sqrt(diff * (Math.Pow(temperature.DamageCap.Double(), 2) / coldDamageThreshold)); - _damageableSystem.TryChangeDamage(uid, temperature.ColdDamage * tempDamage, interruptsDoAfters: false); + _damageableSystem.TryChangeDamage(uid, temperature.ColdDamage * tempDamage, ignoreResistances: true, interruptsDoAfters: false); } else if (temperature.TakingDamage) {