Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Direct pressure and asphyxiation damage do not interrupt DoAfters anymore (#5459)

Browse Source
This commit is contained in:
20kdc
2021-11-23 00:34:56 +00:00
committed by GitHub
parent 18eecaea38
commit 1e061094ca
4 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs
View File

@@ -103,7 +103,7 @@ namespace Content.Server.Atmos.EntitySystems
goto default;
// Deal damage and ignore resistances. Resistance to pressure damage should be done via pressure protection gear.
_damageableSystem.TryChangeDamage(uid, barotrauma.Damage * Atmospherics.LowPressureDamage, true);
_damageableSystem.TryChangeDamage(uid, barotrauma.Damage * Atmospherics.LowPressureDamage, true, false);
if (status == null) break;
@@ -126,7 +126,7 @@ namespace Content.Server.Atmos.EntitySystems
var damageScale = MathF.Min((pressure / Atmospherics.HazardHighPressure) * Atmospherics.PressureDamageCoefficient, Atmospherics.MaxHighPressureDamage);
// Deal damage and ignore resistances. Resistance to pressure damage should be done via pressure protection gear.
_damageableSystem.TryChangeDamage(uid, barotrauma.Damage * damageScale, true);
_damageableSystem.TryChangeDamage(uid, barotrauma.Damage * damageScale, true, false);
if (status == null) break;

2
Content.Server/Body/Components/RespiratorComponent.cs
View File

@@ -320,7 +320,7 @@ namespace Content.Server.Body.Components
alertsComponent.ShowAlert(AlertType.LowOxygen);
}
EntitySystem.Get<DamageableSystem>().TryChangeDamage(Owner.Uid, Damage, true);
EntitySystem.Get<DamageableSystem>().TryChangeDamage(Owner.Uid, Damage, true, false);
}
private void StopSuffocation()

2
Content.Server/DoAfter/DoAfterSystem.cs
View File

@@ -23,7 +23,7 @@ namespace Content.Server.DoAfter
public void HandleDamage(EntityUid _, DoAfterComponent component, DamageChangedEvent args)
{
if (component.DoAfters.Count == 0 || !args.DamageIncreased)
if (component.DoAfters.Count == 0 || !args.InterruptsDoAfters)
{
return;
}