Revert "add atmos stuff for mapping vox boxes (DeltaV-Station#1668)"

This reverts commit 6dc5ff7.

Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs

@@ -36,7 +36,7 @@ private void FixGridAtmosCommand(IConsoleShell shell, string argstr, string[] ar
            return;
        }
 
-       var mixtures = new GasMixture[8]; // DeltaV - vox mixture
+       var mixtures = new GasMixture[7];
        for (var i = 0; i < mixtures.Length; i++)
            mixtures[i] = new GasMixture(Atmospherics.CellVolume) { Temperature = Atmospherics.T20C };
 
@@ -65,9 +65,6 @@ private void FixGridAtmosCommand(IConsoleShell shell, string argstr, string[] ar
        mixtures[6].AdjustMoles(Gas.Nitrogen, Atmospherics.NitrogenMolesStandard);
        mixtures[6].Temperature = 235f; // Little colder than an actual freezer but gives a grace period to get e.g. themomachines set up, should keep warm for a few door openings
 
-       // 7: DeltaV Nitrogen (101kpa)
-       mixtures[7].AdjustMoles(Gas.Nitrogen, Atmospherics.NitrogenMolesStandard + Atmospherics.OxygenMolesStandard); // DeltaV
-
        foreach (var arg in args)
        {
            if (!NetEntity.TryParse(arg, out var netEntity) || !TryGetEntity(netEntity, out var euid))

Content.Server/Atmos/Monitor/Components/AirAlarmComponent.cs

@@ -11,8 +11,8 @@ namespace Content.Server.Atmos.Monitor.Components;
 [RegisterComponent]
 public sealed partial class AirAlarmComponent : Component
 {
-    [DataField] public AirAlarmMode CurrentMode { get; set; } = AirAlarmMode.Filtering;
-    [DataField] public bool AutoMode { get; set; } = true;
+    [ViewVariables] public AirAlarmMode CurrentMode { get; set; } = AirAlarmMode.Filtering;
+    [ViewVariables] public bool AutoMode { get; set; } = true;
 
     // Remember to null this afterwards.
     [ViewVariables] public IAirAlarmModeUpdate? CurrentModeUpdater { get; set; }

Content.Server/Atmos/Piping/Trinary/Components/GasFilterComponent.cs

@@ -5,25 +5,31 @@ namespace Content.Server.Atmos.Piping.Trinary.Components
     [RegisterComponent]
     public sealed partial class GasFilterComponent : Component
     {
-        [DataField]
-        public bool Enabled = true;
+        [ViewVariables(VVAccess.ReadWrite)]
+        [DataField("enabled")]
+        public bool Enabled { get; set; } = true;
 
+        [ViewVariables(VVAccess.ReadWrite)]
         [DataField("inlet")]
-        public string InletName = "inlet";
+        public string InletName { get; set; } = "inlet";
 
+        [ViewVariables(VVAccess.ReadWrite)]
         [DataField("filter")]
-        public string FilterName = "filter";
+        public string FilterName { get; set; } = "filter";
 
+        [ViewVariables(VVAccess.ReadWrite)]
         [DataField("outlet")]
-        public string OutletName = "outlet";
+        public string OutletName { get; set; } = "outlet";
 
-        [DataField]
-        public float TransferRate = Atmospherics.MaxTransferRate;
+        [ViewVariables(VVAccess.ReadWrite)]
 
-        [DataField]
-        public float MaxTransferRate = Atmospherics.MaxTransferRate;
+        [DataField("transferRate")]
+        public float TransferRate { get; set; } = Atmospherics.MaxTransferRate;
 
-        [DataField]
-        public Gas? FilteredGas;
+        [DataField("maxTransferRate")]
+        public float MaxTransferRate { get; set; } = Atmospherics.MaxTransferRate;
+
+        [ViewVariables(VVAccess.ReadWrite)]
+        public Gas? FilteredGas { get; set; }
     }
 }

Content.Server/Atmos/Piping/Unary/Components/GasVentScrubberComponent.cs

@@ -9,25 +9,26 @@ namespace Content.Server.Atmos.Piping.Unary.Components
     [Access(typeof(GasVentScrubberSystem))]
     public sealed partial class GasVentScrubberComponent : Component
     {
-        [DataField]
+        [ViewVariables(VVAccess.ReadWrite)]
         public bool Enabled { get; set; } = false;
 
-        [DataField]
+        [ViewVariables]
         public bool IsDirty { get; set; } = false;
 
+        [ViewVariables(VVAccess.ReadWrite)]
         [DataField("outlet")]
         public string OutletName { get; set; } = "pipe";
 
-        [DataField]
-        public HashSet<Gas> FilterGases = new(GasVentScrubberData.DefaultFilterGases);
+        [ViewVariables]
+        public readonly HashSet<Gas> FilterGases = new(GasVentScrubberData.DefaultFilterGases);
 
-        [DataField]
+        [ViewVariables(VVAccess.ReadWrite)]
         public ScrubberPumpDirection PumpDirection { get; set; } = ScrubberPumpDirection.Scrubbing;
 
         /// <summary>
         ///     Target volume to transfer. If <see cref="WideNet"/> is enabled, actual transfer rate will be much higher.
         /// </summary>
-        [DataField]
+        [ViewVariables(VVAccess.ReadWrite)]
         public float TransferRate
         {
             get => _transferRate;
@@ -36,17 +37,18 @@ public float TransferRate
 
         private float _transferRate = Atmospherics.MaxTransferRate;
 
-        [DataField]
+        [ViewVariables(VVAccess.ReadWrite)]
+        [DataField("maxTransferRate")]
         public float MaxTransferRate = Atmospherics.MaxTransferRate;
 
         /// <summary>
         ///     As pressure difference approaches this number, the effective volume rate may be smaller than <see
         ///     cref="TransferRate"/>
         /// </summary>
-        [DataField]
+        [DataField("maxPressure")]
         public float MaxPressure = Atmospherics.MaxOutputPressure;
 
-        [DataField]
+        [ViewVariables(VVAccess.ReadWrite)]
         public bool WideNet { get; set; } = false;
 
         public GasVentScrubberData ToAirAlarmData()

Resources/Prototypes/Atmospherics/thresholds.yml

@@ -83,17 +83,3 @@
   id: danger # just any gas you don't want at all
   upperBound: !type:AlarmThresholdSetting
     threshold: 0.0001
-
-- type: alarmThreshold
-  id: voxOxygen
-  upperBound: !type:AlarmThresholdSetting
-    threshold: 0.02 # 2%
-  upperWarnAround: !type:AlarmThresholdSetting
-    threshold: 0.5 # 1%
-
-- type: alarmThreshold
-  id: voxNitrogen
-  lowerBound: !type:AlarmThresholdSetting
-    threshold: 0.8 # danger below 80% nitrogen
-  lowerWarnAround: !type:AlarmThresholdSetting
-    threshold: 1.125 # warning below 90%