From cb79611061a177fc910cfeb3779643c25589b318 Mon Sep 17 00:00:00 2001
From: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Date: Fri, 5 Sep 2025 00:09:54 -0700
Subject: [PATCH] Fix DeltaPressure damage not capping beyond a certain
 pressure (#40125)

---
 .../Atmos/EntitySystems/AtmosphereSystem.DeltaPressure.cs      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.DeltaPressure.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.DeltaPressure.cs
index 974636d3ae..efddcaf1a7 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.DeltaPressure.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.DeltaPressure.cs
@@ -247,7 +247,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;