Implement Air Vent pressure lockout override, allowing atmos to overr…

…ide lockout via air alarm fill preset.
space-wizards · Jun 12, 2024 · 30a626b · 30a626b
1 parent b091a55
commit 30a626b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/Content.Server/Atmos/Piping/Unary/Components/GasVentPumpComponent.cs b/Content.Server/Atmos/Piping/Unary/Components/GasVentPumpComponent.cs
@@ -135,6 +135,10 @@ public float InternalPressureBound
         [ViewVariables(VVAccess.ReadWrite)]
         [DataField("depressurizePressure")]
         public float DepressurizePressure = 0;
+
+        [ViewVariables(VVAccess.ReadWrite)]
+        [DataField("pressureLockoutOverride")]
+        public bool PressureLockoutOverride = false;
         #endregion
 
         public GasVentPumpData ToAirAlarmData()
@@ -146,7 +150,8 @@ public GasVentPumpData ToAirAlarmData()
                 PumpDirection = PumpDirection,
                 PressureChecks = PressureChecks,
                 ExternalPressureBound = ExternalPressureBound,
-                InternalPressureBound = InternalPressureBound
+                InternalPressureBound = InternalPressureBound,
+                PressureLockoutOverride = PressureLockoutOverride
             };
         }
 
@@ -158,6 +163,7 @@ public void FromAirAlarmData(GasVentPumpData data)
             PressureChecks = data.PressureChecks;
             ExternalPressureBound = data.ExternalPressureBound;
             InternalPressureBound = data.InternalPressureBound;
+            PressureLockoutOverride = data.PressureLockoutOverride;
         }
     }
 }
diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs
@@ -108,7 +108,8 @@ private void OnGasVentPumpUpdated(EntityUid uid, GasVentPumpComponent vent, ref
                 // (ignoring temperature differences because I am lazy)
                 var transferMoles = pressureDelta * environment.Volume / (pipe.Air.Temperature * Atmospherics.R);
 
-                if (vent.UnderPressureLockout)
+                // Only run if the device is under lockout and not being overriden
+                if (vent.UnderPressureLockout & !vent.PressureLockoutOverride)
                 {
                     // Leak only a small amount of gas as a proportion of supply pipe pressure.
                     var pipeDelta = pipe.Air.Pressure - environment.Pressure;
@@ -280,7 +281,7 @@ private void OnExamine(EntityUid uid, GasVentPumpComponent component, ExaminedEv
                 return;
             if (args.IsInDetailsRange)
             {
-                if (pumpComponent.UnderPressureLockout)
+                if (pumpComponent.UnderPressureLockout & !pumpComponent.PressureLockoutOverride)
                 {
                     args.PushMarkup(Loc.GetString("gas-vent-pump-uvlo"));
                 }

diff --git a/Content.Shared/Atmos/Piping/Unary/Components/SharedVentPumpComponent.cs b/Content.Shared/Atmos/Piping/Unary/Components/SharedVentPumpComponent.cs
@@ -13,6 +13,7 @@ public sealed class GasVentPumpData : IAtmosDeviceData
         public VentPressureBound PressureChecks { get; set; } = VentPressureBound.ExternalBound;
         public float ExternalPressureBound { get; set; } = Atmospherics.OneAtmosphere;
         public float InternalPressureBound { get; set; } = 0f;
+        public bool PressureLockoutOverride { get; set; } = false;
 
         // Presets for 'dumb' air alarm modes
 
@@ -22,7 +23,8 @@ public sealed class GasVentPumpData : IAtmosDeviceData
             PumpDirection = VentPumpDirection.Releasing,
             PressureChecks = VentPressureBound.ExternalBound,
             ExternalPressureBound = Atmospherics.OneAtmosphere,
-            InternalPressureBound = 0f
+            InternalPressureBound = 0f,
+            PressureLockoutOverride = false
         };
 
         public static GasVentPumpData FillModePreset = new GasVentPumpData
@@ -32,7 +34,8 @@ public sealed class GasVentPumpData : IAtmosDeviceData
             PumpDirection = VentPumpDirection.Releasing,
             PressureChecks = VentPressureBound.ExternalBound,
             ExternalPressureBound = Atmospherics.OneAtmosphere * 50,
-            InternalPressureBound = 0f
+            InternalPressureBound = 0f,
+            PressureLockoutOverride = true
         };
 
         public static GasVentPumpData PanicModePreset = new GasVentPumpData
@@ -42,7 +45,8 @@ public sealed class GasVentPumpData : IAtmosDeviceData
             PumpDirection = VentPumpDirection.Releasing,
             PressureChecks = VentPressureBound.ExternalBound,
             ExternalPressureBound = Atmospherics.OneAtmosphere,
-            InternalPressureBound = 0f
+            InternalPressureBound = 0f,
+            PressureLockoutOverride = false
         };
 
         public static GasVentPumpData ReplaceModePreset = new GasVentPumpData
@@ -53,7 +57,8 @@ public sealed class GasVentPumpData : IAtmosDeviceData
             PumpDirection = VentPumpDirection.Releasing,
             PressureChecks = VentPressureBound.ExternalBound,
             ExternalPressureBound = Atmospherics.OneAtmosphere,
-            InternalPressureBound = 0f
+            InternalPressureBound = 0f,
+            PressureLockoutOverride = false
         };
     }