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

Make bloodloss and asphyxiation damage not ignore resistances (#21665)

Browse Source
This commit is contained in:
DrSmugleaf
2023-11-15 02:03:02 -08:00
committed by GitHub
parent 8343e04ff4
commit f99de2727d
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/Body/Systems/BloodstreamSystem.cs
View File

@@ -10,16 +10,16 @@ using Content.Shared.Chemistry.EntitySystems;
using Content.Shared.Chemistry.Reaction; using Content.Shared.Chemistry.Reaction;
using Content.Shared.Damage; using Content.Shared.Damage;
using Content.Shared.Damage.Prototypes; using Content.Shared.Damage.Prototypes;
using Content.Shared.Drunk;
using Content.Shared.FixedPoint; using Content.Shared.FixedPoint;
using Content.Shared.IdentityManagement; using Content.Shared.IdentityManagement;
using Content.Shared.Popups;
using Content.Shared.Drunk;
using Content.Shared.Mobs.Systems; using Content.Shared.Mobs.Systems;
using Content.Shared.Popups;
using Content.Shared.Rejuvenate; using Content.Shared.Rejuvenate;
using Content.Shared.Speech.EntitySystems;
using Robust.Server.GameObjects; using Robust.Server.GameObjects;
using Robust.Shared.Prototypes; using Robust.Shared.Prototypes;
using Robust.Shared.Random; using Robust.Shared.Random;
using Content.Shared.Speech.EntitySystems;
namespace Content.Server.Body.Systems; namespace Content.Server.Body.Systems;
@@ -114,7 +114,7 @@ public sealed class BloodstreamSystem : EntitySystem
// bloodloss damage is based on the base value, and modified by how low your blood level is. // bloodloss damage is based on the base value, and modified by how low your blood level is.
var amt = bloodstream.BloodlossDamage / (0.1f + bloodPercentage); var amt = bloodstream.BloodlossDamage / (0.1f + bloodPercentage);
_damageableSystem.TryChangeDamage(uid, amt, true, false); _damageableSystem.TryChangeDamage(uid, amt, false, false);
// Apply dizziness as a symptom of bloodloss. // Apply dizziness as a symptom of bloodloss.
// The effect is applied in a way that it will never be cleared without being healthy. // The effect is applied in a way that it will never be cleared without being healthy.

4
Content.Server/Body/Systems/RespiratorSystem.cs
View File

@@ -160,7 +160,7 @@ namespace Content.Server.Body.Systems
_alertsSystem.ShowAlert(uid, AlertType.LowOxygen); _alertsSystem.ShowAlert(uid, AlertType.LowOxygen);
} }
_damageableSys.TryChangeDamage(uid, respirator.Damage, true, false); _damageableSys.TryChangeDamage(uid, respirator.Damage, false, false);
} }
private void StopSuffocation(EntityUid uid, RespiratorComponent respirator) private void StopSuffocation(EntityUid uid, RespiratorComponent respirator)
@@ -170,7 +170,7 @@ namespace Content.Server.Body.Systems
_alertsSystem.ClearAlert(uid, AlertType.LowOxygen); _alertsSystem.ClearAlert(uid, AlertType.LowOxygen);
_damageableSys.TryChangeDamage(uid, respirator.DamageRecovery, true); _damageableSys.TryChangeDamage(uid, respirator.DamageRecovery);
} }
public void UpdateSaturation(EntityUid uid, float amount, public void UpdateSaturation(EntityUid uid, float amount,