diff --git a/Content.Client/Atmos/Consoles/AtmosAlertsComputerWindow.xaml.cs b/Content.Client/Atmos/Consoles/AtmosAlertsComputerWindow.xaml.cs
index 57ad482e02f..344a71a470d 100644
--- a/Content.Client/Atmos/Consoles/AtmosAlertsComputerWindow.xaml.cs
+++ b/Content.Client/Atmos/Consoles/AtmosAlertsComputerWindow.xaml.cs
@@ -31,7 +31,6 @@ public sealed partial class AtmosAlertsComputerWindow : FancyWindow
 
     private AtmosAlertsComputerEntry[]? _airAlarms = null;
     private AtmosAlertsComputerEntry[]? _fireAlarms = null;
-    private AtmosAlertsComputerEntry[]? _gaslocks = null; // Frontier
     private IEnumerable<AtmosAlertsComputerEntry>? _allAlarms = null;
 
     private IEnumerable<AtmosAlertsComputerEntry>? _activeAlarms = null;
@@ -195,7 +194,6 @@ public void UpdateUI(EntityCoordinates? consoleCoords, AtmosAlertsComputerEntry[
         // Retain alarm data for use inbetween updates
         _airAlarms = airAlarms;
         _fireAlarms = fireAlarms;
-        _gaslocks = gaslocks; // Frontier
         _allAlarms = airAlarms.Concat(fireAlarms);
         _allAlarms = airAlarms.Concat(gaslocks); // Frontier
 
@@ -288,7 +286,7 @@ public void UpdateUI(EntityCoordinates? consoleCoords, AtmosAlertsComputerEntry[
         }
 
         // Frontier: gaslocks
-        for (int index = 0; index < gaslocks.Count(); index++)
+        for (var index = 0; index < gaslocks.Length; index++)
         {
             var entry = gaslocks.ElementAt(index);
             UpdateGaslockUIEntry(entry, index, GaslocksTable, console, focusGaslockData);
@@ -470,7 +468,7 @@ private void UpdateGaslockUIEntry(AtmosAlertsComputerEntry entry, int index, Con
             newEntryContainer.SendUndockAction += SendGaslockUndockAction;
 
             // On click
-            newEntryContainer.FocusButton.OnButtonUp += args =>
+            newEntryContainer.FocusButton.OnButtonUp += _ =>
             {
                 if (_trackedEntity == newEntryContainer.NetEntity)
                 {
@@ -502,7 +500,7 @@ private void UpdateGaslockUIEntry(AtmosAlertsComputerEntry entry, int index, Con
         // Update values and UI elements
         var tableChild = table.GetChild(index);
 
-        if (tableChild is not AtmosAlarmGaslockEntryContainer)
+        if (tableChild is not AtmosAlarmGaslockEntryContainer entryContainer)
         {
             table.RemoveChild(tableChild);
             UpdateGaslockUIEntry(entry, index, table, console, focusData);
@@ -510,8 +508,6 @@ private void UpdateGaslockUIEntry(AtmosAlertsComputerEntry entry, int index, Con
             return;
         }
 
-        var entryContainer = (AtmosAlarmGaslockEntryContainer)tableChild;
-
         entryContainer.UpdateEntry(entry, entry.NetEntity == _trackedEntity, focusData);
     }
     // End Frontier: separate UpdateUI function for gaslocks
@@ -520,26 +516,27 @@ private void UpdateConsoleTable(AtmosAlertsComputerComponent console, Control ta
     {
         foreach (var tableChild in table.Children)
         {
-            // Frontier: multiple type checks
-            if (tableChild is AtmosAlarmEntryContainer)
+            switch (tableChild)
             {
-                var entryContainer = (AtmosAlarmEntryContainer)tableChild;
-
-                if (entryContainer.NetEntity != currTrackedEntity)
-                    entryContainer.RemoveAsFocus();
-
-                else if (entryContainer.NetEntity == currTrackedEntity)
-                    entryContainer.SetAsFocus();
-            }
-            else if (tableChild is AtmosAlarmGaslockEntryContainer)
-            {
-                var entryContainer = (AtmosAlarmGaslockEntryContainer)tableChild;
+                // Frontier: multiple type checks
+                case AtmosAlarmEntryContainer entry:
+                {
+                    if (entry.NetEntity != currTrackedEntity)
+                        entry.RemoveAsFocus();
 
-                if (entryContainer.NetEntity != currTrackedEntity)
-                    entryContainer.RemoveAsFocus();
+                    else if (entry.NetEntity == currTrackedEntity)
+                        entry.SetAsFocus();
+                    break;
+                }
+                case AtmosAlarmGaslockEntryContainer gaslockEntry:
+                {
+                    if (gaslockEntry.NetEntity != currTrackedEntity)
+                        gaslockEntry.RemoveAsFocus();
 
-                else if (entryContainer.NetEntity == currTrackedEntity)
-                    entryContainer.SetAsFocus();
+                    else if (gaslockEntry.NetEntity == currTrackedEntity)
+                        gaslockEntry.SetAsFocus();
+                    break;
+                }
             }
             // End Frontier
         }
@@ -671,14 +668,13 @@ private bool TryGetNextScrollPosition([NotNullWhen(true)] out float? nextScrollP
 
         foreach (var control in container.Children)
         {
-            if (control == null) // Frontier: move type checks down
-                continue;
-
-            if (control is AtmosAlarmEntryContainer && ((AtmosAlarmEntryContainer)control).NetEntity == _trackedEntity) // Frontier: add type check
+            // Frontier - Move type checks down
+            if (control is AtmosAlarmEntryContainer entry && entry.NetEntity == _trackedEntity)
                 return true;
 
-            if (control is AtmosAlarmGaslockEntryContainer && ((AtmosAlarmGaslockEntryContainer)control).NetEntity == _trackedEntity) // Frontier
-                return true; // Frontier
+            // Frontier - Add gaslock check
+            if (control is AtmosAlarmGaslockEntryContainer gaslockEntry && gaslockEntry.NetEntity == _trackedEntity)
+                return true;
 
             nextScrollPosition += control.Height;
         }
diff --git a/Content.Client/_NF/Atmos/BUI/GasSaleConsoleBoundUserInterface.cs b/Content.Client/_NF/Atmos/BUI/GasSaleConsoleBoundUserInterface.cs
index f50ab1059ae..c08d3d13ed2 100644
--- a/Content.Client/_NF/Atmos/BUI/GasSaleConsoleBoundUserInterface.cs
+++ b/Content.Client/_NF/Atmos/BUI/GasSaleConsoleBoundUserInterface.cs
@@ -5,15 +5,11 @@
 
 namespace Content.Client._NF.Atmos.BUI;
 
-public sealed class GasSaleConsoleBoundUserInterface : BoundUserInterface
+public sealed class GasSaleConsoleBoundUserInterface(EntityUid owner, Enum uiKey) : BoundUserInterface(owner, uiKey)
 {
     [ViewVariables]
     private GasSaleMenu? _menu;
 
-    public GasSaleConsoleBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
-    {
-    }
-
     protected override void Open()
     {
         base.Open();
diff --git a/Content.Client/_NF/Atmos/Consoles/AtmosAlarmGaslockEntryContainer.xaml b/Content.Client/_NF/Atmos/Consoles/AtmosAlarmGaslockEntryContainer.xaml
index bd4b8613787..6899c324643 100644
--- a/Content.Client/_NF/Atmos/Consoles/AtmosAlarmGaslockEntryContainer.xaml
+++ b/Content.Client/_NF/Atmos/Consoles/AtmosAlarmGaslockEntryContainer.xaml
@@ -1,31 +1,35 @@
 <BoxContainer xmlns="https://spacestation14.io"
-         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-         xmlns:s="clr-namespace:Content.Client.Stylesheets"
-         xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
-         xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-         Orientation="Vertical" HorizontalExpand ="True" Margin="0 0 0 3">
+              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+              xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
+              Orientation="Vertical" HorizontalExpand="True" Margin="0 0 0 3">
 
     <!-- Device selection button -->
-    <Button Name="FocusButton" HorizontalExpand="True" SetHeight="32" Margin="12 0 0 0" StyleClasses="OpenBoth" Access="Public">
+    <Button Name="FocusButton" HorizontalExpand="True" SetHeight="32" Margin="12 0 0 0" StyleClasses="OpenBoth"
+            Access="Public">
         <BoxContainer HorizontalExpand="True" VerticalExpand="True" Orientation="Horizontal">
 
             <!-- Alarm state -->
-            <TextureRect Stretch="Keep" HorizontalAlignment="Left" Margin="-20 -2 0 0" ModulateSelfOverride="#25252a" TexturePath="/Textures/Interface/AtmosMonitoring/status_bg.png">
+            <TextureRect Stretch="Keep" HorizontalAlignment="Left" Margin="-20 -2 0 0" ModulateSelfOverride="#25252a"
+                         TexturePath="/Textures/Interface/AtmosMonitoring/status_bg.png">
                 <BoxContainer VerticalExpand="True" HorizontalExpand="True" Orientation="Horizontal" Margin="8 0">
-                    <TextureRect Name="ArrowTexture" VerticalAlignment="Center" SetSize="12 12" Stretch="KeepAspectCentered" Margin="3 0" TexturePath="/Textures/Interface/Nano/triangle_right.png"></TextureRect>
-                    <Label Name="AlarmStateLabel" HorizontalExpand="True" HorizontalAlignment="Center" FontColorOverride="#5A5A5A" Text="{Loc 'atmos-alerts-window-invalid-state'}"></Label>
+                    <TextureRect Name="ArrowTexture" VerticalAlignment="Center" SetSize="12 12"
+                                 Stretch="KeepAspectCentered" Margin="3 0"
+                                 TexturePath="/Textures/Interface/Nano/triangle_right.png" />
+                    <Label Name="AlarmStateLabel" HorizontalExpand="True" HorizontalAlignment="Center"
+                           FontColorOverride="#5A5A5A" Text="{Loc 'atmos-alerts-window-invalid-state'}" />
                 </BoxContainer>
             </TextureRect>
 
             <!-- Alarm name -->
-            <Label Name="AlarmNameLabel" Text="???" HorizontalExpand="True" HorizontalAlignment="Center" Margin="5 0"></Label>
+            <Label Name="AlarmNameLabel" Text="???" HorizontalExpand="True" HorizontalAlignment="Center" Margin="5 0" />
         </BoxContainer>
     </Button>
 
     <!-- Panel that appears on selecting the device -->
-    <PanelContainer Name="FocusContainer" HorizontalExpand="True" Margin="1 -1 1 0" ReservesSpace="False" Visible="False" Access="Public">
+    <PanelContainer Name="FocusContainer" HorizontalExpand="True" Margin="1 -1 1 0" ReservesSpace="False"
+                    Visible="False" Access="Public">
         <PanelContainer.PanelOverride>
-            <gfx:StyleBoxFlat BackgroundColor="#25252a"/>
+            <gfx:StyleBoxFlat BackgroundColor="#25252a" />
         </PanelContainer.PanelOverride>
         <BoxContainer HorizontalExpand="True" VerticalExpand="True" Orientation="Vertical">
 
@@ -33,41 +37,57 @@
             <Control>
 
                 <!-- Main container for displaying atmospheric data -->
-                <BoxContainer Name="MainDataContainer" HorizontalExpand="True" VerticalExpand="True" Orientation="Vertical" ReservesSpace="False" Visible="False">
+                <BoxContainer Name="MainDataContainer" HorizontalExpand="True" VerticalExpand="True"
+                              Orientation="Vertical" ReservesSpace="False" Visible="False">
                     <BoxContainer HorizontalExpand="True" Orientation="Horizontal">
-                        <Label Name="DirectionHeaderLabel" Text="{Loc 'atmos-alerts-window-direction-label'}" HorizontalAlignment="Center" HorizontalExpand="True" FontColorOverride="#a9a9a9" Margin="0 2 0 0" SetHeight="24"/>
-                        <Label Name="PressureHeaderLabel" Text="{Loc 'atmos-alerts-window-pressure-label'}" HorizontalAlignment="Center" HorizontalExpand="True" FontColorOverride="#a9a9a9" Margin="0 2 0 0" SetHeight="24"/>
-                        <Label Name="EnabledHeaderLabel" Text="{Loc 'atmos-alerts-window-enabled-label'}" HorizontalAlignment="Center" HorizontalExpand="True" FontColorOverride="#a9a9a9" Margin="0 2 0 0" SetHeight="24"/>
-                        <Label Name="DockedHeaderLabel" Text="{Loc 'atmos-alerts-window-docked-label'}" HorizontalAlignment="Center" HorizontalExpand="True" FontColorOverride="#a9a9a9" Margin="0 2 0 0" SetHeight="24"/>
+                        <Label Name="DirectionHeaderLabel" Text="{Loc 'atmos-alerts-window-direction-label'}"
+                               HorizontalAlignment="Center" HorizontalExpand="True" FontColorOverride="#a9a9a9"
+                               Margin="0 2 0 0" SetHeight="24" />
+                        <Label Name="PressureHeaderLabel" Text="{Loc 'atmos-alerts-window-pressure-label'}"
+                               HorizontalAlignment="Center" HorizontalExpand="True" FontColorOverride="#a9a9a9"
+                               Margin="0 2 0 0" SetHeight="24" />
+                        <Label Name="EnabledHeaderLabel" Text="{Loc 'atmos-alerts-window-enabled-label'}"
+                               HorizontalAlignment="Center" HorizontalExpand="True" FontColorOverride="#a9a9a9"
+                               Margin="0 2 0 0" SetHeight="24" />
+                        <Label Name="DockedHeaderLabel" Text="{Loc 'atmos-alerts-window-docked-label'}"
+                               HorizontalAlignment="Center" HorizontalExpand="True" FontColorOverride="#a9a9a9"
+                               Margin="0 2 0 0" SetHeight="24" />
                     </BoxContainer>
                     <PanelContainer HorizontalExpand="True">
                         <PanelContainer.PanelOverride>
-                            <gfx:StyleBoxFlat BackgroundColor="#202023"/>
+                            <gfx:StyleBoxFlat BackgroundColor="#202023" />
                         </PanelContainer.PanelOverride>
                         <BoxContainer HorizontalExpand="True" Orientation="Horizontal">
-                            <Button Name="DirectionLabel" Text="???" HorizontalAlignment="Center" HorizontalExpand="True" Margin="0 2 0 0" />
-                            <LineEdit Name="PressureInput" Text="???" MinSize="70 0" HorizontalAlignment="Center" HorizontalExpand="True" Margin="0 2 0 0"/>
-                            <Button Name="EnabledLabel" Text="???" HorizontalAlignment="Center" HorizontalExpand="True" Margin="0 2 0 0"/>
-                            <Button Name="DockedLabel" Text="???" HorizontalAlignment="Center" HorizontalExpand="True" Margin="0 2 0 0"/>
+                            <Button Name="DirectionLabel" Text="???" HorizontalAlignment="Center"
+                                    HorizontalExpand="True" Margin="0 2 0 0" />
+                            <LineEdit Name="PressureInput" Text="???" MinSize="70 0" HorizontalAlignment="Center"
+                                      HorizontalExpand="True" Margin="0 2 0 0" />
+                            <Button Name="EnabledLabel" Text="???" HorizontalAlignment="Center" HorizontalExpand="True"
+                                    Margin="0 2 0 0" />
+                            <Button Name="DockedLabel" Text="???" HorizontalAlignment="Center" HorizontalExpand="True"
+                                    Margin="0 2 0 0" />
                         </BoxContainer>
                     </PanelContainer>
                     <BoxContainer HorizontalExpand="True" Orientation="Horizontal">
-                        <Label Name="GasesHeaderLabel" Text="{Loc 'atmos-alerts-window-gaslock-gases-label'}" HorizontalAlignment="Center" HorizontalExpand="True" FontColorOverride="#a9a9a9" Margin="0 4 0 0" SetHeight="24"></Label>
-                    </BoxContainer>                    <PanelContainer HorizontalExpand=
-"True">
+                        <Label Name="GasesHeaderLabel" Text="{Loc 'atmos-alerts-window-gaslock-gases-label'}"
+                               HorizontalAlignment="Center" HorizontalExpand="True" FontColorOverride="#a9a9a9"
+                               Margin="0 4 0 0" SetHeight="24" />
+                    </BoxContainer>
+                    <PanelContainer HorizontalExpand="True">
                         <PanelContainer.PanelOverride>
-                            <gfx:StyleBoxFlat BackgroundColor="#202023"/>
+                            <gfx:StyleBoxFlat BackgroundColor="#202023" />
                         </PanelContainer.PanelOverride>
 
                         <!-- Gas entries added via C# code -->
-                        <GridContainer Name="GasGridContainer" HorizontalExpand="True" Columns = "4"></GridContainer>
+                        <GridContainer Name="GasGridContainer" HorizontalExpand="True" Columns="4" />
                     </PanelContainer>
                 </BoxContainer>
 
                 <!-- If the alarm is inactive, this is label is diplayed instead -->
-                <Label Name="NoDataLabel" Text="{Loc 'atmos-alerts-window-no-data-available'}" HorizontalAlignment="Center" Margin="0 15" FontColorOverride="#a9a9a9" ReservesSpace="False" Visible="False"></Label>
+                <Label Name="NoDataLabel" Text="{Loc 'atmos-alerts-window-no-data-available'}"
+                       HorizontalAlignment="Center" Margin="0 15" FontColorOverride="#a9a9a9" ReservesSpace="False"
+                       Visible="False" />
             </Control>
         </BoxContainer>
     </PanelContainer>
-
 </BoxContainer>
diff --git a/Content.Client/_NF/Atmos/Consoles/AtmosAlarmGaslockEntryContainer.xaml.cs b/Content.Client/_NF/Atmos/Consoles/AtmosAlarmGaslockEntryContainer.xaml.cs
index 7bbd63d4228..7bbac722a0c 100644
--- a/Content.Client/_NF/Atmos/Consoles/AtmosAlarmGaslockEntryContainer.xaml.cs
+++ b/Content.Client/_NF/Atmos/Consoles/AtmosAlarmGaslockEntryContainer.xaml.cs
@@ -1,3 +1,5 @@
+using System.Globalization;
+using System.Linq;
 using Content.Client.Stylesheets;
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.Components;
@@ -9,7 +11,6 @@
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Map;
-using System.Linq;
 
 namespace Content.Client._NF.Atmos.Consoles;
 
@@ -27,11 +28,11 @@ public sealed partial class AtmosAlarmGaslockEntryContainer : BoxContainer
     public event Action<NetEntity, bool>? SendChangeEnabledAction;
     public event Action<NetEntity>? SendUndockAction;
 
-    private bool _lastDirectionInwards = false;
-    private bool _lastEnabled = false;
-    private bool _lastDocked = false;
+    private bool _lastDirectionInwards;
+    private bool _lastEnabled;
+    private bool _lastDocked;
 
-    private Dictionary<Gas, string> _gasShorthands = new Dictionary<Gas, string>()
+    private readonly Dictionary<Gas, string> _gasShorthands = new()
     {
         [Gas.Ammonia] = "NH₃",
         [Gas.CarbonDioxide] = "CO₂",
@@ -66,33 +67,33 @@ public AtmosAlarmGaslockEntryContainer(NetEntity uid, EntityCoordinates? coordin
 
     public void TrySendDirectionChangeAction()
     {
-        if (SendChangeDirectionMessageAction == null)
-            return;
-        SendChangeDirectionMessageAction(NetEntity, !_lastDirectionInwards);
+        SendChangeDirectionMessageAction?.Invoke(NetEntity, !_lastDirectionInwards);
     }
 
     public void TrySendPressureChangeAction()
     {
         if (SendPressureChangeAction == null)
             return;
+
         if (!float.TryParse(PressureInput.Text, out var result))
             return;
+
         SendPressureChangeAction(NetEntity, result);
     }
 
     public void TrySendEnableChangeAction()
     {
-        if (SendChangeEnabledAction == null)
-            return;
-        SendChangeEnabledAction(NetEntity, !_lastEnabled);
+        SendChangeEnabledAction?.Invoke(NetEntity, !_lastEnabled);
     }
 
     public void TrySendUndockAction()
     {
         if (SendUndockAction == null)
             return;
+
         if (!_lastDocked)
             return;
+
         SendUndockAction(NetEntity);
     }
 
@@ -102,13 +103,16 @@ public void UpdateEntry(AtmosAlertsComputerEntry entry, bool isFocus, AtmosAlert
         Coordinates = _entManager.GetCoordinates(entry.Coordinates);
 
         // Load fonts
-        var normalFont = new VectorFont(_cache.GetResource<FontResource>("/Fonts/NotoSansDisplay/NotoSansDisplay-Regular.ttf"), 11);
+        var normalFont =
+            new VectorFont(_cache.GetResource<FontResource>("/Fonts/NotoSansDisplay/NotoSansDisplay-Regular.ttf"), 11);
 
         AlarmStateLabel.Text = Loc.GetString("atmos-alerts-window-normal-state");
         AlarmStateLabel.FontColorOverride = StyleNano.GoodGreenFore;
 
         // Update alarm name
-        AlarmNameLabel.Text = Loc.GetString("atmos-alerts-window-alarm-label", ("name", entry.EntityName), ("address", entry.Address));
+        AlarmNameLabel.Text = Loc.GetString("atmos-alerts-window-alarm-label",
+            ("name", entry.EntityName),
+            ("address", entry.Address));
 
         // Focus updates
         FocusContainer.Visible = isFocus;
@@ -127,71 +131,77 @@ public void UpdateEntry(AtmosAlertsComputerEntry entry, bool isFocus, AtmosAlert
         }
         // End Frontier
 
-        if (isFocus && entry.Group == AtmosAlertsComputerGroup.Gaslock)
-        {
-            MainDataContainer.Visible = (entry.AlarmState != AtmosAlarmType.Invalid);
-            NoDataLabel.Visible = (entry.AlarmState == AtmosAlarmType.Invalid);
+        if (!isFocus || entry.Group != AtmosAlertsComputerGroup.Gaslock)
+            return;
 
-            if (focusData != null)
-            {
-                DirectionLabel.Text = Loc.GetString(focusData.Value.PumpingInwards ? "atmos-alerts-window-direction-inwards" : "atmos-alerts-window-direction-outwards");
+        MainDataContainer.Visible = entry.AlarmState != AtmosAlarmType.Invalid;
+        NoDataLabel.Visible = entry.AlarmState == AtmosAlarmType.Invalid;
+
+        if (focusData == null)
+            return;
 
-                // Update pressure (if user is not editing text)
-                if (!PressureInput.HasKeyboardFocus())
-                    PressureInput.Text = focusData.Value.Pressure.ToString();
-                EnabledLabel.Text = Loc.GetString(focusData.Value.Enabled ? "atmos-alerts-window-enabled-on" : "atmos-alerts-window-enabled-off");
-                DockedLabel.Text = Loc.GetString(focusData.Value.DockedEntity == NetEntity.Invalid ? "atmos-alerts-window-docked-off" : "atmos-alerts-window-docked-on");
-                DockedLabel.Disabled = focusData.Value.DockedEntity == NetEntity.Invalid;
+        DirectionLabel.Text = Loc.GetString(focusData.Value.PumpingInwards
+            ? "atmos-alerts-window-direction-inwards"
+            : "atmos-alerts-window-direction-outwards");
 
-                // Update other present gases
-                GasGridContainer.RemoveAllChildren();
+        // Update pressure (if user is not editing text)
+        if (!PressureInput.HasKeyboardFocus())
+            PressureInput.Text = focusData.Value.Pressure.ToString(CultureInfo.InvariantCulture);
+        EnabledLabel.Text = Loc.GetString(focusData.Value.Enabled
+            ? "atmos-alerts-window-enabled-on"
+            : "atmos-alerts-window-enabled-off");
+        DockedLabel.Text = Loc.GetString(focusData.Value.DockedEntity == NetEntity.Invalid
+            ? "atmos-alerts-window-docked-off"
+            : "atmos-alerts-window-docked-on");
+        DockedLabel.Disabled = focusData.Value.DockedEntity == NetEntity.Invalid;
 
-                var gasData = focusData.Value.GasData.Where(g => g.Key != Gas.Oxygen);
+        // Update other present gases
+        GasGridContainer.RemoveAllChildren();
 
-                if (gasData.Count() == 0)
-                {
-                    // No other gases
-                    var gasLabel = new Label()
-                    {
-                        Text = Loc.GetString("atmos-alerts-window-other-gases-value-nil"),
-                        FontOverride = normalFont,
-                        FontColorOverride = StyleNano.DisabledFore,
-                        HorizontalAlignment = HAlignment.Center,
-                        VerticalAlignment = VAlignment.Center,
-                        HorizontalExpand = true,
-                        Margin = new Thickness(0, 2, 0, 0),
-                        SetHeight = 24f,
-                    };
-
-                    GasGridContainer.AddChild(gasLabel);
-                }
-
-                else
+        var gasData = focusData.Value.GasData;
+
+        if (!gasData.Any())
+        {
+            // No other gases
+            var gasLabel = new Label
+            {
+                Text = Loc.GetString("atmos-alerts-window-other-gases-value-nil"),
+                FontOverride = normalFont,
+                FontColorOverride = StyleNano.DisabledFore,
+                HorizontalAlignment = HAlignment.Center,
+                VerticalAlignment = VAlignment.Center,
+                HorizontalExpand = true,
+                Margin = new Thickness(0, 2, 0, 0),
+                SetHeight = 24f,
+            };
+
+            GasGridContainer.AddChild(gasLabel);
+        }
+
+        else
+        {
+            // Add an entry for each gas
+            foreach (var (gas, (_, percent)) in gasData)
+            {
+                FixedPoint2 gasPercent = percent * 100f;
+
+                var gasShorthand = _gasShorthands.GetValueOrDefault(gas, "X");
+
+                var gasLabel = new Label
                 {
-                    // Add an entry for each gas
-                    foreach ((var gas, (var mol, var percent)) in gasData)
-                    {
-                        var gasPercent = (FixedPoint2)0f;
-                        gasPercent = percent * 100f;
-
-                        if (!_gasShorthands.TryGetValue(gas, out var gasShorthand))
-                            gasShorthand = "X";
-
-                        var gasLabel = new Label()
-                        {
-                            Text = Loc.GetString("atmos-alerts-window-other-gases-value", ("shorthand", gasShorthand), ("value", gasPercent)),
-                            FontOverride = normalFont,
-                            FontColorOverride = StyleNano.GoodGreenFore,
-                            HorizontalAlignment = HAlignment.Center,
-                            VerticalAlignment = VAlignment.Center,
-                            HorizontalExpand = true,
-                            Margin = new Thickness(0, 2, 0, 0),
-                            SetHeight = 24f,
-                        };
-
-                        GasGridContainer.AddChild(gasLabel);
-                    }
-                }
+                    Text = Loc.GetString("atmos-alerts-window-other-gases-value",
+                        ("shorthand", gasShorthand),
+                        ("value", gasPercent)),
+                    FontOverride = normalFont,
+                    FontColorOverride = StyleNano.GoodGreenFore,
+                    HorizontalAlignment = HAlignment.Center,
+                    VerticalAlignment = VAlignment.Center,
+                    HorizontalExpand = true,
+                    Margin = new Thickness(0, 2, 0, 0),
+                    SetHeight = 24f,
+                };
+
+                GasGridContainer.AddChild(gasLabel);
             }
         }
     }
diff --git a/Content.Client/_NF/Atmos/Systems/GasDepositSystem.cs b/Content.Client/_NF/Atmos/Systems/GasDepositSystem.cs
new file mode 100644
index 00000000000..9cf81ff6279
--- /dev/null
+++ b/Content.Client/_NF/Atmos/Systems/GasDepositSystem.cs
@@ -0,0 +1,5 @@
+using Content.Shared._NF.Atmos.Systems;
+
+namespace Content.Client._NF.Atmos.Systems;
+
+public sealed class GasDepositSystem : SharedGasDepositSystem;
diff --git a/Content.Client/_NF/Atmos/UI/GasDepositExtractorBoundUserInterface.cs b/Content.Client/_NF/Atmos/UI/GasDepositExtractorBoundUserInterface.cs
index c3cd5559aa0..82ead7311b7 100644
--- a/Content.Client/_NF/Atmos/UI/GasDepositExtractorBoundUserInterface.cs
+++ b/Content.Client/_NF/Atmos/UI/GasDepositExtractorBoundUserInterface.cs
@@ -1,7 +1,7 @@
 using Content.Client.Atmos.UI;
-using Content.Server._NF.Atmos.Components;
 using Content.Shared.Atmos.Piping.Binary.Components;
 using Content.Shared.IdentityManagement;
+using Content.Shared._NF.Atmos.Components;
 using JetBrains.Annotations;
 using Robust.Client.UserInterface;
 
@@ -11,15 +11,12 @@ namespace Content.Client._NF.Atmos.UI;
 /// Initializes a <see cref="GasPressurePumpWindow"/> and updates it when new server messages are received.
 /// </summary>
 [UsedImplicitly]
-public sealed class GasDepositExtractorBoundUserInterface : BoundUserInterface
+public sealed class GasDepositExtractorBoundUserInterface(EntityUid owner, Enum uiKey)
+    : BoundUserInterface(owner, uiKey)
 {
     [ViewVariables]
     private GasPressurePumpWindow? _window;
 
-    public GasDepositExtractorBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
-    {
-    }
-
     protected override void Open()
     {
         base.Open();
@@ -31,7 +28,7 @@ protected override void Open()
         Update();
     }
 
-    public void Update()
+    public override void Update()
     {
         if (_window == null)
             return;
@@ -48,7 +45,9 @@ public void Update()
 
     private void OnToggleStatusButtonPressed()
     {
-        if (_window is null) return;
+        if (_window is null)
+            return;
+
         SendPredictedMessage(new GasPressurePumpToggleStatusMessage(_window.PumpStatus));
     }
 
diff --git a/Content.Client/_NF/Atmos/UI/GasPressureBidiPumpBoundUserInterface.cs b/Content.Client/_NF/Atmos/UI/GasPressureBidiPumpBoundUserInterface.cs
index a4387319ae2..67f4146bfe8 100644
--- a/Content.Client/_NF/Atmos/UI/GasPressureBidiPumpBoundUserInterface.cs
+++ b/Content.Client/_NF/Atmos/UI/GasPressureBidiPumpBoundUserInterface.cs
@@ -1,5 +1,4 @@
 using Content.Shared._NF.Atmos.Piping.Binary.Messages;
-using Content.Shared.Atmos;
 using Content.Shared.Atmos.Components;
 using Content.Shared.Atmos.Piping.Binary.Components;
 using Content.Shared.IdentityManagement;
@@ -12,18 +11,12 @@ namespace Content.Client._NF.Atmos.UI
     /// Initializes a <see cref="GasPressureBidiPumpWindow"/> and updates it when new server messages are received.
     /// </summary>
     [UsedImplicitly]
-    public sealed class GasPressureBidiPumpBoundUserInterface : BoundUserInterface
+    public sealed class GasPressureBidiPumpBoundUserInterface(EntityUid owner, Enum uiKey)
+        : BoundUserInterface(owner, uiKey)
     {
-        [ViewVariables]
-        private const float MaxPressure = Atmospherics.MaxOutputPressure;
-
         [ViewVariables]
         private GasPressureBidiPumpWindow? _window;
 
-        public GasPressureBidiPumpBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
-        {
-        }
-
         protected override void Open()
         {
             base.Open();
@@ -38,13 +31,17 @@ protected override void Open()
 
         private void OnToggleStatusButtonPressed()
         {
-            if (_window is null) return;
+            if (_window is null)
+                return;
+
             SendMessage(new GasPressurePumpToggleStatusMessage(_window.PumpStatus));
         }
 
         private void OnToggleDirectionButtonPressed()
         {
-            if (_window is null) return;
+            if (_window is null)
+                return;
+
             SendMessage(new GasPressurePumpChangePumpDirectionMessage(_window.PumpInwards));
         }
 
@@ -56,8 +53,7 @@ private void OnPumpOutputPressurePressed(float value)
         /// <summary>
         /// Update the UI state based on server-sent info
         /// </summary>
-        /// <param name="state"></param>
-        protected void Update()
+        public override void Update()
         {
             if (_window == null)
                 return;
diff --git a/Content.Client/_NF/Atmos/UI/GasPressureBidiPumpWindow.xaml b/Content.Client/_NF/Atmos/UI/GasPressureBidiPumpWindow.xaml
index 68e58809eef..27240c971b8 100644
--- a/Content.Client/_NF/Atmos/UI/GasPressureBidiPumpWindow.xaml
+++ b/Content.Client/_NF/Atmos/UI/GasPressureBidiPumpWindow.xaml
@@ -1,23 +1,24 @@
 <controls:FancyWindow xmlns="https://spacestation14.io"
-            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-            SetSize="340 160" MinSize="340 160" Title="Bidirectional Pressure Pump">
+                      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                      xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+                      SetSize="340 160" MinSize="340 160" Title="Bidirectional Pressure Pump">
     <BoxContainer Orientation="Vertical" Margin="5 5 5 5" SeparationOverride="10">
         <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
-            <Label Text="{Loc comp-gas-pump-ui-pump-status}" Margin="0 0 5 0"/>
-            <Button Name="ToggleStatusButton"/>
-            <Control HorizontalExpand="True"/>
-            <Button HorizontalAlignment="Right" Name="SetOutputPressureButton" Text="{Loc comp-gas-pump-ui-pump-set-rate}" Disabled="True" Margin="0 0 5 0"/>
+            <Label Text="{Loc comp-gas-pump-ui-pump-status}" Margin="0 0 5 0" />
+            <Button Name="ToggleStatusButton" />
+            <Control HorizontalExpand="True" />
+            <Button HorizontalAlignment="Right" Name="SetOutputPressureButton"
+                    Text="{Loc comp-gas-pump-ui-pump-set-rate}" Disabled="True" Margin="0 0 5 0" />
             <Button Name="SetMaxPressureButton" Text="{Loc comp-gas-pump-ui-pump-set-max}" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
-            <Label Text="{Loc comp-gas-pump-ui-pump-output-pressure}"/>
+            <Label Text="{Loc comp-gas-pump-ui-pump-output-pressure}" />
             <FloatSpinBox HorizontalExpand="True" Name="PumpPressureOutputInput" MinSize="70 0" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
-            <Label Text="{Loc comp-gas-pump-ui-pump-direction}"/>
+            <Label Text="{Loc comp-gas-pump-ui-pump-direction}" />
             <Control MinSize="5 0" />
-            <Button Name="ToggleDirectionButton"/>
+            <Button Name="ToggleDirectionButton" />
         </BoxContainer>
     </BoxContainer>
 </controls:FancyWindow>
diff --git a/Content.Client/_NF/Atmos/UI/GasPressureBidiPumpWindow.xaml.cs b/Content.Client/_NF/Atmos/UI/GasPressureBidiPumpWindow.xaml.cs
index 9d43815b3a5..c000b482657 100644
--- a/Content.Client/_NF/Atmos/UI/GasPressureBidiPumpWindow.xaml.cs
+++ b/Content.Client/_NF/Atmos/UI/GasPressureBidiPumpWindow.xaml.cs
@@ -12,7 +12,7 @@ namespace Content.Client._NF.Atmos.UI;
 public sealed partial class GasPressureBidiPumpWindow : FancyWindow
 {
     public bool PumpStatus = true;
-    public bool PumpInwards = false;
+    public bool PumpInwards;
 
     public event Action? ToggleStatusButtonPressed;
     public event Action? ToggleDirectionButtonPressed;
@@ -64,26 +64,16 @@ public void SetOutputPressure(float pressure)
     public void SetPumpStatus(bool enabled)
     {
         PumpStatus = enabled;
-        if (enabled)
-        {
-            ToggleStatusButton.Text = Loc.GetString("comp-gas-pump-ui-status-enabled");
-        }
-        else
-        {
-            ToggleStatusButton.Text = Loc.GetString("comp-gas-pump-ui-status-disabled");
-        }
+        ToggleStatusButton.Text = Loc.GetString(enabled
+            ? "comp-gas-pump-ui-status-enabled"
+            : "comp-gas-pump-ui-status-disabled");
     }
 
     public void SetPumpDirection(bool inwards)
     {
         PumpInwards = inwards;
-        if (inwards)
-        {
-            ToggleDirectionButton.Text = Loc.GetString("comp-gas-pump-ui-direction-in");
-        }
-        else
-        {
-            ToggleDirectionButton.Text = Loc.GetString("comp-gas-pump-ui-direction-out");
-        }
+        ToggleDirectionButton.Text = Loc.GetString(inwards
+            ? "comp-gas-pump-ui-direction-in"
+            : "comp-gas-pump-ui-direction-out");
     }
 }
diff --git a/Content.Client/_NF/Atmos/UI/GasSaleMenu.cs b/Content.Client/_NF/Atmos/UI/GasSaleMenu.cs
index 0cefa29227d..06ba7a977a2 100644
--- a/Content.Client/_NF/Atmos/UI/GasSaleMenu.cs
+++ b/Content.Client/_NF/Atmos/UI/GasSaleMenu.cs
@@ -39,8 +39,8 @@ public void SetMixture(GasMixture mixture, int appraisal)
     {
         Gases.Children.Clear();
         GasAmounts.Children.Clear();
-        bool hasGas = false;
-        for (int i = 0; i < Atmospherics.TotalNumberOfGases; i++)
+        var hasGas = false;
+        for (var i = 0; i < Atmospherics.TotalNumberOfGases; i++)
         {
             var gasAmount = mixture.GetMoles(i);
             if (gasAmount <= 0)
@@ -59,12 +59,14 @@ public void SetMixture(GasMixture mixture, int appraisal)
             GasAmounts.Children.Add(amountLabel);
             hasGas = true;
         }
+
         if (!hasGas)
         {
             Label noGasLabel = new();
             noGasLabel.Text = Loc.GetString("gas-sale-menu-no-gases");
             Gases.Children.Add(noGasLabel);
         }
+
         AppraisalLabel.Text = BankSystemExtensions.ToSpesoString(appraisal);
     }
 
diff --git a/Content.Client/_NF/Atmos/UI/GasSaleMenu.xaml b/Content.Client/_NF/Atmos/UI/GasSaleMenu.xaml
index 4c5cb96ede3..682e60d4aae 100644
--- a/Content.Client/_NF/Atmos/UI/GasSaleMenu.xaml
+++ b/Content.Client/_NF/Atmos/UI/GasSaleMenu.xaml
@@ -14,11 +14,11 @@
                    StyleClasses="LabelKeyText" />
             <Label Name="AppraisalLabel"
                    Text="{Loc 'gas-sale-menu-no-value'}"
-                   HorizontalAlignment="Right"/>
+                   HorizontalAlignment="Right" />
 
             <Label Text="{Loc 'gas-sale-menu-mixture-title'}"
                    StyleClasses="LabelKeyText" />
-            <Control/> <!-- placeholder -->
+            <Control /> <!-- placeholder -->
 
             <BoxContainer Name="Gases"
                           Orientation="Vertical"
@@ -34,10 +34,10 @@
 
         <Button Name="RefreshButton"
                 Text="{Loc 'gas-sale-refresh-button'}"
-                Margin="5 5 5 0"/>
+                Margin="5 5 5 0" />
         <Button Name="SellButton"
                 Text="{Loc 'gas-sale-sell-button'}"
-                Margin="5 0 5 0"/>
+                Margin="5 0 5 0" />
         <TextureButton VerticalExpand="True" />
     </BoxContainer>
 </controls:FancyWindow>
diff --git a/Content.Client/_NF/Atmos/UI/GaslockObject.xaml b/Content.Client/_NF/Atmos/UI/GaslockObject.xaml
deleted file mode 100644
index af07246f332..00000000000
--- a/Content.Client/_NF/Atmos/UI/GaslockObject.xaml
+++ /dev/null
@@ -1,11 +0,0 @@
-<PanelContainer HorizontalExpand="True"
-                         xmlns="https://spacestation14.io"
-                         Margin="0 3">
-    <BoxContainer Name="Contents" Orientation="Vertical"
-                           Margin="3">
-        <Label Name="DockedLabel"
-                        HorizontalAlignment="Center"
-                        Margin="3 5"/>
-        <BoxContainer Orientation="Vertical" Name="DockContainer"/>
-    </BoxContainer>
-</PanelContainer>
diff --git a/Content.Client/_NF/Atmos/UI/GaslockObject.xaml.cs b/Content.Client/_NF/Atmos/UI/GaslockObject.xaml.cs
deleted file mode 100644
index b02b0749167..00000000000
--- a/Content.Client/_NF/Atmos/UI/GaslockObject.xaml.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using Content.Shared._NF.Atmos.BUIStates;
-using JetBrains.Annotations;
-using Robust.Client.AutoGenerated;
-using Robust.Client.Graphics;
-using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.XAML;
-
-namespace Content.Client._NF.Atmos.UI;
-
-[GenerateTypedNameReferences]
-public sealed partial class GaslockObject : PanelContainer
-{
-    [PublicAPI]
-    public event Action? UndockPressed;
-
-    [PublicAPI]
-    public event Action? ViewPressed;
-
-    public BoxContainer ContentsContainer => Contents;
-
-    public GaslockObject()
-    {
-        RobustXamlLoader.Load(this);
-        IoCManager.InjectDependencies(this);
-
-        PanelOverride = new StyleBoxFlat(new Color(30, 30, 34));
-    }
-
-    public void AddDock(GaslockPortState state, ShuttleGaslockControl dockControl)
-    {
-        var viewButton = new Button()
-        {
-            Text = Loc.GetString("shuttle-console-view"),
-        };
-
-        viewButton.OnPressed += args =>
-        {
-            dockControl.SetViewedDock(state);
-        };
-
-        var container = new BoxContainer()
-        {
-            Orientation = BoxContainer.LayoutOrientation.Vertical,
-            Children =
-            {
-                new Label()
-                {
-                    Text = state.Name,
-                    HorizontalAlignment = HAlignment.Center,
-                },
-                viewButton
-            }
-        };
-
-        DockContainer.AddChild(container);
-    }
-
-    public void SetName(string value)
-    {
-        DockedLabel.Text = value;
-    }
-}
diff --git a/Content.Client/_NF/Atmos/UI/ShuttleGaslockControl.xaml b/Content.Client/_NF/Atmos/UI/ShuttleGaslockControl.xaml
deleted file mode 100644
index b1bbb4c6290..00000000000
--- a/Content.Client/_NF/Atmos/UI/ShuttleGaslockControl.xaml
+++ /dev/null
@@ -1 +0,0 @@
-<ui:BaseShuttleControl xmlns:ui="clr-namespace:Content.Client.Shuttles.UI"/>
diff --git a/Content.Client/_NF/Atmos/UI/ShuttleGaslockControl.xaml.cs b/Content.Client/_NF/Atmos/UI/ShuttleGaslockControl.xaml.cs
deleted file mode 100644
index 9ef166a92fe..00000000000
--- a/Content.Client/_NF/Atmos/UI/ShuttleGaslockControl.xaml.cs
+++ /dev/null
@@ -1,473 +0,0 @@
-using System.Numerics;
-using Content.Client.Shuttles.Systems;
-using Content.Shared.Shuttles.Components;
-using Content.Shared.Shuttles.Systems;
-using Robust.Client.AutoGenerated;
-using Robust.Client.Graphics;
-using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Map;
-using Robust.Shared.Map.Components;
-using Robust.Shared.Timing;
-using Content.Client.Shuttles.UI;
-using Content.Shared._NF.Atmos.BUIStates;
-
-namespace Content.Client._NF.Atmos.UI;
-
-[GenerateTypedNameReferences]
-public sealed partial class ShuttleGaslockControl : BaseShuttleControl
-{
-    [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly IMapManager _mapManager = default!;
-    private readonly DockingSystem _dockSystem;
-    private readonly SharedShuttleSystem _shuttles;
-    private readonly SharedTransformSystem _xformSystem;
-
-    public NetEntity? HighlightedDock;
-
-    public NetEntity? ViewedDock => _viewedState?.Entity;
-    private GaslockPortState? _viewedState;
-
-    public EntityUid? GridEntity;
-
-    private EntityCoordinates? _coordinates;
-    private Angle? _angle;
-
-    public GaslockConsoleBoundUserInterfaceState? DockState = null;
-
-    private List<Entity<MapGridComponent>> _grids = new();
-
-    private readonly HashSet<GaslockPortState> _drawnDocks = new();
-    private readonly Dictionary<GaslockPortState, Button> _dockButtons = new();
-
-    /// <summary>
-    /// Store buttons for every other dock
-    /// </summary>
-    private readonly Dictionary<GaslockPortState, Control> _dockContainers = new();
-
-    private static readonly TimeSpan DockChangeCooldown = TimeSpan.FromSeconds(0.5);
-
-    /// <summary>
-    /// Rate-limiting for docking changes
-    /// </summary>
-    private TimeSpan _nextDockChange;
-
-    public event Action<NetEntity>? OnViewDock;
-    public event Action<NetEntity, NetEntity>? DockRequest;
-    public event Action<NetEntity>? UndockRequest;
-
-    public ShuttleGaslockControl() : base(2f, 32f, 8f)
-    {
-        RobustXamlLoader.Load(this);
-        _dockSystem = EntManager.System<DockingSystem>();
-        _shuttles = EntManager.System<SharedShuttleSystem>();
-        _xformSystem = EntManager.System<SharedTransformSystem>();
-        MinSize = new Vector2(SizeFull, SizeFull);
-    }
-
-    public void SetViewedDock(GaslockPortState? dockState)
-    {
-        _viewedState = dockState;
-
-        if (dockState != null)
-        {
-            _coordinates = EntManager.GetCoordinates(dockState.Coordinates);
-            _angle = dockState.Angle;
-            OnViewDock?.Invoke(dockState.Entity);
-        }
-        else
-        {
-            _coordinates = null;
-            _angle = null;
-        }
-    }
-
-    protected override void FrameUpdate(FrameEventArgs args)
-    {
-        base.FrameUpdate(args);
-        HideDocks();
-        _drawnDocks.Clear();
-    }
-
-    protected override void Draw(DrawingHandleScreen handle)
-    {
-        base.Draw(handle);
-
-        DrawBacking(handle);
-
-        if (_coordinates == null ||
-            _angle == null ||
-            DockState == null ||
-            !EntManager.TryGetComponent<TransformComponent>(GridEntity, out var gridXform))
-        {
-            DrawNoSignal(handle);
-            return;
-        }
-
-        DrawCircles(handle);
-        DrawNorthLine(handle, _angle.Value); // Frontier Corvax: north line drawing
-        var gridNent = EntManager.GetNetEntity(GridEntity);
-        var mapPos = _xformSystem.ToMapCoordinates(_coordinates.Value);
-        var ourGridMatrix = _xformSystem.GetWorldMatrix(GridEntity.Value);
-        var dockMatrix = Matrix3Helpers.CreateTransform(_coordinates.Value.Position, Angle.Zero);
-        var worldFromDock = Matrix3x2.Multiply(dockMatrix, ourGridMatrix);
-
-        Matrix3x2.Invert(worldFromDock, out var offsetMatrix);
-
-        // Draw nearby grids
-        var controlBounds = PixelSizeBox;
-        _grids.Clear();
-        _mapManager.FindGridsIntersecting(gridXform.MapID, new Box2(mapPos.Position - WorldRangeVector, mapPos.Position + WorldRangeVector), ref _grids);
-
-        // offset the dotted-line position to the bounds.
-        Vector2? viewedDockPos = _viewedState != null ? MidPointVector : null;
-
-        if (viewedDockPos != null)
-        {
-            viewedDockPos = viewedDockPos.Value + _angle.Value.RotateVec(new Vector2(0f,-0.6f) * MinimapScale);
-        }
-
-        var canDockChange = _timing.CurTime > _nextDockChange;
-        var lineOffset = (float) _timing.RealTime.TotalSeconds * 30f;
-
-        var viewedDockType = _viewedState?.DockType ?? DockType.None; // Frontier: cache dock type
-        var viewedReceiveOnly = _viewedState?.ReceiveOnly ?? true; // Frontier: cache receive only
-
-        foreach (var grid in _grids)
-        {
-            EntManager.TryGetComponent(grid.Owner, out IFFComponent? iffComp);
-
-            if (grid.Owner != GridEntity && !_shuttles.CanDraw(grid.Owner, iffComp: iffComp))
-                continue;
-
-            var gridMatrix = _xformSystem.GetWorldMatrix(grid.Owner);
-            var matty = Matrix3x2.Multiply(gridMatrix, offsetMatrix);
-            var color = _shuttles.GetIFFColor(grid.Owner, grid.Owner == GridEntity, component: iffComp);
-
-            DrawGrid(handle, matty, grid, color);
-
-            // Draw any docks on that grid
-            if (!DockState.State.Docks.TryGetValue(EntManager.GetNetEntity(grid), out var gridDocks))
-                continue;
-
-            foreach (var dock in gridDocks)
-            {
-                if (ViewedDock == dock.Entity)
-                    continue;
-
-                var position = Vector2.Transform(dock.Coordinates.Position, matty);
-
-                var otherDockRotation = Matrix3Helpers.CreateRotation(dock.Angle);
-                var scaledPos = ScalePosition(position with {Y = -position.Y});
-
-                if (!controlBounds.Contains(scaledPos.Floored()))
-                    continue;
-
-                // Draw the dock's collision
-                var collisionBL = Vector2.Transform(dock.Coordinates.Position +
-                                                  Vector2.Transform(new Vector2(-0.2f, -0.7f), otherDockRotation), matty);
-                var collisionBR = Vector2.Transform(dock.Coordinates.Position +
-                                                  Vector2.Transform(new Vector2(0.2f, -0.7f), otherDockRotation), matty);
-                var collisionTR = Vector2.Transform(dock.Coordinates.Position +
-                                                  Vector2.Transform(new Vector2(0.2f, -0.5f), otherDockRotation), matty);
-                var collisionTL = Vector2.Transform(dock.Coordinates.Position +
-                                                  Vector2.Transform(new Vector2(-0.2f, -0.5f), otherDockRotation), matty);
-
-                var verts = new[]
-                {
-                    collisionBL,
-                    collisionBR,
-                    collisionBR,
-                    collisionTR,
-                    collisionTR,
-                    collisionTL,
-                    collisionTL,
-                    collisionBL,
-                };
-
-                for (var i = 0; i < verts.Length; i++)
-                {
-                    var vert = verts[i];
-                    vert.Y = -vert.Y;
-                    verts[i] = ScalePosition(vert);
-                }
-
-                var collisionCenter = verts[0] + verts[1] + verts[3] + verts[5];
-
-                var otherDockConnection = Color.ToSrgb(Color.Pink);
-                handle.DrawPrimitives(DrawPrimitiveTopology.TriangleFan, verts, otherDockConnection.WithAlpha(0.2f));
-                handle.DrawPrimitives(DrawPrimitiveTopology.LineList, verts, otherDockConnection);
-
-                // Draw the dock itself
-                var dockBL = Vector2.Transform(dock.Coordinates.Position + new Vector2(-0.5f, -0.5f), matty);
-                var dockBR = Vector2.Transform(dock.Coordinates.Position + new Vector2(0.5f, -0.5f), matty);
-                var dockTR = Vector2.Transform(dock.Coordinates.Position + new Vector2(0.5f, 0.5f), matty);
-                var dockTL = Vector2.Transform(dock.Coordinates.Position + new Vector2(-0.5f, 0.5f), matty);
-
-                verts = new[]
-                {
-                    dockBL,
-                    dockBR,
-                    dockBR,
-                    dockTR,
-                    dockTR,
-                    dockTL,
-                    dockTL,
-                    dockBL
-                };
-
-                for (var i = 0; i < verts.Length; i++)
-                {
-                    var vert = verts[i];
-                    vert.Y = -vert.Y;
-                    verts[i] = ScalePosition(vert);
-                }
-
-                Color otherDockColor;
-
-                if (HighlightedDock == dock.Entity)
-                {
-                    //otherDockColor = Color.ToSrgb(Color.Magenta); // Frontier
-                    otherDockColor = Color.ToSrgb(dock.HighlightedRadarColor); // Frontier
-                }
-                else
-                {
-                    // otherDockColor = Color.ToSrgb(Color.Purple); // Frontier
-                    otherDockColor = Color.ToSrgb(dock.RadarColor); // Frontier
-                }
-
-                /*
-                 * Can draw in these conditions:
-                 * 1. Same grid
-                 * 2. It's in range
-                 *
-                 * We don't want to draw stuff far away that's docked because it will just overlap our buttons
-                 */
-
-                var canDraw = grid.Owner == GridEntity;
-                _dockButtons.TryGetValue(dock, out var dockButton);
-
-                // Rate limit
-                if (dockButton != null && dock.GridDockedWith != null)
-                {
-                    dockButton.Disabled = !canDockChange;
-                    dockButton.Visible = true; // Frontier: undock should always be visible.
-                }
-
-                // If the dock is in range then also do highlighting
-                if (viewedDockPos != null && dock.Coordinates.NetEntity != gridNent)
-                {
-                    collisionCenter /= 4;
-                    var range = viewedDockPos.Value - collisionCenter;
-
-                    if (range.Length() < SharedDockingSystem.DockingHiglightRange * MinimapScale)
-                    {
-                        if (_viewedState?.GridDockedWith == null)
-                        {
-                            var coordsOne = EntManager.GetCoordinates(_viewedState!.Coordinates);
-                            var coordsTwo = EntManager.GetCoordinates(dock.Coordinates);
-                            var mapOne = _xformSystem.ToMapCoordinates(coordsOne);
-                            var mapTwo = _xformSystem.ToMapCoordinates(coordsTwo);
-
-                            var rotA = _xformSystem.GetWorldRotation(coordsOne.EntityId) + _viewedState!.Angle;
-                            var rotB = _xformSystem.GetWorldRotation(coordsTwo.EntityId) + dock.Angle;
-
-                            var distance = (mapOne.Position - mapTwo.Position).Length();
-
-                            var inAlignment = _dockSystem.InAlignment(mapOne, rotA, mapTwo, rotB);
-                            var canDock = distance < SharedDockingSystem.DockRange && inAlignment;
-
-                            if (dockButton != null)
-                            {
-                                dockButton.Disabled = !canDock && dock.GridDockedWith == null || !canDockChange; // Frontier: add "&& dock.GridDockedWith == null"
-                                dockButton.Visible = dock.GridDockedWith != null || (dock.DockType & viewedDockType) != DockType.None && !viewedReceiveOnly; // Frontier: do not enable docking for receive-only docks
-                            }
-
-                            var lineColor = inAlignment ? Color.Lime : Color.Red;
-                            handle.DrawDottedLine(viewedDockPos.Value, collisionCenter, lineColor, offset: lineOffset);
-                        }
-                        else if (dockButton != null)
-                        {
-                            dockButton.Visible = dock.GridDockedWith != null; // Frontier: do not enable docking for receive-only docks
-                        }
-
-                        canDraw = true;
-                    }
-                    else if (dockButton != null)
-                    {
-                        dockButton.Disabled = true;
-                        dockButton.Visible = dock.GridDockedWith != null || (dock.DockType & viewedDockType) != DockType.None && !viewedReceiveOnly; // Frontier
-                    }
-                }
-
-                handle.DrawPrimitives(DrawPrimitiveTopology.TriangleFan, verts, otherDockColor.WithAlpha(0.2f));
-                handle.DrawPrimitives(DrawPrimitiveTopology.LineList, verts, otherDockColor);
-
-                // Position the dock control above it
-                var container = _dockContainers[dock];
-                container.Visible = canDraw;
-
-                if (canDraw)
-                {
-                    // Because it's being layed out top-down we have to arrange for first frame.
-                    container.Arrange(PixelRect);
-                    var containerPos = scaledPos / UIScale - container.DesiredSize / 2 - new Vector2(0f, 0.75f) * MinimapScale;
-                    SetPosition(container, containerPos);
-                }
-
-                _drawnDocks.Add(dock);
-            }
-        }
-
-        // Draw the dock's collision
-        var invertedPosition = Vector2.Zero;
-        invertedPosition.Y = -invertedPosition.Y;
-        var rotation = Matrix3Helpers.CreateRotation(-_angle.Value + MathF.PI);
-        var ourDockConnection = new UIBox2(
-            ScalePosition(Vector2.Transform(new Vector2(-0.2f, -0.7f), rotation)),
-            ScalePosition(Vector2.Transform(new Vector2(0.2f, -0.5f), rotation)));
-
-        var ourDock = new UIBox2(
-            ScalePosition(Vector2.Transform(new Vector2(-0.5f, 0.5f), rotation)),
-            ScalePosition(Vector2.Transform(new Vector2(0.5f, -0.5f), rotation)));
-
-        var dockColor = _viewedState?.HighlightedRadarColor ?? Color.Magenta;
-        var connectionColor = Color.Pink;
-
-        handle.DrawRect(ourDockConnection, connectionColor.WithAlpha(0.2f));
-        handle.DrawRect(ourDockConnection, connectionColor, filled: false);
-
-        // Draw the dock itself
-        handle.DrawRect(ourDock, dockColor.WithAlpha(0.2f));
-        handle.DrawRect(ourDock, dockColor, filled: false);
-    }
-
-    private void HideDocks()
-    {
-        foreach (var (dock, control) in _dockContainers)
-        {
-            if (_drawnDocks.Contains(dock))
-                continue;
-
-            control.Visible = false;
-        }
-    }
-
-    public void BuildDocks(EntityUid? shuttle)
-    {
-        var viewedEnt = ViewedDock;
-        _viewedState = null;
-
-        foreach (var btn in _dockButtons.Values)
-        {
-            btn.Dispose();
-        }
-
-        foreach (var container in _dockContainers.Values)
-        {
-            container.Dispose();
-        }
-
-        _dockButtons.Clear();
-        _dockContainers.Clear();
-
-        if (DockState == null)
-            return;
-
-        var gridNent = EntManager.GetNetEntity(GridEntity);
-
-        foreach (var (otherShuttle, docks) in DockState.State.Docks)
-        {
-            // If it's our shuttle we add a view button
-
-            foreach (var dock in docks)
-            {
-                if (dock.Entity == viewedEnt)
-                {
-                    _viewedState = dock;
-                }
-
-                var container = new BoxContainer()
-                {
-                    Orientation = BoxContainer.LayoutOrientation.Vertical,
-                    Margin = new Thickness(3),
-                };
-
-                var panel = new PanelContainer()
-                {
-                    HorizontalAlignment = HAlignment.Center,
-                    VerticalAlignment = VAlignment.Center,
-                    PanelOverride = new StyleBoxFlat(new Color(30, 30, 34, 200)),
-                    Children =
-                    {
-                        container,
-                    }
-                };
-
-                Button button;
-
-                if (otherShuttle == gridNent)
-                {
-                    button = new Button()
-                    {
-                        Text = Loc.GetString("shuttle-console-view"),
-                    };
-
-                    button.OnPressed += args =>
-                    {
-                        SetViewedDock(dock);
-                    };
-                }
-                else
-                {
-                    if (dock.Connected)
-                    {
-                        button = new Button()
-                        {
-                            Text = Loc.GetString("shuttle-console-undock"),
-                        };
-
-                        button.OnPressed += args =>
-                        {
-                            _nextDockChange = _timing.CurTime + DockChangeCooldown;
-                            UndockRequest?.Invoke(dock.Entity);
-                        };
-                    }
-                    else
-                    {
-                        button = new Button()
-                        {
-                            Text = Loc.GetString("shuttle-console-dock"),
-                            Disabled = true,
-                        };
-
-                        button.OnPressed += args =>
-                        {
-                            if (ViewedDock == null)
-                                return;
-
-                            _nextDockChange = _timing.CurTime + DockChangeCooldown;
-                            DockRequest?.Invoke(ViewedDock.Value, dock.Entity);
-                        };
-                    }
-
-                    _dockButtons.Add(dock, button);
-                }
-
-                container.AddChild(new Label()
-                {
-                    Text = dock.LabelName ?? dock.Name, // Frontier: add dock.LabelName
-                    HorizontalAlignment = HAlignment.Center,
-                });
-
-                button.HorizontalAlignment = HAlignment.Center;
-                container.AddChild(button);
-
-                AddChild(panel);
-                panel.Measure(Vector2Helpers.Infinity);
-                _dockContainers[dock] = panel;
-            }
-        }
-    }
-}
diff --git a/Content.Server/Atmos/Consoles/AtmosAlertsComputerSystem.cs b/Content.Server/Atmos/Consoles/AtmosAlertsComputerSystem.cs
index b556fcd8552..6b6424f4d1f 100644
--- a/Content.Server/Atmos/Consoles/AtmosAlertsComputerSystem.cs
+++ b/Content.Server/Atmos/Consoles/AtmosAlertsComputerSystem.cs
@@ -17,13 +17,10 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Server._NF.Atmos.Components; // Frontier
-using Content.Server.Atmos.Piping.Binary.Components; // Frontier
 using Content.Server.Atmos.Piping.Binary.EntitySystems; // Frontier
 using Content.Server.NodeContainer.EntitySystems; // Frontier
 using Content.Server.NodeContainer.Nodes; // Frontier
 using Content.Shared._NF.Atmos.BUI; // Frontier
-using Content.Shared._NF.Atmos.Piping.Binary.Messages; // Frontier
-using Content.Shared.Atmos.Piping.Binary.Components; // Frontier
 using Content.Shared.Shuttles.Events; // Frontier
 using Content.Server.Shuttles.Systems;
 using Content.Server.Shuttles.Components; // Frontier
@@ -251,7 +248,7 @@ public void UpdateUIState
         // Gathering remaining data to be send to the client
         var focusAlarmData = GetFocusAlarmData(uid, GetEntity(component.FocusDevice), gridUid);
 
-        var focusGaslockData = GetFocusGaslockData(uid, GetEntity(component.FocusDevice), gridUid); // Frontier
+        var focusGaslockData = GetFocusGaslockData(GetEntity(component.FocusDevice), gridUid); // Frontier
 
         // Set the UI state
         _userInterfaceSystem.SetUiState(uid, AtmosAlertsComputerUiKey.Key,
@@ -448,7 +445,7 @@ private void InitalizeConsole(EntityUid uid, AtmosAlertsComputerComponent compon
     }
 
     // Frontier: gets gaslock BUI state for a particular entity
-    private AtmosAlertsFocusGaslockData? GetFocusGaslockData(EntityUid uid, EntityUid? focusDevice, EntityUid gridUid)
+    private AtmosAlertsFocusGaslockData? GetFocusGaslockData(EntityUid? focusDevice, EntityUid gridUid)
     {
         if (focusDevice == null)
             return null;
@@ -471,7 +468,7 @@ private void InitalizeConsole(EntityUid uid, AtmosAlertsComputerComponent compon
             if (port.Air.TotalMoles > 1e-8)
             {
                 var totalMoles = port.Air.TotalMoles;
-                for (int i = 0; i < Atmospherics.TotalNumberOfGases; i++)
+                for (var i = 0; i < Atmospherics.TotalNumberOfGases; i++)
                 {
                     var moles = port.Air.GetMoles(i);
                     if (moles < 1e-8)
@@ -493,7 +490,7 @@ private void InitalizeConsole(EntityUid uid, AtmosAlertsComputerComponent compon
     }
 
     // Frontier: message handlers for gaslock state
-    private void OnUndockRequestMessage(EntityUid gridUid, AtmosAlertsComputerComponent comp, UndockRequestMessage args)
+    private void OnUndockRequestMessage(Entity<AtmosAlertsComputerComponent> ent, ref UndockRequestMessage args)
     {
         var dockUid = GetEntity(args.DockEntity);
         if (!HasComp<DockablePipeComponent>(dockUid) ||
@@ -503,7 +500,7 @@ private void OnUndockRequestMessage(EntityUid gridUid, AtmosAlertsComputerCompon
     }
 
     // We want this to be doing whatever the pressure pump is doing, so we're hijacking the GasPressurePumpSystem interface.
-    private void OnPumpDirectionMessage(EntityUid gridUid, AtmosAlertsComputerComponent comp, RemoteGasPressurePumpChangePumpDirectionMessage args)
+    private void OnPumpDirectionMessage(Entity<AtmosAlertsComputerComponent> ent, ref RemoteGasPressurePumpChangePumpDirectionMessage args)
     {
         var pumpUid = GetEntity(args.Pump);
         if (!TryComp<GasPressurePumpComponent>(pumpUid, out var pumpComp) || !pumpComp.SettableDirection)
@@ -511,7 +508,7 @@ private void OnPumpDirectionMessage(EntityUid gridUid, AtmosAlertsComputerCompon
         _pressurePump.SetPumpDirection((pumpUid, pumpComp), args.Inwards, args.Actor);
     }
 
-    private void OnPumpPressureMessage(EntityUid gridUid, AtmosAlertsComputerComponent comp, RemoteGasPressurePumpChangeOutputPressureMessage args)
+    private void OnPumpPressureMessage(Entity<AtmosAlertsComputerComponent> ent, ref RemoteGasPressurePumpChangeOutputPressureMessage args)
     {
         var pumpUid = GetEntity(args.Pump);
         if (!TryComp<GasPressurePumpComponent>(pumpUid, out var pumpComp))
@@ -519,7 +516,7 @@ private void OnPumpPressureMessage(EntityUid gridUid, AtmosAlertsComputerCompone
         _pressurePump.SetPumpPressure((pumpUid, pumpComp), args.Pressure, args.Actor);
     }
 
-    private void OnPumpStatusMessage(EntityUid gridUid, AtmosAlertsComputerComponent comp, RemoteGasPressurePumpToggleStatusMessage args)
+    private void OnPumpStatusMessage(Entity<AtmosAlertsComputerComponent> ent, ref RemoteGasPressurePumpToggleStatusMessage args)
     {
         var pumpUid = GetEntity(args.Pump);
         if (!TryComp<GasPressurePumpComponent>(pumpUid, out var pumpComp))
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.GridAtmosphere.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.GridAtmosphere.cs
index 978af933086..b11eb5dc3e6 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.GridAtmosphere.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.GridAtmosphere.cs
@@ -1,4 +1,3 @@
-using Content.Server._NF.Atmos.Components;
 using Content.Server.Atmos.Components;
 using Content.Server.Atmos.Reactions;
 using Content.Shared.Atmos;
diff --git a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressurePumpSystem.cs b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressurePumpSystem.cs
index 6f59666cfa6..1ec49a70fc9 100644
--- a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressurePumpSystem.cs
+++ b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressurePumpSystem.cs
@@ -59,37 +59,38 @@ private void OnPumpUpdated(EntityUid uid, GasPressurePumpComponent pump, ref Atm
     }
 
     // Frontier: server-side pump accessors
-    public void SetPumpDirection(Entity<GasPressurePumpComponent> pump, bool inwards, EntityUid actor)
+    public void SetPumpDirection(Entity<GasPressurePumpComponent> ent, bool inwards, EntityUid actor)
     {
-        if (!pump.Comp.SettableDirection || pump.Comp.PumpingInwards == inwards)
+        if (!ent.Comp.SettableDirection || ent.Comp.PumpingInwards == inwards)
             return;
 
-        var temp = pump.Comp.OutletName;
-        pump.Comp.OutletName = pump.Comp.InletName;
-        pump.Comp.InletName = temp;
+        (ent.Comp.OutletName, ent.Comp.InletName) = (ent.Comp.InletName, ent.Comp.OutletName);
 
-        pump.Comp.PumpingInwards = inwards;
-        _adminLogger.Add(LogType.AtmosDirectionChanged, LogImpact.Medium,
-            $"{ToPrettyString(actor):player} set the direction on {ToPrettyString(pump.Owner):device} to {(inwards ? "in" : "out")}");
-        Dirty(pump.Owner, pump.Comp);
-        UpdateAppearance(pump.Owner, pump.Comp);
+        ent.Comp.PumpingInwards = inwards;
+        _adminLogger.Add(LogType.AtmosDirectionChanged,
+            LogImpact.Medium,
+            $"{ToPrettyString(actor):player} set the direction on {ToPrettyString(ent):device} to {(inwards ? "in" : "out")}");
+        Dirty(ent);
+        UpdateAppearance(ent, ent.Comp);
     }
 
-    public void SetPumpPressure(Entity<GasPressurePumpComponent> pump, float pressure, EntityUid actor)
+    public void SetPumpPressure(Entity<GasPressurePumpComponent> ent, float pressure, EntityUid actor)
     {
-        pump.Comp.TargetPressure = Math.Clamp(pressure, 0f, Atmospherics.MaxOutputPressure);
-        _adminLogger.Add(LogType.AtmosPressureChanged, LogImpact.Medium,
-            $"{ToPrettyString(actor):player} set the pressure on {ToPrettyString(pump.Owner):device} to {pressure}kPa");
-        Dirty(pump.Owner, pump.Comp);
+        ent.Comp.TargetPressure = Math.Clamp(pressure, 0f, Atmospherics.MaxOutputPressure);
+        _adminLogger.Add(LogType.AtmosPressureChanged,
+            LogImpact.Medium,
+            $"{ToPrettyString(actor):player} set the pressure on {ToPrettyString(ent):device} to {pressure}kPa");
+        Dirty(ent, ent.Comp);
     }
 
-    public void SetPumpStatus(Entity<GasPressurePumpComponent> pump, bool enabled, EntityUid actor)
+    public void SetPumpStatus(Entity<GasPressurePumpComponent> ent, bool enabled, EntityUid actor)
     {
-        pump.Comp.Enabled = enabled;
-        _adminLogger.Add(LogType.AtmosPowerChanged, LogImpact.Medium,
-            $"{ToPrettyString(actor):player} set the power on {ToPrettyString(pump.Owner):device} to {enabled}");
-        Dirty(pump.Owner, pump.Comp);
-        UpdateAppearance(pump.Owner, pump.Comp);
+        ent.Comp.Enabled = enabled;
+        _adminLogger.Add(LogType.AtmosPowerChanged,
+            LogImpact.Medium,
+            $"{ToPrettyString(actor):player} set the power on {ToPrettyString(ent):device} to {enabled}");
+        Dirty(ent);
+        UpdateAppearance(ent, ent.Comp);
     }
     // End Frontier: server-side pump accessors
 }
diff --git a/Content.Server/_NF/Atmos/Components/DockablePipeComponent.cs b/Content.Server/_NF/Atmos/Components/DockablePipeComponent.cs
index a8758504bbc..06ffd2a9176 100644
--- a/Content.Server/_NF/Atmos/Components/DockablePipeComponent.cs
+++ b/Content.Server/_NF/Atmos/Components/DockablePipeComponent.cs
@@ -1,6 +1,8 @@
+using Content.Server._NF.Atmos.Systems;
+
 namespace Content.Server._NF.Atmos.Components;
 
-[RegisterComponent]
+[RegisterComponent, Access(typeof(DockablePipeSystem))]
 public sealed partial class DockablePipeComponent : Component
 {
     /// <summary>
diff --git a/Content.Server/_NF/Atmos/Components/GasSaleConsoleComponent.cs b/Content.Server/_NF/Atmos/Components/GasSaleConsoleComponent.cs
index 0aa56d14835..028efe36a00 100644
--- a/Content.Server/_NF/Atmos/Components/GasSaleConsoleComponent.cs
+++ b/Content.Server/_NF/Atmos/Components/GasSaleConsoleComponent.cs
@@ -1,18 +1,29 @@
-using Content.Server._NF.Atmos.EntitySystems;
+using Content.Shared._NF.Atmos.Systems;
 using Content.Shared.Stacks;
+using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server._NF.Atmos.Components;
 
-[RegisterComponent, Access(typeof(GasDepositSystem))]
+[RegisterComponent, Access(typeof(SharedGasDepositSystem))]
 public sealed partial class GasSaleConsoleComponent : Component
 {
-    // Currency type to spawn when gas is sold.
+    /// <summary>
+    /// Currency type to spawn when gas is sold.
+    /// </summary>
     [DataField]
     public ProtoId<StackPrototype> CashType = "Credit";
 
-    // The radius around the console in meters to check for gas sale points.
-    // Can be modified individually when mapping, so that consoles have a further reach.
+    /// <summary>
+    /// The radius around the console in meters to check for gas sale points.
+    /// Can be modified individually when mapping, so that consoles have a further reach.
+    /// </summary>
     [DataField]
     public int SellPointDistance = 8;
+
+    /// <summary>
+    /// The sound to use when gas is sold.
+    /// </summary>
+    [DataField]
+    public SoundSpecifier ApproveSound = new SoundPathSpecifier("/Audio/Effects/Cargo/ping.ogg");
 }
diff --git a/Content.Server/_NF/Atmos/Components/GasSalePointComponent.cs b/Content.Server/_NF/Atmos/Components/GasSalePointComponent.cs
index 68cae224900..95ef23e7571 100644
--- a/Content.Server/_NF/Atmos/Components/GasSalePointComponent.cs
+++ b/Content.Server/_NF/Atmos/Components/GasSalePointComponent.cs
@@ -1,9 +1,9 @@
-using Content.Server._NF.Atmos.EntitySystems;
+using Content.Shared._NF.Atmos.Systems;
 using Content.Shared.Atmos;
 
 namespace Content.Server._NF.Atmos.Components;
 
-[RegisterComponent, Access(typeof(GasDepositSystem))]
+[RegisterComponent, Access(typeof(SharedGasDepositSystem))]
 public sealed partial class GasSalePointComponent : Component
 {
     [DataField]
diff --git a/Content.Server/_NF/Atmos/Components/RandomGasDepositComponent.cs b/Content.Server/_NF/Atmos/Components/RandomGasDepositComponent.cs
index 75634087ceb..873e9c4963b 100644
--- a/Content.Server/_NF/Atmos/Components/RandomGasDepositComponent.cs
+++ b/Content.Server/_NF/Atmos/Components/RandomGasDepositComponent.cs
@@ -1,27 +1,16 @@
-using Content.Shared.Atmos;
+using Content.Server._NF.Atmos.Systems;
+using Content.Shared._NF.Atmos.Prototypes;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server._NF.Atmos.Components;
+namespace Content.Shared._NF.Atmos.Components;
 
-[RegisterComponent]
+[RegisterComponent, Access(typeof(GasDepositSystem))]
 public sealed partial class RandomGasDepositComponent : Component
 {
     /// <summary>
-    /// The name of the node that is available to dock.
+    /// The name of the prototype used to populate the gas deposit in this entity.
     /// If null or invalid, will be selected from existing set at random.
     /// </summary>
     [DataField]
     public ProtoId<GasDepositPrototype>? DepositPrototype;
-
-    /// <summary>
-    /// Gases left in the deposit.
-    /// </summary>
-    [ViewVariables]
-    public GasMixture Deposit = new();
-
-    /// <summary>
-    /// The maximum number of moles for this deposit to be considered "mostly depleted".
-    /// </summary>
-    [ViewVariables]
-    public float LowMoles;
 }
diff --git a/Content.Server/_NF/Atmos/EntitySystems/GasDepositSystem.cs b/Content.Server/_NF/Atmos/EntitySystems/GasDepositSystem.cs
deleted file mode 100644
index 79c5365df5f..00000000000
--- a/Content.Server/_NF/Atmos/EntitySystems/GasDepositSystem.cs
+++ /dev/null
@@ -1,385 +0,0 @@
-using System.Numerics;
-using Content.Server._NF.Atmos.Components;
-using Content.Server.Administration.Logs;
-using Content.Server.Atmos.EntitySystems;
-using Content.Server.Atmos.Piping.Components;
-using Content.Server.Audio;
-using Content.Server.DeviceLinking.Systems;
-using Content.Server.NodeContainer.EntitySystems;
-using Content.Server.NodeContainer.NodeGroups;
-using Content.Server.NodeContainer.Nodes;
-using Content.Server.Popups;
-using Content.Server.Power.Components;
-using Content.Server.Stack;
-using Content.Shared._NF.Atmos.BUI;
-using Content.Shared._NF.Atmos.Events;
-using Content.Shared._NF.Atmos.Visuals;
-using Content.Shared.Atmos;
-using Content.Shared.Atmos.Piping.Binary.Components;
-using Content.Shared.Bank.Components;
-using Content.Shared.Construction.Components;
-using Content.Shared.Database;
-using Content.Shared.Examine;
-using Content.Shared.Interaction;
-using Content.Shared.Power;
-using Robust.Server.Audio;
-using Robust.Server.GameObjects;
-using Robust.Shared.Audio;
-using Robust.Shared.Map.Components;
-using Robust.Shared.Player;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-
-namespace Content.Server._NF.Atmos.EntitySystems;
-
-// System for handling gas deposits and machines for extracting from gas deposits
-public sealed class GasDepositSystem : EntitySystem
-{
-    [Dependency] private readonly MapSystem _map = default!;
-    [Dependency] private readonly IPrototypeManager _prototype = default!;
-    [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly PopupSystem _popup = default!;
-    [Dependency] private readonly NodeContainerSystem _nodeContainer = default!;
-    [Dependency] private readonly AmbientSoundSystem _ambientSound = default!;
-    [Dependency] private readonly AtmosphereSystem _atmosphere = default!;
-    [Dependency] private readonly IAdminLogManager _adminLog = default!;
-    [Dependency] private readonly UserInterfaceSystem _ui = default!;
-    [Dependency] private readonly AppearanceSystem _appearance = default!;
-    [Dependency] private readonly DeviceLinkSystem _deviceLink = default!;
-    [Dependency] private readonly StackSystem _stack = default!;
-    [Dependency] private readonly TransformSystem _transform = default!;
-    [Dependency] private readonly AudioSystem _audio = default!;
-
-    // The fraction that a deposit's volume should be depleted to before it is considered "low volume".
-    private const float LowMoleCoefficient = 0.25f;
-    // The maximum distance to check for nearby gas sale points when selling gas.
-    private const double DefaultMaxSalePointDistance = 8.0;
-
-    private static readonly SoundPathSpecifier ApproveSound = new("/Audio/Effects/Cargo/ping.ogg");
-
-
-    /// <inheritdoc/>
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<RandomGasDepositComponent, MapInitEvent>(OnDepositMapInit);
-
-        SubscribeLocalEvent<GasDepositExtractorComponent, MapInitEvent>(OnExtractorMapInit);
-        SubscribeLocalEvent<GasDepositExtractorComponent, BoundUIOpenedEvent>(OnExtractorUiOpened);
-        SubscribeLocalEvent<GasDepositExtractorComponent, PowerChangedEvent>(OnPowerChanged);
-        SubscribeLocalEvent<GasDepositExtractorComponent, ExaminedEvent>(OnExamined);
-        SubscribeLocalEvent<GasDepositExtractorComponent, AnchorAttemptEvent>(OnAnchorAttempt);
-        SubscribeLocalEvent<GasDepositExtractorComponent, AnchorStateChangedEvent>(OnAnchorChanged);
-        SubscribeLocalEvent<GasDepositExtractorComponent, AtmosDeviceUpdateEvent>(OnExtractorUpdate);
-        SubscribeLocalEvent<GasDepositExtractorComponent, ActivateInWorldEvent>(OnPumpActivate);
-
-        SubscribeLocalEvent<GasDepositExtractorComponent, GasPressurePumpChangeOutputPressureMessage>(OnOutputPressureChangeMessage);
-        SubscribeLocalEvent<GasDepositExtractorComponent, GasPressurePumpToggleStatusMessage>(OnToggleStatusMessage);
-
-        SubscribeLocalEvent<GasSalePointComponent, AtmosDeviceUpdateEvent>(OnSalePointUpdate);
-
-        SubscribeLocalEvent<GasSaleConsoleComponent, BoundUIOpenedEvent>(OnConsoleUiOpened);
-        SubscribeLocalEvent<GasSaleConsoleComponent, GasSaleSellMessage>(OnConsoleSell);
-        SubscribeLocalEvent<GasSaleConsoleComponent, GasSaleRefreshMessage>(OnConsoleRefresh);
-    }
-
-    private void OnExtractorMapInit(Entity<GasDepositExtractorComponent> extractor, ref MapInitEvent args)
-    {
-        UpdateAppearance(extractor);
-    }
-
-    private void OnExtractorUiOpened(Entity<GasDepositExtractorComponent> extractor, ref BoundUIOpenedEvent args)
-    {
-        Dirty(extractor);
-    }
-
-    private void OnPowerChanged(Entity<GasDepositExtractorComponent> extractor, ref PowerChangedEvent args)
-    {
-        UpdateAppearance(extractor);
-    }
-
-    private void OnExamined(Entity<GasDepositExtractorComponent> extractor, ref ExaminedEvent args)
-    {
-        if (!Transform(extractor).Anchored || !args.IsInDetailsRange)
-            return;
-
-        args.PushMarkup(Loc.GetString("gas-deposit-drill-system-examined",
-                ("statusColor", "lightblue"),
-                ("pressure", extractor.Comp.TargetPressure)));
-        if (TryComp(extractor.Comp.DepositEntity, out RandomGasDepositComponent? deposit))
-        {
-            args.PushMarkup(Loc.GetString("gas-deposit-drill-system-examined-amount",
-                    ("statusColor", "lightblue"),
-                    ("value", deposit.Deposit.TotalMoles)));
-        }
-    }
-
-    public void OnAnchorAttempt(Entity<GasDepositExtractorComponent> extractor, ref AnchorAttemptEvent args)
-    {
-        if (args.Cancelled)
-            return;
-
-        if (!TryComp(extractor, out TransformComponent? xform)
-            || xform.GridUid is not { Valid: true } grid
-            || !TryComp(grid, out MapGridComponent? gridComp))
-        {
-            args.Cancel();
-            return;
-        }
-
-        var indices = _map.TileIndicesFor(grid, gridComp, xform.Coordinates);
-        var enumerator = _map.GetAnchoredEntitiesEnumerator(grid, gridComp, indices);
-
-        while (enumerator.MoveNext(out var otherEnt))
-        {
-            // Don't match yourself.
-            if (otherEnt == extractor)
-                continue;
-
-            // Is another storage entity is already anchored here?
-            if (HasComp<RandomGasDepositComponent>(otherEnt))
-            {
-                extractor.Comp.DepositEntity = otherEnt.Value;
-                return;
-            }
-        }
-
-        _popup.PopupEntity(Loc.GetString("gas-deposit-drill-no-resources"), extractor);
-        args.Cancel();
-    }
-
-    public void OnAnchorChanged(Entity<GasDepositExtractorComponent> extractor, ref AnchorStateChangedEvent args)
-    {
-        if (!args.Anchored)
-            extractor.Comp.DepositEntity = null;
-    }
-
-    public void OnDepositMapInit(Entity<RandomGasDepositComponent> deposit, ref MapInitEvent args)
-    {
-        if (!_prototype.TryIndex(deposit.Comp.DepositPrototype, out var depositPrototype))
-        {
-            if (!_prototype.TryGetRandom<GasDepositPrototype>(_random, out var randomPrototype))
-                return;
-            depositPrototype = (GasDepositPrototype)randomPrototype;
-        }
-        for (int i = 0; i < (depositPrototype?.Gases?.Length ?? 0) && i < Atmospherics.TotalNumberOfGases; i++)
-        {
-            var gasRange = depositPrototype!.Gases[i];
-            deposit.Comp.Deposit.SetMoles(i, gasRange[0] + _random.NextFloat() * (gasRange[1] - gasRange[0]));
-        }
-        deposit.Comp.LowMoles = deposit.Comp.Deposit.TotalMoles * LowMoleCoefficient;
-    }
-
-    private void OnExtractorUpdate(Entity<GasDepositExtractorComponent> extractor, ref AtmosDeviceUpdateEvent args)
-    {
-        if (!extractor.Comp.Enabled
-            || !TryComp(extractor.Comp.DepositEntity, out RandomGasDepositComponent? depositComp)
-            || TryComp<ApcPowerReceiverComponent>(extractor, out var power) && !power.Powered
-            || !_nodeContainer.TryGetNode(extractor.Owner, extractor.Comp.PortName, out PipeNode? port)
-            || port.NodeGroup is not PipeNet { NodeCount: > 1 } net)
-        {
-            _ambientSound.SetAmbience(extractor, false);
-            SetDepositState(extractor, GasDepositExtractorState.Off);
-            return;
-        }
-
-        if (depositComp.Deposit.TotalMoles < Atmospherics.GasMinMoles)
-        {
-            _ambientSound.SetAmbience(extractor, false);
-            SetDepositState(extractor, GasDepositExtractorState.Empty);
-            return;
-        }
-
-        var targetPressure = float.Clamp(extractor.Comp.TargetPressure, 0, extractor.Comp.MaxTargetPressure);
-
-        // How many moles could we theoretically spawn. Cap by pressure, amount, and extractor limit.
-        var allowableMoles = (targetPressure - net.Air.Pressure) * net.Air.Volume / (extractor.Comp.OutputTemperature * Atmospherics.R);
-        allowableMoles = float.Min(allowableMoles, extractor.Comp.ExtractionRate * args.dt);
-
-        if (allowableMoles < Atmospherics.GasMinMoles)
-        {
-            _ambientSound.SetAmbience(extractor, false);
-            SetDepositState(extractor, GasDepositExtractorState.Blocked);
-            return;
-        }
-
-        var removed = depositComp.Deposit.Remove(allowableMoles);
-        removed.Temperature = extractor.Comp.OutputTemperature;
-        _atmosphere.Merge(net.Air, removed);
-
-        _ambientSound.SetAmbience(extractor, true);
-        if (depositComp.Deposit.TotalMoles <= depositComp.LowMoles)
-            SetDepositState(extractor, GasDepositExtractorState.Low);
-        else
-            SetDepositState(extractor, GasDepositExtractorState.On);
-    }
-
-    private void OnToggleStatusMessage(Entity<GasDepositExtractorComponent> extractor, ref GasPressurePumpToggleStatusMessage args)
-    {
-        extractor.Comp.Enabled = args.Enabled;
-        _adminLog.Add(LogType.AtmosPowerChanged, LogImpact.Low,
-            $"{ToPrettyString(args.Actor):player} set the power on {ToPrettyString(extractor):device} to {args.Enabled}");
-        Dirty(extractor);
-    }
-
-    private void OnPumpActivate(Entity<GasDepositExtractorComponent> extractor, ref ActivateInWorldEvent args)
-    {
-        if (args.Handled || !args.Complex)
-            return;
-
-        if (!TryComp(args.User, out ActorComponent? actor))
-            return;
-
-        if (Transform(extractor).Anchored)
-        {
-            _ui.OpenUi(extractor.Owner, GasPressurePumpUiKey.Key, actor.PlayerSession);
-            Dirty(extractor);
-        }
-        else
-        {
-            _popup.PopupCursor(Loc.GetString("ui-needs-anchor"), args.User);
-        }
-
-        args.Handled = true;
-    }
-
-    private void OnOutputPressureChangeMessage(Entity<GasDepositExtractorComponent> extractor, ref GasPressurePumpChangeOutputPressureMessage args)
-    {
-        extractor.Comp.TargetPressure = Math.Clamp(args.Pressure, 0f, Atmospherics.MaxOutputPressure);
-        _adminLog.Add(LogType.AtmosPressureChanged, LogImpact.Low,
-            $"{ToPrettyString(args.Actor):player} set the pressure on {ToPrettyString(extractor):device} to {args.Pressure}kPa");
-        Dirty(extractor);
-    }
-
-    private void SetDepositState(Entity<GasDepositExtractorComponent> extractor, GasDepositExtractorState newState)
-    {
-        if (newState != extractor.Comp.LastState)
-        {
-            extractor.Comp.LastState = newState;
-            UpdateAppearance(extractor);
-        }
-    }
-
-    private void UpdateAppearance(Entity<GasDepositExtractorComponent> extractor, AppearanceComponent? appearance = null)
-    {
-        if (!Resolve(extractor, ref appearance, false))
-            return;
-
-        bool pumpOn = extractor.Comp.Enabled && (!TryComp<ApcPowerReceiverComponent>(extractor, out var power) || power.Powered);
-        if (!pumpOn)
-            _appearance.SetData(extractor, GasDepositExtractorVisuals.State, GasDepositExtractorState.Off, appearance);
-        else
-            _appearance.SetData(extractor, GasDepositExtractorVisuals.State, extractor.Comp.LastState, appearance);
-    }
-
-    // Atmos update: take any gas from the connecting network and push it into the pump.
-    private void OnSalePointUpdate(Entity<GasSalePointComponent> salePoint, ref AtmosDeviceUpdateEvent args)
-    {
-        if (TryComp<ApcPowerReceiverComponent>(salePoint, out var power) && !power.Powered
-            || !_nodeContainer.TryGetNode(salePoint.Owner, salePoint.Comp.InletPipePortName, out PipeNode? port)
-            || port.NodeGroup is not PipeNet { NodeCount: > 1 } net)
-        {
-            return;
-        }
-
-        if (net.Air.TotalMoles > 0)
-        {
-            _atmosphere.Merge(salePoint.Comp.GasStorage, net.Air);
-            net.Air.Clear();
-        }
-    }
-
-    private void OnConsoleUiOpened(Entity<GasSaleConsoleComponent> saleConsole, ref BoundUIOpenedEvent args)
-    {
-        UpdateConsoleInterface(saleConsole);
-    }
-
-    private void OnConsoleRefresh(Entity<GasSaleConsoleComponent> saleConsole, ref GasSaleRefreshMessage args)
-    {
-        UpdateConsoleInterface(saleConsole);
-    }
-
-    private void OnConsoleSell(Entity<GasSaleConsoleComponent> saleConsole, ref GasSaleSellMessage args)
-    {
-        var xform = Transform(saleConsole);
-        if (xform.GridUid is not EntityUid gridUid)
-        {
-            _ui.SetUiState(saleConsole.Owner, GasSaleConsoleUiKey.Key,
-            new GasSaleConsoleBoundUserInterfaceState(0, new GasMixture(), false));
-            return;
-        }
-
-        var mixture = new GasMixture();
-        foreach (var salePoint in GetNearbySalePoints(saleConsole, gridUid))
-        {
-            _atmosphere.Merge(mixture, salePoint.Comp.GasStorage);
-            salePoint.Comp.GasStorage.Clear();
-        }
-
-        var amount = _atmosphere.GetPrice(mixture);
-        if (TryComp<MarketModifierComponent>(saleConsole, out var priceMod))
-            amount *= priceMod.Mod;
-
-        var stackPrototype = _prototype.Index(saleConsole.Comp.CashType);
-        _stack.Spawn((int)amount, stackPrototype, xform.Coordinates);
-        _audio.PlayPvs(ApproveSound, saleConsole);
-        _ui.SetUiState(saleConsole.Owner, GasSaleConsoleUiKey.Key,
-            new GasSaleConsoleBoundUserInterfaceState(0, new GasMixture(), false));
-    }
-
-    private void UpdateConsoleInterface(Entity<GasSaleConsoleComponent> saleConsole)
-    {
-        if (Transform(saleConsole).GridUid is not EntityUid gridUid)
-        {
-            _ui.SetUiState(saleConsole.Owner, GasSaleConsoleUiKey.Key,
-            new GasSaleConsoleBoundUserInterfaceState(0, new GasMixture(), false));
-            return;
-        }
-
-        GetNearbyMixtures(saleConsole, gridUid, out var mixture, out var amount);
-        if (TryComp<MarketModifierComponent>(saleConsole, out var priceMod))
-            amount *= priceMod.Mod;
-
-        _ui.SetUiState(saleConsole.Owner, GasSaleConsoleUiKey.Key,
-            new GasSaleConsoleBoundUserInterfaceState((int)amount, mixture, mixture.TotalMoles > 0));
-    }
-
-    private void GetNearbyMixtures(EntityUid consoleUid, EntityUid gridUid, out GasMixture mixture, out double value)
-    {
-        mixture = new GasMixture();
-
-        foreach (var salePoint in GetNearbySalePoints(consoleUid, gridUid))
-            _atmosphere.Merge(mixture, salePoint.Comp.GasStorage);
-
-        value = _atmosphere.GetPrice(mixture);
-    }
-
-    private List<Entity<GasSalePointComponent>> GetNearbySalePoints(EntityUid consoleUid, EntityUid gridUid)
-    {
-        List<Entity<GasSalePointComponent>> ret = new();
-
-        var query = AllEntityQuery<GasSalePointComponent, TransformComponent>();
-
-        var consolePosition = Transform(consoleUid).Coordinates.Position;
-        var maxSalePointDistance = DefaultMaxSalePointDistance;
-
-        // Get the mapped checking distance from the console
-        if (TryComp<GasSaleConsoleComponent>(consoleUid, out var cargoShuttleComponent))
-            maxSalePointDistance = cargoShuttleComponent.SellPointDistance;
-
-        while (query.MoveNext(out var uid, out var comp, out var compXform))
-        {
-            if (compXform.ParentUid != gridUid
-                || !compXform.Anchored
-                || Vector2.Distance(consolePosition, compXform.Coordinates.Position) > maxSalePointDistance)
-            {
-                continue;
-            }
-
-            ret.Add((uid, comp));
-        }
-
-        return ret;
-    }
-}
diff --git a/Content.Server/_NF/Atmos/EntitySystems/DockablePipeSystem.cs b/Content.Server/_NF/Atmos/Systems/DockablePipeSystem.cs
similarity index 50%
rename from Content.Server/_NF/Atmos/EntitySystems/DockablePipeSystem.cs
rename to Content.Server/_NF/Atmos/Systems/DockablePipeSystem.cs
index 0c98605e23a..8e852ec4ca5 100644
--- a/Content.Server/_NF/Atmos/EntitySystems/DockablePipeSystem.cs
+++ b/Content.Server/_NF/Atmos/Systems/DockablePipeSystem.cs
@@ -3,16 +3,16 @@
 using Content.Server.NodeContainer.EntitySystems;
 using Content.Server.NodeContainer.Nodes;
 using Content.Server.Shuttles.Events;
-using Content.Shared.Atmos.Visuals;
+using Content.Shared._NF.Atmos.Visuals;
 using Robust.Server.GameObjects;
 
-namespace Content.Server._NF.Atmos.EntitySystems;
+namespace Content.Server._NF.Atmos.Systems;
 
-public sealed partial class DockablePipeSystem : EntitySystem
+public sealed class DockablePipeSystem : EntitySystem
 {
+    [Dependency] private readonly AppearanceSystem _appearance = default!;
     [Dependency] private readonly NodeContainerSystem _nodeContainer = default!;
     [Dependency] private readonly NodeGroupSystem _nodeGroup = default!;
-    [Dependency] private readonly AppearanceSystem _appearance = default!;
 
     public override void Initialize()
     {
@@ -22,28 +22,28 @@ public override void Initialize()
         SubscribeLocalEvent<DockablePipeComponent, UndockEvent>(OnUndock);
     }
 
-    private void OnDock(EntityUid uid, DockablePipeComponent component, ref DockEvent args)
+    private void OnDock(Entity<DockablePipeComponent> ent, ref DockEvent args)
     {
         // Reflood node?
-        if (string.IsNullOrEmpty(component.DockNodeName) ||
-            !TryComp(uid, out NodeContainerComponent? nodeContainer) ||
-            !_nodeContainer.TryGetNode(nodeContainer, component.DockNodeName, out DockablePipeNode? dockablePipe))
+        if (string.IsNullOrEmpty(ent.Comp.DockNodeName) ||
+            !TryComp(ent, out NodeContainerComponent? nodeContainer) ||
+            !_nodeContainer.TryGetNode(nodeContainer, ent.Comp.DockNodeName, out DockablePipeNode? dockablePipe))
             return;
 
         _nodeGroup.QueueReflood(dockablePipe);
-        _appearance.SetData(uid, DockablePipeVisuals.Docked, true);
+        _appearance.SetData(ent, DockablePipeVisuals.Docked, true);
     }
 
-    private void OnUndock(EntityUid uid, DockablePipeComponent component, ref UndockEvent args)
+    private void OnUndock(Entity<DockablePipeComponent> ent, ref UndockEvent args)
     {
         // Clean up node?
-        if (string.IsNullOrEmpty(component.DockNodeName) ||
-            !TryComp(uid, out NodeContainerComponent? nodeContainer) ||
-            !_nodeContainer.TryGetNode(nodeContainer, component.DockNodeName, out DockablePipeNode? dockablePipe))
+        if (string.IsNullOrEmpty(ent.Comp.DockNodeName) ||
+            !TryComp(ent, out NodeContainerComponent? nodeContainer) ||
+            !_nodeContainer.TryGetNode(nodeContainer, ent.Comp.DockNodeName, out DockablePipeNode? dockablePipe))
             return;
 
         _nodeGroup.QueueNodeRemove(dockablePipe);
         dockablePipe.Air.Clear();
-        _appearance.SetData(uid, DockablePipeVisuals.Docked, false);
+        _appearance.SetData(ent, DockablePipeVisuals.Docked, false);
     }
 }
diff --git a/Content.Server/_NF/Atmos/Systems/GasDepositSystem.cs b/Content.Server/_NF/Atmos/Systems/GasDepositSystem.cs
new file mode 100644
index 00000000000..6b37613a404
--- /dev/null
+++ b/Content.Server/_NF/Atmos/Systems/GasDepositSystem.cs
@@ -0,0 +1,323 @@
+using System.Numerics;
+using Content.Server._NF.Atmos.Components;
+using Content.Server.Administration.Logs;
+using Content.Server.Atmos.EntitySystems;
+using Content.Server.Atmos.Piping.Components;
+using Content.Server.Audio;
+using Content.Server.NodeContainer.EntitySystems;
+using Content.Server.NodeContainer.NodeGroups;
+using Content.Server.NodeContainer.Nodes;
+using Content.Server.Power.Components;
+using Content.Server.Stack;
+using Content.Shared._NF.Atmos.BUI;
+using Content.Shared._NF.Atmos.Components;
+using Content.Shared._NF.Atmos.Events;
+using Content.Shared._NF.Atmos.Prototypes;
+using Content.Shared._NF.Atmos.Systems;
+using Content.Shared._NF.Atmos.Visuals;
+using Content.Shared.Atmos;
+using Content.Shared.Atmos.Piping.Binary.Components;
+using Content.Shared.Bank.Components;
+using Content.Shared.Database;
+using Content.Shared.Power;
+using Robust.Server.Audio;
+using Robust.Server.GameObjects;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+
+namespace Content.Server._NF.Atmos.Systems;
+
+/// <summary>
+/// System for handling gas deposits and machines for extracting from gas deposits
+/// </summary>
+public sealed class GasDepositSystem : SharedGasDepositSystem
+{
+    [Dependency] private readonly AmbientSoundSystem _ambientSound = default!;
+    [Dependency] private readonly AppearanceSystem _appearance = default!;
+    [Dependency] private readonly AtmosphereSystem _atmosphere = default!;
+    [Dependency] private readonly AudioSystem _audio = default!;
+    [Dependency] private readonly IAdminLogManager _adminLog = default!;
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly NodeContainerSystem _nodeContainer = default!;
+    [Dependency] private readonly StackSystem _stack = default!;
+
+    /// <summary>
+    /// The fraction that a deposit's volume should be depleted to before it is considered "low volume".
+    /// </summary>
+    private const float LowMoleCoefficient = 0.25f;
+
+    /// <summary>
+    /// The maximum distance to check for nearby gas sale points when selling gas.
+    /// </summary>
+    private const double DefaultMaxSalePointDistance = 8.0;
+
+    /// <inheritdoc />
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<RandomGasDepositComponent, MapInitEvent>(OnRandomDepositMapInit);
+
+        SubscribeLocalEvent<GasDepositExtractorComponent, MapInitEvent>(OnExtractorMapInit);
+        SubscribeLocalEvent<GasDepositExtractorComponent, BoundUIOpenedEvent>(OnExtractorUiOpened);
+        SubscribeLocalEvent<GasDepositExtractorComponent, PowerChangedEvent>(OnPowerChanged);
+        SubscribeLocalEvent<GasDepositExtractorComponent, AnchorStateChangedEvent>(OnAnchorChanged);
+        SubscribeLocalEvent<GasDepositExtractorComponent, AtmosDeviceUpdateEvent>(OnExtractorUpdate);
+
+        SubscribeLocalEvent<GasDepositExtractorComponent, GasPressurePumpChangeOutputPressureMessage>(
+            OnOutputPressureChangeMessage);
+        SubscribeLocalEvent<GasDepositExtractorComponent, GasPressurePumpToggleStatusMessage>(OnToggleStatusMessage);
+
+        SubscribeLocalEvent<GasSalePointComponent, AtmosDeviceUpdateEvent>(OnSalePointUpdate);
+
+        SubscribeLocalEvent<GasSaleConsoleComponent, BoundUIOpenedEvent>(OnConsoleUiOpened);
+        SubscribeLocalEvent<GasSaleConsoleComponent, GasSaleSellMessage>(OnConsoleSell);
+        SubscribeLocalEvent<GasSaleConsoleComponent, GasSaleRefreshMessage>(OnConsoleRefresh);
+    }
+
+    private void OnExtractorMapInit(Entity<GasDepositExtractorComponent> ent, ref MapInitEvent args)
+    {
+        UpdateAppearance(ent);
+    }
+
+    private void OnExtractorUiOpened(Entity<GasDepositExtractorComponent> ent, ref BoundUIOpenedEvent args)
+    {
+        Dirty(ent);
+    }
+
+    private void OnPowerChanged(Entity<GasDepositExtractorComponent> ent, ref PowerChangedEvent args)
+    {
+        UpdateAppearance(ent);
+    }
+
+    public void OnAnchorChanged(Entity<GasDepositExtractorComponent> ent, ref AnchorStateChangedEvent args)
+    {
+        if (!args.Anchored)
+            ent.Comp.DepositEntity = null;
+    }
+
+    public void OnRandomDepositMapInit(Entity<RandomGasDepositComponent> ent, ref MapInitEvent args)
+    {
+        EnsureComp<GasDepositComponent>(ent, out var deposit);
+        if (!_prototype.TryIndex(ent.Comp.DepositPrototype, out var depositPrototype))
+        {
+            if (!_prototype.TryGetRandom<GasDepositPrototype>(_random, out var randomPrototype))
+                return;
+            depositPrototype = (GasDepositPrototype)randomPrototype;
+        }
+
+        for (var i = 0; i < depositPrototype.Gases.Length && i < Atmospherics.TotalNumberOfGases; i++)
+        {
+            var gasRange = depositPrototype.Gases[i];
+            deposit.Deposit.SetMoles(i, gasRange[0] + _random.NextFloat() * (gasRange[1] - gasRange[0]));
+        }
+
+        deposit.LowMoles = deposit.Deposit.TotalMoles * LowMoleCoefficient;
+    }
+
+    private void OnExtractorUpdate(Entity<GasDepositExtractorComponent> ent, ref AtmosDeviceUpdateEvent args)
+    {
+        if (!ent.Comp.Enabled
+            || !TryComp(ent.Comp.DepositEntity, out GasDepositComponent? depositComp)
+            || TryComp<ApcPowerReceiverComponent>(ent, out var power) && !power.Powered
+            || !_nodeContainer.TryGetNode(ent.Owner, ent.Comp.PortName, out PipeNode? port))
+        {
+            _ambientSound.SetAmbience(ent, false);
+            SetDepositState(ent, GasDepositExtractorState.Off);
+            return;
+        }
+
+        if (depositComp.Deposit.TotalMoles < Atmospherics.GasMinMoles)
+        {
+            _ambientSound.SetAmbience(ent, false);
+            SetDepositState(ent, GasDepositExtractorState.Empty);
+            return;
+        }
+
+        // Nowhere to pipe gas, say it's blocked.
+        if (port.NodeGroup is not PipeNet { NodeCount: > 1 } net)
+        {
+            _ambientSound.SetAmbience(ent, false);
+            SetDepositState(ent, GasDepositExtractorState.Blocked);
+            return;
+        }
+
+        var targetPressure = float.Clamp(ent.Comp.TargetPressure, 0, ent.Comp.MaxTargetPressure);
+
+        // How many moles could we theoretically spawn. Cap by pressure, amount, and extractor limit.
+        var allowableMoles = (targetPressure - net.Air.Pressure) * net.Air.Volume /
+                             (ent.Comp.OutputTemperature * Atmospherics.R);
+        allowableMoles = float.Min(allowableMoles, ent.Comp.ExtractionRate * args.dt);
+
+        if (allowableMoles < Atmospherics.GasMinMoles)
+        {
+            _ambientSound.SetAmbience(ent, false);
+            SetDepositState(ent, GasDepositExtractorState.Blocked);
+            return;
+        }
+
+        var removed = depositComp.Deposit.Remove(allowableMoles);
+        removed.Temperature = ent.Comp.OutputTemperature;
+        _atmosphere.Merge(net.Air, removed);
+
+        _ambientSound.SetAmbience(ent, true);
+        if (depositComp.Deposit.TotalMoles <= depositComp.LowMoles)
+            SetDepositState(ent, GasDepositExtractorState.Low);
+        else
+            SetDepositState(ent, GasDepositExtractorState.On);
+    }
+
+    private void OnToggleStatusMessage(Entity<GasDepositExtractorComponent> ent,
+        ref GasPressurePumpToggleStatusMessage args)
+    {
+        ent.Comp.Enabled = args.Enabled;
+        _adminLog.Add(LogType.AtmosPowerChanged,
+            LogImpact.Low,
+            $"{ToPrettyString(args.Actor):player} set the power on {ToPrettyString(ent):device} to {args.Enabled}");
+        Dirty(ent);
+    }
+
+    private void OnOutputPressureChangeMessage(Entity<GasDepositExtractorComponent> ent,
+        ref GasPressurePumpChangeOutputPressureMessage args)
+    {
+        ent.Comp.TargetPressure = Math.Clamp(args.Pressure, 0f, Atmospherics.MaxOutputPressure);
+        _adminLog.Add(LogType.AtmosPressureChanged,
+            LogImpact.Low,
+            $"{ToPrettyString(args.Actor):player} set the pressure on {ToPrettyString(ent):device} to {args.Pressure}kPa");
+        Dirty(ent);
+    }
+
+    private void SetDepositState(Entity<GasDepositExtractorComponent> ent, GasDepositExtractorState newState)
+    {
+        if (newState != ent.Comp.LastState)
+        {
+            ent.Comp.LastState = newState;
+            UpdateAppearance(ent);
+        }
+    }
+
+    private void UpdateAppearance(Entity<GasDepositExtractorComponent> ent, AppearanceComponent? appearance = null)
+    {
+        if (!Resolve(ent, ref appearance, false))
+            return;
+
+        var pumpOn = ent.Comp.Enabled && (!TryComp<ApcPowerReceiverComponent>(ent, out var power) || power.Powered);
+        if (!pumpOn)
+            _appearance.SetData(ent, GasDepositExtractorVisuals.State, GasDepositExtractorState.Off, appearance);
+        else
+            _appearance.SetData(ent, GasDepositExtractorVisuals.State, ent.Comp.LastState, appearance);
+    }
+
+    // Atmos update: take any gas from the connecting network and push it into the pump.
+    private void OnSalePointUpdate(Entity<GasSalePointComponent> ent, ref AtmosDeviceUpdateEvent args)
+    {
+        if (TryComp<ApcPowerReceiverComponent>(ent, out var power) && !power.Powered
+            || !_nodeContainer.TryGetNode(ent.Owner, ent.Comp.InletPipePortName, out PipeNode? port)
+            || port.NodeGroup is not PipeNet { NodeCount: > 1 } net)
+            return;
+
+        if (net.Air.TotalMoles > 0)
+        {
+            _atmosphere.Merge(ent.Comp.GasStorage, net.Air);
+            net.Air.Clear();
+        }
+    }
+
+    private void OnConsoleUiOpened(Entity<GasSaleConsoleComponent> ent, ref BoundUIOpenedEvent args)
+    {
+        UpdateConsoleInterface(ent);
+    }
+
+    private void OnConsoleRefresh(Entity<GasSaleConsoleComponent> ent, ref GasSaleRefreshMessage args)
+    {
+        UpdateConsoleInterface(ent);
+    }
+
+    private void OnConsoleSell(Entity<GasSaleConsoleComponent> ent, ref GasSaleSellMessage args)
+    {
+        var xform = Transform(ent);
+        if (xform.GridUid is not { } gridUid)
+        {
+            UI.SetUiState(ent.Owner,
+                GasSaleConsoleUiKey.Key,
+                new GasSaleConsoleBoundUserInterfaceState(0, new GasMixture(), false));
+            return;
+        }
+
+        var mixture = new GasMixture();
+        foreach (var salePoint in GetNearbySalePoints(ent, gridUid))
+        {
+            _atmosphere.Merge(mixture, salePoint.Comp.GasStorage);
+            salePoint.Comp.GasStorage.Clear();
+        }
+
+        var amount = _atmosphere.GetPrice(mixture);
+        if (TryComp<MarketModifierComponent>(ent, out var priceMod))
+            amount *= priceMod.Mod;
+
+        var stackPrototype = _prototype.Index(ent.Comp.CashType);
+        _stack.Spawn((int)amount, stackPrototype, xform.Coordinates);
+        _audio.PlayPvs(ent.Comp.ApproveSound, ent);
+        UI.SetUiState(ent.Owner,
+            GasSaleConsoleUiKey.Key,
+            new GasSaleConsoleBoundUserInterfaceState(0, new GasMixture(), false));
+    }
+
+    private void UpdateConsoleInterface(Entity<GasSaleConsoleComponent> ent)
+    {
+        if (Transform(ent).GridUid is not { } gridUid)
+        {
+            UI.SetUiState(ent.Owner,
+                GasSaleConsoleUiKey.Key,
+                new GasSaleConsoleBoundUserInterfaceState(0, new GasMixture(), false));
+            return;
+        }
+
+        GetNearbyMixtures(ent, gridUid, out var mixture, out var amount);
+        if (TryComp<MarketModifierComponent>(ent, out var priceMod))
+            amount *= priceMod.Mod;
+
+        UI.SetUiState(ent.Owner,
+            GasSaleConsoleUiKey.Key,
+            new GasSaleConsoleBoundUserInterfaceState((int)amount, mixture, mixture.TotalMoles > 0));
+    }
+
+    private void GetNearbyMixtures(EntityUid consoleUid, EntityUid gridUid, out GasMixture mixture, out double value)
+    {
+        mixture = new GasMixture();
+
+        foreach (var salePoint in GetNearbySalePoints(consoleUid, gridUid))
+        {
+            _atmosphere.Merge(mixture, salePoint.Comp.GasStorage);
+        }
+
+        value = _atmosphere.GetPrice(mixture);
+    }
+
+    private List<Entity<GasSalePointComponent>> GetNearbySalePoints(EntityUid consoleUid, EntityUid gridUid)
+    {
+        List<Entity<GasSalePointComponent>> ret = new();
+
+        var query = AllEntityQuery<GasSalePointComponent, TransformComponent>();
+
+        var consolePosition = Transform(consoleUid).Coordinates.Position;
+        var maxSalePointDistance = DefaultMaxSalePointDistance;
+
+        // Get the mapped checking distance from the console
+        if (TryComp<GasSaleConsoleComponent>(consoleUid, out var cargoShuttleComponent))
+            maxSalePointDistance = cargoShuttleComponent.SellPointDistance;
+
+        while (query.MoveNext(out var uid, out var comp, out var compXform))
+        {
+            if (compXform.ParentUid != gridUid
+                || !compXform.Anchored
+                || Vector2.Distance(consolePosition, compXform.Coordinates.Position) > maxSalePointDistance)
+                continue;
+
+            ret.Add((uid, comp));
+        }
+
+        return ret;
+    }
+}
diff --git a/Content.Server/_NF/NodeContainer/Nodes/DockablePipeNode.cs b/Content.Server/_NF/NodeContainer/Nodes/DockablePipeNode.cs
index 4cdd421d043..30dbe106d97 100644
--- a/Content.Server/_NF/NodeContainer/Nodes/DockablePipeNode.cs
+++ b/Content.Server/_NF/NodeContainer/Nodes/DockablePipeNode.cs
@@ -1,38 +1,36 @@
-using Content.Server.Atmos;
 using Content.Server.Shuttles.Components;
 using Robust.Shared.Map.Components;
 
-namespace Content.Server.NodeContainer.Nodes
+namespace Content.Server.NodeContainer.Nodes;
+
+
+[DataDefinition, Virtual]
+public partial class DockablePipeNode : PipeNode
 {
-    [DataDefinition]
-    [Virtual]
-    public partial class DockablePipeNode : PipeNode, IGasMixtureHolder, IRotatableNode
-    {
 
-        public override IEnumerable<Node> GetReachableNodes(TransformComponent xform,
-            EntityQuery<NodeContainerComponent> nodeQuery,
-            EntityQuery<TransformComponent> xformQuery,
-            MapGridComponent? grid,
-            IEntityManager entMan)
+    public override IEnumerable<Node> GetReachableNodes(TransformComponent xform,
+        EntityQuery<NodeContainerComponent> nodeQuery,
+        EntityQuery<TransformComponent> xformQuery,
+        MapGridComponent? grid,
+        IEntityManager entMan)
+    {
+        foreach (var pipe in base.GetReachableNodes(xform, nodeQuery, xformQuery, grid, entMan))
         {
-            foreach (var pipe in base.GetReachableNodes(xform, nodeQuery, xformQuery, grid, entMan))
-            {
-                yield return pipe;
-            }
+            yield return pipe;
+        }
 
-            if (!xform.Anchored || grid == null)
-                yield break;
+        if (!xform.Anchored || grid == null)
+            yield break;
 
-            if (entMan.TryGetComponent(Owner, out DockingComponent? docking)
-                && docking.DockedWith != null
-                && nodeQuery.TryComp(docking.DockedWith, out var otherNode))
+        if (entMan.TryGetComponent(Owner, out DockingComponent? docking)
+            && docking.DockedWith != null
+            && nodeQuery.TryComp(docking.DockedWith, out var otherNode))
+        {
+            // Hack: this doesn't take into account the direction of the dockable port.
+            foreach (var node in otherNode.Nodes.Values)
             {
-                // Hack: this doesn't take into account the direction of the dockable port.
-                foreach (var node in otherNode.Nodes.Values)
-                {
-                    if (node is DockablePipeNode pipe)
-                        yield return pipe;
-                }
+                if (node is DockablePipeNode pipe)
+                    yield return pipe;
             }
         }
     }
diff --git a/Content.Server/_NF/Worldgen/Components/Debris/RandomEntityPopulatorComponent.cs b/Content.Server/_NF/Worldgen/Components/Debris/RandomEntityPopulatorComponent.cs
index fc018c16019..59b98a2ebe1 100644
--- a/Content.Server/_NF/Worldgen/Components/Debris/RandomEntityPopulatorComponent.cs
+++ b/Content.Server/_NF/Worldgen/Components/Debris/RandomEntityPopulatorComponent.cs
@@ -8,8 +8,7 @@ namespace Content.Server.Worldgen.Components.Debris;
 /// <summary>
 ///     This is used for populating a grid with random entities automatically.
 /// </summary>
-[RegisterComponent]
-[Access(typeof(RandomEntityPopulatorSystem))]
+[RegisterComponent, Access(typeof(RandomEntityPopulatorSystem))]
 public sealed partial class RandomEntityPopulatorComponent : Component
 {
     private List<(RandomEntityParameters Params, EntitySpawnCollectionCache Cache)>? _caches;
@@ -24,38 +23,40 @@ public sealed partial class RandomEntityPopulatorComponent : Component
     ///     The spawn collections used to place entities on different tile types.
     /// </summary>
     [ViewVariables]
-    public List<(RandomEntityParameters Params, EntitySpawnCollectionCache Cache)> Caches
-    {
-        get
-        {
-            if (_caches is null)
-            {
-                _caches = _entries
-                    .Select(x => (x.Params, new EntitySpawnCollectionCache(x.Entries)))
-                    .ToList();
-            }
-
-            return _caches;
-        }
-    }
+    public List<(RandomEntityParameters Params, EntitySpawnCollectionCache Cache)> Caches =>
+        _caches ??= _entries
+            .Select(x => (x.Params, new EntitySpawnCollectionCache(x.Entries)))
+            .ToList();
 }
 
 // A random set of entities to spawn
 [DataDefinition]
 public sealed partial class RandomEntityParameters
 {
-    // The minimum number of this entity to spawn.
-    // Actual number is generated in a uniform range between min and max.
-    // Each entity is independently selected from the entity list below.
+    /// <summary>
+    /// The minimum number of this entity to spawn.
+    /// Actual number is generated in a uniform range between min and max.
+    /// Each entity is independently selected from the entity list below.
+    /// </summary>
     [DataField]
     public int Min = 1;
-    // The minimum number of this entity to spawn.
-    // Actual number is generated in a uniform range.
+
+    /// <summary>
+    /// The maximum number of this entity to spawn.
+    /// Actual number is generated in a uniform range.
+    /// </summary>
     [DataField]
     public int Max = 1;
+
+    /// <summary>
+    /// If true, this entity set will be spawned when air sealed (e.g. under a wall).
+    /// </summary>
     [DataField]
-    public bool CanBeAirSealed = false;
-    // The probability to generate this set of entities.
+    public bool CanBeAirSealed;
+
+    /// <summary>
+    /// The probability to generate this set of entities.
+    /// </summary>
     [DataField]
     public float Prob = 1.0f;
 }
@@ -65,6 +66,7 @@ public sealed partial class RandomEntityEntrySet
 {
     [DataField]
     public RandomEntityParameters Params;
+
     [DataField]
     public List<EntitySpawnEntry> Entries;
 }
diff --git a/Content.Server/_NF/Worldgen/Systems/Debris/RandomEntityPopulatorSystem.cs b/Content.Server/_NF/Worldgen/Systems/Debris/RandomEntityPopulatorSystem.cs
index fa8f52907cb..0c4c56afeab 100644
--- a/Content.Server/_NF/Worldgen/Systems/Debris/RandomEntityPopulatorSystem.cs
+++ b/Content.Server/_NF/Worldgen/Systems/Debris/RandomEntityPopulatorSystem.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Worldgen.Components.Debris;
 using Robust.Server.GameObjects;
@@ -22,24 +23,24 @@ public override void Initialize()
         SubscribeLocalEvent<RandomEntityPopulatorComponent, LocalStructureLoadedEvent>(OnFloorPlanBuilt);
     }
 
-    private void OnFloorPlanBuilt(EntityUid uid, RandomEntityPopulatorComponent component, LocalStructureLoadedEvent args)
+    private void OnFloorPlanBuilt(Entity<RandomEntityPopulatorComponent> ent, ref LocalStructureLoadedEvent args)
     {
-        if (!TryComp<MapGridComponent>(uid, out var mapGrid))
+        if (!TryComp<MapGridComponent>(ent, out var mapGrid))
             return;
 
         var placeables = new List<string?>(4);
         List<Vector2i>? validTileIndices = null;
         // For each entity populator in the set, select a number between min and max
-        foreach (var (paramSet, cache) in component.Caches)
+        foreach (var (paramSet, cache) in ent.Comp.Caches)
         {
             if (!_random.Prob(paramSet.Prob))
                 continue;
 
             var numToGenerate = _random.Next(paramSet.Min, paramSet.Max + 1);
-            for (int i = 0; i < numToGenerate; i++)
+            for (var i = 0; i < numToGenerate; i++)
             {
                 // Then find a spot (if we can) - on any failure, assume the asteroid is full and move onto the next one, which may have different parameters
-                if (!SelectRandomTile(uid, mapGrid, paramSet.CanBeAirSealed, ref validTileIndices, out var coords))
+                if (!SelectRandomTile(ent, mapGrid, paramSet.CanBeAirSealed, ref validTileIndices, out var coords))
                     break;
 
                 cache.GetSpawns(_random, ref placeables);
@@ -65,15 +66,11 @@ private bool SelectRandomTile(EntityUid gridUid,
 
         if (tileIndices == null)
         {
-            var tileIterator = _map.GetAllTiles(gridUid, mapComp, ignoreEmpty: true);
-            tileIndices = new List<Vector2i>();
-            foreach (var tile in tileIterator)
-            {
-                tileIndices.Add(tile.GridIndices);
-            }
+            var tileIterator = _map.GetAllTiles(gridUid, mapComp, true);
+            tileIndices = tileIterator.Select(tile => tile.GridIndices).ToList();
         }
 
-        bool found = false;
+        var found = false;
         for (var i = 0; i < 10; i++)
         {
             if (tileIndices.Count <= 0)
@@ -81,9 +78,7 @@ private bool SelectRandomTile(EntityUid gridUid,
 
             var idx = _random.Next(tileIndices.Count);
             if (!canBeAirSealed && _atmosphere.IsTileAirBlocked(gridUid, tileIndices[idx], mapGridComp: mapComp))
-            {
                 continue;
-            }
 
             found = true;
             targetCoords = _map.GridTileToLocal(gridUid, mapComp, tileIndices[idx]);
diff --git a/Content.Shared/Atmos/EntitySystems/SharedGasPressurePumpSystem.cs b/Content.Shared/Atmos/EntitySystems/SharedGasPressurePumpSystem.cs
index bfee4ef3099..12e462f49d5 100644
--- a/Content.Shared/Atmos/EntitySystems/SharedGasPressurePumpSystem.cs
+++ b/Content.Shared/Atmos/EntitySystems/SharedGasPressurePumpSystem.cs
@@ -79,6 +79,7 @@ protected void UpdateAppearance(EntityUid uid, GasPressurePumpComponent? pump =
 
         var pumpOn = pump.Enabled && _receiver.IsPowered(uid);
         Appearance.SetData(uid, PumpVisuals.Enabled, pumpOn, appearance);
+        Appearance.SetData(uid, PumpVisuals.PumpingInwards, pump.PumpingInwards, appearance); // Frontier
     }
 
     private void OnToggleStatusMessage(EntityUid uid, GasPressurePumpComponent pump, GasPressurePumpToggleStatusMessage args)
diff --git a/Content.Shared/_NF/Atmos/BUI/AtmosAlertsComputerMessages.cs b/Content.Shared/_NF/Atmos/BUI/AtmosAlertsComputerMessages.cs
index c08af058aa6..8b7a4b24171 100644
--- a/Content.Shared/_NF/Atmos/BUI/AtmosAlertsComputerMessages.cs
+++ b/Content.Shared/_NF/Atmos/BUI/AtmosAlertsComputerMessages.cs
@@ -3,40 +3,24 @@
 namespace Content.Shared._NF.Atmos.BUI;
 
 [Serializable, NetSerializable]
-public sealed class RemoteGasPressurePumpChangePumpDirectionMessage : BoundUserInterfaceMessage
+public sealed class RemoteGasPressurePumpChangePumpDirectionMessage(NetEntity pump, bool inwards)
+    : BoundUserInterfaceMessage
 {
-    public NetEntity Pump { get; }
-    public bool Inwards { get; }
-
-    public RemoteGasPressurePumpChangePumpDirectionMessage(NetEntity pump, bool inwards)
-    {
-        Pump = pump;
-        Inwards = inwards;
-    }
+    public NetEntity Pump { get; } = pump;
+    public bool Inwards { get; } = inwards;
 }
 
 [Serializable, NetSerializable]
-public sealed class RemoteGasPressurePumpChangeOutputPressureMessage : BoundUserInterfaceMessage
+public sealed class RemoteGasPressurePumpChangeOutputPressureMessage(NetEntity pump, float pressure)
+    : BoundUserInterfaceMessage
 {
-    public NetEntity Pump { get; }
-    public float Pressure { get; }
-
-    public RemoteGasPressurePumpChangeOutputPressureMessage(NetEntity pump, float pressure)
-    {
-        Pump = pump;
-        Pressure = pressure;
-    }
+    public NetEntity Pump { get; } = pump;
+    public float Pressure { get; } = pressure;
 }
 
 [Serializable, NetSerializable]
-public sealed class RemoteGasPressurePumpToggleStatusMessage : BoundUserInterfaceMessage
+public sealed class RemoteGasPressurePumpToggleStatusMessage(NetEntity pump, bool enabled) : BoundUserInterfaceMessage
 {
-    public NetEntity Pump { get; }
-    public bool Enabled { get; }
-
-    public RemoteGasPressurePumpToggleStatusMessage(NetEntity pump, bool enabled)
-    {
-        Pump = pump;
-        Enabled = enabled;
-    }
+    public NetEntity Pump { get; } = pump;
+    public bool Enabled { get; } = enabled;
 }
diff --git a/Content.Shared/_NF/Atmos/BUI/GasSaleConsoleBoundUserInterfaceState.cs b/Content.Shared/_NF/Atmos/BUI/GasSaleConsoleBoundUserInterfaceState.cs
index b0be22c69df..8f8d9e21d32 100644
--- a/Content.Shared/_NF/Atmos/BUI/GasSaleConsoleBoundUserInterfaceState.cs
+++ b/Content.Shared/_NF/Atmos/BUI/GasSaleConsoleBoundUserInterfaceState.cs
@@ -4,29 +4,23 @@
 namespace Content.Shared._NF.Atmos.BUI;
 
 [NetSerializable, Serializable]
-public sealed class GasSaleConsoleBoundUserInterfaceState : BoundUserInterfaceState
+public sealed class GasSaleConsoleBoundUserInterfaceState(int appraisal, GasMixture mixture, bool enabled)
+    : BoundUserInterfaceState
 {
     /// <summary>
     /// Estimated appraisal value of the gas mixture.
     /// </summary>
-    public int Appraisal;
+    public int Appraisal = appraisal;
 
     /// <summary>
     /// The mixture in the linked sale entity.
     /// </summary>
-    public GasMixture Mixture;
+    public GasMixture Mixture = mixture;
 
     /// <summary>
     /// Whether or not the buttons on the interface are enabled.
     /// </summary>
-    public bool Enabled;
-
-    public GasSaleConsoleBoundUserInterfaceState(int appraisal, GasMixture mixture, bool enabled)
-    {
-        Appraisal = appraisal;
-        Mixture = mixture;
-        Enabled = enabled;
-    }
+    public bool Enabled = enabled;
 }
 
 [Serializable, NetSerializable]
diff --git a/Content.Shared/_NF/Atmos/BUIStates/GaslockConsoleBoundUserInterfaceState.cs b/Content.Shared/_NF/Atmos/BUIStates/GaslockConsoleBoundUserInterfaceState.cs
index 45c7c6bc9b9..456b0546392 100644
--- a/Content.Shared/_NF/Atmos/BUIStates/GaslockConsoleBoundUserInterfaceState.cs
+++ b/Content.Shared/_NF/Atmos/BUIStates/GaslockConsoleBoundUserInterfaceState.cs
@@ -4,25 +4,15 @@
 namespace Content.Shared._NF.Atmos.BUIStates;
 
 [Serializable, NetSerializable]
-public sealed class GaslockConsoleBoundUserInterfaceState : BoundUserInterfaceState
+public sealed class GaslockConsoleBoundUserInterfaceState(NetCoordinates coords, GaslockState state)
+    : BoundUserInterfaceState
 {
-    public NetCoordinates Coords;
-    public GaslockState State;
-
-    public GaslockConsoleBoundUserInterfaceState(NetCoordinates coords, GaslockState state)
-    {
-        Coords = coords;
-        State = state;
-    }
+    public NetCoordinates Coords = coords;
+    public GaslockState State = state;
 }
 
 [Serializable, NetSerializable]
-public sealed class GaslockState
+public sealed class GaslockState(Dictionary<NetEntity, List<GaslockPortState>> docks)
 {
-    public Dictionary<NetEntity, List<GaslockPortState>> Docks;
-
-    public GaslockState(Dictionary<NetEntity, List<GaslockPortState>> docks)
-    {
-        Docks = docks;
-    }
+    public Dictionary<NetEntity, List<GaslockPortState>> Docks = docks;
 }
diff --git a/Content.Shared/_NF/Atmos/Components/GasDepositComponent.cs b/Content.Shared/_NF/Atmos/Components/GasDepositComponent.cs
new file mode 100644
index 00000000000..f45f1664c4d
--- /dev/null
+++ b/Content.Shared/_NF/Atmos/Components/GasDepositComponent.cs
@@ -0,0 +1,20 @@
+using Content.Shared.Atmos;
+using Content.Shared._NF.Atmos.Systems;
+
+namespace Content.Shared._NF.Atmos.Components;
+
+[RegisterComponent, Access(typeof(SharedGasDepositSystem))]
+public sealed partial class GasDepositComponent : Component
+{
+    /// <summary>
+    /// Gases left in the deposit.
+    /// </summary>
+    [DataField]
+    public GasMixture Deposit = new();
+
+    /// <summary>
+    /// The maximum number of moles for this deposit to be considered "mostly depleted".
+    /// </summary>
+    [ViewVariables]
+    public float LowMoles;
+}
diff --git a/Content.Shared/_NF/Atmos/Components/GasDepositExtractorComponent.cs b/Content.Shared/_NF/Atmos/Components/GasDepositExtractorComponent.cs
index 258b77f82ef..a77da6b88c7 100644
--- a/Content.Shared/_NF/Atmos/Components/GasDepositExtractorComponent.cs
+++ b/Content.Shared/_NF/Atmos/Components/GasDepositExtractorComponent.cs
@@ -1,10 +1,12 @@
+using Content.Shared._NF.Atmos.Systems;
 using Content.Shared._NF.Atmos.Visuals;
 using Content.Shared.Atmos;
 using Robust.Shared.GameStates;
 
-namespace Content.Server._NF.Atmos.Components;
+namespace Content.Shared._NF.Atmos.Components;
 
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[Access(typeof(SharedGasDepositSystem))]
 public sealed partial class GasDepositExtractorComponent : Component
 {
     /// <summary>
@@ -37,9 +39,6 @@ public sealed partial class GasDepositExtractorComponent : Component
     /// <summary>
     /// The entity to be extracted from.
     /// </summary>
-    /// <remarks>
-    /// Should abstract into a general GasDepositComponent later.
-    /// </remarks>
     [DataField]
     public EntityUid? DepositEntity;
 
diff --git a/Content.Shared/_NF/Atmos/Events/GasSalePointEvents.cs b/Content.Shared/_NF/Atmos/Events/GasSalePointEvents.cs
index 579ec858380..14dd96b2414 100644
--- a/Content.Shared/_NF/Atmos/Events/GasSalePointEvents.cs
+++ b/Content.Shared/_NF/Atmos/Events/GasSalePointEvents.cs
@@ -13,4 +13,4 @@ public sealed class GasSaleSellMessage : BoundUserInterfaceMessage;
 /// Similar to the appraise button on the cargo consoles.
 /// </summary>
 [Serializable, NetSerializable]
-public sealed class GasSaleRefreshMessage : BoundUserInterfaceMessage;
\ No newline at end of file
+public sealed class GasSaleRefreshMessage : BoundUserInterfaceMessage;
diff --git a/Content.Server/_NF/Atmos/Prototypes/GasDepositPrototype.cs b/Content.Shared/_NF/Atmos/Prototypes/GasDepositPrototype.cs
similarity index 84%
rename from Content.Server/_NF/Atmos/Prototypes/GasDepositPrototype.cs
rename to Content.Shared/_NF/Atmos/Prototypes/GasDepositPrototype.cs
index d5c56e5d0bd..5121a4e4d38 100644
--- a/Content.Server/_NF/Atmos/Prototypes/GasDepositPrototype.cs
+++ b/Content.Shared/_NF/Atmos/Prototypes/GasDepositPrototype.cs
@@ -2,12 +2,12 @@
 using Content.Shared.Atmos;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server._NF.Atmos;
+namespace Content.Shared._NF.Atmos.Prototypes;
 
-[Prototype("gasDeposit")]
+[Prototype]
 public sealed partial class GasDepositPrototype : IPrototype
 {
-    [ViewVariables]
+    /// <inheritdoc/>
     [IdDataField]
     public string ID { get; private set; } = default!;
 
diff --git a/Content.Shared/_NF/Atmos/Systems/SharedGasDepositSystem.cs b/Content.Shared/_NF/Atmos/Systems/SharedGasDepositSystem.cs
new file mode 100644
index 00000000000..6fc90a245e9
--- /dev/null
+++ b/Content.Shared/_NF/Atmos/Systems/SharedGasDepositSystem.cs
@@ -0,0 +1,98 @@
+using Content.Shared._NF.Atmos.Components;
+using Content.Shared.Atmos.Piping.Binary.Components;
+using Content.Shared.Construction.Components;
+using Content.Shared.Examine;
+using Content.Shared.Interaction;
+using Content.Shared.Popups;
+using Robust.Shared.Map.Components;
+using Robust.Shared.Player;
+
+namespace Content.Shared._NF.Atmos.Systems;
+
+public abstract class SharedGasDepositSystem : EntitySystem
+{
+    [Dependency] private readonly SharedMapSystem _map = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] protected readonly SharedUserInterfaceSystem UI = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+
+        SubscribeLocalEvent<GasDepositExtractorComponent, ExaminedEvent>(OnExamined);
+        SubscribeLocalEvent<GasDepositExtractorComponent, AnchorAttemptEvent>(OnAnchorAttempt);
+        SubscribeLocalEvent<GasDepositExtractorComponent, ActivateInWorldEvent>(OnPumpActivate);
+    }
+
+    private void OnExamined(Entity<GasDepositExtractorComponent> ent, ref ExaminedEvent args)
+    {
+        if (!Transform(ent).Anchored || !args.IsInDetailsRange)
+            return;
+
+        args.PushMarkup(Loc.GetString("gas-deposit-drill-system-examined",
+            ("statusColor", "lightblue"),
+            ("pressure", ent.Comp.TargetPressure)));
+        if (TryComp(ent.Comp.DepositEntity, out GasDepositComponent? deposit))
+        {
+            args.PushMarkup(Loc.GetString("gas-deposit-drill-system-examined-amount",
+                ("statusColor", "lightblue"),
+                ("value", deposit.Deposit.TotalMoles)));
+        }
+    }
+
+    public void OnAnchorAttempt(Entity<GasDepositExtractorComponent> ent, ref AnchorAttemptEvent args)
+    {
+        if (args.Cancelled)
+            return;
+
+        if (!TryComp(ent, out TransformComponent? xform)
+            || xform.GridUid is not { Valid: true } grid
+            || !TryComp(grid, out MapGridComponent? gridComp))
+        {
+            args.Cancel();
+            return;
+        }
+
+        var indices = _map.TileIndicesFor(grid, gridComp, xform.Coordinates);
+        var enumerator = _map.GetAnchoredEntitiesEnumerator(grid, gridComp, indices);
+
+        while (enumerator.MoveNext(out var otherEnt))
+        {
+            // Don't match yourself.
+            if (otherEnt == ent)
+                continue;
+
+            // Is another storage entity is already anchored here?
+            if (!HasComp<GasDepositComponent>(otherEnt))
+                continue;
+
+            ent.Comp.DepositEntity = otherEnt.Value;
+            return;
+        }
+
+        _popup.PopupPredicted(Loc.GetString("gas-deposit-drill-no-resources"), ent, args.User);
+        args.Cancel();
+    }
+
+    private void OnPumpActivate(Entity<GasDepositExtractorComponent> ent, ref ActivateInWorldEvent args)
+    {
+        if (args.Handled || !args.Complex)
+            return;
+
+        if (!TryComp(args.User, out ActorComponent? actor))
+            return;
+
+        if (Transform(ent).Anchored)
+        {
+            UI.OpenUi(ent.Owner, GasPressurePumpUiKey.Key, actor.PlayerSession);
+            Dirty(ent);
+        }
+        else
+        {
+            _popup.PopupCursor(Loc.GetString("ui-needs-anchor"), args.User);
+        }
+
+        args.Handled = true;
+    }
+}
diff --git a/Content.Shared/_NF/Atmos/Visuals/DockablePumpVisuals.cs b/Content.Shared/_NF/Atmos/Visuals/DockablePumpVisuals.cs
index 250ba879f11..c87603860fb 100644
--- a/Content.Shared/_NF/Atmos/Visuals/DockablePumpVisuals.cs
+++ b/Content.Shared/_NF/Atmos/Visuals/DockablePumpVisuals.cs
@@ -1,6 +1,6 @@
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.Atmos.Visuals;
+namespace Content.Shared._NF.Atmos.Visuals;
 
 [Serializable, NetSerializable]
 public enum DockablePipeVisuals : byte
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/Atmospherics/deposits.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/Atmospherics/deposits.yml
index eedb5078e12..fe85bd3ed18 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Specific/Atmospherics/deposits.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/Atmospherics/deposits.yml
@@ -14,6 +14,7 @@
     bodyType: Static
     canCollide: False
   - type: Fixtures
+  - type: GasDeposit
   - type: RandomGasDeposit
   - type: Sprite
     drawdepth: FloorTiles
@@ -128,13 +129,13 @@
   suffix: DEBUG
   components:
   - type: Pinpointer
-    component: RandomGasDeposit
-    targetName: RandomGasDeposit
+    component: GasDeposit
+    targetName: GasDeposit
 
 - type: entity
-  id: DepositLocatorUnpowered
+  id: GasDepositLocatorUnpowered
   parent: BaseItem
-  name: deposit locator
+  name: gas deposit locator
   description: A scanner that checks the nearby area for gas deposits.
   suffix: Unpowered
   components:
@@ -159,7 +160,7 @@
     range: 20
     criteria:
       components:
-      - RandomGasDeposit
+      - GasDeposit
   - type: Beeper
     isMuted: true
     minBeepInterval: 0.15
@@ -171,8 +172,8 @@
         volume: -8
 
 - type: entity
-  id: DepositLocator
-  parent: [ DepositLocatorUnpowered, PowerCellSlotSmallItem ]
+  id: GasDepositLocator
+  parent: [ GasDepositLocatorUnpowered, PowerCellSlotSmallItem ]
   suffix: Powered
   components:
   - type: PowerCellDraw
@@ -181,8 +182,8 @@
   - type: ToggleCellDraw
 
 - type: entity
-  id: DepositLocatorEmpty
-  parent: DepositLocator
+  id: GasDepositLocatorEmpty
+  parent: GasDepositLocator
   suffix: Empty
   components:
   - type: ItemSlots
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
index f3ed9b5c57f..b2d14efea6f 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
@@ -265,7 +265,7 @@
       - WelderIndustrialAdvanced
       - HolofanProjector
       - FireExtinguisher
-      - DepositLocator
+      - GasDepositLocator
     ## Parts
       - MicroManipulatorStockPart
       - MatterBinStockPart
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Piping/Atmospherics/binary.yml b/Resources/Prototypes/_NF/Entities/Structures/Piping/Atmospherics/binary.yml
index b13d65ee1b4..65964435c6c 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Piping/Atmospherics/binary.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Piping/Atmospherics/binary.yml
@@ -188,13 +188,15 @@
     mode: NoSprite
 
 - type: entity
-  parent: BasePressurePumpGaslock
+  parent: [BaseStructureDynamic, BasePressurePumpGaslock]
   id: GaslockFrame
   name: portable gaslock
   description: Pumps gas through. Accepts docking, but cannot dock. Both sides must be docked and pumping in the same direction for gas to flow.
   placement:
     mode: SnapgridCenter
   components:
+  - type: Transform
+    anchored: false
   - type: Anchorable
   - type: Rotatable
   - type: Sprite
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Piping/Atmospherics/unary.yml b/Resources/Prototypes/_NF/Entities/Structures/Piping/Atmospherics/unary.yml
index 51e7c8470a5..6bc4044d771 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Piping/Atmospherics/unary.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Piping/Atmospherics/unary.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: [ BaseMachinePowered, ConstructibleMachine ]
+  parent: [ BaseStructureDynamic, BaseMachinePowered, ConstructibleMachine ]
   id: GasMiningDrill
   name: gas mining drill
   description: A powerful, luggable drill for mining gas deposits on asteroids. Outputs gas through a pipe.
diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/devices.yml b/Resources/Prototypes/_NF/Recipes/Lathes/devices.yml
index 8745dd83008..75d6148ef15 100644
--- a/Resources/Prototypes/_NF/Recipes/Lathes/devices.yml
+++ b/Resources/Prototypes/_NF/Recipes/Lathes/devices.yml
@@ -40,8 +40,8 @@
     Gold: 50
 
 - type: latheRecipe
-  id: DepositLocator
-  result: DepositLocatorEmpty
+  id: GasDepositLocator
+  result: GasDepositLocatorEmpty
   category: Tools
   completetime: 3
   materials: