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

Make temperature damage not interrupt do-afters (#5835)

Browse Source
This commit is contained in:
Leon Friedrich
2021-12-20 04:39:59 +13:00
committed by GitHub
parent a87507e822
commit a46af58e59
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

@@ -172,7 +172,7 @@ namespace Content.Server.Temperature.Systems
var diff = Math.Abs(temperature.CurrentTemperature - temperature.HeatDamageThreshold); var diff = Math.Abs(temperature.CurrentTemperature - temperature.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); _damageableSystem.TryChangeDamage(uid, temperature.HeatDamage * tempDamage, interruptsDoAfters: false);
} }
else if (temperature.CurrentTemperature <= temperature.ColdDamageThreshold) else if (temperature.CurrentTemperature <= temperature.ColdDamageThreshold)
{ {
@@ -185,7 +185,7 @@ namespace Content.Server.Temperature.Systems
var diff = Math.Abs(temperature.CurrentTemperature - temperature.ColdDamageThreshold); var diff = Math.Abs(temperature.CurrentTemperature - temperature.ColdDamageThreshold);
var tempDamage = var tempDamage =
Math.Sqrt(diff * (Math.Pow(temperature.DamageCap.Double(), 2) / temperature.ColdDamageThreshold)); 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) else if (temperature.TakingDamage)
{ {