From: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Date: Fri, 5 Sep 2025 07:09:54 +0000 (-0700)
Subject: Fix DeltaPressure damage not capping beyond a certain pressure (#40125)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=1db8496dd71a4af2ec3e046bbbdb59ad47a266b0;p=space-station-14.git

Fix DeltaPressure damage not capping beyond a certain pressure (#40125)
---

diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.DeltaPressure.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.DeltaPressure.cs
index 207589e554..9d72b195fe 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.DeltaPressure.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.DeltaPressure.cs
@@ -230,7 +230,8 @@ public sealed partial class AtmosphereSystem
     private void PerformDamage(Entity<DeltaPressureComponent> ent, float pressure, float deltaPressure)
     {
         var maxPressure = Math.Max(pressure - ent.Comp.MinPressure, deltaPressure - ent.Comp.MinPressureDelta);
-        var appliedDamage = ScaleDamage(ent, ent.Comp.BaseDamage, maxPressure);
+        var maxPressureCapped = Math.Min(maxPressure, ent.Comp.MaxEffectivePressure);
+        var appliedDamage = ScaleDamage(ent, ent.Comp.BaseDamage, maxPressureCapped);
 
         _damage.TryChangeDamage(ent, appliedDamage, ignoreResistances: true, interruptsDoAfters: false);
         ent.Comp.IsTakingDamage = true;