tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ignore resistances in temperature system (#17301)

Browse Source
This commit is contained in:
Slava0135
2023-06-13 15:59:07 +03:00
committed by GitHub
parent 0af6ecd505
commit 12d3b4a326
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Temperature/Systems/TemperatureSystem.cs
View File

@@ -199,7 +199,7 @@ namespace Content.Server.Temperature.Systems
var diff = Math.Abs(temperature.CurrentTemperature - heatDamageThreshold); var diff = Math.Abs(temperature.CurrentTemperature - heatDamageThreshold);
var tempDamage = c / (1 + a * Math.Pow(Math.E, -heatK * diff)) - y; 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) else if (temperature.CurrentTemperature <= coldDamageThreshold)
{ {
@@ -213,7 +213,7 @@ namespace Content.Server.Temperature.Systems
var diff = Math.Abs(temperature.CurrentTemperature - coldDamageThreshold); var diff = Math.Abs(temperature.CurrentTemperature - coldDamageThreshold);
var tempDamage = var tempDamage =
Math.Sqrt(diff * (Math.Pow(temperature.DamageCap.Double(), 2) / coldDamageThreshold)); 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) else if (temperature.TakingDamage)
{ {