diff --git a/Content.Client/AME/UI/AMEControllerBoundUserInterface.cs b/Content.Client/AME/UI/AMEControllerBoundUserInterface.cs
index 3765d45fa2..aaeaf538f3 100644
--- a/Content.Client/AME/UI/AMEControllerBoundUserInterface.cs
+++ b/Content.Client/AME/UI/AMEControllerBoundUserInterface.cs
@@ -19,14 +19,9 @@ namespace Content.Client.AME.UI
         {
             base.Open();
 
-            _window = new AMEWindow();
+            _window = new AMEWindow(this);
             _window.OnClose += Close;
             _window.OpenCentered();
-
-            _window.EjectButton.OnPressed += _ => ButtonPressed(UiButton.Eject);
-            _window.ToggleInjection.OnPressed += _ => ButtonPressed(UiButton.ToggleInjection);
-            _window.IncreaseFuelButton.OnPressed += _ => ButtonPressed(UiButton.IncreaseFuel);
-            _window.DecreaseFuelButton.OnPressed += _ => ButtonPressed(UiButton.DecreaseFuel);
         }
 
         /// <summary>
@@ -44,7 +39,7 @@ namespace Content.Client.AME.UI
             _window?.UpdateState(castState); //Update window state
         }
 
-        private void ButtonPressed(UiButton button, int dispenseIndex = -1)
+        public void ButtonPressed(UiButton button, int dispenseIndex = -1)
         {
             SendMessage(new UiButtonPressedMessage(button));
         }
diff --git a/Content.Client/AME/UI/AMEWindow.cs b/Content.Client/AME/UI/AMEWindow.cs
deleted file mode 100644
index e9104e6f67..0000000000
--- a/Content.Client/AME/UI/AMEWindow.cs
+++ /dev/null
@@ -1,173 +0,0 @@
-using Content.Client.Stylesheets;
-using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.CustomControls;
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-using Robust.Shared.Localization;
-using static Content.Shared.AME.SharedAMEControllerComponent;
-using static Robust.Client.UserInterface.Controls.BoxContainer;
-
-namespace Content.Client.AME.UI
-{
-    public class AMEWindow : SS14Window
-    {
-        public Label InjectionStatus { get; set; }
-        public Button EjectButton { get; set; }
-        public Button ToggleInjection { get; set; }
-        public Button IncreaseFuelButton { get; set; }
-        public Button DecreaseFuelButton { get; set; }
-        public ProgressBar? FuelMeter { get; set; }
-        public Label FuelAmount { get; set; }
-        public Label InjectionAmount { get; set; }
-        public Label CoreCount { get; set; }
-
-
-        public AMEWindow()
-        {
-            IoCManager.InjectDependencies(this);
-
-            Title = Loc.GetString("ame-window-title");
-
-            MinSize = SetSize = (250, 250);
-
-            Contents.AddChild(new BoxContainer
-            {
-	            Orientation = LayoutOrientation.Vertical,
-                Children =
-                    {
-                        new BoxContainer
-                        {
-                            Orientation = LayoutOrientation.Horizontal,
-                            Children =
-                            {
-                                new Label {Text = Loc.GetString("ame-window-engine-status-label") + " "},
-                                (InjectionStatus = new Label {Text = Loc.GetString("ame-window-engine-injection-status-not-injecting-label")})
-                            }
-                        },
-                        new BoxContainer
-                        {
-                            Orientation = LayoutOrientation.Horizontal,
-                            Children =
-                            {
-                                (ToggleInjection = new Button {Text = Loc.GetString("ame-window-toggle-injection-button"), StyleClasses = {StyleBase.ButtonOpenBoth}, Disabled = true}),
-                            }
-                        },
-                        new BoxContainer
-                        {
-                            Orientation = LayoutOrientation.Horizontal,
-                            Children =
-                            {
-                                new Label {Text = Loc.GetString("ame-window-fuel-status-label") + " "},
-                                (FuelAmount = new Label {Text = Loc.GetString("ame-window-fuel-not-inserted-text")})
-                            }
-                        },
-                        new BoxContainer
-                        {
-                            Orientation = LayoutOrientation.Horizontal,
-                            Children =
-                            {
-                                (EjectButton = new Button {Text = Loc.GetString("ame-window-eject-button"), StyleClasses = {StyleBase.ButtonOpenBoth}, Disabled = true}),
-                            }
-                        },
-                        new BoxContainer
-                        {
-                            Orientation = LayoutOrientation.Horizontal,
-                            Children =
-                            {
-                                new Label {Text = Loc.GetString("ame-window-injection-amount-label") + " "},
-                                (InjectionAmount = new Label {Text = "0"})
-                            }
-                        },
-                        new BoxContainer
-                        {
-                            Orientation = LayoutOrientation.Horizontal,
-                            Children =
-                            {
-                                (IncreaseFuelButton = new Button {Text = Loc.GetString("ame-window-increase-fuel-button"), StyleClasses = {StyleBase.ButtonOpenRight}}),
-                                (DecreaseFuelButton = new Button {Text = Loc.GetString("ame-window-decrease-fuel-button"), StyleClasses = {StyleBase.ButtonOpenLeft}}),
-                            }
-                        },
-                        new BoxContainer
-                        {
-                            Orientation = LayoutOrientation.Horizontal,
-                            Children =
-                            {
-                                 new Label { Text = Loc.GetString("ame-window-core-count-label") + " "},
-                                (CoreCount = new Label { Text = "0"}),
-                            }
-                        }
-                    }
-            });
-        }
-
-        /// <summary>
-        /// This searches recursively through all the children of "parent"
-        /// and sets the Disabled value of any buttons found to "val"
-        /// </summary>
-        /// <param name="parent">The control which childrens get searched</param>
-        /// <param name="val">The value to which disabled gets set</param>
-        private void SetButtonDisabledRecursive(Control parent, bool val)
-        {
-            foreach (var child in parent.Children)
-            {
-                if (child is Button but)
-                {
-                    but.Disabled = val;
-                    continue;
-                }
-
-                if (child.Children != null)
-                {
-                    SetButtonDisabledRecursive(child, val);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Update the UI state when new state data is received from the server.
-        /// </summary>
-        /// <param name="state">State data sent by the server.</param>
-        public void UpdateState(BoundUserInterfaceState state)
-        {
-            var castState = (AMEControllerBoundUserInterfaceState) state;
-
-            // Disable all buttons if not powered
-            if (Contents.Children != null)
-            {
-                SetButtonDisabledRecursive(Contents, !castState.HasPower);
-                EjectButton.Disabled = false;
-            }
-
-            if (!castState.HasFuelJar)
-            {
-                EjectButton.Disabled = true;
-                ToggleInjection.Disabled = true;
-                FuelAmount.Text = Loc.GetString("ame-window-fuel-not-inserted-text");
-            }
-            else
-            {
-                EjectButton.Disabled = false;
-                ToggleInjection.Disabled = false;
-                FuelAmount.Text = $"{castState.FuelAmount}";
-            }
-
-            if (!castState.IsMaster)
-            {
-                ToggleInjection.Disabled = true;
-            }
-
-            if (!castState.Injecting)
-            {
-                InjectionStatus.Text = Loc.GetString("ame-window-engine-injection-status-not-injecting-label") + " ";
-            }
-            else
-            {
-                InjectionStatus.Text = Loc.GetString("ame-window-engine-injection-status-injecting-label") + " ";
-            }
-
-            CoreCount.Text = $"{castState.CoreCount}";
-            InjectionAmount.Text = $"{castState.InjectionAmount}";
-        }
-    }
-}
diff --git a/Content.Client/AME/UI/AMEWindow.xaml b/Content.Client/AME/UI/AMEWindow.xaml
new file mode 100644
index 0000000000..bc1e7d9ded
--- /dev/null
+++ b/Content.Client/AME/UI/AMEWindow.xaml
@@ -0,0 +1,46 @@
+<SS14Window xmlns="https://spacestation14.io"
+            Title="{Loc 'ame-window-title'}"
+            MinSize="250 250">
+    <BoxContainer Orientation="Vertical">
+        <BoxContainer Orientation="Horizontal">
+            <Label Text="{Loc 'ame-window-engine-status-label'}" />
+            <Label Text=" " />
+            <Label Name="InjectionStatus" Text="{Loc 'ame-window-engine-injection-status-not-injecting-label'}" />
+        </BoxContainer>
+        <BoxContainer Orientation="Horizontal">
+            <Button Name="ToggleInjection"
+                    Text="{Loc 'ame-window-toggle-injection-button'}"
+                    StyleClasses="OpenBoth"
+                    Disabled="True" />
+        </BoxContainer>
+        <BoxContainer Orientation="Horizontal">
+            <Label Text="{Loc 'ame-window-fuel-status-label'}" />
+            <Label Text=" " />
+            <Label Name="FuelAmount" Text="{Loc 'ame-window-fuel-not-inserted-text'}" />
+        </BoxContainer>
+        <BoxContainer Orientation="Horizontal">
+            <Button Name="EjectButton"
+                    Text="{Loc 'ame-window-eject-button'}"
+                    StyleClasses="OpenBoth"
+                    Disabled="True" />
+        </BoxContainer>
+        <BoxContainer Orientation="Horizontal">
+            <Label Text="{Loc 'ame-window-injection-amount-label'}" />
+            <Label Text=" " />
+            <Label Name="InjectionAmount" Text="0" />
+        </BoxContainer>
+        <BoxContainer Orientation="Horizontal">
+            <Button Name="IncreaseFuelButton"
+                    Text="{Loc 'ame-window-increase-fuel-button'}"
+                    StyleClasses="OpenRight" />
+            <Button Name="DecreaseFuelButton"
+                    Text="{Loc 'ame-window-decrease-fuel-button'}"
+                    StyleClasses="OpenLeft" />
+        </BoxContainer>
+        <BoxContainer Orientation="Horizontal">
+            <Label Text="{Loc 'ame-window-core-count-label'}" />
+            <Label Text=" " />
+            <Label Name="CoreCount" Text="0" />
+        </BoxContainer>
+    </BoxContainer>
+</SS14Window>
diff --git a/Content.Client/AME/UI/AMEWindow.xaml.cs b/Content.Client/AME/UI/AMEWindow.xaml.cs
new file mode 100644
index 0000000000..90c345faf7
--- /dev/null
+++ b/Content.Client/AME/UI/AMEWindow.xaml.cs
@@ -0,0 +1,74 @@
+using Content.Client.UserInterface;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
+using Robust.Shared.Localization;
+using static Content.Shared.AME.SharedAMEControllerComponent;
+
+namespace Content.Client.AME.UI
+{
+    [GenerateTypedNameReferences]
+    public partial class AMEWindow : SS14Window
+    {
+        public AMEWindow(AMEControllerBoundUserInterface ui)
+        {
+            RobustXamlLoader.Load(this);
+            IoCManager.InjectDependencies(this);
+
+            EjectButton.OnPressed += _ => ui.ButtonPressed(UiButton.Eject);
+            ToggleInjection.OnPressed += _ => ui.ButtonPressed(UiButton.ToggleInjection);
+            IncreaseFuelButton.OnPressed += _ => ui.ButtonPressed(UiButton.IncreaseFuel);
+            DecreaseFuelButton.OnPressed += _ => ui.ButtonPressed(UiButton.DecreaseFuel);
+        }
+
+        /// <summary>
+        /// Update the UI state when new state data is received from the server.
+        /// </summary>
+        /// <param name="state">State data sent by the server.</param>
+        public void UpdateState(BoundUserInterfaceState state)
+        {
+            var castState = (AMEControllerBoundUserInterfaceState) state;
+
+            // Disable all buttons if not powered
+            if (Contents.Children != null)
+            {
+                ButtonHelpers.SetButtonDisabledRecursive(Contents, !castState.HasPower);
+                EjectButton.Disabled = false;
+            }
+
+            if (!castState.HasFuelJar)
+            {
+                EjectButton.Disabled = true;
+                ToggleInjection.Disabled = true;
+                FuelAmount.Text = Loc.GetString("ame-window-fuel-not-inserted-text");
+            }
+            else
+            {
+                EjectButton.Disabled = false;
+                ToggleInjection.Disabled = false;
+                FuelAmount.Text = $"{castState.FuelAmount}";
+            }
+
+            if (!castState.IsMaster)
+            {
+                ToggleInjection.Disabled = true;
+            }
+
+            if (!castState.Injecting)
+            {
+                InjectionStatus.Text = Loc.GetString("ame-window-engine-injection-status-not-injecting-label") + " ";
+            }
+            else
+            {
+                InjectionStatus.Text = Loc.GetString("ame-window-engine-injection-status-injecting-label") + " ";
+            }
+
+            CoreCount.Text = $"{castState.CoreCount}";
+            InjectionAmount.Text = $"{castState.InjectionAmount}";
+        }
+    }
+}
diff --git a/Content.Client/Access/UI/IdCardConsoleWindow.cs b/Content.Client/Access/UI/IdCardConsoleWindow.cs
deleted file mode 100644
index 4c3093baa2..0000000000
--- a/Content.Client/Access/UI/IdCardConsoleWindow.cs
+++ /dev/null
@@ -1,208 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using Content.Shared.Access;
-using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.CustomControls;
-using Robust.Shared.Localization;
-using Robust.Shared.Maths;
-using Robust.Shared.Prototypes;
-using static Content.Shared.Access.SharedIdCardConsoleComponent;
-using static Robust.Client.UserInterface.Controls.BoxContainer;
-
-namespace Content.Client.Access.UI
-{
-    public class IdCardConsoleWindow : SS14Window
-    {
-        private readonly Button _privilegedIdButton;
-        private readonly Button _targetIdButton;
-
-        private readonly Label _privilegedIdLabel;
-        private readonly Label _targetIdLabel;
-
-        private readonly Label _fullNameLabel;
-        private readonly LineEdit _fullNameLineEdit;
-        private readonly Label _jobTitleLabel;
-        private readonly LineEdit _jobTitleLineEdit;
-
-        private readonly Button _fullNameSaveButton;
-        private readonly Button _jobTitleSaveButton;
-
-        private readonly IdCardConsoleBoundUserInterface _owner;
-
-        private readonly Dictionary<string, Button> _accessButtons = new();
-
-        private string? _lastFullName;
-        private string? _lastJobTitle;
-
-        public IdCardConsoleWindow(IdCardConsoleBoundUserInterface owner, IPrototypeManager prototypeManager)
-        {
-            MinSize = SetSize = (650, 290);
-            _owner = owner;
-            var vBox = new BoxContainer
-            {
-                Orientation = LayoutOrientation.Vertical
-            };
-
-            vBox.AddChild(new GridContainer
-            {
-                Columns = 3,
-                Children =
-                {
-                    new Label {Text = Loc.GetString("id-card-console-window-privileged-id")},
-                    (_privilegedIdButton = new Button()),
-                    (_privilegedIdLabel = new Label()),
-
-                    new Label {Text = Loc.GetString("id-card-console-window-target-id")},
-                    (_targetIdButton = new Button()),
-                    (_targetIdLabel = new Label())
-                }
-            });
-
-            _privilegedIdButton.OnPressed += _ => _owner.ButtonPressed(UiButton.PrivilegedId);
-            _targetIdButton.OnPressed += _ => _owner.ButtonPressed(UiButton.TargetId);
-
-            // Separator
-            vBox.AddChild(new Control {MinSize = (0, 8)});
-
-            // Name and job title line edits.
-            vBox.AddChild(new GridContainer
-            {
-                Columns = 3,
-                HSeparationOverride = 4,
-                Children =
-                {
-                    // Name
-                    (_fullNameLabel = new Label
-                    {
-                        Text = Loc.GetString("id-card-console-window-full-name-label")
-                    }),
-                    (_fullNameLineEdit = new LineEdit
-                    {
-                        HorizontalExpand = true,
-                    }),
-                    (_fullNameSaveButton = new Button
-                    {
-                        Text = Loc.GetString("id-card-console-window-save-button"),
-                        Disabled = true
-                    }),
-
-                    // Title
-                    (_jobTitleLabel = new Label
-                    {
-                        Text = Loc.GetString("id-card-console-window-job-title-label")
-                    }),
-                    (_jobTitleLineEdit = new LineEdit
-                    {
-                        HorizontalExpand = true
-                    }),
-                    (_jobTitleSaveButton = new Button
-                    {
-                        Text = Loc.GetString("id-card-console-window-save-button"),
-                        Disabled = true
-                    }),
-                },
-            });
-
-            _fullNameLineEdit.OnTextEntered += _ => SubmitData();
-            _fullNameLineEdit.OnTextChanged += _ =>
-            {
-                _fullNameSaveButton.Disabled = _fullNameSaveButton.Text == _lastFullName;
-            };
-            _fullNameSaveButton.OnPressed += _ => SubmitData();
-
-            _jobTitleLineEdit.OnTextEntered += _ => SubmitData();
-            _jobTitleLineEdit.OnTextChanged += _ =>
-            {
-                _jobTitleSaveButton.Disabled = _jobTitleLineEdit.Text == _lastJobTitle;
-            };
-            _jobTitleSaveButton.OnPressed += _ => SubmitData();
-
-            // Separator
-            vBox.AddChild(new Control {MinSize = (0, 8)});
-
-            {
-                var grid = new GridContainer
-                {
-                    Columns = 5,
-                    HorizontalAlignment = HAlignment.Center
-                };
-                vBox.AddChild(grid);
-
-                foreach (var accessLevel in prototypeManager.EnumeratePrototypes<AccessLevelPrototype>())
-                {
-                    var newButton = new Button
-                    {
-                        Text = accessLevel.Name,
-                        ToggleMode = true,
-                    };
-                    grid.AddChild(newButton);
-                    _accessButtons.Add(accessLevel.ID, newButton);
-                    newButton.OnPressed += _ => SubmitData();
-                }
-            }
-
-            Contents.AddChild(vBox);
-        }
-
-        public void UpdateState(IdCardConsoleBoundUserInterfaceState state)
-        {
-            _privilegedIdButton.Text = state.IsPrivilegedIdPresent
-                ? Loc.GetString("id-card-console-window-eject-button")
-                : Loc.GetString("id-card-console-window-insert-button");
-
-            _privilegedIdLabel.Text = state.PrivilegedIdName;
-
-            _targetIdButton.Text = state.IsTargetIdPresent
-                ? Loc.GetString("id-card-console-window-eject-button")
-                : Loc.GetString("id-card-console-window-insert-button");
-
-            _targetIdLabel.Text = state.TargetIdName;
-
-            var interfaceEnabled =
-                state.IsPrivilegedIdPresent && state.IsPrivilegedIdAuthorized && state.IsTargetIdPresent;
-
-            var fullNameDirty = _lastFullName != null && _fullNameLineEdit.Text != state.TargetIdFullName;
-            var jobTitleDirty = _lastJobTitle != null && _jobTitleLineEdit.Text != state.TargetIdJobTitle;
-
-            _fullNameLabel.Modulate = interfaceEnabled ? Color.White : Color.Gray;
-            _fullNameLineEdit.Editable = interfaceEnabled;
-            if (!fullNameDirty)
-            {
-                _fullNameLineEdit.Text = state.TargetIdFullName ?? string.Empty;
-            }
-
-            _fullNameSaveButton.Disabled = !interfaceEnabled || !fullNameDirty;
-
-            _jobTitleLabel.Modulate = interfaceEnabled ? Color.White : Color.Gray;
-            _jobTitleLineEdit.Editable = interfaceEnabled;
-            if (!jobTitleDirty)
-            {
-                _jobTitleLineEdit.Text = state.TargetIdJobTitle ?? string.Empty;
-            }
-
-            _jobTitleSaveButton.Disabled = !interfaceEnabled || !jobTitleDirty;
-
-            foreach (var (accessName, button) in _accessButtons)
-            {
-                button.Disabled = !interfaceEnabled;
-                if (interfaceEnabled)
-                {
-                    button.Pressed = state.TargetIdAccessList?.Contains(accessName) ?? false;
-                }
-            }
-
-            _lastFullName = state.TargetIdFullName;
-            _lastJobTitle = state.TargetIdJobTitle;
-        }
-
-        private void SubmitData()
-        {
-            _owner.SubmitData(
-                _fullNameLineEdit.Text,
-                _jobTitleLineEdit.Text,
-                // Iterate over the buttons dictionary, filter by `Pressed`, only get key from the key/value pair
-                _accessButtons.Where(x => x.Value.Pressed).Select(x => x.Key).ToList());
-        }
-    }
-}
diff --git a/Content.Client/Access/UI/IdCardConsoleWindow.xaml b/Content.Client/Access/UI/IdCardConsoleWindow.xaml
new file mode 100644
index 0000000000..b384e448fa
--- /dev/null
+++ b/Content.Client/Access/UI/IdCardConsoleWindow.xaml
@@ -0,0 +1,30 @@
+<SS14Window xmlns="https://spacestation14.io"
+            MinSize="650 290">
+    <BoxContainer Orientation="Vertical">
+        <GridContainer Columns="3">
+            <Label Text="{Loc 'id-card-console-window-privileged-id'}" />
+            <Button Name="PrivilegedIdButton" />
+            <Label Name="PrivilegedIdLabel" />
+
+            <Label Text="{Loc 'id-card-console-window-target-id'}" />
+            <Button Name="TargetIdButton" />
+            <Label Name="TargetIdLabel" />
+        </GridContainer>
+        <Control MinSize="0 8" />
+        <GridContainer Columns="3" HSeparationOverride="4">
+            <Label Name="FullNameLabel" Text="{Loc 'id-card-console-window-full-name-label'}" />
+            <LineEdit Name="FullNameLineEdit" HorizontalExpand="True" />
+            <Button Name="FullNameSaveButton" Text="{Loc 'id-card-console-window-save-button'}" Disabled="True" />
+
+            <Label Name="JobTitleLabel" Text="{Loc 'id-card-console-window-job-title-label'}" />
+            <LineEdit Name="JobTitleLineEdit" HorizontalExpand="True" />
+            <Button Name="JobTitleSaveButton" Text="{Loc 'id-card-console-window-save-button'}" Disabled="True" />
+        </GridContainer>
+        <Control MinSize="0 8" />
+        <GridContainer Name="AccessLevelGrid" Columns="5" HorizontalAlignment="Center">
+
+            <!-- Access level buttons are added here by the C# code -->
+
+        </GridContainer>
+    </BoxContainer>
+</SS14Window>
diff --git a/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs b/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs
new file mode 100644
index 0000000000..dfb35f36ac
--- /dev/null
+++ b/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs
@@ -0,0 +1,121 @@
+using System.Collections.Generic;
+using System.Linq;
+using Content.Shared.Access;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Localization;
+using Robust.Shared.Maths;
+using Robust.Shared.Prototypes;
+using static Content.Shared.Access.SharedIdCardConsoleComponent;
+
+namespace Content.Client.Access.UI
+{
+    [GenerateTypedNameReferences]
+    public partial class IdCardConsoleWindow : SS14Window
+    {
+        private readonly IdCardConsoleBoundUserInterface _owner;
+
+        private readonly Dictionary<string, Button> _accessButtons = new();
+
+        private string? _lastFullName;
+        private string? _lastJobTitle;
+
+        public IdCardConsoleWindow(IdCardConsoleBoundUserInterface owner, IPrototypeManager prototypeManager)
+        {
+            RobustXamlLoader.Load(this);
+
+            _owner = owner;
+
+            PrivilegedIdButton.OnPressed += _ => _owner.ButtonPressed(UiButton.PrivilegedId);
+            TargetIdButton.OnPressed += _ => _owner.ButtonPressed(UiButton.TargetId);
+
+            FullNameLineEdit.OnTextEntered += _ => SubmitData();
+            FullNameLineEdit.OnTextChanged += _ =>
+            {
+                FullNameSaveButton.Disabled = FullNameSaveButton.Text == _lastFullName;
+            };
+            FullNameSaveButton.OnPressed += _ => SubmitData();
+
+            JobTitleLineEdit.OnTextEntered += _ => SubmitData();
+            JobTitleLineEdit.OnTextChanged += _ =>
+            {
+                JobTitleSaveButton.Disabled = JobTitleLineEdit.Text == _lastJobTitle;
+            };
+            JobTitleSaveButton.OnPressed += _ => SubmitData();
+
+            foreach (var accessLevel in prototypeManager.EnumeratePrototypes<AccessLevelPrototype>())
+            {
+                var newButton = new Button
+                {
+                    Text = accessLevel.Name,
+                    ToggleMode = true,
+                };
+                AccessLevelGrid.AddChild(newButton);
+                _accessButtons.Add(accessLevel.ID, newButton);
+                newButton.OnPressed += _ => SubmitData();
+            }
+        }
+
+        public void UpdateState(IdCardConsoleBoundUserInterfaceState state)
+        {
+            PrivilegedIdButton.Text = state.IsPrivilegedIdPresent
+                ? Loc.GetString("id-card-console-window-eject-button")
+                : Loc.GetString("id-card-console-window-insert-button");
+
+            PrivilegedIdLabel.Text = state.PrivilegedIdName;
+
+            TargetIdButton.Text = state.IsTargetIdPresent
+                ? Loc.GetString("id-card-console-window-eject-button")
+                : Loc.GetString("id-card-console-window-insert-button");
+
+            TargetIdLabel.Text = state.TargetIdName;
+
+            var interfaceEnabled =
+                state.IsPrivilegedIdPresent && state.IsPrivilegedIdAuthorized && state.IsTargetIdPresent;
+
+            var fullNameDirty = _lastFullName != null && FullNameLineEdit.Text != state.TargetIdFullName;
+            var jobTitleDirty = _lastJobTitle != null && JobTitleLineEdit.Text != state.TargetIdJobTitle;
+
+            FullNameLabel.Modulate = interfaceEnabled ? Color.White : Color.Gray;
+            FullNameLineEdit.Editable = interfaceEnabled;
+            if (!fullNameDirty)
+            {
+                FullNameLineEdit.Text = state.TargetIdFullName ?? string.Empty;
+            }
+
+            FullNameSaveButton.Disabled = !interfaceEnabled || !fullNameDirty;
+
+            JobTitleLabel.Modulate = interfaceEnabled ? Color.White : Color.Gray;
+            JobTitleLineEdit.Editable = interfaceEnabled;
+            if (!jobTitleDirty)
+            {
+                JobTitleLineEdit.Text = state.TargetIdJobTitle ?? string.Empty;
+            }
+
+            JobTitleSaveButton.Disabled = !interfaceEnabled || !jobTitleDirty;
+
+            foreach (var (accessName, button) in _accessButtons)
+            {
+                button.Disabled = !interfaceEnabled;
+                if (interfaceEnabled)
+                {
+                    button.Pressed = state.TargetIdAccessList?.Contains(accessName) ?? false;
+                }
+            }
+
+            _lastFullName = state.TargetIdFullName;
+            _lastJobTitle = state.TargetIdJobTitle;
+        }
+
+        private void SubmitData()
+        {
+            _owner.SubmitData(
+                FullNameLineEdit.Text,
+                JobTitleLineEdit.Text,
+                // Iterate over the buttons dictionary, filter by `Pressed`, only get key from the key/value pair
+                _accessButtons.Where(x => x.Value.Pressed).Select(x => x.Key).ToList());
+        }
+    }
+}
diff --git a/Content.Client/Actions/ClientActionsComponent.cs b/Content.Client/Actions/ClientActionsComponent.cs
index 6df12b2581..3caab80cc6 100644
--- a/Content.Client/Actions/ClientActionsComponent.cs
+++ b/Content.Client/Actions/ClientActionsComponent.cs
@@ -1,9 +1,8 @@
-using System.Collections.Generic;
 using Content.Client.Actions.Assignments;
 using Content.Client.Actions.UI;
 using Content.Client.Hands;
 using Content.Client.Inventory;
-using Content.Client.Items.UI;
+using Content.Client.Items.Managers;
 using Content.Shared.Actions.Components;
 using Content.Shared.Actions.Prototypes;
 using Robust.Client.GameObjects;
@@ -26,12 +25,13 @@ namespace Content.Client.Actions
         public const byte Slots = 10;
 
         [Dependency] private readonly IPlayerManager _playerManager = default!;
+        [Dependency] private readonly IItemSlotManager _itemSlotManager = default!;
 
         [ComponentDependency] private readonly HandsComponent? _handsComponent = null;
         [ComponentDependency] private readonly ClientInventoryComponent? _inventoryComponent = null;
 
         private ActionsUI? _ui;
-        private readonly List<ItemSlotButton> _highlightingItemSlots = new();
+        private EntityUid _highlightedEntity;
 
         /// <summary>
         /// Current assignments for all hotbars / slots for this entity.
@@ -225,26 +225,8 @@ namespace Content.Client.Actions
         {
             StopHighlightingItemSlots();
 
-            // figure out if it's in hand or inventory and highlight it
-            foreach (var hand in _handsComponent!.Gui!.Hands)
-            {
-                if (hand.HeldItem != item || hand.HandButton == null) continue;
-                _highlightingItemSlots.Add(hand.HandButton);
-                hand.HandButton.Highlight(true);
-                return;
-            }
-
-            foreach (var (slot, slotItem) in _inventoryComponent!.AllSlots)
-            {
-                if (slotItem != item) continue;
-                foreach (var itemSlotButton in
-                    _inventoryComponent.InterfaceController.GetItemSlotButtons(slot))
-                {
-                    _highlightingItemSlots.Add(itemSlotButton);
-                    itemSlotButton.Highlight(true);
-                }
-                return;
-            }
+            _highlightedEntity = item.Uid;
+            _itemSlotManager.HighlightEntity(item.Uid);
         }
 
         /// <summary>
@@ -252,11 +234,11 @@ namespace Content.Client.Actions
         /// </summary>
         public void StopHighlightingItemSlots()
         {
-            foreach (var itemSlot in _highlightingItemSlots)
-            {
-                itemSlot.Highlight(false);
-            }
-            _highlightingItemSlots.Clear();
+            if (_highlightedEntity == default)
+                return;
+
+            _itemSlotManager.UnHighlightEntity(_highlightedEntity);
+            _highlightedEntity = default;
         }
 
         public void ToggleActionsMenu()
diff --git a/Content.Client/Alerts/UI/AlertsUI.xaml b/Content.Client/Alerts/UI/AlertsUI.xaml
new file mode 100644
index 0000000000..516db31159
--- /dev/null
+++ b/Content.Client/Alerts/UI/AlertsUI.xaml
@@ -0,0 +1,10 @@
+<Control xmlns="https://spacestation14.io"
+         MinSize="64 64">
+    <PanelContainer StyleClasses="TransparentBorderedWindowPanel"
+                    HorizontalAlignment="Right"
+                    VerticalAlignment="Top">
+        <GridContainer Name="AlertContainer" MaxGridHeight="64" ExpandBackwards="True">
+
+        </GridContainer>
+    </PanelContainer>
+</Control>
diff --git a/Content.Client/Alerts/UI/AlertsUI.cs b/Content.Client/Alerts/UI/AlertsUI.xaml.cs
similarity index 71%
rename from Content.Client/Alerts/UI/AlertsUI.cs
rename to Content.Client/Alerts/UI/AlertsUI.xaml.cs
index 46e6721acd..0a1d35ef88 100644
--- a/Content.Client/Alerts/UI/AlertsUI.cs
+++ b/Content.Client/Alerts/UI/AlertsUI.xaml.cs
@@ -1,8 +1,9 @@
 using Content.Client.Chat.Managers;
 using Content.Client.Chat.UI;
-using Content.Client.Stylesheets;
+using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
 using Robust.Shared.IoC;
 
 namespace Content.Client.Alerts.UI
@@ -10,13 +11,20 @@ namespace Content.Client.Alerts.UI
     /// <summary>
     ///     The status effects display on the right side of the screen.
     /// </summary>
-    public sealed class AlertsUI : Control
+    [GenerateTypedNameReferences]
+    public sealed partial class AlertsUI : Control
     {
+        [Dependency] private readonly IChatManager _chatManager = default!;
+
         public const float ChatSeparation = 38f;
-        public GridContainer Grid { get; }
+
+        public GridContainer Grid => AlertContainer;
 
         public AlertsUI()
         {
+            IoCManager.InjectDependencies(this);
+            RobustXamlLoader.Load(this);
+
             LayoutContainer.SetGrowHorizontal(this, LayoutContainer.GrowDirection.Begin);
             LayoutContainer.SetGrowVertical(this, LayoutContainer.GrowDirection.End);
             LayoutContainer.SetAnchorTop(this, 0f);
@@ -25,28 +33,11 @@ namespace Content.Client.Alerts.UI
             LayoutContainer.SetMarginBottom(this, -180);
             LayoutContainer.SetMarginTop(this, 250);
             LayoutContainer.SetMarginRight(this, -10);
-            var panelContainer = new PanelContainer
-            {
-                StyleClasses = {StyleNano.StyleClassTransparentBorderedWindowPanel},
-                HorizontalAlignment = HAlignment.Right,
-                VerticalAlignment = VAlignment.Top
-            };
-            AddChild(panelContainer);
-
-            Grid = new GridContainer
-            {
-                MaxGridHeight = 64,
-                ExpandBackwards = true
-            };
-            panelContainer.AddChild(Grid);
-
-            MinSize = (64, 64);
         }
 
         protected override void EnteredTree()
         {
             base.EnteredTree();
-            var _chatManager = IoCManager.Resolve<IChatManager>();
             _chatManager.OnChatBoxResized += OnChatResized;
             OnChatResized(new ChatResizedEventArgs(HudChatBox.InitialChatBottom));
         }
@@ -54,15 +45,12 @@ namespace Content.Client.Alerts.UI
         protected override void ExitedTree()
         {
             base.ExitedTree();
-            var _chatManager = IoCManager.Resolve<IChatManager>();
             _chatManager.OnChatBoxResized -= OnChatResized;
         }
 
-
         private void OnChatResized(ChatResizedEventArgs chatResizedEventArgs)
         {
             // resize us to fit just below the chatbox
-            var _chatManager = IoCManager.Resolve<IChatManager>();
             if (_chatManager.CurrentChatBox != null)
             {
                 LayoutContainer.SetMarginTop(this, chatResizedEventArgs.NewBottom + ChatSeparation);
@@ -81,12 +69,12 @@ namespace Content.Client.Alerts.UI
             // this is here because there isn't currently a good way to allow the grid to adjust its height based
             // on constraints, otherwise we would use anchors to lay it out
             base.Resized();
-            Grid.MaxGridHeight = Height;
+            AlertContainer.MaxGridHeight = Height;
         }
 
         protected override void UIScaleChanged()
         {
-            Grid.MaxGridHeight = Height;
+            AlertContainer.MaxGridHeight = Height;
             base.UIScaleChanged();
         }
     }
diff --git a/Content.Client/Atmos/EntitySystems/GasTileOverlaySystem.cs b/Content.Client/Atmos/EntitySystems/GasTileOverlaySystem.cs
index 9beb61a3c9..ee46b25881 100644
--- a/Content.Client/Atmos/EntitySystems/GasTileOverlaySystem.cs
+++ b/Content.Client/Atmos/EntitySystems/GasTileOverlaySystem.cs
@@ -19,6 +19,7 @@ namespace Content.Client.Atmos.EntitySystems
     {
         [Dependency] private readonly IMapManager _mapManager = default!;
         [Dependency] private readonly IResourceCache _resourceCache = default!;
+        [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
 
         // Gas overlays
         private readonly float[] _timer = new float[Atmospherics.TotalNumberOfGases];
@@ -38,16 +39,12 @@ namespace Content.Client.Atmos.EntitySystems
         private readonly Dictionary<GridId, Dictionary<Vector2i, GasOverlayChunk>> _tileData =
             new();
 
-        private AtmosphereSystem _atmosphereSystem = default!;
-
         public override void Initialize()
         {
             base.Initialize();
             SubscribeNetworkEvent<GasOverlayMessage>(HandleGasOverlayMessage);
             _mapManager.OnGridRemoved += OnGridRemoved;
 
-            _atmosphereSystem = Get<AtmosphereSystem>();
-
             for (var i = 0; i < Atmospherics.TotalNumberOfGases; i++)
             {
                 var overlay = _atmosphereSystem.GetOverlay(i);
diff --git a/Content.Client/Atmos/Visualizers/EnabledAtmosDeviceVisualizer.cs b/Content.Client/Atmos/Visualizers/EnabledAtmosDeviceVisualizer.cs
index b39fb9eed8..24af950e1e 100644
--- a/Content.Client/Atmos/Visualizers/EnabledAtmosDeviceVisualizer.cs
+++ b/Content.Client/Atmos/Visualizers/EnabledAtmosDeviceVisualizer.cs
@@ -9,22 +9,13 @@ namespace Content.Client.Atmos.Visualizers
     [UsedImplicitly]
     public abstract class EnabledAtmosDeviceVisualizer : AppearanceVisualizer
     {
+        [DataField("disabledState")]
+        private string _disabledState = string.Empty;
         [DataField("enabledState")]
         private string _enabledState = string.Empty;
         protected abstract object LayerMap { get; }
         protected abstract Enum DataKey { get; }
 
-        public override void InitializeEntity(IEntity entity)
-        {
-            base.InitializeEntity(entity);
-
-            if (!entity.TryGetComponent(out ISpriteComponent? sprite))
-                return;
-
-            sprite.LayerMapSet(LayerMap, sprite.AddLayerState(_enabledState));
-            sprite.LayerSetVisible(LayerMap, false);
-        }
-
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
@@ -32,8 +23,8 @@ namespace Content.Client.Atmos.Visualizers
             if (!component.Owner.TryGetComponent(out ISpriteComponent? sprite))
                 return;
 
-            if(component.TryGetData(DataKey, out bool enabled))
-                sprite.LayerSetVisible(LayerMap, enabled);
+            if(component.TryGetData(DataKey, out bool enabled) && sprite.LayerMapTryGet(LayerMap, out var layer))
+                sprite.LayerSetState(layer, enabled ? _enabledState : _disabledState);
         }
     }
 }
diff --git a/Content.Client/Atmos/Visualizers/GasFilterVisualizer.cs b/Content.Client/Atmos/Visualizers/GasFilterVisualizer.cs
new file mode 100644
index 0000000000..5ad5468c42
--- /dev/null
+++ b/Content.Client/Atmos/Visualizers/GasFilterVisualizer.cs
@@ -0,0 +1,18 @@
+using System;
+using Content.Shared.Atmos.Piping;
+using JetBrains.Annotations;
+
+namespace Content.Client.Atmos.Visualizers
+{
+    [UsedImplicitly]
+    public class GasFilterVisualizer : EnabledAtmosDeviceVisualizer
+    {
+        protected override object LayerMap => Layers.Enabled;
+        protected override Enum DataKey => FilterVisuals.Enabled;
+
+        enum Layers : byte
+        {
+            Enabled,
+        }
+    }
+}
diff --git a/Content.Client/Atmos/Visualizers/GasPortableVisualizer.cs b/Content.Client/Atmos/Visualizers/GasPortableVisualizer.cs
index 07e62b5d59..77804494ce 100644
--- a/Content.Client/Atmos/Visualizers/GasPortableVisualizer.cs
+++ b/Content.Client/Atmos/Visualizers/GasPortableVisualizer.cs
@@ -46,7 +46,7 @@ namespace Content.Client.Atmos.Visualizers
             }
         }
 
-        private enum Layers
+        private enum Layers : byte
         {
             ConnectedToPort,
         }
diff --git a/Content.Client/Atmos/Visualizers/OutletInjectorVisualizer.cs b/Content.Client/Atmos/Visualizers/OutletInjectorVisualizer.cs
index dc1681c226..ec23d7b503 100644
--- a/Content.Client/Atmos/Visualizers/OutletInjectorVisualizer.cs
+++ b/Content.Client/Atmos/Visualizers/OutletInjectorVisualizer.cs
@@ -10,7 +10,7 @@ namespace Content.Client.Atmos.Visualizers
         protected override object LayerMap => Layers.Enabled;
         protected override Enum DataKey => OutletInjectorVisuals.Enabled;
 
-        enum Layers
+        enum Layers : byte
         {
             Enabled,
         }
diff --git a/Content.Client/Atmos/Visualizers/PassiveVentVisualizer.cs b/Content.Client/Atmos/Visualizers/PassiveVentVisualizer.cs
index 01991d837b..d2d08244bc 100644
--- a/Content.Client/Atmos/Visualizers/PassiveVentVisualizer.cs
+++ b/Content.Client/Atmos/Visualizers/PassiveVentVisualizer.cs
@@ -10,7 +10,7 @@ namespace Content.Client.Atmos.Visualizers
         protected override object LayerMap => Layers.Enabled;
         protected override Enum DataKey => PassiveVentVisuals.Enabled;
 
-        enum Layers
+        enum Layers : byte
         {
             Enabled,
         }
diff --git a/Content.Client/Atmos/Visualizers/PipeConnectorVisualizer.cs b/Content.Client/Atmos/Visualizers/PipeConnectorVisualizer.cs
index 9f7e58d31b..36244dc23d 100644
--- a/Content.Client/Atmos/Visualizers/PipeConnectorVisualizer.cs
+++ b/Content.Client/Atmos/Visualizers/PipeConnectorVisualizer.cs
@@ -1,6 +1,7 @@
 using System;
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.Piping;
+using Content.Shared.SubFloor;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
@@ -69,13 +70,16 @@ namespace Content.Client.Atmos.Visualizers
             if (!component.TryGetData(PipeVisuals.VisualState, out PipeVisualState state))
                 return;
 
+            if(!component.TryGetData(SubFloorVisuals.SubFloor, out bool subfloor))
+                subfloor = true;
+
             foreach (Layer layerKey in Enum.GetValues(typeof(Layer)))
             {
                 var dir = (PipeDirection) layerKey;
                 var layerVisible = state.ConnectedDirections.HasDirection(dir);
 
                 var layer = sprite.LayerMapGet(layerKey);
-                sprite.LayerSetVisible(layer, layerVisible);
+                sprite.LayerSetVisible(layer, layerVisible && subfloor);
                 sprite.LayerSetColor(layer, color);
             }
         }
diff --git a/Content.Client/Atmos/Visualizers/PressurePumpVisualizer.cs b/Content.Client/Atmos/Visualizers/PressurePumpVisualizer.cs
index c1441da37b..e0b5db06d3 100644
--- a/Content.Client/Atmos/Visualizers/PressurePumpVisualizer.cs
+++ b/Content.Client/Atmos/Visualizers/PressurePumpVisualizer.cs
@@ -10,7 +10,7 @@ namespace Content.Client.Atmos.Visualizers
         protected override object LayerMap => Layers.Enabled;
         protected override Enum DataKey => PressurePumpVisuals.Enabled;
 
-        enum Layers
+        enum Layers : byte
         {
             Enabled,
         }
diff --git a/Content.Client/Atmos/Visualizers/ScrubberVisualizer.cs b/Content.Client/Atmos/Visualizers/ScrubberVisualizer.cs
index 6568fab771..e58b0bf8e7 100644
--- a/Content.Client/Atmos/Visualizers/ScrubberVisualizer.cs
+++ b/Content.Client/Atmos/Visualizers/ScrubberVisualizer.cs
@@ -44,7 +44,7 @@ namespace Content.Client.Atmos.Visualizers
         }
     }
 
-    public enum ScrubberVisualLayers
+    public enum ScrubberVisualLayers : byte
     {
         Scrubber,
     }
diff --git a/Content.Client/Atmos/Visualizers/ThermoMachineVisualizer.cs b/Content.Client/Atmos/Visualizers/ThermoMachineVisualizer.cs
index e9d77226cc..ab7db6ae92 100644
--- a/Content.Client/Atmos/Visualizers/ThermoMachineVisualizer.cs
+++ b/Content.Client/Atmos/Visualizers/ThermoMachineVisualizer.cs
@@ -10,7 +10,7 @@ namespace Content.Client.Atmos.Visualizers
         protected override object LayerMap => Layers.Enabled;
         protected override Enum DataKey => ThermoMachineVisuals.Enabled;
 
-        enum Layers
+        enum Layers : byte
         {
             Enabled,
         }
diff --git a/Content.Client/Atmos/Visualizers/VentPumpVisualizer.cs b/Content.Client/Atmos/Visualizers/VentPumpVisualizer.cs
index 7db4bc7d5f..cecc544b57 100644
--- a/Content.Client/Atmos/Visualizers/VentPumpVisualizer.cs
+++ b/Content.Client/Atmos/Visualizers/VentPumpVisualizer.cs
@@ -40,7 +40,7 @@ namespace Content.Client.Atmos.Visualizers
         }
     }
 
-    public enum VentVisualLayers
+    public enum VentVisualLayers : byte
     {
         Vent,
     }
diff --git a/Content.Client/Audio/BackgroundAudioSystem.cs b/Content.Client/Audio/BackgroundAudioSystem.cs
index 4d79891649..8a6f2b2607 100644
--- a/Content.Client/Audio/BackgroundAudioSystem.cs
+++ b/Content.Client/Audio/BackgroundAudioSystem.cs
@@ -25,6 +25,7 @@ namespace Content.Client.Audio
         [Dependency] private readonly IConfigurationManager _configManager = default!;
         [Dependency] private readonly IStateManager _stateManager = default!;
         [Dependency] private readonly IBaseClient _client = default!;
+        [Dependency] private readonly ClientGameTicker _gameTicker = default!;
 
         private SoundCollectionPrototype _ambientCollection = default!;
 
@@ -48,7 +49,7 @@ namespace Content.Client.Audio
             _client.PlayerJoinedServer += OnJoin;
             _client.PlayerLeaveServer += OnLeave;
 
-            Get<ClientGameTicker>().LobbyStatusUpdated += LobbySongReceived;
+            _gameTicker.LobbyStatusUpdated += LobbySongReceived;
         }
 
         public override void Shutdown()
@@ -60,7 +61,7 @@ namespace Content.Client.Audio
             _client.PlayerJoinedServer -= OnJoin;
             _client.PlayerLeaveServer -= OnLeave;
 
-            Get<ClientGameTicker>().LobbyStatusUpdated -= LobbySongReceived;
+            _gameTicker.LobbyStatusUpdated -= LobbySongReceived;
 
             EndAmbience();
             EndLobbyMusic();
@@ -165,7 +166,7 @@ namespace Content.Client.Audio
         private void StartLobbyMusic()
         {
             EndLobbyMusic();
-            var file = Get<ClientGameTicker>().LobbySong;
+            var file = _gameTicker.LobbySong;
             if (file == null) // We have not received the lobby song yet.
             {
                 return;
diff --git a/Content.Client/Chemistry/UI/ChemMasterWindow.cs b/Content.Client/Chemistry/UI/ChemMasterWindow.cs
index c627470286..5f3a895e35 100644
--- a/Content.Client/Chemistry/UI/ChemMasterWindow.cs
+++ b/Content.Client/Chemistry/UI/ChemMasterWindow.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Linq;
 using Content.Client.Stylesheets;
+using Content.Client.UserInterface;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Reagent;
 using Robust.Client.Graphics;
@@ -279,34 +280,11 @@ namespace Content.Client.Chemistry.UI
             UpdatePanelInfo(castState);
             if (Contents.Children != null)
             {
-                SetButtonDisabledRecursive(Contents, !castState.HasPower);
+                ButtonHelpers.SetButtonDisabledRecursive(Contents, !castState.HasPower);
                 EjectButton.Disabled = !castState.HasBeaker;
             }
         }
 
-        /// <summary>
-        /// This searches recursively through all the children of "parent"
-        /// and sets the Disabled value of any buttons found to "val"
-        /// </summary>
-        /// <param name="parent">The control which childrens get searched</param>
-        /// <param name="val">The value to which disabled gets set</param>
-        private void SetButtonDisabledRecursive(Control parent, bool val)
-        {
-            foreach (var child in parent.Children)
-            {
-                if (child is Button but)
-                {
-                    but.Disabled = val;
-                    continue;
-                }
-
-                if (child.Children != null)
-                {
-                    SetButtonDisabledRecursive(child, val);
-                }
-            }
-        }
-
         /// <summary>
         /// Update the container, buffer, and packaging panels.
         /// </summary>
diff --git a/Content.Client/Chemistry/UI/ReagentDispenserWindow.cs b/Content.Client/Chemistry/UI/ReagentDispenserWindow.cs
index e5b3571027..34311fb74d 100644
--- a/Content.Client/Chemistry/UI/ReagentDispenserWindow.cs
+++ b/Content.Client/Chemistry/UI/ReagentDispenserWindow.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using Content.Client.Stylesheets;
+using Content.Client.UserInterface;
 using Content.Shared.Chemistry.Dispenser;
 using Content.Shared.Chemistry.Reagent;
 using Robust.Client.Graphics;
@@ -173,29 +174,6 @@ namespace Content.Client.Chemistry.UI
             }
         }
 
-        /// <summary>
-        /// This searches recursively through all the children of "parent"
-        /// and sets the Disabled value of any buttons found to "val"
-        /// </summary>
-        /// <param name="parent">The control which childrens get searched</param>
-        /// <param name="val">The value to which disabled gets set</param>
-        private void SetButtonDisabledRecursive(Control parent, bool val)
-        {
-            foreach (var child in parent.Children)
-            {
-                if (child is Button but)
-                {
-                    but.Disabled = val;
-                    continue;
-                }
-
-                if (child.Children != null)
-                {
-                    SetButtonDisabledRecursive(child, val);
-                }
-            }
-        }
-
         /// <summary>
         /// Update the UI state when new state data is received from the server.
         /// </summary>
@@ -209,7 +187,7 @@ namespace Content.Client.Chemistry.UI
             // Disable all buttons if not powered
             if (Contents.Children != null)
             {
-                SetButtonDisabledRecursive(Contents, !castState.HasPower);
+                ButtonHelpers.SetButtonDisabledRecursive(Contents, !castState.HasPower);
                 EjectButton.Disabled = false;
             }
 
diff --git a/Content.Client/Cloning/MagbootsComponent.cs b/Content.Client/Clothing/MagbootsComponent.cs
similarity index 87%
rename from Content.Client/Cloning/MagbootsComponent.cs
rename to Content.Client/Clothing/MagbootsComponent.cs
index dce398cf52..fb03315318 100644
--- a/Content.Client/Cloning/MagbootsComponent.cs
+++ b/Content.Client/Clothing/MagbootsComponent.cs
@@ -1,7 +1,7 @@
-using Content.Shared.Clothing;
+using Content.Shared.Clothing;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.Cloning
+namespace Content.Client.Clothing
 {
     [RegisterComponent]
     public sealed class MagbootsComponent : SharedMagbootsComponent
diff --git a/Content.Client/Doors/AirlockVisualizer.cs b/Content.Client/Doors/AirlockVisualizer.cs
index 8f6c0651b1..a428a5bc2e 100644
--- a/Content.Client/Doors/AirlockVisualizer.cs
+++ b/Content.Client/Doors/AirlockVisualizer.cs
@@ -17,15 +17,6 @@ namespace Content.Client.Doors
     {
         private const string AnimationKey = "airlock_animation";
 
-        [DataField("open_sound", required: true)]
-        private string _openSound = default!;
-
-        [DataField("close_sound", required: true)]
-        private string _closeSound = default!;
-
-        [DataField("deny_sound", required: true)]
-        private string _denySound = default!;
-
         [DataField("animation_time")]
         private float _delay = 0.8f;
 
@@ -51,14 +42,6 @@ namespace Content.Client.Doors
                 CloseAnimation.AnimationTracks.Add(flickMaintenancePanel);
                 flickMaintenancePanel.LayerKey = WiresVisualizer.WiresVisualLayers.MaintenancePanel;
                 flickMaintenancePanel.KeyFrames.Add(new AnimationTrackSpriteFlick.KeyFrame("panel_closing", 0f));
-
-                var sound = new AnimationTrackPlaySound();
-                CloseAnimation.AnimationTracks.Add(sound);
-
-                if (_closeSound != null)
-                {
-                    sound.KeyFrames.Add(new AnimationTrackPlaySound.KeyFrame(_closeSound, 0));
-                }
             }
 
             OpenAnimation = new Animation {Length = TimeSpan.FromSeconds(_delay)};
@@ -80,11 +63,6 @@ namespace Content.Client.Doors
 
                 var sound = new AnimationTrackPlaySound();
                 OpenAnimation.AnimationTracks.Add(sound);
-
-                if (_openSound != null)
-                {
-                    sound.KeyFrames.Add(new AnimationTrackPlaySound.KeyFrame(_openSound, 0));
-                }
             }
 
             DenyAnimation = new Animation {Length = TimeSpan.FromSeconds(0.3f)};
@@ -96,11 +74,6 @@ namespace Content.Client.Doors
 
                 var sound = new AnimationTrackPlaySound();
                 DenyAnimation.AnimationTracks.Add(sound);
-
-                if (_denySound != null)
-                {
-                    sound.KeyFrames.Add(new AnimationTrackPlaySound.KeyFrame(_denySound, 0, () => AudioHelpers.WithVariation(0.05f)));
-                }
             }
         }
 
diff --git a/Content.Client/DragDrop/DragDropSystem.cs b/Content.Client/DragDrop/DragDropSystem.cs
index 7051978def..7163623a4b 100644
--- a/Content.Client/DragDrop/DragDropSystem.cs
+++ b/Content.Client/DragDrop/DragDropSystem.cs
@@ -36,6 +36,8 @@ namespace Content.Client.DragDrop
         [Dependency] private readonly IEyeManager _eyeManager = default!;
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+        [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
+        [Dependency] private readonly InputSystem _inputSystem = default!;
 
         // how often to recheck possible targets (prevents calling expensive
         // check logic each update)
@@ -69,8 +71,6 @@ namespace Content.Client.DragDrop
 
         private ShaderInstance? _dropTargetInRangeShader;
         private ShaderInstance? _dropTargetOutOfRangeShader;
-        private SharedInteractionSystem _interactionSystem = default!;
-        private InputSystem _inputSystem = default!;
 
         private readonly List<ISpriteComponent> _highlightedSprites = new();
 
@@ -80,8 +80,6 @@ namespace Content.Client.DragDrop
 
             _dropTargetInRangeShader = _prototypeManager.Index<ShaderPrototype>(ShaderDropTargetInRange).Instance();
             _dropTargetOutOfRangeShader = _prototypeManager.Index<ShaderPrototype>(ShaderDropTargetOutOfRange).Instance();
-            _interactionSystem = Get<SharedInteractionSystem>();
-            _inputSystem = Get<InputSystem>();
             // needs to fire on mouseup and mousedown so we can detect a drag / drop
             CommandBinds.Builder
                 .Bind(EngineKeyFunctions.Use, new PointerInputCmdHandler(OnUse, false))
diff --git a/Content.Client/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs
index b975c28673..95a7ec0596 100644
--- a/Content.Client/Entry/EntryPoint.cs
+++ b/Content.Client/Entry/EntryPoint.cs
@@ -81,7 +81,6 @@ namespace Content.Client.Entry
             factory.RegisterClass<SharedCargoConsoleComponent>();
             factory.RegisterClass<SharedReagentDispenserComponent>();
             factory.RegisterClass<SharedChemMasterComponent>();
-            factory.RegisterClass<SharedMicrowaveComponent>();
             factory.RegisterClass<SharedGravityGeneratorComponent>();
             factory.RegisterClass<SharedAMEControllerComponent>();
 
diff --git a/Content.Client/Entry/IgnoredComponents.cs b/Content.Client/Entry/IgnoredComponents.cs
index 805c620ea0..388c56ae43 100644
--- a/Content.Client/Entry/IgnoredComponents.cs
+++ b/Content.Client/Entry/IgnoredComponents.cs
@@ -92,6 +92,7 @@ namespace Content.Client.Entry
             "ExaminableBattery",
             "PottedPlantHide",
             "SecureEntityStorage",
+            "Lock",
             "PresetIdCard",
             "SolarControlConsole",
             "FlashOnTrigger",
@@ -153,7 +154,8 @@ namespace Content.Client.Entry
             "GasPassiveGate",
             "GasValve",
             "GasThermoMachine",
-            "Metabolism",
+            "Respirator",
+            "Metabolizer",
             "AiFactionTag",
             "PressureProtection",
             "AMEPart",
diff --git a/Content.Client/Hands/HandVirtualPullItemStatus.xaml b/Content.Client/Hands/HandVirtualPullItemStatus.xaml
new file mode 100644
index 0000000000..9fac1e0d08
--- /dev/null
+++ b/Content.Client/Hands/HandVirtualPullItemStatus.xaml
@@ -0,0 +1,3 @@
+<Control xmlns="https://spacestation14.io">
+    <Label StyleClasses="ItemStatus" Text="Pulling" />
+</Control>
diff --git a/Content.Client/Hands/HandVirtualPullItemStatus.xaml.cs b/Content.Client/Hands/HandVirtualPullItemStatus.xaml.cs
new file mode 100644
index 0000000000..f4324f6e41
--- /dev/null
+++ b/Content.Client/Hands/HandVirtualPullItemStatus.xaml.cs
@@ -0,0 +1,13 @@
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.Hands
+{
+    public sealed class HandVirtualPullItemStatus : Control
+    {
+        public HandVirtualPullItemStatus()
+        {
+            RobustXamlLoader.Load(this);
+        }
+    }
+}
diff --git a/Content.Client/Hands/HandsComponent.cs b/Content.Client/Hands/HandsComponent.cs
index 0299384e33..4276ca1e9c 100644
--- a/Content.Client/Hands/HandsComponent.cs
+++ b/Content.Client/Hands/HandsComponent.cs
@@ -1,15 +1,8 @@
 using System.Collections.Generic;
-using Content.Client.Animations;
-using Content.Client.HUD;
 using Content.Shared.Hands.Components;
 using Content.Shared.Item;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-using Robust.Shared.Network;
-using Robust.Shared.Players;
-using Robust.Shared.Timing;
-using Robust.Shared.ViewVariables;
 
 namespace Content.Client.Hands
 {
@@ -18,16 +11,7 @@ namespace Content.Client.Hands
     [ComponentReference(typeof(SharedHandsComponent))]
     public class HandsComponent : SharedHandsComponent
     {
-        [Dependency] private readonly IGameHud _gameHud = default!;
-
-        [ViewVariables]
-        public HandsGui? Gui { get; private set; }
-
-        protected override void OnRemove()
-        {
-            ClearGui();
-            base.OnRemove();
-        }
+        public HandsGui? Gui { get; set; }
 
         public override void HandleComponentState(ComponentState? curState, ComponentState? nextState)
         {
@@ -38,94 +22,23 @@ namespace Content.Client.Hands
 
             foreach (var handState in state.Hands)
             {
-                var newHand = new Hand(handState.Name, handState.Enabled, handState.Location);
+                var newHand = new Hand(handState.Name, handState.Location);
                 Hands.Add(newHand);
             }
+
             ActiveHand = state.ActiveHand;
 
             UpdateHandContainers();
             UpdateHandVisualizer();
-            UpdateHandsGuiState();
-        }
-
-        public void SettupGui()
-        {
-            if (Gui == null)
-            {
-                Gui = new HandsGui();
-                _gameHud.HandsContainer.AddChild(Gui);
-                Gui.HandClick += args => OnHandClick(args.HandClicked);
-                Gui.HandActivate += args => OnActivateInHand(args.HandUsed);
-                UpdateHandsGuiState();
-            }
-        }
-
-        public void ClearGui()
-        {
-            Gui?.Dispose();
-            Gui = null;
-        }
-
-        public override void HandleNetworkMessage(ComponentMessage message, INetChannel netChannel, ICommonSession? session = null)
-        {
-            base.HandleNetworkMessage(message, netChannel, session);
-
-            switch (message)
-            {
-                case PickupAnimationMessage msg:
-                    RunPickupAnimation(msg);
-                    break;
-            }
+            Owner.EntityManager.EventBus.RaiseEvent(EventSource.Local, new HandsModifiedMessage { Hands = this });
         }
 
         public override void HandsModified()
         {
-            base.HandsModified();
-
             UpdateHandContainers();
             UpdateHandVisualizer();
-            UpdateHandsGuiState();
-        }
 
-        private void OnHandClick(string handClicked)
-        {
-            if (!TryGetHand(handClicked, out var pressedHand))
-                return;
-
-            if (!TryGetActiveHand(out var activeHand))
-                return;
-
-            var pressedEntity = pressedHand.HeldEntity;
-            var activeEntity = activeHand.HeldEntity;
-
-            if (pressedHand == activeHand && activeEntity != null)
-            {
-                SendNetworkMessage(new UseInHandMsg()); //use item in hand
-                return;
-            }
-
-            if (pressedHand != activeHand && pressedEntity == null)
-            {
-                SendNetworkMessage(new ClientChangedHandMsg(pressedHand.Name)); //swap hand
-                return;
-            }
-
-            if (pressedHand != activeHand && pressedEntity != null && activeEntity != null)
-            {
-                SendNetworkMessage(new ClientAttackByInHandMsg(pressedHand.Name)); //use active item on held item
-                return;
-            }
-
-            if (pressedHand != activeHand && pressedEntity != null && activeEntity == null)
-            {
-                SendNetworkMessage(new MoveItemFromHandMsg(pressedHand.Name)); //move item in hand to active hand
-                return;
-            }
-        }
-
-        private void OnActivateInHand(string handActivated)
-        {
-            SendNetworkMessage(new ActivateInHandMsg(handActivated));
+            base.HandsModified();
         }
 
         public void UpdateHandContainers()
@@ -149,27 +62,10 @@ namespace Content.Client.Hands
                 appearance.SetData(HandsVisuals.VisualState, GetHandsVisualState());
         }
 
-        public void UpdateHandsGuiState()
-        {
-            Gui?.SetState(GetHandsGuiState());
-        }
-
-        private HandsGuiState GetHandsGuiState()
-        {
-            var handStates = new List<GuiHand>();
-
-            foreach (var hand in ReadOnlyHands)
-            {
-                var handState = new GuiHand(hand.Name, hand.Location, hand.HeldEntity, hand.Enabled);
-                handStates.Add(handState);
-            }
-            return new HandsGuiState(handStates, ActiveHand);
-        }
-
         private HandsVisualState GetHandsVisualState()
         {
             var hands = new List<HandVisualState>();
-            foreach (var hand in ReadOnlyHands)
+            foreach (var hand in Hands)
             {
                 if (hand.HeldEntity == null)
                     continue;
@@ -182,16 +78,5 @@ namespace Content.Client.Hands
             }
             return new(hands);
         }
-
-        private void RunPickupAnimation(PickupAnimationMessage msg)
-        {
-            if (!Owner.EntityManager.TryGetEntity(msg.EntityUid, out var entity))
-                return;
-
-            if (!IoCManager.Resolve<IGameTiming>().IsFirstTimePredicted)
-                return;
-
-            ReusableAnimations.AnimateEntityPickup(entity, msg.InitialPosition, msg.PickupDirection);
-        }
     }
 }
diff --git a/Content.Client/Hands/HandsGui.xaml b/Content.Client/Hands/HandsGui.xaml
new file mode 100644
index 0000000000..d39c044821
--- /dev/null
+++ b/Content.Client/Hands/HandsGui.xaml
@@ -0,0 +1,6 @@
+<Control xmlns="https://spacestation14.io">
+    <BoxContainer Orientation="Vertical">
+        <Control Name="StatusContainer" />
+        <BoxContainer Name="HandsContainer" Orientation="Horizontal" HorizontalAlignment="Center" />
+    </BoxContainer>
+</Control>
diff --git a/Content.Client/Hands/HandsGui.cs b/Content.Client/Hands/HandsGui.xaml.cs
similarity index 68%
rename from Content.Client/Hands/HandsGui.cs
rename to Content.Client/Hands/HandsGui.xaml.cs
index ff0fa47b23..63590882bf 100644
--- a/Content.Client/Hands/HandsGui.cs
+++ b/Content.Client/Hands/HandsGui.xaml.cs
@@ -1,87 +1,84 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using System.Linq;
 using Content.Client.HUD;
 using Content.Client.Items.Managers;
 using Content.Client.Items.UI;
 using Content.Client.Resources;
-using Content.Shared;
 using Content.Shared.CCVar;
 using Content.Shared.Hands.Components;
-using Content.Shared.Input;
+using Robust.Client.AutoGenerated;
 using Robust.Client.Graphics;
-using Robust.Client.Player;
 using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Configuration;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Input;
 using Robust.Shared.IoC;
 using Robust.Shared.Timing;
 using Robust.Shared.ViewVariables;
-using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Hands
 {
-    public class HandsGui : Control
+    [GenerateTypedNameReferences]
+    public sealed partial class HandsGui : Control
     {
         [Dependency] private readonly IResourceCache _resourceCache = default!;
         [Dependency] private readonly IItemSlotManager _itemSlotManager = default!;
         [Dependency] private readonly IGameHud _gameHud = default!;
         [Dependency] private readonly INetConfigurationManager _configManager = default!;
 
+        private readonly HandsSystem _handsSystem;
+        private readonly HandsComponent _handsComponent;
+
         private Texture StorageTexture => _gameHud.GetHudTexture("back.png");
         private Texture BlockedTexture => _resourceCache.GetTexture("/Textures/Interface/Inventory/blocked.png");
 
         private ItemStatusPanel StatusPanel { get; }
 
-        private BoxContainer HandsContainer { get; }
-
-        [ViewVariables]
-        public IReadOnlyList<GuiHand> Hands => _hands;
-        private List<GuiHand> _hands = new();
+        [ViewVariables] private GuiHand[] _hands = Array.Empty<GuiHand>();
 
         private string? ActiveHand { get; set; }
 
-        public Action<HandClickEventArgs>? HandClick; //TODO: Move to Eventbus
-
-        public Action<HandActivateEventArgs>? HandActivate; //TODO: Move to Eventbus
-
-        public HandsGui()
+        public HandsGui(HandsComponent hands, HandsSystem handsSystem)
         {
-            IoCManager.InjectDependencies(this);
-            _configManager.OnValueChanged(CCVars.HudTheme, UpdateHudTheme);
+            _handsComponent = hands;
+            _handsSystem = handsSystem;
 
-            AddChild(new BoxContainer
-            {
-                Orientation = LayoutOrientation.Horizontal,
-                SeparationOverride = 0,
-                HorizontalAlignment = HAlignment.Center,
-                Children =
-                {
-                    new BoxContainer
-                    {
-                        Orientation = LayoutOrientation.Vertical,
-                        Children =
-                        {
-                            (StatusPanel = ItemStatusPanel.FromSide(HandLocation.Middle)),
-                            (HandsContainer = new BoxContainer
-                            {
-                                Orientation = LayoutOrientation.Horizontal,
-                                HorizontalAlignment = HAlignment.Center
-                            }),
-                        }
-                    },
-                }
-            });
+            RobustXamlLoader.Load(this);
+            IoCManager.InjectDependencies(this);
+
+            StatusPanel = ItemStatusPanel.FromSide(HandLocation.Middle);
+            StatusContainer.AddChild(StatusPanel);
+            StatusPanel.SetPositionFirst();
         }
 
-        public void SetState(HandsGuiState state)
+        protected override void EnteredTree()
         {
+            base.EnteredTree();
+
+            _handsSystem.GuiStateUpdated += HandsSystemOnGuiStateUpdated;
+            _configManager.OnValueChanged(CCVars.HudTheme, UpdateHudTheme);
+
+            HandsSystemOnGuiStateUpdated();
+        }
+
+        protected override void ExitedTree()
+        {
+            base.ExitedTree();
+
+            _handsSystem.GuiStateUpdated -= HandsSystemOnGuiStateUpdated;
+            _configManager.UnsubValueChanged(CCVars.HudTheme, UpdateHudTheme);
+        }
+
+        private void HandsSystemOnGuiStateUpdated()
+        {
+            var state = _handsSystem.GetGuiState();
+
             ActiveHand = state.ActiveHand;
             _hands = state.GuiHands;
+            Array.Sort(_hands, HandOrderComparer.Instance);
             UpdateGui();
         }
 
@@ -97,12 +94,15 @@ namespace Content.Client.Hands
 
                 var handName = hand.Name;
                 newButton.OnPressed += args => OnHandPressed(args, handName);
-                newButton.OnStoragePressed += args => OnStoragePressed(handName);
-
-                newButton.Blocked.Visible = !hand.Enabled;
+                newButton.OnStoragePressed += _ => OnStoragePressed(handName);
 
                 _itemSlotManager.SetItemSlot(newButton, hand.HeldItem);
+
+                // Show blocked overlay if hand is pulling.
+                newButton.Blocked.Visible =
+                    hand.HeldItem != null && hand.HeldItem.HasComponent<HandVirtualPullComponent>();
             }
+
             if (TryGetActiveHand(out var activeHand))
             {
                 activeHand.HandButton.SetActiveHand(true);
@@ -114,7 +114,7 @@ namespace Content.Client.Hands
         {
             if (args.Function == EngineKeyFunctions.UIClick)
             {
-                HandClick?.Invoke(new HandClickEventArgs(handName));
+                _handsSystem.UIHandClick(_handsComponent, handName);
             }
             else if (TryGetHand(handName, out var hand))
             {
@@ -124,7 +124,7 @@ namespace Content.Client.Hands
 
         private void OnStoragePressed(string handName)
         {
-            HandActivate?.Invoke(new HandActivateEventArgs(handName));
+            _handsSystem.UIHandActivate(handName);
         }
 
         private bool TryGetActiveHand([NotNullWhen(true)] out GuiHand? activeHand)
@@ -145,6 +145,7 @@ namespace Content.Client.Hands
                 if (hand.Name == handName)
                     foundHand = hand;
             }
+
             return foundHand != null;
         }
 
@@ -153,7 +154,9 @@ namespace Content.Client.Hands
             base.FrameUpdate(args);
 
             foreach (var hand in _hands)
+            {
                 _itemSlotManager.UpdateCooldown(hand.HandButton, hand.HeldItem);
+            }
         }
 
         private HandButton MakeHandButton(HandLocation buttonLocation)
@@ -173,23 +176,31 @@ namespace Content.Client.Hands
             UpdateGui();
         }
 
-        public class HandClickEventArgs
+        private sealed class HandOrderComparer : IComparer<GuiHand>
         {
-            public string HandClicked { get; }
+            public static readonly HandOrderComparer Instance = new();
 
-            public HandClickEventArgs(string handClicked)
+            public int Compare(GuiHand? x, GuiHand? y)
             {
-                HandClicked = handClicked;
-            }
-        }
+                if (ReferenceEquals(x, y)) return 0;
+                if (ReferenceEquals(null, y)) return 1;
+                if (ReferenceEquals(null, x)) return -1;
 
-        public class HandActivateEventArgs
-        {
-            public string HandUsed { get; }
+                var orderX = Map(x.HandLocation);
+                var orderY = Map(y.HandLocation);
 
-            public HandActivateEventArgs(string handUsed)
-            {
-                HandUsed = handUsed;
+                return orderX.CompareTo(orderY);
+
+                static int Map(HandLocation loc)
+                {
+                    return loc switch
+                    {
+                        HandLocation.Left => 3,
+                        HandLocation.Middle => 2,
+                        HandLocation.Right => 1,
+                        _ => throw new ArgumentOutOfRangeException(nameof(loc), loc, null)
+                    };
+                }
             }
         }
     }
@@ -203,7 +214,7 @@ namespace Content.Client.Hands
         ///     The set of hands to be displayed.
         /// </summary>
         [ViewVariables]
-        public List<GuiHand> GuiHands { get; } = new();
+        public GuiHand[] GuiHands { get; }
 
         /// <summary>
         ///     The name of the currently active hand.
@@ -211,7 +222,7 @@ namespace Content.Client.Hands
         [ViewVariables]
         public string? ActiveHand { get; }
 
-        public HandsGuiState(List<GuiHand> guiHands, string? activeHand = null)
+        public HandsGuiState(GuiHand[] guiHands, string? activeHand = null)
         {
             GuiHands = guiHands;
             ActiveHand = activeHand;
@@ -247,18 +258,11 @@ namespace Content.Client.Hands
         [ViewVariables]
         public HandButton HandButton { get; set; } = default!;
 
-        /// <summary>
-        ///     If this hand can be used by the player.
-        /// </summary>
-        [ViewVariables]
-        public bool Enabled { get; }
-
-        public GuiHand(string name, HandLocation handLocation, IEntity? heldItem, bool enabled)
+        public GuiHand(string name, HandLocation handLocation, IEntity? heldItem)
         {
             Name = name;
             HandLocation = handLocation;
             HeldItem = heldItem;
-            Enabled = enabled;
         }
     }
 }
diff --git a/Content.Client/Hands/HandsSystem.cs b/Content.Client/Hands/HandsSystem.cs
deleted file mode 100644
index 4ba3a73c6f..0000000000
--- a/Content.Client/Hands/HandsSystem.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-using Content.Shared.Hands;
-using Content.Shared.Hands.Components;
-using Content.Shared.Input;
-using Robust.Client.GameObjects;
-using Robust.Shared.Containers;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Input.Binding;
-using Robust.Shared.Map;
-using Robust.Shared.Players;
-
-namespace Content.Client.Hands
-{
-    internal sealed class HandsSystem : SharedHandsSystem
-    {
-        public override void Initialize()
-        {
-            base.Initialize();
-
-            SubscribeLocalEvent<HandsComponent, PlayerAttachedEvent>((_, component, _) => component.SettupGui());
-            SubscribeLocalEvent<HandsComponent, PlayerDetachedEvent>((_, component, _) => component.ClearGui());
-
-            CommandBinds.Builder
-                .Bind(ContentKeyFunctions.SwapHands, InputCmdHandler.FromDelegate(SwapHandsPressed))
-                .Bind(ContentKeyFunctions.Drop, new PointerInputCmdHandler(DropPressed))
-                .Register<HandsSystem>();
-        }
-
-        public override void Shutdown()
-        {
-            CommandBinds.Unregister<HandsSystem>();
-            base.Shutdown();
-        }
-
-        private void SwapHandsPressed(ICommonSession? session)
-        {
-            if (session == null)
-                return;
-
-            var player = session.AttachedEntity;
-
-            if (player == null)
-                return;
-
-            if (!player.TryGetComponent(out SharedHandsComponent? hands))
-                return;
-
-            if (!hands.TryGetSwapHandsResult(out var nextHand))
-                return;
-
-            EntityManager.RaisePredictiveEvent(new RequestSetHandEvent(nextHand));
-        }
-
-        private bool DropPressed(ICommonSession? session, EntityCoordinates coords, EntityUid uid)
-        {
-            if (session == null)
-                return false;
-
-            var player = session.AttachedEntity;
-
-            if (player == null)
-                return false;
-
-            if (!player.TryGetComponent(out SharedHandsComponent? hands))
-                return false;
-
-            var activeHand = hands.ActiveHand;
-
-            if (activeHand == null)
-                return false;
-
-            EntityManager.RaisePredictiveEvent(new RequestDropHeldEntityEvent(activeHand, coords));
-            return true;
-        }
-
-        protected override void HandleContainerModified(EntityUid uid, SharedHandsComponent component, ContainerModifiedMessage args)
-        {
-            component.HandsModified();
-        }
-    }
-}
diff --git a/Content.Client/Hands/Systems/HandVirtualPullSystem.cs b/Content.Client/Hands/Systems/HandVirtualPullSystem.cs
new file mode 100644
index 0000000000..0f47efd9dc
--- /dev/null
+++ b/Content.Client/Hands/Systems/HandVirtualPullSystem.cs
@@ -0,0 +1,18 @@
+using Content.Client.Items;
+using Content.Shared.Hands.Components;
+using JetBrains.Annotations;
+using Robust.Shared.GameObjects;
+
+namespace Content.Client.Hands
+{
+    [UsedImplicitly]
+    public sealed class HandVirtualPullSystem : EntitySystem
+    {
+        public override void Initialize()
+        {
+            base.Initialize();
+
+            Subs.ItemStatus<HandVirtualPullComponent>(_ => new HandVirtualPullItemStatus());
+        }
+    }
+}
diff --git a/Content.Client/Hands/Systems/HandsSystem.cs b/Content.Client/Hands/Systems/HandsSystem.cs
new file mode 100644
index 0000000000..5f2e40f2e5
--- /dev/null
+++ b/Content.Client/Hands/Systems/HandsSystem.cs
@@ -0,0 +1,149 @@
+using System;
+using System.Linq;
+using Content.Client.Animations;
+using Content.Client.HUD;
+using Content.Shared.Hands;
+using Content.Shared.Hands.Components;
+using JetBrains.Annotations;
+using Robust.Client.GameObjects;
+using Robust.Client.Player;
+using Robust.Shared.Containers;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Input.Binding;
+using Robust.Shared.IoC;
+using Robust.Shared.Timing;
+
+namespace Content.Client.Hands
+{
+    [UsedImplicitly]
+    public sealed class HandsSystem : SharedHandsSystem
+    {
+        [Dependency] private readonly IGameTiming _gameTiming = default!;
+        [Dependency] private readonly IGameHud _gameHud = default!;
+        [Dependency] private readonly IPlayerManager _playerManager = default!;
+
+        public event Action? GuiStateUpdated;
+
+        public override void Initialize()
+        {
+            base.Initialize();
+
+            SubscribeLocalEvent<HandsComponent, PlayerAttachedEvent>(HandlePlayerAttached);
+            SubscribeLocalEvent<HandsComponent, PlayerDetachedEvent>(HandlePlayerDetached);
+            SubscribeLocalEvent<HandsComponent, ComponentRemove>(HandleCompRemove);
+            SubscribeLocalEvent<HandsModifiedMessage>(HandleHandsModified);
+
+            SubscribeNetworkEvent<PickupAnimationMessage>(HandlePickupAnimation);
+        }
+
+        public override void Shutdown()
+        {
+            CommandBinds.Unregister<HandsSystem>();
+            base.Shutdown();
+        }
+
+        private void HandleHandsModified(HandsModifiedMessage ev)
+        {
+            if (ev.Hands.Owner == _playerManager.LocalPlayer?.ControlledEntity)
+                GuiStateUpdated?.Invoke();
+        }
+
+        protected override void HandleContainerModified(EntityUid uid, SharedHandsComponent component, ContainerModifiedMessage args)
+        {
+            if (uid == _playerManager.LocalPlayer?.ControlledEntity?.Uid)
+                GuiStateUpdated?.Invoke();
+        }
+
+        private void HandlePickupAnimation(PickupAnimationMessage msg)
+        {
+            if (!EntityManager.TryGetEntity(msg.EntityUid, out var entity))
+                return;
+
+            if (!_gameTiming.IsFirstTimePredicted)
+                return;
+
+            ReusableAnimations.AnimateEntityPickup(entity, msg.InitialPosition, msg.PickupDirection);
+        }
+
+        public HandsGuiState GetGuiState()
+        {
+            var player = _playerManager.LocalPlayer?.ControlledEntity;
+
+            if (player == null || !player.TryGetComponent(out HandsComponent? hands))
+                return new HandsGuiState(Array.Empty<GuiHand>());
+
+            var states = hands.Hands
+                .Select(hand => new GuiHand(hand.Name, hand.Location, hand.HeldEntity))
+                .ToArray();
+
+            return new HandsGuiState(states, hands.ActiveHand);
+        }
+
+        public void UIHandClick(HandsComponent hands, string handName)
+        {
+            if (!hands.TryGetHand(handName, out var pressedHand))
+                return;
+
+            if (!hands.TryGetActiveHand(out var activeHand))
+                return;
+
+            var pressedEntity = pressedHand.HeldEntity;
+            var activeEntity = activeHand.HeldEntity;
+
+            if (pressedHand == activeHand && activeEntity != null)
+            {
+                // use item in hand
+                // it will always be attack_self() in my heart.
+                RaiseNetworkEvent(new UseInHandMsg());
+                return;
+            }
+
+            if (pressedHand != activeHand && pressedEntity == null)
+            {
+                // change active hand
+                RaiseNetworkEvent(new RequestSetHandEvent(handName));
+                return;
+            }
+
+            if (pressedHand != activeHand && pressedEntity != null && activeEntity != null)
+            {
+                // use active item on held item
+                RaiseNetworkEvent(new ClientInteractUsingInHandMsg(pressedHand.Name));
+                return;
+            }
+
+            if (pressedHand != activeHand && pressedEntity != null && activeEntity == null)
+            {
+                // use active item on held item
+                RaiseNetworkEvent(new MoveItemFromHandMsg(pressedHand.Name));
+            }
+        }
+
+        public void UIHandActivate(string handName)
+        {
+            RaiseNetworkEvent (new ActivateInHandMsg(handName));
+        }
+
+        private void HandlePlayerAttached(EntityUid uid, HandsComponent component, PlayerAttachedEvent args)
+        {
+            component.Gui = new HandsGui(component, this);
+            _gameHud.HandsContainer.AddChild(component.Gui);
+        }
+
+        private static void HandlePlayerDetached(EntityUid uid, HandsComponent component, PlayerDetachedEvent args)
+        {
+            ClearGui(component);
+        }
+
+        private static void HandleCompRemove(EntityUid uid, HandsComponent component, ComponentRemove args)
+        {
+            ClearGui(component);
+        }
+
+        private static void ClearGui(HandsComponent comp)
+        {
+            comp.Gui?.Orphan();
+            comp.Gui = null;
+        }
+    }
+}
diff --git a/Content.Client/Items/ItemStatusMessages.cs b/Content.Client/Items/ItemStatusMessages.cs
new file mode 100644
index 0000000000..93ebaeabe0
--- /dev/null
+++ b/Content.Client/Items/ItemStatusMessages.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using Robust.Client.UserInterface;
+using Robust.Shared.GameObjects;
+
+namespace Content.Client.Items
+{
+    public sealed class ItemStatusCollectMessage : EntityEventArgs
+    {
+        public List<Control> Controls = new();
+    }
+
+    public static class ItemStatusRegisterExt
+    {
+        /// <summary>
+        /// Register an item status control for a component.
+        /// </summary>
+        /// <param name="subs">The <see cref="EntitySystem.Subs"/> handle from within entity system initialize.</param>
+        /// <param name="createControl">A delegate to create the actual control.</param>
+        /// <typeparam name="TComp">The type of component for which this control should be made.</typeparam>
+        public static void ItemStatus<TComp>(
+            this EntitySystem.Subscriptions subs,
+            Func<EntityUid, Control> createControl)
+            where TComp : IComponent
+        {
+            subs.SubscribeLocalEvent<TComp, ItemStatusCollectMessage>((uid, _, args) =>
+            {
+                args.Controls.Add(createControl(uid));
+            });
+        }
+    }
+}
diff --git a/Content.Client/Items/Managers/IItemSlotManager.cs b/Content.Client/Items/Managers/IItemSlotManager.cs
index 127eedc1b4..bbebaf55b4 100644
--- a/Content.Client/Items/Managers/IItemSlotManager.cs
+++ b/Content.Client/Items/Managers/IItemSlotManager.cs
@@ -1,4 +1,5 @@
-using Content.Client.Items.UI;
+using System;
+using Content.Client.Items.UI;
 using Robust.Client.UserInterface;
 using Robust.Shared.GameObjects;
 
@@ -10,5 +11,21 @@ namespace Content.Client.Items.Managers
         void UpdateCooldown(ItemSlotButton? cooldownTexture, IEntity? entity);
         bool SetItemSlot(ItemSlotButton button, IEntity? entity);
         void HoverInSlot(ItemSlotButton button, IEntity? entity, bool fits);
+        event Action<EntitySlotHighlightedEventArgs>? EntityHighlightedUpdated;
+        bool IsHighlighted(EntityUid uid);
+
+        /// <summary>
+        /// Highlight all slot controls that contain the specified entity.
+        /// </summary>
+        /// <param name="uid">The UID of the entity to highlight.</param>
+        /// <seealso cref="UnHighlightEntity"/>
+        void HighlightEntity(EntityUid uid);
+
+        /// <summary>
+        /// Remove highlighting for the specified entity.
+        /// </summary>
+        /// <param name="uid">The UID of the entity to unhighlight.</param>
+        /// <seealso cref="HighlightEntity"/>
+        void UnHighlightEntity(EntityUid uid);
     }
 }
diff --git a/Content.Client/Items/Managers/ItemSlotManager.cs b/Content.Client/Items/Managers/ItemSlotManager.cs
index 5fd3f0fbe0..3435913914 100644
--- a/Content.Client/Items/Managers/ItemSlotManager.cs
+++ b/Content.Client/Items/Managers/ItemSlotManager.cs
@@ -1,8 +1,11 @@
+using System;
+using System.Collections.Generic;
 using Content.Client.Examine;
 using Content.Client.Items.UI;
 using Content.Client.Storage;
 using Content.Client.Verbs;
 using Content.Shared.Cooldown;
+using Content.Shared.Hands.Components;
 using Content.Shared.Input;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
@@ -28,6 +31,11 @@ namespace Content.Client.Items.Managers
         [Dependency] private readonly IEntityManager _entityManager = default!;
         [Dependency] private readonly IEyeManager _eyeManager = default!;
         [Dependency] private readonly IMapManager _mapManager = default!;
+        [Dependency] private readonly IComponentManager _componentManager = default!;
+
+        private readonly HashSet<EntityUid> _highlightEntities = new();
+
+        public event Action<EntitySlotHighlightedEventArgs>? EntityHighlightedUpdated;
 
         public bool SetItemSlot(ItemSlotButton button, IEntity? entity)
         {
@@ -38,13 +46,26 @@ namespace Content.Client.Items.Managers
             }
             else
             {
-                if (!entity.TryGetComponent(out ISpriteComponent? sprite))
+                ISpriteComponent? sprite;
+                if (entity.TryGetComponent(out HandVirtualPullComponent? virtPull)
+                    && _componentManager.TryGetComponent(virtPull.PulledEntity, out ISpriteComponent pulledSprite))
+                {
+                    sprite = pulledSprite;
+                }
+                else if (!entity.TryGetComponent(out sprite))
+                {
                     return false;
+                }
 
                 button.ClearHover();
                 button.SpriteView.Sprite = sprite;
                 button.StorageButton.Visible = entity.HasComponent<ClientStorageComponent>();
             }
+
+            button.Entity = entity?.Uid ?? default;
+
+            // im lazy
+            button.UpdateSlotHighlighted();
             return true;
         }
 
@@ -145,5 +166,38 @@ namespace Content.Client.Items.Managers
 
             button.HoverSpriteView.Sprite = hoverSprite;
         }
+
+        public bool IsHighlighted(EntityUid uid)
+        {
+            return _highlightEntities.Contains(uid);
+        }
+
+        public void HighlightEntity(EntityUid uid)
+        {
+            if (!_highlightEntities.Add(uid))
+                return;
+
+            EntityHighlightedUpdated?.Invoke(new EntitySlotHighlightedEventArgs(uid, true));
+        }
+
+        public void UnHighlightEntity(EntityUid uid)
+        {
+            if (!_highlightEntities.Remove(uid))
+                return;
+
+            EntityHighlightedUpdated?.Invoke(new EntitySlotHighlightedEventArgs(uid, false));
+        }
+    }
+
+    public readonly struct EntitySlotHighlightedEventArgs
+    {
+        public EntitySlotHighlightedEventArgs(EntityUid entity, bool newHighlighted)
+        {
+            Entity = entity;
+            NewHighlighted = newHighlighted;
+        }
+
+        public EntityUid Entity { get; }
+        public bool NewHighlighted { get; }
     }
 }
diff --git a/Content.Client/Items/UI/ItemSlotButton.cs b/Content.Client/Items/UI/ItemSlotButton.cs
index 8ffbdc5cf8..201fa28f5c 100644
--- a/Content.Client/Items/UI/ItemSlotButton.cs
+++ b/Content.Client/Items/UI/ItemSlotButton.cs
@@ -1,18 +1,24 @@
 using System;
 using Content.Client.Cooldown;
+using Content.Client.Items.Managers;
 using Content.Client.Stylesheets;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Input;
+using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 
 namespace Content.Client.Items.UI
 {
-    public class ItemSlotButton : Control
+    public class ItemSlotButton : Control, IEntityEventSubscriber
     {
         private const string HighlightShader = "SelectionOutlineInrange";
 
+        [Dependency] private readonly IItemSlotManager _itemSlotManager = default!;
+
+        public EntityUid Entity { get; set; }
         public TextureRect Button { get; }
         public SpriteView SpriteView { get; }
         public SpriteView HoverSpriteView { get; }
@@ -32,6 +38,8 @@ namespace Content.Client.Items.UI
 
         public ItemSlotButton(Texture texture, Texture storageTexture, string textureName)
         {
+            IoCManager.InjectDependencies(this);
+
             MinSize = (64, 64);
 
             TextureName = textureName;
@@ -101,6 +109,31 @@ namespace Content.Client.Items.UI
             });
         }
 
+        protected override void EnteredTree()
+        {
+            base.EnteredTree();
+
+            _itemSlotManager.EntityHighlightedUpdated += HandleEntitySlotHighlighted;
+            UpdateSlotHighlighted();
+        }
+
+        protected override void ExitedTree()
+        {
+            base.ExitedTree();
+
+            _itemSlotManager.EntityHighlightedUpdated -= HandleEntitySlotHighlighted;
+        }
+
+        private void HandleEntitySlotHighlighted(EntitySlotHighlightedEventArgs entitySlotHighlightedEventArgs)
+        {
+            UpdateSlotHighlighted();
+        }
+
+        public void UpdateSlotHighlighted()
+        {
+            Highlight(_itemSlotManager.IsHighlighted(Entity));
+        }
+
         public void ClearHover()
         {
             if (EntityHover)
diff --git a/Content.Client/Items/UI/ItemStatusPanel.cs b/Content.Client/Items/UI/ItemStatusPanel.cs
index d880d7ea49..d1dbd714c6 100644
--- a/Content.Client/Items/UI/ItemStatusPanel.cs
+++ b/Content.Client/Items/UI/ItemStatusPanel.cs
@@ -8,7 +8,9 @@ using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Maths;
+using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 using static Content.Client.IoC.StaticIoC;
@@ -18,6 +20,8 @@ namespace Content.Client.Items.UI
 {
     public class ItemStatusPanel : Control
     {
+        [Dependency] private readonly IEntityManager _entityManager = default!;
+
         [ViewVariables]
         private readonly List<(IItemStatus, Control)> _activeStatusComponents = new();
 
@@ -33,6 +37,8 @@ namespace Content.Client.Items.UI
 
         public ItemStatusPanel(Texture texture, StyleBox.Margin cutout, StyleBox.Margin flat, Label.AlignMode textAlign)
         {
+            IoCManager.InjectDependencies(this);
+
             var panel = new StyleBoxTexture
             {
                 Texture = texture
@@ -117,6 +123,13 @@ namespace Content.Client.Items.UI
             return new ItemStatusPanel(ResC.GetTexture(texture), cutOut, flat, textAlign);
         }
 
+        protected override void FrameUpdate(FrameEventArgs args)
+        {
+            base.FrameUpdate(args);
+
+            UpdateItemName();
+        }
+
         public void Update(IEntity? entity)
         {
             if (entity == null)
@@ -131,12 +144,29 @@ namespace Content.Client.Items.UI
             {
                 _entity = entity;
                 BuildNewEntityStatus();
-                _itemNameLabel.Text = entity.Name;
+
+                UpdateItemName();
             }
 
             _panel.Visible = true;
         }
 
+        private void UpdateItemName()
+        {
+            if (_entity == null)
+                return;
+
+            if (_entity.TryGetComponent(out HandVirtualPullComponent? virtualPull)
+                && _entityManager.TryGetEntity(virtualPull.PulledEntity, out var pulledEnt))
+            {
+                _itemNameLabel.Text = pulledEnt.Name;
+            }
+            else
+            {
+                _itemNameLabel.Text = _entity.Name;
+            }
+        }
+
         private void ClearOldStatus()
         {
             _statusContents.RemoveAllChildren();
@@ -162,6 +192,14 @@ namespace Content.Client.Items.UI
 
                 _activeStatusComponents.Add((statusComponent, control));
             }
+
+            var collectMsg = new ItemStatusCollectMessage();
+            _entity.EntityManager.EventBus.RaiseLocalEvent(_entity.Uid, collectMsg);
+
+            foreach (var control in collectMsg.Controls)
+            {
+                _statusContents.AddChild(control);
+            }
         }
     }
 }
diff --git a/Content.Client/Kitchen/KitchenSpikeComponent.cs b/Content.Client/Kitchen/Components/KitchenSpikeComponent.cs
similarity index 88%
rename from Content.Client/Kitchen/KitchenSpikeComponent.cs
rename to Content.Client/Kitchen/Components/KitchenSpikeComponent.cs
index efae8b89e6..58f271d63f 100644
--- a/Content.Client/Kitchen/KitchenSpikeComponent.cs
+++ b/Content.Client/Kitchen/Components/KitchenSpikeComponent.cs
@@ -2,7 +2,7 @@ using Content.Shared.DragDrop;
 using Content.Shared.Kitchen.Components;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.Kitchen
+namespace Content.Client.Kitchen.Components
 {
     [RegisterComponent]
     internal sealed class KitchenSpikeComponent : SharedKitchenSpikeComponent
diff --git a/Content.Client/Kitchen/Components/MicrowaveComponent.cs b/Content.Client/Kitchen/Components/MicrowaveComponent.cs
new file mode 100644
index 0000000000..862a8b6de0
--- /dev/null
+++ b/Content.Client/Kitchen/Components/MicrowaveComponent.cs
@@ -0,0 +1,17 @@
+using Content.Shared.Kitchen.Components;
+using Content.Shared.Sound;
+using Robust.Shared.Audio;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Serialization.Manager.Attributes;
+
+namespace Content.Client.Kitchen.Components
+{
+    [RegisterComponent]
+    public class MicrowaveComponent : SharedMicrowaveComponent
+    {
+        public IPlayingAudioStream? PlayingStream { get; set; }
+
+        [DataField("loopingSound")]
+        public SoundSpecifier LoopingSound = new SoundPathSpecifier("/Audio/Machines/microwave_loop.ogg");
+    }
+}
diff --git a/Content.Client/Kitchen/EntitySystems/MicrowaveSystem.cs b/Content.Client/Kitchen/EntitySystems/MicrowaveSystem.cs
new file mode 100644
index 0000000000..6a18a0feac
--- /dev/null
+++ b/Content.Client/Kitchen/EntitySystems/MicrowaveSystem.cs
@@ -0,0 +1,31 @@
+using System;
+using Content.Client.Kitchen.Components;
+using Robust.Shared.Audio;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Player;
+
+namespace Content.Client.Kitchen.EntitySystems
+{
+    public class MicrowaveSystem : EntitySystem
+    {
+        public void StartSoundLoop(MicrowaveComponent microwave)
+        {
+            StopSoundLoop(microwave);
+
+            microwave.PlayingStream = SoundSystem.Play(Filter.Local(), microwave.LoopingSound.GetSound(), microwave.Owner,
+                AudioParams.Default.WithAttenuation(1).WithMaxDistance(5).WithLoop(true));
+        }
+
+        public void StopSoundLoop(MicrowaveComponent microwave)
+        {
+            try
+            {
+                microwave.PlayingStream?.Stop();
+            }
+            catch (Exception _)
+            {
+                // TODO: HOLY SHIT EXPOSE SOME DISPOSED PROPERTY ON PLAYING STREAM OR SOMETHING.
+            }
+        }
+    }
+}
diff --git a/Content.Client/Kitchen/UI/GrinderMenu.xaml b/Content.Client/Kitchen/UI/GrinderMenu.xaml
new file mode 100644
index 0000000000..38fd6ee197
--- /dev/null
+++ b/Content.Client/Kitchen/UI/GrinderMenu.xaml
@@ -0,0 +1,15 @@
+<SS14Window xmlns="https://spacestation14.io"
+            xmlns:ui="clr-namespace:Content.Client.Kitchen.UI"
+            Title="{Loc grinder-menu-title}" MinSize="512 256" SetSize="512 256">
+<BoxContainer Orientation="Horizontal">
+        <BoxContainer Orientation="Vertical" VerticalAlignment="Center">
+            <Button Name="GrindButton" Text="{Loc grinder-menu-grind-button}" TextAlign="Center" MinSize="64 64"/>
+            <Control MinSize="0 16"/>
+            <Button Name="JuiceButton" Text="{Loc grinder-menu-juice-button}" TextAlign="Center" MinSize="64 64"/>
+        </BoxContainer>
+        <Control MinSize="16 0"/>
+        <ui:LabelledContentBox Name="ChamberContentBox" LabelText="{Loc grinder-menu-chamber-content-box-label}" ButtonText="{Loc grinder-menu-chamber-content-box-button}" VerticalExpand="True" HorizontalExpand="True" SizeFlagsStretchRatio="2"/>
+        <Control MinSize="8 0"/>
+        <ui:LabelledContentBox Name="BeakerContentBox" LabelText="{Loc grinder-menu-beaker-content-box-label}" ButtonText="{Loc grinder-menu-beaker-content-box-button}" VerticalExpand="True" HorizontalExpand="True" SizeFlagsStretchRatio="2"/>
+    </BoxContainer>
+</SS14Window>
diff --git a/Content.Client/Kitchen/UI/GrinderMenu.xaml.cs b/Content.Client/Kitchen/UI/GrinderMenu.xaml.cs
new file mode 100644
index 0000000000..2698dab900
--- /dev/null
+++ b/Content.Client/Kitchen/UI/GrinderMenu.xaml.cs
@@ -0,0 +1,131 @@
+using System.Collections.Generic;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Chemistry.Solution;
+using Content.Shared.Kitchen.Components;
+using Robust.Client.AutoGenerated;
+using Robust.Client.GameObjects;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Localization;
+using Robust.Shared.Maths;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client.Kitchen.UI
+{
+    [GenerateTypedNameReferences]
+    public partial class GrinderMenu : SS14Window
+    {
+        private readonly IEntityManager _entityManager;
+        private readonly IPrototypeManager _prototypeManager ;
+        private readonly ReagentGrinderBoundUserInterface _owner;
+
+        private readonly Dictionary<int, EntityUid> _chamberVisualContents = new();
+
+        public GrinderMenu(ReagentGrinderBoundUserInterface owner, IEntityManager entityManager, IPrototypeManager prototypeManager)
+        {
+            RobustXamlLoader.Load(this);
+            _entityManager = entityManager;
+            _prototypeManager = prototypeManager;
+            _owner = owner;
+            GrindButton.OnPressed += owner.StartGrinding;
+            JuiceButton.OnPressed += owner.StartJuicing;
+            ChamberContentBox.EjectButton.OnPressed += owner.EjectAll;
+            BeakerContentBox.EjectButton.OnPressed += owner.EjectBeaker;
+            ChamberContentBox.BoxContents.OnItemSelected += OnChamberBoxContentsItemSelected;
+            BeakerContentBox.BoxContents.SelectMode = ItemList.ItemListSelectMode.None;
+        }
+
+        private void OnChamberBoxContentsItemSelected(ItemList.ItemListSelectedEventArgs args)
+        {
+            _owner.EjectChamberContent(_chamberVisualContents[args.ItemIndex]);
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            base.Dispose(disposing);
+
+            _chamberVisualContents.Clear();
+            GrindButton.OnPressed -= _owner.StartGrinding;
+            JuiceButton.OnPressed -= _owner.StartJuicing;
+            ChamberContentBox.EjectButton.OnPressed -= _owner.EjectAll;
+            BeakerContentBox.EjectButton.OnPressed -= _owner.EjectBeaker;
+            ChamberContentBox.BoxContents.OnItemSelected -= OnChamberBoxContentsItemSelected;
+        }
+
+        public void UpdateState(ReagentGrinderInterfaceState state)
+        {
+            BeakerContentBox.EjectButton.Disabled = !state.HasBeakerIn;
+            ChamberContentBox.EjectButton.Disabled = state.ChamberContents.Length <= 0;
+            GrindButton.Disabled = !state.CanGrind || !state.Powered;
+            JuiceButton.Disabled = !state.CanJuice || !state.Powered;
+            RefreshContentsDisplay(state.ReagentQuantities, state.ChamberContents, state.HasBeakerIn);
+        }
+
+        public void HandleMessage(BoundUserInterfaceMessage message)
+        {
+            switch (message)
+            {
+                case SharedReagentGrinderComponent.ReagentGrinderWorkStartedMessage workStarted:
+                    GrindButton.Disabled = true;
+                    GrindButton.Modulate = workStarted.GrinderProgram == SharedReagentGrinderComponent.GrinderProgram.Grind ? Color.Green : Color.White;
+                    JuiceButton.Disabled = true;
+                    JuiceButton.Modulate = workStarted.GrinderProgram == SharedReagentGrinderComponent.GrinderProgram.Juice ? Color.Green : Color.White;
+                    BeakerContentBox.EjectButton.Disabled = true;
+                    ChamberContentBox.EjectButton.Disabled = true;
+                    break;
+                case SharedReagentGrinderComponent.ReagentGrinderWorkCompleteMessage doneMessage:
+                    GrindButton.Disabled = false;
+                    JuiceButton.Disabled = false;
+                    GrindButton.Modulate = Color.White;
+                    JuiceButton.Modulate = Color.White;
+                    BeakerContentBox.EjectButton.Disabled = false;
+                    ChamberContentBox.EjectButton.Disabled = false;
+                    break;
+            }
+        }
+
+        private void RefreshContentsDisplay(IList<Solution.ReagentQuantity>? reagents, IReadOnlyList<EntityUid> containedSolids, bool isBeakerAttached)
+        {
+            //Refresh chamber contents
+            _chamberVisualContents.Clear();
+
+            ChamberContentBox.BoxContents.Clear();
+            foreach (var uid in containedSolids)
+            {
+                if (!_entityManager.TryGetEntity(uid, out var entity))
+                {
+                    return;
+                }
+                var texture = entity.GetComponent<SpriteComponent>().Icon?.Default;
+
+                var solidItem = ChamberContentBox.BoxContents.AddItem(entity.Name, texture);
+                var solidIndex = ChamberContentBox.BoxContents.IndexOf(solidItem);
+                _chamberVisualContents.Add(solidIndex, uid);
+            }
+
+            //Refresh beaker contents
+            BeakerContentBox.BoxContents.Clear();
+            //if no beaker is attached use this guard to prevent hitting a null reference.
+            if (!isBeakerAttached || reagents == null)
+            {
+                return;
+            }
+
+            //Looks like we have a beaker attached.
+            if (reagents.Count <= 0)
+            {
+                BeakerContentBox.BoxContents.AddItem(Loc.GetString("grinder-menu-beaker-content-box-is-empty"));
+            }
+            else
+            {
+                foreach (var reagent in reagents)
+                {
+                    var reagentName = _prototypeManager.TryIndex(reagent.ReagentId, out ReagentPrototype? proto) ? Loc.GetString($"{reagent.Quantity} {proto.Name}") : "???";
+                    BeakerContentBox.BoxContents.AddItem(reagentName);
+                }
+            }
+        }
+    }
+}
diff --git a/Content.Client/Kitchen/UI/LabelledContentBox.xaml b/Content.Client/Kitchen/UI/LabelledContentBox.xaml
new file mode 100644
index 0000000000..d69e52e2a1
--- /dev/null
+++ b/Content.Client/Kitchen/UI/LabelledContentBox.xaml
@@ -0,0 +1,7 @@
+<customControls:BoxContainer Orientation="Vertical" xmlns:customControls="https://spacestation14.io">
+    <customControls:SplitContainer Orientation="Horizontal">
+        <customControls:Label Name="Label" Align="Center"/>
+        <customControls:Button Name="Button" TextAlign="Center"/>
+    </customControls:SplitContainer>
+    <customControls:ItemList Name="ItemList" VerticalExpand="True" HorizontalExpand="True" SelectMode="Button" SizeFlagsStretchRatio="2" MinSize="100 128"/>
+</customControls:BoxContainer>
diff --git a/Content.Client/Kitchen/UI/LabelledContentBox.xaml.cs b/Content.Client/Kitchen/UI/LabelledContentBox.xaml.cs
new file mode 100644
index 0000000000..b88f8fc4e3
--- /dev/null
+++ b/Content.Client/Kitchen/UI/LabelledContentBox.xaml.cs
@@ -0,0 +1,15 @@
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+
+namespace Content.Client.Kitchen.UI
+{
+    [GenerateTypedNameReferences]
+    public partial class LabelledContentBox : BoxContainer
+    {
+        public string? LabelText { get => Label.Text; set => Label.Text = value; }
+        public string? ButtonText { get => Button.Text; set => Button.Text = value; }
+
+        public ItemList BoxContents => ItemList;
+        public Button EjectButton => Button;
+    }
+}
diff --git a/Content.Client/Kitchen/UI/ReagentGrinderBoundUserInterface.cs b/Content.Client/Kitchen/UI/ReagentGrinderBoundUserInterface.cs
index e33cae9e5e..c0398d7e6e 100644
--- a/Content.Client/Kitchen/UI/ReagentGrinderBoundUserInterface.cs
+++ b/Content.Client/Kitchen/UI/ReagentGrinderBoundUserInterface.cs
@@ -1,17 +1,10 @@
-using System.Collections.Generic;
-using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Kitchen.Components;
 using Robust.Client.GameObjects;
-using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
-using Robust.Shared.Localization;
-using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
 using static Content.Shared.Chemistry.Solution.Solution;
-using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Kitchen.UI
 {
@@ -21,8 +14,6 @@ namespace Content.Client.Kitchen.UI
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
         private GrinderMenu? _menu;
-        private readonly Dictionary<int, EntityUid> _chamberVisualContents = new();
-        private readonly Dictionary<int, ReagentQuantity> _beakerVisualContents = new();
 
         public ReagentGrinderBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) { }
 
@@ -30,22 +21,9 @@ namespace Content.Client.Kitchen.UI
         {
             base.Open();
 
-            _menu = new GrinderMenu(this);
+            _menu = new GrinderMenu(this, _entityManager, _prototypeManager);
             _menu.OpenCentered();
             _menu.OnClose += Close;
-            _menu.GrindButton.OnPressed += args => SendMessage(new SharedReagentGrinderComponent.ReagentGrinderGrindStartMessage());
-            _menu.JuiceButton.OnPressed += args => SendMessage(new SharedReagentGrinderComponent.ReagentGrinderJuiceStartMessage());
-            _menu.ChamberContentBox.EjectButton.OnPressed += args => SendMessage(new SharedReagentGrinderComponent.ReagentGrinderEjectChamberAllMessage());
-            _menu.BeakerContentBox.EjectButton.OnPressed += args => SendMessage(new SharedReagentGrinderComponent.ReagentGrinderEjectBeakerMessage());
-            _menu.ChamberContentBox.BoxContents.OnItemSelected += args =>
-            {
-                SendMessage(new SharedReagentGrinderComponent.ReagentGrinderEjectChamberContentMessage(_chamberVisualContents[args.ItemIndex]));
-            };
-
-            _menu.BeakerContentBox.BoxContents.OnItemSelected += args =>
-            {
-                SendMessage(new SharedReagentGrinderComponent.ReagentGrinderVaporizeReagentIndexedMessage(_beakerVisualContents[args.ItemIndex]));
-            };
         }
 
         protected override void Dispose(bool disposing)
@@ -56,8 +34,6 @@ namespace Content.Client.Kitchen.UI
                 return;
             }
 
-            _chamberVisualContents?.Clear();
-            _beakerVisualContents?.Clear();
             _menu?.Dispose();
         }
 
@@ -69,243 +45,19 @@ namespace Content.Client.Kitchen.UI
                 return;
             }
 
-            if (_menu == null)
-            {
-                return;
-            }
-
-            _menu.BeakerContentBox.EjectButton.Disabled = !cState.HasBeakerIn;
-            _menu.ChamberContentBox.EjectButton.Disabled = cState.ChamberContents.Length <= 0;
-            _menu.GrindButton.Disabled = !cState.CanGrind || !cState.Powered;
-            _menu.JuiceButton.Disabled = !cState.CanJuice || !cState.Powered;
-            RefreshContentsDisplay(cState.ReagentQuantities, cState.ChamberContents, cState.HasBeakerIn);
+            _menu?.UpdateState(cState);
         }
 
         protected override void ReceiveMessage(BoundUserInterfaceMessage message)
         {
             base.ReceiveMessage(message);
-
-            if (_menu == null)
-            {
-                return;
-            }
-
-            switch (message)
-            {
-                case SharedReagentGrinderComponent.ReagentGrinderWorkStartedMessage workStarted:
-                    _menu.GrindButton.Disabled = true;
-                    _menu.GrindButton.Modulate = workStarted.GrinderProgram == SharedReagentGrinderComponent.GrinderProgram.Grind ? Color.Green : Color.White;
-                    _menu.JuiceButton.Disabled = true;
-                    _menu.JuiceButton.Modulate = workStarted.GrinderProgram == SharedReagentGrinderComponent.GrinderProgram.Juice ? Color.Green : Color.White;
-                    _menu.BeakerContentBox.EjectButton.Disabled = true;
-                    _menu.ChamberContentBox.EjectButton.Disabled = true;
-                    break;
-                case SharedReagentGrinderComponent.ReagentGrinderWorkCompleteMessage doneMessage:
-                    _menu.GrindButton.Disabled = false;
-                    _menu.JuiceButton.Disabled = false;
-                    _menu.GrindButton.Modulate = Color.White;
-                    _menu.JuiceButton.Modulate = Color.White;
-                    _menu.BeakerContentBox.EjectButton.Disabled = false;
-                    _menu.ChamberContentBox.EjectButton.Disabled = false;
-                    break;
-            }
+            _menu?.HandleMessage(message);
         }
 
-        private void RefreshContentsDisplay(IList<ReagentQuantity>? reagents, IReadOnlyList<EntityUid> containedSolids, bool isBeakerAttached)
-        {
-            //Refresh chamber contents
-            _chamberVisualContents.Clear();
-
-            if (_menu == null)
-            {
-                return;
-            }
-
-            _menu.ChamberContentBox.BoxContents.Clear();
-            foreach (var uid in containedSolids)
-            {
-                if (!_entityManager.TryGetEntity(uid, out var entity))
-                {
-                    return;
-                }
-                var texture = entity.GetComponent<SpriteComponent>().Icon?.Default;
-
-                var solidItem = _menu.ChamberContentBox.BoxContents.AddItem(entity.Name, texture);
-                var solidIndex = _menu.ChamberContentBox.BoxContents.IndexOf(solidItem);
-                _chamberVisualContents.Add(solidIndex, uid);
-            }
-
-            //Refresh beaker contents
-            _beakerVisualContents.Clear();
-            _menu.BeakerContentBox.BoxContents.Clear();
-            //if no beaker is attached use this guard to prevent hitting a null reference.
-            if (!isBeakerAttached || reagents == null)
-            {
-                return;
-            }
-
-            //Looks like we have a beaker attached.
-            if (reagents.Count <= 0)
-            {
-                _menu.BeakerContentBox.BoxContents.AddItem(Loc.GetString("grinder-menu-beaker-content-box-is-empty"));
-            }
-            else
-            {
-                for (var i = 0; i < reagents.Count; i++)
-                {
-                    var goodIndex = _prototypeManager.TryIndex(reagents[i].ReagentId, out ReagentPrototype? proto);
-                    var reagentName = goodIndex ? Loc.GetString($"{reagents[i].Quantity} {proto!.Name}") : "???";
-                    var reagentAdded = _menu.BeakerContentBox.BoxContents.AddItem(reagentName);
-                    var reagentIndex = _menu.BeakerContentBox.BoxContents.IndexOf(reagentAdded);
-                    _beakerVisualContents.Add(reagentIndex, reagents[i]);
-                }
-            }
-        }
-
-        public class GrinderMenu : SS14Window
-        {
-            /*The contents of the chamber and beaker will both be vertical scroll rectangles.
-             * Will have a vsplit to split the g/j buttons from the contents menu.
-             * |--------------------------------\
-             * |     |  Chamber [E]   Beaker [E] |
-             * | [G] |  |     |       |     |    |
-             * |     |  |     |       |     |    |
-             * |     |  |     |       |     |    |
-             * | [J] |  |-----|       |-----|    |
-             * |     |                           |
-             * \---------------------------------/
-             *
-             */
-
-            private ReagentGrinderBoundUserInterface Owner { get; set; }
-
-            //We'll need 4 buttons, grind, juice, eject beaker, eject the chamber contents.
-            //The other 2 are referenced in the Open function.
-            public Button GrindButton { get; }
-            public Button JuiceButton { get; }
-
-            public LabelledContentBox ChamberContentBox { get; }
-            public LabelledContentBox BeakerContentBox { get; }
-
-            public sealed class LabelledContentBox : VBoxContainer
-            {
-                public string? LabelText { get; set; }
-
-                public ItemList BoxContents { get; set; }
-
-                public Button EjectButton { get; set; }
-
-                private Label _label;
-
-                public LabelledContentBox(string labelText, string buttonText)
-                {
-                    _label = new Label
-                    {
-                        Text = labelText,
-                        Align = Label.AlignMode.Center,
-                    };
-
-                    EjectButton = new Button
-                    {
-                        Text = buttonText,
-                        TextAlign = Label.AlignMode.Center,
-                    };
-
-                    var vSplit = new HSplitContainer
-                    {
-                        Children =
-                        {
-                            _label,
-                            EjectButton
-                        }
-                    };
-
-                    AddChild(vSplit);
-                    BoxContents = new ItemList
-                    {
-                        VerticalExpand = true,
-                        HorizontalExpand = true,
-                        SelectMode = ItemList.ItemListSelectMode.Button,
-                        SizeFlagsStretchRatio = 2,
-                        MinSize = (100, 128)
-                    };
-                    AddChild(BoxContents);
-                }
-            }
-
-            public GrinderMenu(ReagentGrinderBoundUserInterface owner)
-            {
-                SetSize = MinSize = (512, 256);
-                Owner = owner;
-                Title = Loc.GetString("grinder-menu-title");
-
-                var hSplit = new BoxContainer
-                {
-                    Orientation = LayoutOrientation.Horizontal
-                };
-
-                var vBoxGrindJuiceButtonPanel = new BoxContainer
-                {
-                    Orientation = LayoutOrientation.Vertical,
-                    VerticalAlignment = VAlignment.Center
-                };
-
-                GrindButton = new Button
-                {
-                    Text = Loc.GetString("grinder-menu-grind-button"),
-                    TextAlign = Label.AlignMode.Center,
-                    MinSize = (64, 64)
-                };
-
-                JuiceButton = new Button
-                {
-                    Text = Loc.GetString("grinder-menu-juice-button"),
-                    TextAlign = Label.AlignMode.Center,
-                    MinSize = (64, 64)
-                };
-
-                vBoxGrindJuiceButtonPanel.AddChild(GrindButton);
-                //inner button padding
-                vBoxGrindJuiceButtonPanel.AddChild(new Control
-                {
-                    MinSize = (0, 16),
-                });
-                vBoxGrindJuiceButtonPanel.AddChild(JuiceButton);
-
-                ChamberContentBox = new LabelledContentBox(Loc.GetString("grinder-menu-chamber-content-box-label"), Loc.GetString("grinder-menu-chamber-content-box-button"))
-                {
-                    //Modulate = Color.Red,
-                    VerticalExpand = true,
-                    HorizontalExpand = true,
-                    SizeFlagsStretchRatio = 2,
-
-                };
-
-                BeakerContentBox = new LabelledContentBox(Loc.GetString("grinder-menu-beaker-content-box-label"), Loc.GetString("grinder-menu-beaker-content-box-button"))
-                {
-                    //Modulate = Color.Blue,
-                    VerticalExpand = true,
-                    HorizontalExpand = true,
-                    SizeFlagsStretchRatio = 2,
-                };
-
-                hSplit.AddChild(vBoxGrindJuiceButtonPanel);
-
-                //Padding between the g/j buttons panel and the itemlist boxes panel.
-                hSplit.AddChild(new Control
-                {
-                    MinSize = (16, 0),
-                });
-                hSplit.AddChild(ChamberContentBox);
-
-                //Padding between the two itemlists.
-                hSplit.AddChild(new Control
-                {
-                    MinSize = (8, 0),
-                });
-                hSplit.AddChild(BeakerContentBox);
-                Contents.AddChild(hSplit);
-            }
-        }
+        public void StartGrinding(BaseButton.ButtonEventArgs? args = null) => SendMessage(new SharedReagentGrinderComponent.ReagentGrinderGrindStartMessage());
+        public void StartJuicing(BaseButton.ButtonEventArgs? args = null) => SendMessage(new SharedReagentGrinderComponent.ReagentGrinderJuiceStartMessage());
+        public void EjectAll(BaseButton.ButtonEventArgs? args = null) => SendMessage(new SharedReagentGrinderComponent.ReagentGrinderEjectChamberAllMessage());
+        public void EjectBeaker(BaseButton.ButtonEventArgs? args = null) => SendMessage(new SharedReagentGrinderComponent.ReagentGrinderEjectBeakerMessage());
+        public void EjectChamberContent(EntityUid uid) => SendMessage(new SharedReagentGrinderComponent.ReagentGrinderEjectChamberContentMessage(uid));
     }
 }
diff --git a/Content.Client/Kitchen/Visualizers/MicrowaveVisualizer.cs b/Content.Client/Kitchen/Visualizers/MicrowaveVisualizer.cs
index 97d2bf0e7c..c0a3a68e8c 100644
--- a/Content.Client/Kitchen/Visualizers/MicrowaveVisualizer.cs
+++ b/Content.Client/Kitchen/Visualizers/MicrowaveVisualizer.cs
@@ -1,10 +1,10 @@
-using Content.Client.Sound;
+using Content.Client.Kitchen.Components;
+using Content.Client.Kitchen.EntitySystems;
 using Content.Shared.Kitchen.Components;
 using Content.Shared.Power;
-using Content.Shared.Sound;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
-using Robust.Shared.Audio;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Log;
 
 namespace Content.Client.Kitchen.Visualizers
@@ -17,35 +17,33 @@ namespace Content.Client.Kitchen.Visualizers
             base.OnChangeData(component);
             var sprite = component.Owner.GetComponent<ISpriteComponent>();
 
-            var loopingSoundComponent = component.Owner.GetComponentOrNull<LoopingSoundComponent>();
+            var microwaveComponent = component.Owner.GetComponentOrNull<MicrowaveComponent>();
 
             if (!component.TryGetData(PowerDeviceVisuals.VisualState, out MicrowaveVisualState state))
             {
                 state = MicrowaveVisualState.Idle;
             }
+            // The only reason we get the entity system so late is so that tests don't fail... Amazing, huh?
             switch (state)
             {
                 case MicrowaveVisualState.Broken:
                     sprite.LayerSetState(MicrowaveVisualizerLayers.BaseUnlit, "mwb");
-                    loopingSoundComponent?.StopAllSounds();
+                    if(microwaveComponent != null)
+                        EntitySystem.Get<MicrowaveSystem>().StopSoundLoop(microwaveComponent);
                     break;
 
                 case MicrowaveVisualState.Idle:
                     sprite.LayerSetState(MicrowaveVisualizerLayers.Base, "mw");
                     sprite.LayerSetState(MicrowaveVisualizerLayers.BaseUnlit, "mw_unlit");
-                    loopingSoundComponent?.StopAllSounds();
+                    if(microwaveComponent != null)
+                        EntitySystem.Get<MicrowaveSystem>().StopSoundLoop(microwaveComponent);
                     break;
 
                 case MicrowaveVisualState.Cooking:
                     sprite.LayerSetState(MicrowaveVisualizerLayers.Base, "mw");
                     sprite.LayerSetState(MicrowaveVisualizerLayers.BaseUnlit, "mw_running_unlit");
-                    var audioParams = AudioParams.Default;
-                    audioParams.Loop = true;
-                    var scheduledSound = new ScheduledSound();
-                    scheduledSound.Filename = "/Audio/Machines/microwave_loop.ogg";
-                    scheduledSound.AudioParams = audioParams;
-                    loopingSoundComponent?.StopAllSounds();
-                    loopingSoundComponent?.AddScheduledSound(scheduledSound);
+                    if(microwaveComponent != null)
+                        EntitySystem.Get<MicrowaveSystem>().StartSoundLoop(microwaveComponent);
                     break;
 
                 default:
diff --git a/Content.Client/Light/Components/ExpendableLightComponent.cs b/Content.Client/Light/Components/ExpendableLightComponent.cs
index 5531379084..37eb37ee13 100644
--- a/Content.Client/Light/Components/ExpendableLightComponent.cs
+++ b/Content.Client/Light/Components/ExpendableLightComponent.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Light.Component;
+using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 
 namespace Content.Client.Light.Components
@@ -9,6 +10,6 @@ namespace Content.Client.Light.Components
     [RegisterComponent]
     public class ExpendableLightComponent : SharedExpendableLightComponent
     {
-
+        public IPlayingAudioStream? PlayingStream { get; set; }
     }
 }
diff --git a/Content.Client/Light/Visualizers/ExpendableLightVisualizer.cs b/Content.Client/Light/Visualizers/ExpendableLightVisualizer.cs
index 3a21d11b1a..59e11983e8 100644
--- a/Content.Client/Light/Visualizers/ExpendableLightVisualizer.cs
+++ b/Content.Client/Light/Visualizers/ExpendableLightVisualizer.cs
@@ -1,7 +1,10 @@
-using Content.Client.Light.Components;
+using System;
+using Content.Client.Light.Components;
 using Content.Shared.Light.Component;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Shared.Audio;
+using Robust.Shared.Player;
 
 namespace Content.Client.Light.Visualizers
 {
@@ -17,7 +20,7 @@ namespace Content.Client.Light.Visualizers
                 return;
             }
 
-            if (component.TryGetData(ExpendableLightVisuals.State, out string lightBehaviourID))
+            if (component.TryGetData(ExpendableLightVisuals.Behavior, out string lightBehaviourID))
             {
                 if (component.Owner.TryGetComponent<LightBehaviourComponent>(out var lightBehaviour))
                 {
@@ -33,6 +36,35 @@ namespace Content.Client.Light.Visualizers
                     }
                 }
             }
+
+            void TryStopStream(IPlayingAudioStream? stream)
+            {
+                try
+                {
+                    stream?.Stop();
+                }
+                catch (Exception _)
+                {
+                    // TODO: HOLY SHIT EXPOSE SOME DISPOSED PROPERTY ON PLAYING STREAM OR SOMETHING.
+                }
+            }
+
+            if (component.TryGetData(ExpendableLightVisuals.State, out ExpendableLightState state)
+            && component.Owner.TryGetComponent<ExpendableLightComponent>(out var expendableLight))
+            {
+                switch (state)
+                {
+                    case ExpendableLightState.Lit:
+                        TryStopStream(expendableLight.PlayingStream);
+                        expendableLight.PlayingStream = SoundSystem.Play(Filter.Local(), expendableLight.LoopedSound,
+                            expendableLight.Owner, SharedExpendableLightComponent.LoopedSoundParams.WithLoop(true));
+                        break;
+
+                    case ExpendableLightState.Dead:
+                        TryStopStream(expendableLight.PlayingStream);
+                        break;
+                }
+            }
         }
     }
 }
diff --git a/Content.Client/Physics/Controllers/MoverController.cs b/Content.Client/Physics/Controllers/MoverController.cs
index de4e4eb7b3..9b53311e91 100644
--- a/Content.Client/Physics/Controllers/MoverController.cs
+++ b/Content.Client/Physics/Controllers/MoverController.cs
@@ -19,7 +19,18 @@ namespace Content.Client.Physics.Controllers
                 !player.TryGetComponent(out IMoverComponent? mover) ||
                 !player.TryGetComponent(out PhysicsComponent? body)) return;
 
-            body.Predict = true; // TODO: equal prediction instead of true?
+            // Essentially we only want to set our mob to predicted so every other entity we just interpolate
+            // (i.e. only see what the server has sent us).
+            // The exception to this is joints.
+            body.Predict = true;
+
+            // We set joints to predicted given these can affect how our mob moves.
+            // I would only recommend disabling this if you make pulling not use joints anymore (someday maybe?)
+            foreach (var joint in body.Joints)
+            {
+                joint.BodyA.Predict = true;
+                joint.BodyB.Predict = true;
+            }
 
             // Server-side should just be handled on its own so we'll just do this shizznit
             if (player.TryGetComponent(out IMobMoverComponent? mobMover))
diff --git a/Content.Client/Sound/LoopingSoundComponent.cs b/Content.Client/Sound/LoopingSoundComponent.cs
deleted file mode 100644
index cd2d2e2812..0000000000
--- a/Content.Client/Sound/LoopingSoundComponent.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-using System.Collections.Generic;
-using Content.Shared.Physics;
-using Content.Shared.Sound;
-using Robust.Shared.Audio;
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-using Robust.Shared.Network;
-using Robust.Shared.Player;
-using Robust.Shared.Players;
-using Robust.Shared.Random;
-using Robust.Shared.Serialization.Manager.Attributes;
-
-namespace Content.Client.Sound
-{
-    [RegisterComponent]
-    public class LoopingSoundComponent : SharedLoopingSoundComponent
-    {
-        [Dependency] private readonly IRobustRandom _random = default!;
-
-        private readonly Dictionary<ScheduledSound, IPlayingAudioStream> _audioStreams = new();
-
-        [DataField("schedules", true)]
-        private List<ScheduledSound> _scheduledSounds
-        {
-            set => value.ForEach(AddScheduledSound);
-            get => new();
-        }
-
-        public override void StopAllSounds()
-        {
-            foreach (var kvp in _audioStreams)
-            {
-                kvp.Key.Play = false;
-                kvp.Value.Stop();
-            }
-            _audioStreams.Clear();
-        }
-
-        public override void StopScheduledSound(string filename)
-        {
-            foreach (var kvp in _audioStreams)
-            {
-                if (kvp.Key.Filename != filename) continue;
-                kvp.Key.Play = false;
-                kvp.Value.Stop();
-                _audioStreams.Remove(kvp.Key);
-            }
-        }
-
-        public override void AddScheduledSound(ScheduledSound schedule)
-        {
-            Play(schedule);
-        }
-
-        public void Play(ScheduledSound schedule)
-        {
-            if (!schedule.Play) return;
-
-            Owner.SpawnTimer((int) schedule.Delay + (_random.Next((int) schedule.RandomDelay)),() =>
-                {
-                    if (!schedule.Play) return; // We make sure this hasn't changed.
-
-                    if (!_audioStreams.ContainsKey(schedule))
-                    {
-                        _audioStreams.Add(schedule, SoundSystem.Play(Filter.Local(), schedule.Filename, Owner, schedule.AudioParams)!);
-                    }
-                    else
-                    {
-                        _audioStreams[schedule] = SoundSystem.Play(Filter.Local(), schedule.Filename, Owner, schedule.AudioParams)!;
-                    }
-
-                    if (schedule.Times == 0) return;
-
-                    if (schedule.Times > 0) schedule.Times--;
-
-                    Play(schedule);
-                });
-        }
-
-        public override void HandleNetworkMessage(ComponentMessage message, INetChannel channel, ICommonSession? session = null)
-        {
-            base.HandleNetworkMessage(message, channel, session);
-            switch (message)
-            {
-                case ScheduledSoundMessage msg:
-                    AddScheduledSound(msg.Schedule);
-                    break;
-
-                case StopSoundScheduleMessage msg:
-                    StopScheduledSound(msg.Filename);
-                    break;
-
-                case StopAllSoundsMessage _:
-                    StopAllSounds();
-                    break;
-            }
-        }
-
-        protected override void Initialize()
-        {
-            base.Initialize();
-            SoundSystem.OcclusionCollisionMask = (int) CollisionGroup.Impassable;
-        }
-    }
-}
diff --git a/Content.Client/Storage/Visualizers/StorageVisualizer.cs b/Content.Client/Storage/Visualizers/StorageVisualizer.cs
index 7b7aaf28c4..43a8df5684 100644
--- a/Content.Client/Storage/Visualizers/StorageVisualizer.cs
+++ b/Content.Client/Storage/Visualizers/StorageVisualizer.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Storage;
+using Content.Shared.Storage;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
diff --git a/Content.Client/SubFloor/SubFloorShowLayerVisualizer.cs b/Content.Client/SubFloor/SubFloorShowLayerVisualizer.cs
new file mode 100644
index 0000000000..e16e7b22e8
--- /dev/null
+++ b/Content.Client/SubFloor/SubFloorShowLayerVisualizer.cs
@@ -0,0 +1,40 @@
+using Content.Shared.SubFloor;
+using JetBrains.Annotations;
+using Robust.Client.GameObjects;
+
+namespace Content.Client.SubFloor
+{
+    [UsedImplicitly]
+    public class SubFloorShowLayerVisualizer : AppearanceVisualizer
+    {
+        public override void OnChangeData(AppearanceComponent component)
+        {
+            base.OnChangeData(component);
+
+            if (!component.Owner.TryGetComponent(out SpriteComponent? sprite))
+                return;
+
+            if (component.TryGetData(SubFloorVisuals.SubFloor, out bool subfloor))
+            {
+                sprite.Visible = true;
+
+                // Due to the way this visualizer works, you might want to specify it before any other
+                // visualizer that hides/shows layers depending on certain conditions, such as PipeConnectorVisualizer.
+                foreach (var layer in sprite.AllLayers)
+                {
+                    layer.Visible = subfloor;
+                }
+
+                if (sprite.LayerMapTryGet(Layers.FirstLayer, out var firstLayer))
+                {
+                    sprite.LayerSetVisible(firstLayer, true);
+                }
+            }
+        }
+
+        public enum Layers : byte
+        {
+            FirstLayer,
+        }
+    }
+}
diff --git a/Content.Client/UserInterface/ButtonHelpers.cs b/Content.Client/UserInterface/ButtonHelpers.cs
new file mode 100644
index 0000000000..38abc8684c
--- /dev/null
+++ b/Content.Client/UserInterface/ButtonHelpers.cs
@@ -0,0 +1,31 @@
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+
+namespace Content.Client.UserInterface
+{
+    public static class ButtonHelpers
+    {
+        /// <summary>
+        /// This searches recursively through all the children of "parent"
+        /// and sets the Disabled value of any buttons found to "val"
+        /// </summary>
+        /// <param name="parent">The control which childrens get searched</param>
+        /// <param name="val">The value to which disabled gets set</param>
+        public static void SetButtonDisabledRecursive(Control parent, bool val)
+        {
+            foreach (var child in parent.Children)
+            {
+                if (child is Button but)
+                {
+                    but.Disabled = val;
+                    continue;
+                }
+
+                if (child.ChildCount > 0)
+                {
+                    SetButtonDisabledRecursive(child, val);
+                }
+            }
+        }
+    }
+}
diff --git a/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs b/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs
index d793e3c501..0253c71f76 100644
--- a/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs
+++ b/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs
@@ -18,6 +18,7 @@ namespace Content.Client.Weapons.Melee
     {
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IGameTiming _gameTiming = default!;
+        [Dependency] private readonly EffectSystem _effectSystem = default!;
 
         public override void Initialize()
         {
@@ -67,7 +68,6 @@ namespace Content.Client.Weapons.Melee
                     source.TryGetComponent(out ISpriteComponent? sourceSprite) &&
                     sourceSprite.BaseRSI?.Path != null)
                 {
-                    var sys = Get<EffectSystem>();
                     var curTime = _gameTiming.CurTime;
                     var effect = new EffectSystemMessage
                     {
@@ -81,7 +81,8 @@ namespace Content.Client.Weapons.Melee
                         Born = curTime,
                         DeathTime = curTime.Add(TimeSpan.FromMilliseconds(300f)),
                     };
-                    sys.CreateEffect(effect);
+
+                    _effectSystem.CreateEffect(effect);
                 }
             }
 
diff --git a/Content.Client/Weapons/Ranged/RangedWeaponSystem.cs b/Content.Client/Weapons/Ranged/RangedWeaponSystem.cs
index 85de5e4d55..38ffb63802 100644
--- a/Content.Client/Weapons/Ranged/RangedWeaponSystem.cs
+++ b/Content.Client/Weapons/Ranged/RangedWeaponSystem.cs
@@ -24,21 +24,12 @@ namespace Content.Client.Weapons.Ranged
         [Dependency] private readonly IMapManager _mapManager = default!;
         [Dependency] private readonly IInputManager _inputManager = default!;
         [Dependency] private readonly IGameTiming _gameTiming = default!;
+        [Dependency] private readonly InputSystem _inputSystem = default!;
+        [Dependency] private readonly CombatModeSystem _combatModeSystem = default!;
 
-        private InputSystem _inputSystem = default!;
-        private CombatModeSystem _combatModeSystem = default!;
         private bool _blocked;
         private int _shotCounter;
 
-        public override void Initialize()
-        {
-            base.Initialize();
-
-            IoCManager.InjectDependencies(this);
-            _inputSystem = Get<InputSystem>();
-            _combatModeSystem = Get<CombatModeSystem>();
-        }
-
         public override void Update(float frameTime)
         {
             base.Update(frameTime);
diff --git a/Content.IntegrationTests/Tests/Body/LungTest.cs b/Content.IntegrationTests/Tests/Body/LungTest.cs
index 580984374b..d1ac590adf 100644
--- a/Content.IntegrationTests/Tests/Body/LungTest.cs
+++ b/Content.IntegrationTests/Tests/Body/LungTest.cs
@@ -5,7 +5,7 @@ using System.Threading.Tasks;
 using Content.Server.Atmos;
 using Content.Server.Body.Behavior;
 using Content.Server.Body.Circulatory;
-using Content.Server.Metabolism;
+using Content.Server.Body.Respiratory;
 using Content.Shared.Atmos;
 using Content.Shared.Body.Components;
 using NUnit.Framework;
@@ -32,7 +32,7 @@ namespace Content.IntegrationTests.Tests.Body
     template: HumanoidTemplate
     preset: HumanPreset
     centerSlot: torso
-  - type: Metabolism
+  - type: Respirator
     metabolismHeat: 5000
     radiatedHeat: 400
     implicitHeatRegulation: 5000
@@ -148,7 +148,7 @@ namespace Content.IntegrationTests.Tests.Body
 
             MapId mapId;
             IMapGrid grid = null;
-            MetabolismComponent metabolism = null;
+            RespiratorComponent respirator = null;
             IEntity human = null;
 
             var testMapName = "Maps/Test/Breathing/3by3-20oxy-80nit.yml";
@@ -169,8 +169,8 @@ namespace Content.IntegrationTests.Tests.Body
 
                 Assert.True(human.TryGetComponent(out SharedBodyComponent body));
                 Assert.True(body.HasMechanismBehavior<LungBehavior>());
-                Assert.True(human.TryGetComponent(out metabolism));
-                Assert.False(metabolism.Suffocating);
+                Assert.True(human.TryGetComponent(out respirator));
+                Assert.False(respirator.Suffocating);
             });
 
             var increment = 10;
@@ -178,7 +178,7 @@ namespace Content.IntegrationTests.Tests.Body
             for (var tick = 0; tick < 600; tick += increment)
             {
                 await server.WaitRunTicks(increment);
-                Assert.False(metabolism.Suffocating, $"Entity {human.Name} is suffocating on tick {tick}");
+                Assert.False(respirator.Suffocating, $"Entity {human.Name} is suffocating on tick {tick}");
             }
 
             await server.WaitIdleAsync();
diff --git a/Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs b/Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs
new file mode 100644
index 0000000000..9587897442
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs
@@ -0,0 +1,77 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Content.Server.Chemistry.Components;
+using Content.Server.Fluids.Components;
+using Content.Shared.Chemistry.Reaction;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Coordinates;
+using NUnit.Framework;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Map;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+using Robust.Shared.Utility;
+
+namespace Content.IntegrationTests.Tests.Chemistry
+{
+    [TestFixture]
+    [TestOf(typeof(ReactionPrototype))]
+    public class TryAllReactionsTest : ContentIntegrationTest
+    {
+        [Test]
+        public async Task TryAllTest()
+        {
+            var server = StartServerDummyTicker();
+
+            await server.WaitIdleAsync();
+
+            var mapManager = server.ResolveDependency<IMapManager>();
+            var entityManager = server.ResolveDependency<IEntityManager>();
+            var prototypeManager = server.ResolveDependency<IPrototypeManager>();
+
+            foreach (var reactionPrototype in prototypeManager.EnumeratePrototypes<ReactionPrototype>())
+            {
+                //since i have no clue how to isolate each loop assert-wise im just gonna throw this one in for good measure
+                Console.WriteLine($"Testing {reactionPrototype.ID}");
+
+                IEntity beaker;
+                SolutionContainerComponent component = null;
+
+                server.Assert(() =>
+                {
+                    mapManager.CreateNewMapEntity(MapId.Nullspace);
+
+                    beaker = entityManager.SpawnEntity("BluespaceBeaker", MapCoordinates.Nullspace);
+                    Assert.That(beaker.TryGetComponent(out component));
+                    foreach (var (id, reactant) in reactionPrototype.Reactants)
+                    {
+                        Assert.That(component.TryAddReagent(id, reactant.Amount, out var quantity));
+                        Assert.That(reactant.Amount, Is.EqualTo(quantity));
+                    }
+                });
+
+                await server.WaitIdleAsync();
+
+                server.Assert(() =>
+                {
+                    //you just got linq'd fool
+                    //(i'm sorry)
+                    var foundProductsMap = reactionPrototype.Products
+                        .Concat(reactionPrototype.Reactants.Where(x => x.Value.Catalyst).ToDictionary(x => x.Key, x => x.Value.Amount))
+                        .ToDictionary(x => x, x => false);
+                    foreach (var reagent in component.Solution.Contents)
+                    {
+                        Assert.That(foundProductsMap.TryFirstOrNull(x => x.Key.Key == reagent.ReagentId && x.Key.Value == reagent.Quantity, out var foundProduct));
+                        foundProductsMap[foundProduct.Value.Key] = true;
+                    }
+
+                    Assert.That(foundProductsMap.All(x => x.Value));
+                });
+            }
+
+        }
+    }
+
+}
diff --git a/Content.IntegrationTests/Tests/ClickableTest.cs b/Content.IntegrationTests/Tests/ClickableTest.cs
index ed29ec9d5b..7ac1f71eef 100644
--- a/Content.IntegrationTests/Tests/ClickableTest.cs
+++ b/Content.IntegrationTests/Tests/ClickableTest.cs
@@ -1,11 +1,14 @@
 using System;
 using System.Threading.Tasks;
 using Content.Client.Clickable;
+using Content.Server.GameTicking;
 using NUnit.Framework;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
+using Robust.Shared.Maths;
+using Robust.Shared.Timing;
 
 namespace Content.IntegrationTests.Tests
 {
@@ -57,12 +60,19 @@ namespace Content.IntegrationTests.Tests
         [TestCase("ClickTestRotatingCornerInvisibleNoRot", 0.25f, 0.25f, DirSouthEastJustShy, 1, ExpectedResult = true)]
         public async Task<bool> Test(string prototype, float clickPosX, float clickPosY, double angle, float scale)
         {
+            Vector2? worldPos = null;
             EntityUid entity = default;
+            var clientEntManager = _client.ResolveDependency<IEntityManager>();
+            var serverEntManager = _server.ResolveDependency<IEntityManager>();
+            var mapManager = _server.ResolveDependency<IMapManager>();
+            var gameTicker = _server.ResolveDependency<IEntitySystemManager>().GetEntitySystem<GameTicker>();
 
             await _server.WaitPost(() =>
             {
-                var entMgr = IoCManager.Resolve<IEntityManager>();
-                var ent = entMgr.SpawnEntity(prototype, new MapCoordinates(0, 0, new MapId(1)));
+                var gridEnt = mapManager.GetGrid(gameTicker.DefaultGridId).GridEntityId;
+                worldPos = serverEntManager.GetEntity(gridEnt).Transform.WorldPosition;
+
+                var ent = serverEntManager.SpawnEntity(prototype, new EntityCoordinates(gridEnt, 0f, 0f));
                 ent.Transform.LocalRotation = angle;
                 ent.GetComponent<SpriteComponent>().Scale = (scale, scale);
                 entity = ent.Uid;
@@ -75,17 +85,15 @@ namespace Content.IntegrationTests.Tests
 
             await _client.WaitPost(() =>
             {
-                var entMgr = IoCManager.Resolve<IEntityManager>();
-                var ent = entMgr.GetEntity(entity);
+                var ent = clientEntManager.GetEntity(entity);
                 var clickable = ent.GetComponent<ClickableComponent>();
 
-                hit = clickable.CheckClick((clickPosX, clickPosY), out _, out _);
+                hit = clickable.CheckClick((clickPosX, clickPosY) + worldPos!.Value, out _, out _);
             });
 
             await _server.WaitPost(() =>
             {
-                var entMgr = IoCManager.Resolve<IEntityManager>();
-                entMgr.DeleteEntity(entity);
+                serverEntManager.DeleteEntity(entity);
             });
 
             return hit;
diff --git a/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/ActionsComponentTests.cs b/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/ActionsComponentTests.cs
index 497e735a82..82bdf16910 100644
--- a/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/ActionsComponentTests.cs
+++ b/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/ActionsComponentTests.cs
@@ -52,7 +52,6 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
     - type: PointLight
       enabled: false
       radius: 3
-    - type: LoopingSound
     - type: Appearance
       visuals:
         - type: FlashLightVisualizer
diff --git a/Content.IntegrationTests/Tests/Utility/EntitySystemExtensionsTest.cs b/Content.IntegrationTests/Tests/Utility/EntitySystemExtensionsTest.cs
index 08f8a411f5..b810b42e5d 100644
--- a/Content.IntegrationTests/Tests/Utility/EntitySystemExtensionsTest.cs
+++ b/Content.IntegrationTests/Tests/Utility/EntitySystemExtensionsTest.cs
@@ -5,6 +5,7 @@ using Content.Shared.Spawning;
 using NUnit.Framework;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
+using Robust.Shared.Maths;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Broadphase;
 
@@ -44,7 +45,11 @@ namespace Content.IntegrationTests.Tests.Utility
 
             await server.WaitAssertion(() =>
             {
+                var mapId = new MapId(1);
                 var grid = sMapManager.GetGrid(new GridId(1));
+                grid.SetTile(new Vector2i(0, 0), new Tile(1));
+                var gridEnt = sEntityManager.GetEntity(grid.GridEntityId);
+                var gridPos = gridEnt.Transform.WorldPosition;
                 var entityCoordinates = new EntityCoordinates(grid.GridEntityId, 0, 0);
 
                 // Nothing blocking it, only entity is the grid
@@ -52,8 +57,7 @@ namespace Content.IntegrationTests.Tests.Utility
                 Assert.True(sEntityManager.TrySpawnIfUnobstructed(null, entityCoordinates, CollisionGroup.Impassable, out var entity));
                 Assert.NotNull(entity);
 
-                var mapId = new MapId(1);
-                var mapCoordinates = new MapCoordinates(0, 0, mapId);
+                var mapCoordinates = new MapCoordinates(gridPos.X, gridPos.Y, mapId);
 
                 // Nothing blocking it, only entity is the grid
                 Assert.NotNull(sEntityManager.SpawnIfUnobstructed(null, mapCoordinates, CollisionGroup.Impassable));
diff --git a/Content.Server/AI/Pathfinding/Accessible/AiReachableSystem.cs b/Content.Server/AI/Pathfinding/Accessible/AiReachableSystem.cs
index 5f66ec5e2e..64791ce9ff 100644
--- a/Content.Server/AI/Pathfinding/Accessible/AiReachableSystem.cs
+++ b/Content.Server/AI/Pathfinding/Accessible/AiReachableSystem.cs
@@ -37,8 +37,7 @@ namespace Content.Server.AI.Pathfinding.Accessible
          */
         [Dependency] private readonly IMapManager _mapManager = default!;
         [Dependency] private readonly IGameTiming _gameTiming = default!;
-
-        private PathfindingSystem _pathfindingSystem = default!;
+        [Dependency] private readonly PathfindingSystem _pathfindingSystem = default!;
 
         /// <summary>
         /// Queued region updates
@@ -80,7 +79,6 @@ namespace Content.Server.AI.Pathfinding.Accessible
 
         public override void Initialize()
         {
-            _pathfindingSystem = Get<PathfindingSystem>();
             SubscribeLocalEvent<RoundRestartCleanupEvent>(Reset);
             SubscribeLocalEvent<PathfindingChunkUpdateMessage>(RecalculateNodeRegions);
 #if DEBUG
diff --git a/Content.Server/AI/Steering/AiSteeringSystem.cs b/Content.Server/AI/Steering/AiSteeringSystem.cs
index 7db0a97349..b7e1e468c6 100644
--- a/Content.Server/AI/Steering/AiSteeringSystem.cs
+++ b/Content.Server/AI/Steering/AiSteeringSystem.cs
@@ -27,8 +27,7 @@ namespace Content.Server.AI.Steering
         // http://www.red3d.com/cwr/papers/1999/gdc99steer.html for a steering overview
         [Dependency] private readonly IMapManager _mapManager = default!;
         [Dependency] private readonly IPauseManager _pauseManager = default!;
-
-        private PathfindingSystem _pathfindingSystem = default!;
+        [Dependency] private readonly PathfindingSystem _pathfindingSystem = default!;
 
         /// <summary>
         /// Whether we try to avoid non-blocking physics objects
@@ -87,7 +86,6 @@ namespace Content.Server.AI.Steering
         public override void Initialize()
         {
             base.Initialize();
-            _pathfindingSystem = Get<PathfindingSystem>();
 
             for (var i = 0; i < AgentListCount; i++)
             {
diff --git a/Content.Server/Atmos/Commands/AddAtmosCommand.cs b/Content.Server/Atmos/Commands/AddAtmosCommand.cs
index 4759998b1a..69c85997f5 100644
--- a/Content.Server/Atmos/Commands/AddAtmosCommand.cs
+++ b/Content.Server/Atmos/Commands/AddAtmosCommand.cs
@@ -47,7 +47,7 @@ namespace Content.Server.Atmos.Commands
                 return;
             }
 
-            if (grid.HasComponent<IGridAtmosphereComponent>())
+            if (grid.HasComponent<IAtmosphereComponent>())
             {
                 shell.WriteLine("Grid already has an atmosphere.");
                 return;
diff --git a/Content.Server/Atmos/Commands/AddUnsimulatedAtmosCommand.cs b/Content.Server/Atmos/Commands/AddUnsimulatedAtmosCommand.cs
index 67541a5361..5fb659cc59 100644
--- a/Content.Server/Atmos/Commands/AddUnsimulatedAtmosCommand.cs
+++ b/Content.Server/Atmos/Commands/AddUnsimulatedAtmosCommand.cs
@@ -47,7 +47,7 @@ namespace Content.Server.Atmos.Commands
                 return;
             }
 
-            if (grid.HasComponent<IGridAtmosphereComponent>())
+            if (grid.HasComponent<IAtmosphereComponent>())
             {
                 shell.WriteLine("Grid already has an atmosphere.");
                 return;
diff --git a/Content.Server/Atmos/Components/AtmosExposedComponent.cs b/Content.Server/Atmos/Components/AtmosExposedComponent.cs
index e742458f10..9be43d8067 100644
--- a/Content.Server/Atmos/Components/AtmosExposedComponent.cs
+++ b/Content.Server/Atmos/Components/AtmosExposedComponent.cs
@@ -23,23 +23,20 @@ namespace Content.Server.Atmos.Components
         [ViewVariables]
         [ComponentDependency] private readonly FlammableComponent? _flammableComponent = null;
 
-        public void Update(TileAtmosphere tile, float frameDelta, AtmosphereSystem atmosphereSystem)
+        public void Update(GasMixture air, float frameDelta, AtmosphereSystem atmosphereSystem)
         {
             if (_temperatureComponent != null)
             {
-                if (tile.Air != null)
-                {
-                    var temperatureDelta = tile.Air.Temperature - _temperatureComponent.CurrentTemperature;
-                    var tileHeatCapacity = atmosphereSystem.GetHeatCapacity(tile.Air);
-                    var heat = temperatureDelta * (tileHeatCapacity * _temperatureComponent.HeatCapacity / (tileHeatCapacity + _temperatureComponent.HeatCapacity));
-                    _temperatureComponent.ReceiveHeat(heat);
-                }
+                var temperatureDelta = air.Temperature - _temperatureComponent.CurrentTemperature;
+                var tileHeatCapacity = atmosphereSystem.GetHeatCapacity(air);
+                var heat = temperatureDelta * (tileHeatCapacity * _temperatureComponent.HeatCapacity / (tileHeatCapacity + _temperatureComponent.HeatCapacity));
+                _temperatureComponent.ReceiveHeat(heat);
                 _temperatureComponent.Update();
             }
 
-            _barotraumaComponent?.Update(tile.Air?.Pressure ?? 0);
+            _barotraumaComponent?.Update(air.Pressure);
 
-            _flammableComponent?.Update(tile);
+            _flammableComponent?.Update(air);
         }
     }
 }
diff --git a/Content.Server/Atmos/Components/FlammableComponent.cs b/Content.Server/Atmos/Components/FlammableComponent.cs
index 99aa2402f8..3cccaba238 100644
--- a/Content.Server/Atmos/Components/FlammableComponent.cs
+++ b/Content.Server/Atmos/Components/FlammableComponent.cs
@@ -63,7 +63,7 @@ namespace Content.Server.Atmos.Components
             UpdateAppearance();
         }
 
-        public void Update(TileAtmosphere tile)
+        public void Update(GasMixture air)
         {
             // Slowly dry ourselves off if wet.
             if (FireStacks < 0)
@@ -104,13 +104,13 @@ namespace Content.Server.Atmos.Components
             }
 
             // If we're in an oxygenless environment, put the fire out.
-            if (tile.Air?.GetMoles(Gas.Oxygen) < 1f)
+            if (air.GetMoles(Gas.Oxygen) < 1f)
             {
                 Extinguish();
                 return;
             }
 
-            EntitySystem.Get<AtmosphereSystem>().HotspotExpose(tile.GridIndex, tile.GridIndices, 700f, 50f, true);
+            EntitySystem.Get<AtmosphereSystem>().HotspotExpose(Owner.Transform.Coordinates, 700f, 50f, true);
 
             var physics = Owner.GetComponent<IPhysBody>();
 
diff --git a/Content.Server/Atmos/Components/GasTankComponent.cs b/Content.Server/Atmos/Components/GasTankComponent.cs
index 2d0f7105b8..c8fdcb815e 100644
--- a/Content.Server/Atmos/Components/GasTankComponent.cs
+++ b/Content.Server/Atmos/Components/GasTankComponent.cs
@@ -1,4 +1,3 @@
-#nullable disable warnings
 using System;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Body.Respiratory;
diff --git a/Content.Server/Atmos/Components/GridAtmosphereComponent.cs b/Content.Server/Atmos/Components/GridAtmosphereComponent.cs
index 53670f8d05..76840c37c2 100644
--- a/Content.Server/Atmos/Components/GridAtmosphereComponent.cs
+++ b/Content.Server/Atmos/Components/GridAtmosphereComponent.cs
@@ -14,13 +14,14 @@ using Dependency = Robust.Shared.IoC.DependencyAttribute;
 namespace Content.Server.Atmos.Components
 {
     /// <summary>
-    ///     This is our SSAir equivalent.
+    ///     Internal Atmos class. Use <see cref="AtmosphereSystem"/> to interact with atmos instead.
     /// </summary>
-    [ComponentReference(typeof(IGridAtmosphereComponent))]
+    [ComponentReference(typeof(IAtmosphereComponent))]
     [RegisterComponent, Serializable]
-    public class GridAtmosphereComponent : Component, IGridAtmosphereComponent, ISerializationHooks
+    public class GridAtmosphereComponent : Component, IAtmosphereComponent, ISerializationHooks
     {
         public override string Name => "GridAtmosphere";
+
         public virtual bool Simulated => true;
 
         [ViewVariables]
diff --git a/Content.Server/Atmos/Components/IGridAtmosphereComponent.cs b/Content.Server/Atmos/Components/IAtmosphereComponent.cs
similarity index 79%
rename from Content.Server/Atmos/Components/IGridAtmosphereComponent.cs
rename to Content.Server/Atmos/Components/IAtmosphereComponent.cs
index 11b953b2fa..8e9bfb8abb 100644
--- a/Content.Server/Atmos/Components/IGridAtmosphereComponent.cs
+++ b/Content.Server/Atmos/Components/IAtmosphereComponent.cs
@@ -2,7 +2,7 @@
 
 namespace Content.Server.Atmos.Components
 {
-    public interface IGridAtmosphereComponent : IComponent
+    public interface IAtmosphereComponent : IComponent
     {
         /// <summary>
         ///     Whether this atmosphere is simulated or not.
diff --git a/Content.Server/Atmos/Components/SpaceAtmosphereComponent.cs b/Content.Server/Atmos/Components/SpaceAtmosphereComponent.cs
new file mode 100644
index 0000000000..3d42d24762
--- /dev/null
+++ b/Content.Server/Atmos/Components/SpaceAtmosphereComponent.cs
@@ -0,0 +1,13 @@
+using Robust.Shared.GameObjects;
+
+namespace Content.Server.Atmos.Components
+{
+    [RegisterComponent]
+    [ComponentReference(typeof(IAtmosphereComponent))]
+    public class SpaceAtmosphereComponent : Component, IAtmosphereComponent
+    {
+        public override string Name => "SpaceAtmosphere";
+
+        public bool Simulated => false;
+    }
+}
diff --git a/Content.Server/Atmos/Components/SpaceGridAtmosphereComponent.cs b/Content.Server/Atmos/Components/SpaceGridAtmosphereComponent.cs
deleted file mode 100644
index 6fa75f774d..0000000000
--- a/Content.Server/Atmos/Components/SpaceGridAtmosphereComponent.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using Content.Shared.Atmos;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Map;
-using Robust.Shared.Maths;
-
-namespace Content.Server.Atmos.Components
-{
-    [RegisterComponent]
-    [ComponentReference(typeof(IGridAtmosphereComponent))]
-    public class SpaceGridAtmosphereComponent : UnsimulatedGridAtmosphereComponent
-    {
-        public override string Name => "SpaceGridAtmosphere";
-    }
-}
diff --git a/Content.Server/Atmos/Components/UnsimulatedGridAtmosphereComponent.cs b/Content.Server/Atmos/Components/UnsimulatedGridAtmosphereComponent.cs
index 806164e6c1..a01d98c1da 100644
--- a/Content.Server/Atmos/Components/UnsimulatedGridAtmosphereComponent.cs
+++ b/Content.Server/Atmos/Components/UnsimulatedGridAtmosphereComponent.cs
@@ -8,10 +8,9 @@ using Robust.Shared.Maths;
 namespace Content.Server.Atmos.Components
 {
     [RegisterComponent]
-    [ComponentReference(typeof(IGridAtmosphereComponent))]
-    [ComponentReference(typeof(GridAtmosphereComponent))]
+    [ComponentReference(typeof(IAtmosphereComponent))]
     [Serializable]
-    public class UnsimulatedGridAtmosphereComponent : GridAtmosphereComponent, IGridAtmosphereComponent
+    public class UnsimulatedGridAtmosphereComponent : GridAtmosphereComponent
     {
         public override string Name => "UnsimulatedGridAtmosphere";
 
diff --git a/Content.Server/Atmos/EntitySystems/AirtightSystem.cs b/Content.Server/Atmos/EntitySystems/AirtightSystem.cs
index a1fea661a1..b3b0d4dd5a 100644
--- a/Content.Server/Atmos/EntitySystems/AirtightSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/AirtightSystem.cs
@@ -12,6 +12,7 @@ namespace Content.Server.Atmos.EntitySystems
     public class AirtightSystem : EntitySystem
     {
         [Dependency] private readonly IMapManager _mapManager = default!;
+        [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
 
         public override void Initialize()
         {
@@ -42,7 +43,7 @@ namespace Content.Server.Atmos.EntitySystems
 
             if (airtight.FixVacuum)
             {
-                Get<AtmosphereSystem>().FixVacuum(airtight.LastPosition.Item1, airtight.LastPosition.Item2);
+                _atmosphereSystem.FixVacuum(airtight.LastPosition.Item1, airtight.LastPosition.Item2);
             }
         }
 
@@ -93,9 +94,8 @@ namespace Content.Server.Atmos.EntitySystems
             if (!gridId.IsValid())
                 return;
 
-            var atmosphereSystem = Get<AtmosphereSystem>();
-            atmosphereSystem.UpdateAdjacent(gridId, pos);
-            atmosphereSystem.InvalidateTile(gridId, pos);
+            _atmosphereSystem.UpdateAdjacent(gridId, pos);
+            _atmosphereSystem.InvalidateTile(gridId, pos);
         }
 
         private AtmosDirection Rotate(AtmosDirection myDirection, Angle myAngle)
diff --git a/Content.Server/Atmos/EntitySystems/AtmosDebugOverlaySystem.cs b/Content.Server/Atmos/EntitySystems/AtmosDebugOverlaySystem.cs
index 87a9bc0952..d28ac4324f 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosDebugOverlaySystem.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosDebugOverlaySystem.cs
@@ -21,6 +21,7 @@ namespace Content.Server.Atmos.EntitySystems
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IMapManager _mapManager = default!;
         [Dependency] private readonly IConfigurationManager _configManager = default!;
+        [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
 
         /// <summary>
         ///     Players allowed to see the atmos debug overlay.
@@ -127,7 +128,6 @@ namespace Content.Server.Atmos.EntitySystems
             AccumulatedFrameTime -= _updateCooldown;
 
             var currentTick = _gameTiming.CurTick;
-            var atmosphereSystem = Get<AtmosphereSystem>();
 
             // Now we'll go through each player, then through each chunk in range of that player checking if the player is still in range
             // If they are, check if they need the new data to send (i.e. if there's an overlay for the gas).
@@ -157,7 +157,7 @@ namespace Content.Server.Atmos.EntitySystems
                         for (var x = 0; x < LocalViewRange; x++)
                         {
                             var Vector2i = new Vector2i(baseTile.X + x, baseTile.Y + y);
-                            debugOverlayContent[index++] = ConvertTileToData(atmosphereSystem.GetTileAtmosphereOrCreateSpace(grid, gam, Vector2i));
+                            debugOverlayContent[index++] = ConvertTileToData(_atmosphereSystem.GetTileAtmosphereOrCreateSpace(grid, gam, Vector2i));
                         }
                     }
 
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.CVars.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.CVars.cs
index 4693761b33..df9fbd7c1e 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.CVars.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.CVars.cs
@@ -15,6 +15,7 @@ namespace Content.Server.Atmos.EntitySystems
         public bool MonstermosRipTiles { get; private set; }
         public bool GridImpulse { get; private set; }
         public bool Superconduction { get; private set; }
+        public bool ExcitedGroups { get; private set; }
         public bool ExcitedGroupsSpaceIsAllConsuming { get; private set; }
         public float AtmosMaxProcessTime { get; private set; }
         public float AtmosTickRate { get; private set; }
@@ -31,6 +32,7 @@ namespace Content.Server.Atmos.EntitySystems
             _cfg.OnValueChanged(CCVars.Superconduction, value => Superconduction = value, true);
             _cfg.OnValueChanged(CCVars.AtmosMaxProcessTime, value => AtmosMaxProcessTime = value, true);
             _cfg.OnValueChanged(CCVars.AtmosTickRate, value => AtmosTickRate = value, true);
+            _cfg.OnValueChanged(CCVars.ExcitedGroups, value => ExcitedGroups = value, true);
             _cfg.OnValueChanged(CCVars.ExcitedGroupsSpaceIsAllConsuming, value => ExcitedGroupsSpaceIsAllConsuming = value, true);
         }
     }
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Gases.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Gases.cs
index ba11dd0740..16469a0a58 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Gases.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Gases.cs
@@ -42,13 +42,6 @@ namespace Content.Server.Atmos.EntitySystems
             return MathF.Max(NumericsHelpers.HorizontalAdd(tmp), Atmospherics.MinimumHeatCapacity);
         }
 
-        public float GetHeatCapacityArchived(GasMixture mixture)
-        {
-            Span<float> tmp = stackalloc float[mixture.Moles.Length];
-            NumericsHelpers.Multiply(mixture.MolesArchived, GasSpecificHeats, tmp);
-            return MathF.Max(NumericsHelpers.HorizontalAdd(tmp), Atmospherics.MinimumHeatCapacity);
-        }
-
         public float GetThermalEnergy(GasMixture mixture)
         {
             return mixture.Temperature * GetHeatCapacity(mixture);
@@ -79,7 +72,7 @@ namespace Content.Server.Atmos.EntitySystems
 
         public float Share(GasMixture receiver, GasMixture sharer, int atmosAdjacentTurfs)
         {
-            var temperatureDelta = receiver.TemperatureArchived - sharer.TemperatureArchived;
+            var temperatureDelta = receiver.Temperature - sharer.Temperature;
             var absTemperatureDelta = Math.Abs(temperatureDelta);
             var oldHeatCapacity = 0f;
             var oldSharerHeatCapacity = 0f;
@@ -130,12 +123,12 @@ namespace Content.Server.Atmos.EntitySystems
                 // Transfer of thermal energy (via changed heat capacity) between self and sharer.
                 if (!receiver.Immutable && newHeatCapacity > Atmospherics.MinimumHeatCapacity)
                 {
-                    receiver.Temperature = ((oldHeatCapacity * receiver.Temperature) - (heatCapacityToSharer * receiver.TemperatureArchived) + (heatCapacitySharerToThis * sharer.TemperatureArchived)) / newHeatCapacity;
+                    receiver.Temperature = ((oldHeatCapacity * receiver.Temperature) - (heatCapacityToSharer * receiver.Temperature) + (heatCapacitySharerToThis * sharer.Temperature)) / newHeatCapacity;
                 }
 
                 if (!sharer.Immutable && newSharerHeatCapacity > Atmospherics.MinimumHeatCapacity)
                 {
-                    sharer.Temperature = ((oldSharerHeatCapacity * sharer.Temperature) - (heatCapacitySharerToThis * sharer.TemperatureArchived) + (heatCapacityToSharer*receiver.TemperatureArchived)) / newSharerHeatCapacity;
+                    sharer.Temperature = ((oldSharerHeatCapacity * sharer.Temperature) - (heatCapacitySharerToThis * sharer.Temperature) + (heatCapacityToSharer*receiver.Temperature)) / newSharerHeatCapacity;
                 }
 
                 // Thermal energy of the system (self and sharer) is unchanged.
@@ -154,17 +147,17 @@ namespace Content.Server.Atmos.EntitySystems
             var moles = receiver.TotalMoles;
             var theirMoles = sharer.TotalMoles;
 
-            return (receiver.TemperatureArchived * (moles + movedMoles)) - (sharer.TemperatureArchived * (theirMoles - movedMoles)) * Atmospherics.R / receiver.Volume;
+            return (receiver.Temperature * (moles + movedMoles)) - (sharer.Temperature * (theirMoles - movedMoles)) * Atmospherics.R / receiver.Volume;
 
         }
 
         public float TemperatureShare(GasMixture receiver, GasMixture sharer, float conductionCoefficient)
         {
-            var temperatureDelta = receiver.TemperatureArchived - sharer.TemperatureArchived;
+            var temperatureDelta = receiver.Temperature - sharer.Temperature;
             if (MathF.Abs(temperatureDelta) > Atmospherics.MinimumTemperatureDeltaToConsider)
             {
-                var heatCapacity = GetHeatCapacityArchived(receiver);
-                var sharerHeatCapacity = GetHeatCapacityArchived(sharer);
+                var heatCapacity = GetHeatCapacity(receiver);
+                var sharerHeatCapacity = GetHeatCapacity(sharer);
 
                 if (sharerHeatCapacity > Atmospherics.MinimumHeatCapacity && heatCapacity > Atmospherics.MinimumHeatCapacity)
                 {
@@ -183,10 +176,10 @@ namespace Content.Server.Atmos.EntitySystems
 
         public float TemperatureShare(GasMixture receiver, float conductionCoefficient, float sharerTemperature, float sharerHeatCapacity)
         {
-            var temperatureDelta = receiver.TemperatureArchived - sharerTemperature;
+            var temperatureDelta = receiver.Temperature - sharerTemperature;
             if (MathF.Abs(temperatureDelta) > Atmospherics.MinimumTemperatureDeltaToConsider)
             {
-                var heatCapacity = GetHeatCapacityArchived(receiver);
+                var heatCapacity = GetHeatCapacity(receiver);
 
                 if (sharerHeatCapacity > Atmospherics.MinimumHeatCapacity && heatCapacity > Atmospherics.MinimumHeatCapacity)
                 {
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Grid.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Grid.cs
index 41424c990a..35e06f437d 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Grid.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Grid.cs
@@ -23,13 +23,10 @@ namespace Content.Server.Atmos.EntitySystems
     public partial class AtmosphereSystem
     {
         [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!;
-
-        private GasTileOverlaySystem _gasTileOverlaySystem = default!;
+        [Dependency] private readonly GasTileOverlaySystem _gasTileOverlaySystem = default!;
 
         private void InitializeGrid()
         {
-            _gasTileOverlaySystem = Get<GasTileOverlaySystem>();
-
             SubscribeLocalEvent<GridAtmosphereComponent, ComponentInit>(OnGridAtmosphereInit);
         }
 
@@ -120,6 +117,10 @@ namespace Content.Server.Atmos.EntitySystems
         /// <returns>All tile mixtures in a grid.</returns>
         public IEnumerable<GasMixture> GetAllTileMixtures(GridId grid, bool invalidate = false)
         {
+            // Return an array with a single space gas mixture for invalid grids.
+            if (!grid.IsValid())
+                return new []{ GasMixture.SpaceGas };
+
             if (!_mapManager.TryGetGrid(grid, out var mapGrid))
                 return Enumerable.Empty<GasMixture>();
 
@@ -669,7 +670,7 @@ namespace Content.Server.Atmos.EntitySystems
         public GasMixture? GetTileMixture(EntityCoordinates coordinates, bool invalidate = false)
         {
             return TryGetGridAndTile(coordinates, out var tuple)
-                ? GetTileMixture(tuple.Value.Grid, tuple.Value.Tile, invalidate) : null;
+                ? GetTileMixture(tuple.Value.Grid, tuple.Value.Tile, invalidate) : GasMixture.SpaceGas;
         }
 
         /// <summary>
@@ -681,6 +682,10 @@ namespace Content.Server.Atmos.EntitySystems
         /// <returns>The tile mixture, or null</returns>
         public GasMixture? GetTileMixture(GridId grid, Vector2i tile, bool invalidate = false)
         {
+            // Always return space gas mixtures for invalid grids (grid 0)
+            if (!grid.IsValid())
+                return GasMixture.SpaceGas;
+
             if (!_mapManager.TryGetGrid(grid, out var mapGrid))
                 return null;
 
@@ -689,7 +694,7 @@ namespace Content.Server.Atmos.EntitySystems
                 return GetTileMixture(gridAtmosphere, tile, invalidate);
             }
 
-            if (ComponentManager.TryGetComponent(mapGrid.GridEntityId, out SpaceGridAtmosphereComponent? spaceAtmosphere))
+            if (ComponentManager.TryGetComponent(mapGrid.GridEntityId, out SpaceAtmosphereComponent? _))
             {
                 // Always return a new space gas mixture in this case.
                 return GasMixture.SpaceGas;
@@ -970,6 +975,10 @@ namespace Content.Server.Atmos.EntitySystems
         /// <returns>All adjacent tile gas mixtures to the tile in question</returns>
         public IEnumerable<GasMixture> GetAdjacentTileMixtures(GridId grid, Vector2i tile, bool includeBlocked = false, bool invalidate = false)
         {
+            // For invalid grids, return an array with a single space gas mixture in it.
+            if (!grid.IsValid())
+                return new []{ GasMixture.SpaceGas };
+
             if (!_mapManager.TryGetGrid(grid, out var mapGrid))
                 return Enumerable.Empty<GasMixture>();
 
@@ -1377,7 +1386,7 @@ namespace Content.Server.Atmos.EntitySystems
                 return false;
 
             if (ComponentManager.TryGetComponent(mapGrid.GridEntityId, out GridAtmosphereComponent? gridAtmosphere)
-            && gridAtmosphere.AtmosDevices.Contains(atmosDevice))
+                && gridAtmosphere.AtmosDevices.Contains(atmosDevice))
             {
                 atmosDevice.JoinedGrid = null;
                 gridAtmosphere.AtmosDevices.Remove(atmosDevice);
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Hotspot.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Hotspot.cs
index 03052e17df..445984d021 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Hotspot.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Hotspot.cs
@@ -1,11 +1,8 @@
-#nullable disable warnings
-#nullable enable annotations
 using Content.Server.Atmos.Components;
 using Content.Server.Atmos.Reactions;
 using Content.Server.Coordinates.Helpers;
 using Content.Shared.Atmos;
 using Content.Shared.Maps;
-using Robust.Shared.Map;
 
 namespace Content.Server.Atmos.EntitySystems
 {
@@ -140,7 +137,7 @@ namespace Content.Server.Atmos.EntitySystems
                 Merge(tile.Air, affected);
             }
 
-            var tileRef = tile.GridIndices.GetTileRef(tile.GridIndex);
+            var tileRef = tile.GridIndices.GetTileRef(tile.GridIndex, _mapManager);
 
             foreach (var entity in tileRef.GetEntitiesInTileFast())
             {
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.LINDA.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.LINDA.cs
index 93b73458b1..52f4e926f4 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.LINDA.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.LINDA.cs
@@ -1,5 +1,3 @@
-#nullable disable warnings
-#nullable enable annotations
 using Content.Server.Atmos.Components;
 using Content.Shared.Atmos;
 
@@ -16,9 +14,6 @@ namespace Content.Server.Atmos.EntitySystems
                 return;
             }
 
-            if (tile.ArchivedCycle < fireCount)
-                Archive(tile, fireCount);
-
             tile.CurrentCycle = fireCount;
             var adjacentTileLength = 0;
 
@@ -38,11 +33,10 @@ namespace Content.Server.Atmos.EntitySystems
                 // If the tile is null or has no air, we don't do anything for it.
                 if(enemyTile?.Air == null) continue;
                 if (fireCount <= enemyTile.CurrentCycle) continue;
-                Archive(enemyTile, fireCount);
 
                 var shouldShareAir = false;
 
-                if (tile.ExcitedGroup != null && enemyTile.ExcitedGroup != null)
+                if (ExcitedGroups && tile.ExcitedGroup != null && enemyTile.ExcitedGroup != null)
                 {
                     if (tile.ExcitedGroup != enemyTile.ExcitedGroup)
                     {
@@ -57,21 +51,24 @@ namespace Content.Server.Atmos.EntitySystems
                         AddActiveTile(gridAtmosphere, enemyTile);
                     }
 
-                    var excitedGroup = tile.ExcitedGroup;
-                    excitedGroup ??= enemyTile.ExcitedGroup;
-
-                    if (excitedGroup == null)
+                    if (ExcitedGroups)
                     {
-                        excitedGroup = new ExcitedGroup();
-                        gridAtmosphere.ExcitedGroups.Add(excitedGroup);
+                        var excitedGroup = tile.ExcitedGroup;
+                        excitedGroup ??= enemyTile.ExcitedGroup;
+
+                        if (excitedGroup == null)
+                        {
+                            excitedGroup = new ExcitedGroup();
+                            gridAtmosphere.ExcitedGroups.Add(excitedGroup);
+                        }
+
+                        if (tile.ExcitedGroup == null)
+                            ExcitedGroupAddTile(excitedGroup, tile);
+
+                        if(enemyTile.ExcitedGroup == null)
+                            ExcitedGroupAddTile(excitedGroup, enemyTile);
                     }
 
-                    if (tile.ExcitedGroup == null)
-                        ExcitedGroupAddTile(excitedGroup, tile);
-
-                    if(enemyTile.ExcitedGroup == null)
-                        ExcitedGroupAddTile(excitedGroup, enemyTile);
-
                     shouldShareAir = true;
                 }
 
@@ -106,17 +103,10 @@ namespace Content.Server.Atmos.EntitySystems
                 if (ConsiderSuperconductivity(gridAtmosphere, tile, true))
                     remove = false;
 
-            if(tile.ExcitedGroup == null && remove)
+            if(ExcitedGroups && tile.ExcitedGroup == null && remove)
                 RemoveActiveTile(gridAtmosphere, tile);
         }
 
-        private void Archive(TileAtmosphere tile, int fireCount)
-        {
-            tile.Air?.Archive();
-            tile.ArchivedCycle = fireCount;
-            tile.TemperatureArchived = tile.Temperature;
-        }
-
         private void LastShareCheck(TileAtmosphere tile)
         {
             if (tile.Air == null || tile.ExcitedGroup == null)
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Monstermos.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Monstermos.cs
index 30b4df6473..6f4ed1bd48 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Monstermos.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Monstermos.cs
@@ -1,16 +1,14 @@
-#nullable disable warnings
-#nullable enable annotations
 using System;
-using System.Buffers;
 using System.Collections.Generic;
 using Content.Server.Atmos.Components;
-using Content.Server.Coordinates.Helpers;
+using Content.Server.Doors.Components;
 using Content.Shared.Atmos;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Random;
+using Robust.Shared.Utility;
 
 namespace Content.Server.Atmos.EntitySystems
 {
@@ -20,7 +18,7 @@ namespace Content.Server.Atmos.EntitySystems
 
         private readonly TileAtmosphereComparer _monstermosComparer = new();
 
-        private readonly TileAtmosphere[] _equalizeTiles = new TileAtmosphere[Atmospherics.MonstermosHardTileLimit];
+        private readonly TileAtmosphere?[] _equalizeTiles = new TileAtmosphere[Atmospherics.MonstermosHardTileLimit];
         private readonly TileAtmosphere[] _equalizeGiverTiles = new TileAtmosphere[Atmospherics.MonstermosTileLimit];
         private readonly TileAtmosphere[] _equalizeTakerTiles = new TileAtmosphere[Atmospherics.MonstermosTileLimit];
         private readonly TileAtmosphere[] _equalizeQueue = new TileAtmosphere[Atmospherics.MonstermosTileLimit];
@@ -28,7 +26,7 @@ namespace Content.Server.Atmos.EntitySystems
         private readonly TileAtmosphere[] _depressurizeSpaceTiles = new TileAtmosphere[Atmospherics.MonstermosHardTileLimit];
         private readonly TileAtmosphere[] _depressurizeProgressionOrder = new TileAtmosphere[Atmospherics.MonstermosHardTileLimit * 2];
 
-        public void EqualizePressureInZone(IMapGrid mapGrid, GridAtmosphereComponent gridAtmosphere, TileAtmosphere tile, int cycleNum)
+        private void EqualizePressureInZone(IMapGrid mapGrid, GridAtmosphereComponent gridAtmosphere, TileAtmosphere tile, int cycleNum)
         {
             if (tile.Air == null || (tile.MonstermosInfo.LastCycle >= cycleNum))
                 return; // Already done.
@@ -65,11 +63,12 @@ namespace Content.Server.Atmos.EntitySystems
             for (var i = 0; i < tileCount; i++)
             {
                 if (i > Atmospherics.MonstermosHardTileLimit) break;
-                var exploring = _equalizeTiles[i];
+                var exploring = _equalizeTiles[i]!;
 
                 if (i < Atmospherics.MonstermosTileLimit)
                 {
-                    var tileMoles = exploring.Air.TotalMoles;
+                    // Tiles in the _equalizeTiles array cannot have null air.
+                    var tileMoles = exploring.Air!.TotalMoles;
                     exploring.MonstermosInfo.MoleDelta = tileMoles;
                     totalMoles += tileMoles;
                 }
@@ -106,7 +105,7 @@ namespace Content.Server.Atmos.EntitySystems
                     if (otherTile == null)
                         continue;
 
-                    _equalizeTiles[i].MonstermosInfo.LastQueueCycle = 0;
+                    otherTile.MonstermosInfo.LastQueueCycle = 0;
                 }
 
                 tileCount = Atmospherics.MonstermosTileLimit;
@@ -118,7 +117,7 @@ namespace Content.Server.Atmos.EntitySystems
 
             for (var i = 0; i < tileCount; i++)
             {
-                var otherTile = _equalizeTiles[i];
+                var otherTile = _equalizeTiles[i]!;
                 otherTile.MonstermosInfo.LastCycle = cycleNum;
                 otherTile.MonstermosInfo.MoleDelta -= averageMoles;
                 if (otherTile.MonstermosInfo.MoleDelta > 0)
@@ -133,7 +132,7 @@ namespace Content.Server.Atmos.EntitySystems
 
             var logN = MathF.Log2(tileCount);
 
-            // Optimization - try to spread gases using an O(nlogn) algorithm that has a chance of not working first to avoid O(n^2)
+            // Optimization - try to spread gases using an O(n log n) algorithm that has a chance of not working first to avoid O(n^2)
             if (giverTilesLength > logN && takerTilesLength > logN)
             {
                 // Even if it fails, it will speed up the next part.
@@ -141,7 +140,7 @@ namespace Content.Server.Atmos.EntitySystems
 
                 for (var i = 0; i < tileCount; i++)
                 {
-                    var otherTile = _equalizeTiles[i];
+                    var otherTile = _equalizeTiles[i]!;
                     otherTile.MonstermosInfo.FastDone = true;
                     if (!(otherTile.MonstermosInfo.MoleDelta > 0)) continue;
                     var eligibleDirections = AtmosDirection.Invalid;
@@ -150,7 +149,7 @@ namespace Content.Server.Atmos.EntitySystems
                     {
                         var direction = (AtmosDirection) (1 << j);
                         if (!otherTile.AdjacentBits.IsFlagSet(direction)) continue;
-                        var tile2 = otherTile.AdjacentTiles[j];
+                        var tile2 = otherTile.AdjacentTiles[j]!;
 
                         // skip anything that isn't part of our current processing block.
                         if (tile2.MonstermosInfo.FastDone || tile2.MonstermosInfo.LastQueueCycle != queueCycle)
@@ -171,7 +170,7 @@ namespace Content.Server.Atmos.EntitySystems
 
                         AdjustEqMovement(otherTile, direction, molesToMove);
                         otherTile.MonstermosInfo.MoleDelta -= molesToMove;
-                        otherTile.AdjacentTiles[j].MonstermosInfo.MoleDelta += molesToMove;
+                        otherTile.AdjacentTiles[j]!.MonstermosInfo.MoleDelta += molesToMove;
                     }
                 }
 
@@ -180,7 +179,7 @@ namespace Content.Server.Atmos.EntitySystems
 
                 for (var i = 0; i < tileCount; i++)
                 {
-                    var otherTile = _equalizeTiles[i];
+                    var otherTile = _equalizeTiles[i]!;
                     if (otherTile.MonstermosInfo.MoleDelta > 0)
                     {
                         _equalizeGiverTiles[giverTilesLength++] = otherTile;
@@ -252,7 +251,7 @@ namespace Content.Server.Atmos.EntitySystems
                         if (otherTile.MonstermosInfo.CurrentTransferAmount != 0 && otherTile.MonstermosInfo.CurrentTransferDirection != AtmosDirection.Invalid)
                         {
                             AdjustEqMovement(otherTile, otherTile.MonstermosInfo.CurrentTransferDirection, otherTile.MonstermosInfo.CurrentTransferAmount);
-                            otherTile.AdjacentTiles[otherTile.MonstermosInfo.CurrentTransferDirection.ToIndex()]
+                            otherTile.AdjacentTiles[otherTile.MonstermosInfo.CurrentTransferDirection.ToIndex()]!
                                 .MonstermosInfo.CurrentTransferAmount += otherTile.MonstermosInfo.CurrentTransferAmount;
                             otherTile.MonstermosInfo.CurrentTransferAmount = 0;
                         }
@@ -319,7 +318,7 @@ namespace Content.Server.Atmos.EntitySystems
 
                         AdjustEqMovement(otherTile, otherTile.MonstermosInfo.CurrentTransferDirection, otherTile.MonstermosInfo.CurrentTransferAmount);
 
-                        otherTile.AdjacentTiles[otherTile.MonstermosInfo.CurrentTransferDirection.ToIndex()]
+                        otherTile.AdjacentTiles[otherTile.MonstermosInfo.CurrentTransferDirection.ToIndex()]!
                             .MonstermosInfo.CurrentTransferAmount += otherTile.MonstermosInfo.CurrentTransferAmount;
                         otherTile.MonstermosInfo.CurrentTransferAmount = 0;
                     }
@@ -328,19 +327,19 @@ namespace Content.Server.Atmos.EntitySystems
 
             for (var i = 0; i < tileCount; i++)
             {
-                var otherTile = _equalizeTiles[i];
+                var otherTile = _equalizeTiles[i]!;
                 FinalizeEq(gridAtmosphere, otherTile);
             }
 
             for (var i = 0; i < tileCount; i++)
             {
-                var otherTile = _equalizeTiles[i];
+                var otherTile = _equalizeTiles[i]!;
                 for (var j = 0; j < Atmospherics.Directions; j++)
                 {
                     var direction = (AtmosDirection) (1 << j);
                     if (!otherTile.AdjacentBits.IsFlagSet(direction)) continue;
-                    var otherTile2 = otherTile.AdjacentTiles[j];
-                    if (otherTile2?.Air?.Compare(tile.Air) == GasMixture.GasCompareResult.NoExchange) continue;
+                    var otherTile2 = otherTile.AdjacentTiles[j]!;
+                    if (otherTile2.Air?.Compare(tile.Air) == GasMixture.GasCompareResult.NoExchange) continue;
                     AddActiveTile(gridAtmosphere, otherTile2);
                     break;
                 }
@@ -353,7 +352,7 @@ namespace Content.Server.Atmos.EntitySystems
             Array.Clear(_equalizeQueue, 0, Atmospherics.MonstermosTileLimit);
         }
 
-        public void ExplosivelyDepressurize(IMapGrid mapGrid, GridAtmosphereComponent gridAtmosphere, TileAtmosphere tile, int cycleNum)
+        private void ExplosivelyDepressurize(IMapGrid mapGrid, GridAtmosphereComponent gridAtmosphere, TileAtmosphere tile, int cycleNum)
         {
             // Check if explosive depressurization is enabled and if the tile is valid.
             if (!MonstermosDepressurization || tile.Air == null)
@@ -376,7 +375,8 @@ namespace Content.Server.Atmos.EntitySystems
                 var otherTile = _depressurizeTiles[i];
                 otherTile.MonstermosInfo.LastCycle = cycleNum;
                 otherTile.MonstermosInfo.CurrentTransferDirection = AtmosDirection.Invalid;
-                if (otherTile.Air.Immutable)
+                // Tiles in the _depressurizeTiles array cannot have null air.
+                if (otherTile.Air!.Immutable)
                 {
                     _depressurizeSpaceTiles[spaceTileCount++] = otherTile;
                     otherTile.PressureSpecificTarget = otherTile;
@@ -388,7 +388,7 @@ namespace Content.Server.Atmos.EntitySystems
                         var direction = (AtmosDirection) (1 << j);
                         if (!otherTile.AdjacentBits.IsFlagSet(direction)) continue;
                         var otherTile2 = otherTile.AdjacentTiles[j];
-                        if (otherTile2.Air == null) continue;
+                        if (otherTile2?.Air == null) continue;
                         if (otherTile2.MonstermosInfo.LastQueueCycle == queueCycle) continue;
 
                         ConsiderFirelocks(gridAtmosphere, otherTile, otherTile2);
@@ -421,8 +421,8 @@ namespace Content.Server.Atmos.EntitySystems
                 for (var j = 0; j < Atmospherics.Directions; j++)
                 {
                     var direction = (AtmosDirection) (1 << j);
-                    // TODO ATMOS This is a terrible hack that accounts for the mess that are space TileAtmospheres.
-                    if (!otherTile.AdjacentBits.IsFlagSet(direction) && !otherTile.Air.Immutable) continue;
+                    // Tiles in _depressurizeProgressionOrder cannot have null air.
+                    if (!otherTile.AdjacentBits.IsFlagSet(direction) && !otherTile.Air!.Immutable) continue;
                     var tile2 = otherTile.AdjacentTiles[j];
                     if (tile2?.MonstermosInfo.LastQueueCycle != queueCycle) continue;
                     if (tile2.MonstermosInfo.LastSlowQueueCycle == queueCycleSlow) continue;
@@ -509,7 +509,7 @@ namespace Content.Server.Atmos.EntitySystems
             InvalidateVisuals(other.GridIndex, other.GridIndices);
         }
 
-        public void FinalizeEq(GridAtmosphereComponent gridAtmosphere, TileAtmosphere tile)
+        private void FinalizeEq(GridAtmosphereComponent gridAtmosphere, TileAtmosphere tile)
         {
             Span<float> transferDirections = stackalloc float[Atmospherics.Directions];
             var hasTransferDirs = false;
@@ -533,7 +533,8 @@ namespace Content.Server.Atmos.EntitySystems
                 if (otherTile?.Air == null) continue;
                 if (amount > 0)
                 {
-                    if (tile.Air.TotalMoles < amount)
+                    // Everything that calls this method already ensures that Air will not be null.
+                    if (tile.Air!.TotalMoles < amount)
                         FinalizeEqNeighbors(gridAtmosphere, tile, transferDirections);
 
                     otherTile.MonstermosInfo[direction.GetOpposite()] = 0;
@@ -551,15 +552,19 @@ namespace Content.Server.Atmos.EntitySystems
             {
                 var direction = (AtmosDirection) (1 << i);
                 var amount = transferDirs[i];
+                // Since AdjacentBits is set, AdjacentTiles[i] wouldn't be null, and neither would its air.
                 if(amount < 0 && tile.AdjacentBits.IsFlagSet(direction))
-                    FinalizeEq(gridAtmosphere, tile.AdjacentTiles[i]);  // A bit of recursion if needed.
+                    FinalizeEq(gridAtmosphere, tile.AdjacentTiles[i]!);  // A bit of recursion if needed.
             }
         }
 
         private void AdjustEqMovement(TileAtmosphere tile, AtmosDirection direction, float amount)
         {
+            DebugTools.Assert(tile.AdjacentBits.HasFlag(direction));
+            DebugTools.Assert(tile.AdjacentTiles[direction.ToIndex()] != null);
             tile.MonstermosInfo[direction] += amount;
-            tile.AdjacentTiles[direction.ToIndex()].MonstermosInfo[direction.GetOpposite()] -= amount;
+            // Every call to this method already ensures that the adjacent tile won't be null.
+            tile.AdjacentTiles[direction.ToIndex()]!.MonstermosInfo[direction.GetOpposite()] -= amount;
         }
 
         private void HandleDecompressionFloorRip(IMapGrid mapGrid, TileAtmosphere tile, float sum)
@@ -573,9 +578,9 @@ namespace Content.Server.Atmos.EntitySystems
                 PryTile(mapGrid, tile.GridIndices);
         }
 
-        private class TileAtmosphereComparer : IComparer<TileAtmosphere>
+        private class TileAtmosphereComparer : IComparer<TileAtmosphere?>
         {
-            public int Compare(TileAtmosphere a, TileAtmosphere b)
+            public int Compare(TileAtmosphere? a, TileAtmosphere? b)
             {
                 if (a == null && b == null)
                     return 0;
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs
index 184e0bf9f5..e02f81e0ca 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs
@@ -14,6 +14,7 @@ namespace Content.Server.Atmos.EntitySystems
     {
         [Dependency] private readonly IGameTiming _gameTiming = default!;
 
+        private readonly AtmosDeviceUpdateEvent _updateEvent = new();
         private readonly Stopwatch _simulationStopwatch = new();
 
         /// <summary>
@@ -204,11 +205,10 @@ namespace Content.Server.Atmos.EntitySystems
                 atmosphere.CurrentRunAtmosDevices = new Queue<AtmosDeviceComponent>(atmosphere.AtmosDevices);
 
             var time = _gameTiming.CurTime;
-            var updateEvent = new AtmosDeviceUpdateEvent();
             var number = 0;
             while (atmosphere.CurrentRunAtmosDevices.TryDequeue(out var device))
             {
-                EntityManager.EventBus.RaiseLocalEvent(device.Owner.Uid, updateEvent, false);
+                RaiseLocalEvent(device.Owner.Uid, _updateEvent, false);
                 device.LastProcess = time;
 
                 if (number++ < LagCheckIterations) continue;
@@ -241,7 +241,7 @@ namespace Content.Server.Atmos.EntitySystems
             {
                 var atmosphere = _currentRunAtmosphere[_currentRunAtmosphereIndex];
 
-                if (atmosphere.Paused || atmosphere.LifeStage >= ComponentLifeStage.Stopping)
+                if (atmosphere.Paused || !atmosphere.Simulated || atmosphere.LifeStage >= ComponentLifeStage.Stopping)
                     continue;
 
                 atmosphere.Timer += frameTime;
@@ -281,7 +281,8 @@ namespace Content.Server.Atmos.EntitySystems
                         }
 
                         atmosphere.ProcessingPaused = false;
-                        atmosphere.State = AtmosphereProcessingState.ExcitedGroups;
+                        // Next state depends on whether excited groups are enabled or not.
+                        atmosphere.State = ExcitedGroups ? AtmosphereProcessingState.ExcitedGroups : AtmosphereProcessingState.HighPressureDelta;
                         continue;
                     case AtmosphereProcessingState.ExcitedGroups:
                         if (!ProcessExcitedGroups(atmosphere))
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Superconductivity.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Superconductivity.cs
index 2853a6934e..fe21db69d4 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Superconductivity.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Superconductivity.cs
@@ -21,9 +21,6 @@ namespace Content.Server.Atmos.EntitySystems
                 if (adjacent == null || adjacent.ThermalConductivity == 0f)
                     continue;
 
-                if(adjacent.ArchivedCycle < gridAtmosphere.UpdateCounter)
-                    Archive(adjacent, gridAtmosphere.UpdateCounter);
-
                 NeighborConductWithSource(gridAtmosphere, adjacent, tile);
 
                 ConsiderSuperconductivity(gridAtmosphere, adjacent);
@@ -37,8 +34,6 @@ namespace Content.Server.Atmos.EntitySystems
         {
             if(tile.Air == null)
             {
-                if(tile.ArchivedCycle < gridAtmosphere.UpdateCounter)
-                    Archive(tile, gridAtmosphere.UpdateCounter);
                 return AtmosDirection.All;
             }
 
@@ -128,7 +123,7 @@ namespace Content.Server.Atmos.EntitySystems
 
         private void TemperatureShareMutualSolid(TileAtmosphere tile, TileAtmosphere other, float conductionCoefficient)
         {
-            var deltaTemperature = (tile.TemperatureArchived - other.TemperatureArchived);
+            var deltaTemperature = (tile.Temperature - other.Temperature);
             if (MathF.Abs(deltaTemperature) > Atmospherics.MinimumTemperatureDeltaToConsider
                 && tile.HeatCapacity != 0f && other.HeatCapacity != 0f)
             {
@@ -146,7 +141,7 @@ namespace Content.Server.Atmos.EntitySystems
             if (tile.Temperature > Atmospherics.T0C)
             {
                 // Hardcoded space temperature.
-                var deltaTemperature = (tile.TemperatureArchived - Atmospherics.TCMB);
+                var deltaTemperature = (tile.Temperature - Atmospherics.TCMB);
                 if ((tile.HeatCapacity > 0) && (MathF.Abs(deltaTemperature) > Atmospherics.MinimumTemperatureDeltaToConsider))
                 {
                     var heat = tile.ThermalConductivity * deltaTemperature * (tile.HeatCapacity *
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs
index 910ae05a51..966a3192f5 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs
@@ -8,6 +8,9 @@ using Robust.Shared.Map;
 
 namespace Content.Server.Atmos.EntitySystems
 {
+    /// <summary>
+    ///     This is our SSAir equivalent, if you need to interact with or query atmos in any way, go through this.
+    /// </summary>
     [UsedImplicitly]
     public partial class AtmosphereSystem : SharedAtmosphereSystem
     {
@@ -29,7 +32,6 @@ namespace Content.Server.Atmos.EntitySystems
             #region Events
 
             // Map events.
-            _mapManager.MapCreated += OnMapCreated;
             _mapManager.TileChanged += OnTileChanged;
 
             #endregion
@@ -39,7 +41,6 @@ namespace Content.Server.Atmos.EntitySystems
         {
             base.Shutdown();
 
-            _mapManager.MapCreated -= OnMapCreated;
             _mapManager.TileChanged -= OnTileChanged;
         }
 
@@ -57,17 +58,6 @@ namespace Content.Server.Atmos.EntitySystems
             InvalidateTile(eventArgs.NewTile.GridIndex, eventArgs.NewTile.GridIndices);
         }
 
-        private void OnMapCreated(object? sender, MapEventArgs e)
-        {
-            if (e.Map == MapId.Nullspace)
-                return;
-
-            var map = _mapManager.GetMapEntity(e.Map);
-
-            if (!map.HasComponent<IGridAtmosphereComponent>())
-                map.AddComponent<SpaceGridAtmosphereComponent>();
-        }
-
         public override void Update(float frameTime)
         {
             base.Update(frameTime);
@@ -81,7 +71,7 @@ namespace Content.Server.Atmos.EntitySystems
                 foreach (var exposed in EntityManager.ComponentManager.EntityQuery<AtmosExposedComponent>())
                 {
                     // TODO ATMOS: Kill this with fire.
-                    var tile = GetTileAtmosphereOrCreateSpace(exposed.Owner.Transform.Coordinates);
+                    var tile = GetTileMixture(exposed.Owner.Transform.Coordinates);
                     if (tile == null) continue;
                     exposed.Update(tile, _exposedTimer, this);
                 }
diff --git a/Content.Server/Atmos/EntitySystems/GasTankSystem.cs b/Content.Server/Atmos/EntitySystems/GasTankSystem.cs
index 2d3da529e9..0cebc10603 100644
--- a/Content.Server/Atmos/EntitySystems/GasTankSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/GasTankSystem.cs
@@ -1,12 +1,15 @@
 using Content.Server.Atmos.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 
 namespace Content.Server.Atmos.EntitySystems
 {
     [UsedImplicitly]
     public class GasTankSystem : EntitySystem
     {
+        [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
+
         private const float TimerDelay = 0.5f;
         private float _timer = 0f;
 
@@ -19,11 +22,9 @@ namespace Content.Server.Atmos.EntitySystems
             if (_timer < TimerDelay) return;
             _timer -= TimerDelay;
 
-            var atmosphereSystem = Get<AtmosphereSystem>();
-
             foreach (var gasTank in EntityManager.ComponentManager.EntityQuery<GasTankComponent>())
             {
-                atmosphereSystem.React(gasTank.Air, gasTank);
+                _atmosphereSystem.React(gasTank.Air, gasTank);
                 gasTank.CheckStatus();
                 gasTank.UpdateUserInterface();
             }
diff --git a/Content.Server/Atmos/EntitySystems/GasTileOverlaySystem.cs b/Content.Server/Atmos/EntitySystems/GasTileOverlaySystem.cs
index 3a24573cc3..ee9d880ca7 100644
--- a/Content.Server/Atmos/EntitySystems/GasTileOverlaySystem.cs
+++ b/Content.Server/Atmos/EntitySystems/GasTileOverlaySystem.cs
@@ -29,6 +29,7 @@ namespace Content.Server.Atmos.EntitySystems
         [Dependency] private readonly IGameTiming _gameTiming = default!;
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IMapManager _mapManager = default!;
+        [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
 
         /// <summary>
         ///     The tiles that have had their atmos data updated since last tick
@@ -58,8 +59,6 @@ namespace Content.Server.Atmos.EntitySystems
         /// </summary>
         private float _updateCooldown;
 
-        private AtmosphereSystem _atmosphereSystem = default!;
-
         private int _thresholds;
 
         public override void Initialize()
@@ -68,7 +67,6 @@ namespace Content.Server.Atmos.EntitySystems
 
             SubscribeLocalEvent<RoundRestartCleanupEvent>(Reset);
 
-            _atmosphereSystem = Get<AtmosphereSystem>();
             _playerManager.PlayerStatusChanged += OnPlayerStatusChanged;
             _mapManager.OnGridRemoved += OnGridRemoved;
             var configManager = IoCManager.Resolve<IConfigurationManager>();
diff --git a/Content.Server/Atmos/GasMixture.cs b/Content.Server/Atmos/GasMixture.cs
index dddad7366f..f4d013b2ab 100644
--- a/Content.Server/Atmos/GasMixture.cs
+++ b/Content.Server/Atmos/GasMixture.cs
@@ -26,9 +26,6 @@ namespace Content.Server.Atmos
         [DataField("moles")] [ViewVariables]
         public float[] Moles = new float[Atmospherics.AdjustedNumberOfGases];
 
-        [DataField("molesArchived")] [ViewVariables]
-        public float[] MolesArchived = new float[Atmospherics.AdjustedNumberOfGases];
-
         [DataField("temperature")] [ViewVariables]
         private float _temperature = Atmospherics.TCMB;
 
@@ -73,9 +70,6 @@ namespace Content.Server.Atmos
             }
         }
 
-        [DataField("temperatureArchived")] [ViewVariables]
-        public float TemperatureArchived { get; private set; }
-
         [DataField("volume")] [ViewVariables]
         public float Volume { get; set; }
 
@@ -96,13 +90,6 @@ namespace Content.Server.Atmos
             Immutable = true;
         }
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public void Archive()
-        {
-            Moles.AsSpan().CopyTo(MolesArchived.AsSpan());
-            TemperatureArchived = Temperature;
-        }
-
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public float GetMoles(int gasId)
         {
@@ -253,7 +240,6 @@ namespace Content.Server.Atmos
         {
             // The arrays MUST have a specific length.
             Array.Resize(ref Moles, Atmospherics.AdjustedNumberOfGases);
-            Array.Resize(ref MolesArchived, Atmospherics.AdjustedNumberOfGases);
         }
 
         public override bool Equals(object? obj)
@@ -268,12 +254,10 @@ namespace Content.Server.Atmos
             if (ReferenceEquals(null, other)) return false;
             if (ReferenceEquals(this, other)) return true;
             return Moles.SequenceEqual(other.Moles)
-                   && MolesArchived.SequenceEqual(other.MolesArchived)
                    && _temperature.Equals(other._temperature)
                    && ReactionResults.SequenceEqual(other.ReactionResults)
                    && Immutable == other.Immutable
                    && LastShare.Equals(other.LastShare)
-                   && TemperatureArchived.Equals(other.TemperatureArchived)
                    && Volume.Equals(other.Volume);
         }
 
@@ -284,13 +268,10 @@ namespace Content.Server.Atmos
             for (var i = 0; i < Atmospherics.TotalNumberOfGases; i++)
             {
                 var moles = Moles[i];
-                var molesArchived = MolesArchived[i];
                 hashCode.Add(moles);
-                hashCode.Add(molesArchived);
             }
 
             hashCode.Add(_temperature);
-            hashCode.Add(TemperatureArchived);
             hashCode.Add(Immutable);
             hashCode.Add(LastShare);
             hashCode.Add(Volume);
@@ -303,11 +284,9 @@ namespace Content.Server.Atmos
             var newMixture = new GasMixture()
             {
                 Moles = (float[])Moles.Clone(),
-                MolesArchived = (float[])MolesArchived.Clone(),
                 _temperature = _temperature,
                 Immutable = Immutable,
                 LastShare = LastShare,
-                TemperatureArchived = TemperatureArchived,
                 Volume = Volume,
             };
             return newMixture;
diff --git a/Content.Server/Atmos/IGasMixtureHolder.cs b/Content.Server/Atmos/IGasMixtureHolder.cs
index c8bcb60391..e7a55e8048 100644
--- a/Content.Server/Atmos/IGasMixtureHolder.cs
+++ b/Content.Server/Atmos/IGasMixtureHolder.cs
@@ -6,20 +6,5 @@ namespace Content.Server.Atmos
     public interface IGasMixtureHolder
     {
         public GasMixture Air { get; set; }
-
-        public virtual void AssumeAir(GasMixture giver)
-        {
-            EntitySystem.Get<AtmosphereSystem>().Merge(Air, giver);
-        }
-
-        public GasMixture RemoveAir(float amount)
-        {
-            return Air.Remove(amount);
-        }
-
-        public GasMixture RemoveAirVolume(float ratio)
-        {
-            return Air.RemoveRatio(ratio);
-        }
     }
 }
diff --git a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasDualPortVentPumpSystem.cs b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasDualPortVentPumpSystem.cs
index 0782523559..78205ef201 100644
--- a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasDualPortVentPumpSystem.cs
+++ b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasDualPortVentPumpSystem.cs
@@ -10,12 +10,15 @@ using Content.Shared.Atmos.Visuals;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 
 namespace Content.Server.Atmos.Piping.Binary.EntitySystems
 {
     [UsedImplicitly]
     public class GasDualPortVentPumpSystem : EntitySystem
     {
+        [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
+
         public override void Initialize()
         {
             base.Initialize();
@@ -34,24 +37,23 @@ namespace Content.Server.Atmos.Piping.Binary.EntitySystems
                 return;
             }
 
-            appearance?.SetData(VentPumpVisuals.State, VentPumpState.Off);
-
-            if (!vent.Enabled)
-                return;
-
-            if (!ComponentManager.TryGetComponent(uid, out NodeContainerComponent? nodeContainer))
-                return;
-
-            if (!nodeContainer.TryGetNode(vent.InletName, out PipeNode? inlet)
+            if (!vent.Enabled
+            || !ComponentManager.TryGetComponent(uid, out NodeContainerComponent? nodeContainer)
+            || !nodeContainer.TryGetNode(vent.InletName, out PipeNode? inlet)
             || !nodeContainer.TryGetNode(vent.OutletName, out PipeNode? outlet))
+            {
+                appearance?.SetData(VentPumpVisuals.State, VentPumpState.Off);
                 return;
+            }
 
-            var atmosphereSystem = Get<AtmosphereSystem>();
-            var environment = atmosphereSystem.GetTileMixture(vent.Owner.Transform.Coordinates, true);
+            var environment = _atmosphereSystem.GetTileMixture(vent.Owner.Transform.Coordinates, true);
 
             // We're in an air-blocked tile... Do nothing.
             if (environment == null)
+            {
+                appearance?.SetData(VentPumpVisuals.State, VentPumpState.Off);
                 return;
+            }
 
             if (vent.PumpDirection == VentPumpDirection.Releasing)
             {
@@ -68,7 +70,7 @@ namespace Content.Server.Atmos.Piping.Binary.EntitySystems
                 {
                     var transferMoles = pressureDelta * environment.Volume / inlet.Air.Temperature * Atmospherics.R;
                     var removed = inlet.Air.Remove(transferMoles);
-                    atmosphereSystem.Merge(environment, removed);
+                    _atmosphereSystem.Merge(environment, removed);
                 }
             }
             else if (vent.PumpDirection == VentPumpDirection.Siphoning && environment.Pressure > 0f)
@@ -89,7 +91,7 @@ namespace Content.Server.Atmos.Piping.Binary.EntitySystems
                 {
                     var removed = environment.Remove(molesDelta);
 
-                    Get<AtmosphereSystem>().Merge(outlet.Air, removed);
+                    _atmosphereSystem.Merge(outlet.Air, removed);
                 }
             }
         }
diff --git a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressurePumpSystem.cs b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressurePumpSystem.cs
index dc38b4da76..3d2b9ca2ae 100644
--- a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressurePumpSystem.cs
+++ b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressurePumpSystem.cs
@@ -25,22 +25,23 @@ namespace Content.Server.Atmos.Piping.Binary.EntitySystems
         private void OnPumpUpdated(EntityUid uid, GasPressurePumpComponent pump, AtmosDeviceUpdateEvent args)
         {
             var appearance = pump.Owner.GetComponentOrNull<AppearanceComponent>();
-            appearance?.SetData(PressurePumpVisuals.Enabled, false);
 
-            if (!pump.Enabled)
-                return;
-
-            if (!ComponentManager.TryGetComponent(uid, out NodeContainerComponent? nodeContainer))
-                return;
-
-            if (!nodeContainer.TryGetNode(pump.InletName, out PipeNode? inlet)
+            if (!pump.Enabled
+                || !ComponentManager.TryGetComponent(uid, out NodeContainerComponent? nodeContainer)
+                || !nodeContainer.TryGetNode(pump.InletName, out PipeNode? inlet)
                 || !nodeContainer.TryGetNode(pump.OutletName, out PipeNode? outlet))
+            {
+                appearance?.SetData(PressurePumpVisuals.Enabled, false);
                 return;
+            }
 
             var outputStartingPressure = outlet.Air.Pressure;
 
             if (MathHelper.CloseTo(pump.TargetPressure, outputStartingPressure))
+            {
+                appearance?.SetData(PressurePumpVisuals.Enabled, false);
                 return; // No need to pump gas if target has been reached.
+            }
 
             if (inlet.Air.TotalMoles > 0 && inlet.Air.Temperature > 0)
             {
diff --git a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs
index ba4fd92866..555385d401 100644
--- a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs
+++ b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs
@@ -13,7 +13,8 @@ namespace Content.Server.Atmos.Piping.Binary.EntitySystems
     [UsedImplicitly]
     public class GasVolumePumpSystem : EntitySystem
     {
-        [Dependency] private IGameTiming _gameTiming = default!;
+        [Dependency] private readonly IGameTiming _gameTiming = default!;
+        [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
 
         public override void Initialize()
         {
@@ -56,13 +57,12 @@ namespace Content.Server.Atmos.Piping.Binary.EntitySystems
             // Some of the gas from the mixture leaks when overclocked.
             if (pump.Overclocked)
             {
-                var atmosphereSystem = Get<AtmosphereSystem>();
-                var tile = atmosphereSystem.GetTileMixture(pump.Owner.Transform.Coordinates, true);
+                var tile = _atmosphereSystem.GetTileMixture(pump.Owner.Transform.Coordinates, true);
 
                 if (tile != null)
                 {
                     var leaked = removed.RemoveRatio(pump.LeakRatio);
-                    atmosphereSystem.Merge(tile, leaked);
+                    _atmosphereSystem.Merge(tile, leaked);
                 }
             }
 
diff --git a/Content.Server/Atmos/Piping/Components/AtmosDeviceComponent.cs b/Content.Server/Atmos/Piping/Components/AtmosDeviceComponent.cs
index 9b535e7e01..00c36df4e0 100644
--- a/Content.Server/Atmos/Piping/Components/AtmosDeviceComponent.cs
+++ b/Content.Server/Atmos/Piping/Components/AtmosDeviceComponent.cs
@@ -8,7 +8,7 @@ using Robust.Shared.ViewVariables;
 namespace Content.Server.Atmos.Piping.Components
 {
     /// <summary>
-    ///     Adds itself to a <see cref="IGridAtmosphereComponent"/> to be updated by.
+    ///     Adds itself to a <see cref="IAtmosphereComponent"/> to be updated by.
     /// </summary>
     [RegisterComponent]
     public class AtmosDeviceComponent : Component
@@ -22,6 +22,19 @@ namespace Content.Server.Atmos.Piping.Components
         [DataField("requireAnchored")]
         public bool RequireAnchored { get; private set; } = true;
 
+        /// <summary>
+        ///     Whether this device will join an entity system to process when not in a grid.
+        /// </summary>
+        [ViewVariables]
+        [DataField("joinSystem")]
+        public bool JoinSystem { get; } = false;
+
+        /// <summary>
+        ///     Whether we have joined an entity system to process.
+        /// </summary>
+        [ViewVariables]
+        public bool JoinedSystem { get; set; } = false;
+
         [ViewVariables]
         public TimeSpan LastProcess { get; set; } = TimeSpan.Zero;
 
diff --git a/Content.Server/Atmos/Piping/EntitySystems/AtmosDeviceSystem.cs b/Content.Server/Atmos/Piping/EntitySystems/AtmosDeviceSystem.cs
index 5c0d7826c6..12d98e8ff2 100644
--- a/Content.Server/Atmos/Piping/EntitySystems/AtmosDeviceSystem.cs
+++ b/Content.Server/Atmos/Piping/EntitySystems/AtmosDeviceSystem.cs
@@ -1,10 +1,10 @@
 using System;
+using System.Collections.Generic;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Atmos.Piping.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
-using Robust.Shared.Physics;
 using Robust.Shared.Timing;
 
 namespace Content.Server.Atmos.Piping.EntitySystems
@@ -12,7 +12,13 @@ namespace Content.Server.Atmos.Piping.EntitySystems
     [UsedImplicitly]
     public class AtmosDeviceSystem : EntitySystem
     {
-        [Dependency] private IGameTiming _gameTiming = default!;
+        [Dependency] private readonly IGameTiming _gameTiming = default!;
+        [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
+
+        private readonly AtmosDeviceUpdateEvent _updateEvent = new();
+
+        private float _timer = 0f;
+        private readonly HashSet<AtmosDeviceComponent> _joinedDevices = new();
 
         public override void Initialize()
         {
@@ -32,11 +38,24 @@ namespace Content.Server.Atmos.Piping.EntitySystems
         public void JoinAtmosphere(AtmosDeviceComponent component)
         {
             if (!CanJoinAtmosphere(component))
+            {
                 return;
+            }
+
+            // We try to add the device to a valid atmosphere, and if we can't, try to add it to the entity system.
+            if (!_atmosphereSystem.AddAtmosDevice(component))
+            {
+                if (component.JoinSystem)
+                {
+                    _joinedDevices.Add(component);
+                    component.JoinedSystem = true;
+                }
+                else
+                {
+                    return;
+                }
+            }
 
-            // We try to add the device to a valid atmosphere.
-            if (!Get<AtmosphereSystem>().AddAtmosDevice(component))
-                return;
 
             component.LastProcess = _gameTiming.CurTime;
 
@@ -45,8 +64,19 @@ namespace Content.Server.Atmos.Piping.EntitySystems
 
         public void LeaveAtmosphere(AtmosDeviceComponent component)
         {
-            if (!Get<AtmosphereSystem>().RemoveAtmosDevice(component))
+            // Try to remove the component from an atmosphere, and if not
+            if (component.JoinedGrid != null && !_atmosphereSystem.RemoveAtmosDevice(component))
+            {
+                // The grid might have been removed but not us... This usually shouldn't happen.
+                component.JoinedGrid = null;
                 return;
+            }
+
+            if (component.JoinedSystem)
+            {
+                _joinedDevices.Remove(component);
+                component.JoinedSystem = false;
+            }
 
             component.LastProcess = TimeSpan.Zero;
             RaiseLocalEvent(component.Owner.Uid, new AtmosDeviceDisabledEvent(), false);
@@ -84,5 +114,22 @@ namespace Content.Server.Atmos.Piping.EntitySystems
         {
             RejoinAtmosphere(component);
         }
+
+        public override void Update(float frameTime)
+        {
+            _timer += frameTime;
+
+            if (_timer < _atmosphereSystem.AtmosTime)
+                return;
+
+            _timer -= _atmosphereSystem.AtmosTime;
+
+            var time = _gameTiming.CurTime;
+            foreach (var device in _joinedDevices)
+            {
+                RaiseLocalEvent(device.Owner.Uid, _updateEvent, false);
+                device.LastProcess = time;
+            }
+        }
     }
 }
diff --git a/Content.Server/Atmos/Piping/EntitySystems/AtmosUnsafeUnanchorSystem.cs b/Content.Server/Atmos/Piping/EntitySystems/AtmosUnsafeUnanchorSystem.cs
index c14fc7dafa..9e8935d0d3 100644
--- a/Content.Server/Atmos/Piping/EntitySystems/AtmosUnsafeUnanchorSystem.cs
+++ b/Content.Server/Atmos/Piping/EntitySystems/AtmosUnsafeUnanchorSystem.cs
@@ -8,6 +8,7 @@ using Content.Shared.Atmos;
 using Content.Shared.Notification.Managers;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 
 namespace Content.Server.Atmos.Piping.EntitySystems
@@ -15,6 +16,8 @@ namespace Content.Server.Atmos.Piping.EntitySystems
     [UsedImplicitly]
     public class AtmosUnsafeUnanchorSystem : EntitySystem
     {
+        [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
+
         public override void Initialize()
         {
             SubscribeLocalEvent<AtmosUnsafeUnanchorComponent, BeforeUnanchoredEvent>(OnBeforeUnanchored);
@@ -26,7 +29,7 @@ namespace Content.Server.Atmos.Piping.EntitySystems
             if (!component.Enabled || !ComponentManager.TryGetComponent(uid, out NodeContainerComponent? nodes))
                 return;
 
-            if (Get<AtmosphereSystem>().GetTileMixture(component.Owner.Transform.Coordinates) is not {} environment)
+            if (_atmosphereSystem.GetTileMixture(component.Owner.Transform.Coordinates) is not {} environment)
                 return;
 
             foreach (var node in nodes.Nodes.Values)
@@ -47,9 +50,7 @@ namespace Content.Server.Atmos.Piping.EntitySystems
             if (!component.Enabled || !ComponentManager.TryGetComponent(uid, out NodeContainerComponent? nodes))
                 return;
 
-            var atmosphereSystem = Get<AtmosphereSystem>();
-
-            if (atmosphereSystem.GetTileMixture(component.Owner.Transform.Coordinates, true) is not {} environment)
+            if (_atmosphereSystem.GetTileMixture(component.Owner.Transform.Coordinates, true) is not {} environment)
                 environment = GasMixture.SpaceGas;
 
             var lost = 0f;
@@ -71,10 +72,10 @@ namespace Content.Server.Atmos.Piping.EntitySystems
             {
                 if (node is not PipeNode pipe) continue;
 
-                atmosphereSystem.Merge(buffer, pipe.Air.Remove(sharedLoss));
+                _atmosphereSystem.Merge(buffer, pipe.Air.Remove(sharedLoss));
             }
 
-            atmosphereSystem.Merge(environment, buffer);
+            _atmosphereSystem.Merge(environment, buffer);
         }
     }
 }
diff --git a/Content.Server/Atmos/Piping/Other/EntitySystems/GasMinerSystem.cs b/Content.Server/Atmos/Piping/Other/EntitySystems/GasMinerSystem.cs
index d1e61c7b98..0a4379d7f6 100644
--- a/Content.Server/Atmos/Piping/Other/EntitySystems/GasMinerSystem.cs
+++ b/Content.Server/Atmos/Piping/Other/EntitySystems/GasMinerSystem.cs
@@ -6,12 +6,15 @@ using Content.Server.Atmos.Piping.Other.Components;
 using Content.Shared.Atmos;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 
 namespace Content.Server.Atmos.Piping.Other.EntitySystems
 {
     [UsedImplicitly]
     public class GasMinerSystem : EntitySystem
     {
+        [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
+
         public override void Initialize()
         {
             base.Initialize();
@@ -21,9 +24,7 @@ namespace Content.Server.Atmos.Piping.Other.EntitySystems
 
         private void OnMinerUpdated(EntityUid uid, GasMinerComponent miner, AtmosDeviceUpdateEvent args)
         {
-            var atmosphereSystem = Get<AtmosphereSystem>();
-
-            if (!CheckMinerOperation(atmosphereSystem, miner, out var environment) || !miner.Enabled || !miner.SpawnGas.HasValue || miner.SpawnAmount <= 0f)
+            if (!CheckMinerOperation(miner, out var environment) || !miner.Enabled || !miner.SpawnGas.HasValue || miner.SpawnAmount <= 0f)
                 return;
 
             // Time to mine some gas.
@@ -31,15 +32,15 @@ namespace Content.Server.Atmos.Piping.Other.EntitySystems
             var merger = new GasMixture(1) { Temperature = miner.SpawnTemperature };
             merger.SetMoles(miner.SpawnGas.Value, miner.SpawnAmount);
 
-            atmosphereSystem.Merge(environment, merger);
+            _atmosphereSystem.Merge(environment, merger);
         }
 
-        private bool CheckMinerOperation(AtmosphereSystem atmosphereSystem, GasMinerComponent miner, [NotNullWhen(true)] out GasMixture? environment)
+        private bool CheckMinerOperation(GasMinerComponent miner, [NotNullWhen(true)] out GasMixture? environment)
         {
-            environment = atmosphereSystem.GetTileMixture(miner.Owner.Transform.Coordinates, true);
+            environment = _atmosphereSystem.GetTileMixture(miner.Owner.Transform.Coordinates, true);
 
             // Space.
-            if (atmosphereSystem.IsTileSpace(miner.Owner.Transform.Coordinates))
+            if (_atmosphereSystem.IsTileSpace(miner.Owner.Transform.Coordinates))
             {
                 miner.Broken = true;
                 return false;
diff --git a/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs b/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs
index a2db87f7bc..2d24c80fdf 100644
--- a/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs
+++ b/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs
@@ -3,7 +3,9 @@ using Content.Server.Atmos.Piping.Trinary.Components;
 using Content.Server.NodeContainer;
 using Content.Server.NodeContainer.Nodes;
 using Content.Shared.Atmos;
+using Content.Shared.Atmos.Piping;
 using JetBrains.Annotations;
+using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Timing;
@@ -24,33 +26,35 @@ namespace Content.Server.Atmos.Piping.Trinary.EntitySystems
 
         private void OnFilterUpdated(EntityUid uid, GasFilterComponent filter, AtmosDeviceUpdateEvent args)
         {
-            if (!filter.Enabled)
-                return;
+            var appearance = filter.Owner.GetComponentOrNull<AppearanceComponent>();
 
-            if (!ComponentManager.TryGetComponent(uid, out NodeContainerComponent? nodeContainer))
+            if (!filter.Enabled
+            || !ComponentManager.TryGetComponent(uid, out NodeContainerComponent? nodeContainer)
+            || !ComponentManager.TryGetComponent(uid, out AtmosDeviceComponent? device)
+            || !nodeContainer.TryGetNode(filter.InletName, out PipeNode? inletNode)
+            || !nodeContainer.TryGetNode(filter.FilterName, out PipeNode? filterNode)
+            || !nodeContainer.TryGetNode(filter.OutletName, out PipeNode? outletNode)
+            || outletNode.Air.Pressure >= Atmospherics.MaxOutputPressure) // No need to transfer if target is full.
+            {
+                appearance?.SetData(FilterVisuals.Enabled, false);
                 return;
-
-            if (!ComponentManager.TryGetComponent(uid, out AtmosDeviceComponent? device))
-                return;
-
-            if (!nodeContainer.TryGetNode(filter.InletName, out PipeNode? inletNode)
-                || !nodeContainer.TryGetNode(filter.FilterName, out PipeNode? filterNode)
-                || !nodeContainer.TryGetNode(filter.OutletName, out PipeNode? outletNode))
-                return;
-
-            if (outletNode.Air.Pressure >= Atmospherics.MaxOutputPressure)
-                return; // No need to transfer if target is full.
+            }
 
             // We multiply the transfer rate in L/s by the seconds passed since the last process to get the liters.
             var transferRatio = (float)(filter.TransferRate * (_gameTiming.CurTime - device.LastProcess).TotalSeconds) / inletNode.Air.Volume;
 
             if (transferRatio <= 0)
+            {
+                appearance?.SetData(FilterVisuals.Enabled, false);
                 return;
+            }
 
             var removed = inletNode.Air.RemoveRatio(transferRatio);
 
             if (filter.FilteredGas.HasValue)
             {
+                appearance?.SetData(FilterVisuals.Enabled, true);
+
                 var filteredOut = new GasMixture() {Temperature = removed.Temperature};
 
                 filteredOut.SetMoles(filter.FilteredGas.Value, removed.GetMoles(filter.FilteredGas.Value));
diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs
index afc56ec96c..18b4c52433 100644
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs
@@ -19,6 +19,7 @@ using JetBrains.Annotations;
 using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 
 namespace Content.Server.Atmos.Piping.Unary.EntitySystems
@@ -26,6 +27,8 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
     [UsedImplicitly]
     public class GasCanisterSystem : EntitySystem
     {
+        [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
+
         public override void Initialize()
         {
             base.Initialize();
@@ -131,23 +134,21 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
             if (!nodeContainer.TryGetNode(canister.PortName, out PortablePipeNode? portNode))
                 return;
 
-            var atmosphereSystem = Get<AtmosphereSystem>();
-
-            atmosphereSystem.React(canister.Air, portNode);
+            _atmosphereSystem.React(canister.Air, portNode);
 
             if (portNode.NodeGroup is PipeNet {NodeCount: > 1} net)
             {
                 var buffer = new GasMixture(net.Air.Volume + canister.Air.Volume);
 
-                atmosphereSystem.Merge(buffer, net.Air);
-                atmosphereSystem.Merge(buffer, canister.Air);
+                _atmosphereSystem.Merge(buffer, net.Air);
+                _atmosphereSystem.Merge(buffer, canister.Air);
 
                 net.Air.Clear();
-                atmosphereSystem.Merge(net.Air, buffer);
+                _atmosphereSystem.Merge(net.Air, buffer);
                 net.Air.Multiply(net.Air.Volume / buffer.Volume);
 
                 canister.Air.Clear();
-                atmosphereSystem.Merge(canister.Air, buffer);
+                _atmosphereSystem.Merge(canister.Air, buffer);
                 canister.Air.Multiply(canister.Air.Volume / buffer.Volume);
             }
 
@@ -161,12 +162,12 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
                 if (container.ContainedEntities.Count > 0)
                 {
                     var gasTank = container.ContainedEntities[0].GetComponent<GasTankComponent>();
-                    atmosphereSystem.ReleaseGasTo(canister.Air, gasTank.Air, canister.ReleasePressure);
+                    _atmosphereSystem.ReleaseGasTo(canister.Air, gasTank.Air, canister.ReleasePressure);
                 }
                 else
                 {
-                    var environment = atmosphereSystem.GetTileMixture(canister.Owner.Transform.Coordinates, true);
-                    atmosphereSystem.ReleaseGasTo(canister.Air, environment, canister.ReleasePressure);
+                    var environment = _atmosphereSystem.GetTileMixture(canister.Owner.Transform.Coordinates, true);
+                    _atmosphereSystem.ReleaseGasTo(canister.Air, environment, canister.ReleasePressure);
                 }
             }
 
diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasOutletInjectorSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasOutletInjectorSystem.cs
index 63f9665d44..c716f72c04 100644
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasOutletInjectorSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasOutletInjectorSystem.cs
@@ -6,12 +6,15 @@ using Content.Server.NodeContainer.Nodes;
 using Content.Shared.Atmos;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 
 namespace Content.Server.Atmos.Piping.Unary.EntitySystems
 {
     [UsedImplicitly]
     public class GasOutletInjectorSystem : EntitySystem
     {
+        [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
+
         public override void Initialize()
         {
             base.Initialize();
@@ -32,8 +35,7 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
             if (!nodeContainer.TryGetNode(injector.InletName, out PipeNode? inlet))
                 return;
 
-            var atmosphereSystem = Get<AtmosphereSystem>();
-            var environment = atmosphereSystem.GetTileMixture(injector.Owner.Transform.Coordinates, true);
+            var environment = _atmosphereSystem.GetTileMixture(injector.Owner.Transform.Coordinates, true);
 
             if (environment == null)
                 return;
@@ -44,7 +46,7 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
 
                 var removed = inlet.Air.Remove(transferMoles);
 
-                atmosphereSystem.Merge(environment, removed);
+                _atmosphereSystem.Merge(environment, removed);
             }
         }
     }
diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasPassiveVentSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasPassiveVentSystem.cs
index 5a61cbc350..e484e80da0 100644
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasPassiveVentSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasPassiveVentSystem.cs
@@ -7,12 +7,15 @@ using Content.Server.NodeContainer.Nodes;
 using Content.Shared.Atmos;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 
 namespace Content.Server.Atmos.Piping.Unary.EntitySystems
 {
     [UsedImplicitly]
     public class GasPassiveVentSystem : EntitySystem
     {
+        [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
+
         public override void Initialize()
         {
             base.Initialize();
@@ -22,8 +25,7 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
 
         private void OnPassiveVentUpdated(EntityUid uid, GasPassiveVentComponent vent, AtmosDeviceUpdateEvent args)
         {
-            var atmosphereSystem = Get<AtmosphereSystem>();
-            var environment = atmosphereSystem.GetTileMixture(vent.Owner.Transform.Coordinates, true);
+            var environment = _atmosphereSystem.GetTileMixture(vent.Owner.Transform.Coordinates, true);
 
             if (environment == null)
                 return;
@@ -44,7 +46,7 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
                     var airTemperature = environment.Temperature > 0 ? environment.Temperature : inlet.Air.Temperature;
                     var transferMoles = pressureDelta * environment.Volume / (airTemperature * Atmospherics.R);
                     var removed = inlet.Air.Remove(transferMoles);
-                    atmosphereSystem.Merge(environment, removed);
+                    _atmosphereSystem.Merge(environment, removed);
                 }
                 else
                 {
diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs
index 748700d13e..8706a22156 100644
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs
@@ -7,12 +7,15 @@ using Content.Shared.Atmos.Piping;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 
 namespace Content.Server.Atmos.Piping.Unary.EntitySystems
 {
     [UsedImplicitly]
     public class GasThermoMachineSystem : EntitySystem
     {
+        [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
+
         public override void Initialize()
         {
             base.Initialize();
@@ -24,18 +27,16 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
         private void OnThermoMachineUpdated(EntityUid uid, GasThermoMachineComponent thermoMachine, AtmosDeviceUpdateEvent args)
         {
             var appearance = thermoMachine.Owner.GetComponentOrNull<AppearanceComponent>();
-            appearance?.SetData(ThermoMachineVisuals.Enabled, false);
 
-            if (!thermoMachine.Enabled)
+            if (!thermoMachine.Enabled
+                || !ComponentManager.TryGetComponent(uid, out NodeContainerComponent? nodeContainer)
+                || !nodeContainer.TryGetNode(thermoMachine.InletName, out PipeNode? inlet))
+            {
+                appearance?.SetData(ThermoMachineVisuals.Enabled, false);
                 return;
+            }
 
-            if (!ComponentManager.TryGetComponent(uid, out NodeContainerComponent? nodeContainer))
-                return;
-
-            if (!nodeContainer.TryGetNode(thermoMachine.InletName, out PipeNode? inlet))
-                return;
-
-            var airHeatCapacity = Get<AtmosphereSystem>().GetHeatCapacity(inlet.Air);
+            var airHeatCapacity = _atmosphereSystem.GetHeatCapacity(inlet.Air);
             var combinedHeatCapacity = airHeatCapacity + thermoMachine.HeatCapacity;
             var oldTemperature = inlet.Air.Temperature;
 
diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs
index 5e69a4f3b4..a008cde4ca 100644
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs
@@ -9,12 +9,15 @@ using Content.Shared.Atmos.Visuals;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 
 namespace Content.Server.Atmos.Piping.Unary.EntitySystems
 {
     [UsedImplicitly]
     public class GasVentPumpSystem : EntitySystem
     {
+        [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
+
         public override void Initialize()
         {
             base.Initialize();
@@ -33,23 +36,22 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
                 return;
             }
 
-            appearance?.SetData(VentPumpVisuals.State, VentPumpState.Off);
-
-            if (!vent.Enabled)
+            if (!vent.Enabled
+                || !ComponentManager.TryGetComponent(uid, out NodeContainerComponent? nodeContainer)
+                || !nodeContainer.TryGetNode(vent.InletName, out PipeNode? pipe))
+            {
+                appearance?.SetData(VentPumpVisuals.State, VentPumpState.Off);
                 return;
+            }
 
-            if (!ComponentManager.TryGetComponent(uid, out NodeContainerComponent? nodeContainer))
-                return;
-
-            if (!nodeContainer.TryGetNode(vent.InletName, out PipeNode? pipe))
-                return;
-
-            var atmosphereSystem = Get<AtmosphereSystem>();
-            var environment = atmosphereSystem.GetTileMixture(vent.Owner.Transform.Coordinates, true);
+            var environment = _atmosphereSystem.GetTileMixture(vent.Owner.Transform.Coordinates, true);
 
             // We're in an air-blocked tile... Do nothing.
             if (environment == null)
+            {
+                appearance?.SetData(VentPumpVisuals.State, VentPumpState.Off);
                 return;
+            }
 
             if (vent.PumpDirection == VentPumpDirection.Releasing)
             {
@@ -66,7 +68,7 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
                 {
                     var transferMoles = pressureDelta * environment.Volume / (pipe.Air.Temperature * Atmospherics.R);
 
-                    atmosphereSystem.Merge(environment, pipe.Air.Remove(transferMoles));
+                    _atmosphereSystem.Merge(environment, pipe.Air.Remove(transferMoles));
                 }
             }
             else if (vent.PumpDirection == VentPumpDirection.Siphoning && environment.Pressure > 0)
diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs
index 399ba29a38..9b6722411d 100644
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs
@@ -9,6 +9,7 @@ using Content.Shared.Atmos.Piping.Unary.Visuals;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 
 namespace Content.Server.Atmos.Piping.Unary.EntitySystems
@@ -16,6 +17,8 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
     [UsedImplicitly]
     public class GasVentScrubberSystem : EntitySystem
     {
+        [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
+
         public override void Initialize()
         {
             base.Initialize();
@@ -34,28 +37,24 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
                 return;
             }
 
-            appearance?.SetData(ScrubberVisuals.State, ScrubberState.Off);
-
-            if (!scrubber.Enabled)
+            if (!scrubber.Enabled
+            || !ComponentManager.TryGetComponent(uid, out NodeContainerComponent? nodeContainer)
+            || !nodeContainer.TryGetNode(scrubber.OutletName, out PipeNode? outlet))
+            {
+                appearance?.SetData(ScrubberVisuals.State, ScrubberState.Off);
                 return;
+            }
 
-            if (!ComponentManager.TryGetComponent(uid, out NodeContainerComponent? nodeContainer))
-                return;
+            var environment = _atmosphereSystem.GetTileMixture(scrubber.Owner.Transform.Coordinates, true);
 
-            if (!nodeContainer.TryGetNode(scrubber.OutletName, out PipeNode? outlet))
-                return;
-
-            var atmosphereSystem = Get<AtmosphereSystem>();
-            var environment = atmosphereSystem.GetTileMixture(scrubber.Owner.Transform.Coordinates, true);
-
-            Scrub(atmosphereSystem, scrubber, appearance, environment, outlet);
+            Scrub(_atmosphereSystem, scrubber, appearance, environment, outlet);
 
             if (!scrubber.WideNet) return;
 
             // Scrub adjacent tiles too.
-            foreach (var adjacent in atmosphereSystem.GetAdjacentTileMixtures(scrubber.Owner.Transform.Coordinates, false, true))
+            foreach (var adjacent in _atmosphereSystem.GetAdjacentTileMixtures(scrubber.Owner.Transform.Coordinates, false, true))
             {
-                Scrub(atmosphereSystem, scrubber, null, adjacent, outlet);
+                Scrub(_atmosphereSystem, scrubber, null, adjacent, outlet);
             }
         }
 
@@ -70,12 +69,12 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
         private void Scrub(AtmosphereSystem atmosphereSystem, GasVentScrubberComponent scrubber, AppearanceComponent? appearance, GasMixture? tile, PipeNode outlet)
         {
             // Cannot scrub if tile is null or air-blocked.
-            if (tile == null)
-                return;
-
-            // Cannot scrub if pressure too high.
-            if (outlet.Air.Pressure >= 50 * Atmospherics.OneAtmosphere)
+            if (tile == null
+                || outlet.Air.Pressure >= 50 * Atmospherics.OneAtmosphere) // Cannot scrub if pressure too high.
+            {
+                appearance?.SetData(ScrubberVisuals.State, ScrubberState.Off);
                 return;
+            }
 
             if (scrubber.PumpDirection == ScrubberPumpDirection.Scrubbing)
             {
diff --git a/Content.Server/Atmos/TileAtmosphere.cs b/Content.Server/Atmos/TileAtmosphere.cs
index 5bcfc710b4..49447e012a 100644
--- a/Content.Server/Atmos/TileAtmosphere.cs
+++ b/Content.Server/Atmos/TileAtmosphere.cs
@@ -1,5 +1,4 @@
-#nullable disable warnings
-#nullable enable annotations
+using Content.Server.Atmos.EntitySystems;
 using Content.Shared.Atmos;
 using Content.Shared.Maps;
 using Robust.Shared.Map;
@@ -10,21 +9,16 @@ namespace Content.Server.Atmos
 {
     /// <summary>
     ///     Internal Atmos class that stores data about the atmosphere in a grid.
+    ///     You shouldn't use this directly, use <see cref="AtmosphereSystem"/> instead.
     /// </summary>
     public class TileAtmosphere : IGasMixtureHolder
     {
-        [ViewVariables]
-        public int ArchivedCycle;
-
         [ViewVariables]
         public int CurrentCycle;
 
         [ViewVariables]
         public float Temperature { get; set; } = Atmospherics.T20C;
 
-        [ViewVariables]
-        public float TemperatureArchived { get; set; } = Atmospherics.T20C;
-
         [ViewVariables]
         public TileAtmosphere? PressureSpecificTarget { get; set; }
 
@@ -77,6 +71,12 @@ namespace Content.Server.Atmos
         [ViewVariables]
         public GasMixture? Air { get; set; }
 
+        GasMixture IGasMixtureHolder.Air
+        {
+            get => Air ?? new GasMixture(Atmospherics.CellVolume){ Temperature = Temperature };
+            set => Air = value;
+        }
+
         [ViewVariables]
         public float MaxFireTemperatureSustained { get; set; }
 
diff --git a/Content.Server/Body/Behavior/LiverBehavior.cs b/Content.Server/Body/Behavior/LiverBehavior.cs
index 82e12b29ce..aa40d1b142 100644
--- a/Content.Server/Body/Behavior/LiverBehavior.cs
+++ b/Content.Server/Body/Behavior/LiverBehavior.cs
@@ -1,7 +1,6 @@
 using System.Linq;
 using Content.Server.Body.Circulatory;
 using Content.Shared.Body.Networks;
-using Content.Shared.Chemistry.Metabolizable;
 using Content.Shared.Chemistry.Reagent;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
@@ -13,47 +12,8 @@ namespace Content.Server.Body.Behavior
     /// </summary>
     public class LiverBehavior : MechanismBehavior
     {
-        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-
         private float _accumulatedFrameTime;
 
-        /// <summary>
-        ///     Whether the liver is functional.
-        /// </summary>
-        //[ViewVariables] private bool _liverFailing = false;
-
-        /// <summary>
-        ///     Modifier for alcohol damage.
-        /// </summary>
-        //[DataField("alcoholLethality")]
-        //[ViewVariables] private float _alcoholLethality = 0.005f;
-
-        /// <summary>
-        ///     Modifier for alcohol damage.
-        /// </summary>
-        //[DataField("alcoholExponent")]
-        //[ViewVariables] private float _alcoholExponent = 1.6f;
-
-        /// <summary>
-        ///     Toxin volume that can be purged without damage.
-        /// </summary>
-        //[DataField("toxinTolerance")]
-        //[ViewVariables] private float _toxinTolerance = 3f;
-
-        /// <summary>
-        ///     Toxin damage modifier.
-        /// </summary>
-        //[DataField("toxinLethality")]
-        //[ViewVariables] private float _toxinLethality = 0.01f;
-
-        /// <summary>
-        ///     Loops through each reagent in _internalSolution,
-        ///     and calls <see cref="IMetabolizable.Metabolize"/> for each of them.
-        ///     Also handles toxins and alcohol.
-        /// </summary>
-        /// <param name="frameTime">
-        ///     The time since the last update in seconds.
-        /// </param>
         public override void Update(float frameTime)
         {
             if (Body == null)
@@ -70,39 +30,6 @@ namespace Content.Server.Body.Behavior
             }
 
             _accumulatedFrameTime -= 1;
-
-            if (!Body.Owner.TryGetComponent(out BloodstreamComponent? bloodstream))
-            {
-                return;
-            }
-
-            if (bloodstream.Solution.CurrentVolume <= ReagentUnit.Zero)
-            {
-                return;
-            }
-
-            // Run metabolism for each reagent, remove metabolized reagents
-            // Using ToList here lets us edit reagents while iterating
-            foreach (var reagent in bloodstream.Solution.ReagentList.ToList())
-            {
-                if (!_prototypeManager.TryIndex(reagent.ReagentId, out ReagentPrototype? prototype))
-                {
-                    continue;
-                }
-
-                //TODO BODY Check if it's a Toxin. If volume < _toxinTolerance, just remove it. If greater, add damage = volume * _toxinLethality
-                //TODO BODY Check if it has BoozePower > 0. Affect drunkenness, apply damage. Proposed formula (SS13-derived): damage = sqrt(volume) * BoozePower^_alcoholExponent * _alcoholLethality / 10
-                //TODO BODY Liver failure.
-
-                //TODO Make sure reagent prototypes actually have the toxin and boozepower vars set.
-
-                // Run metabolism code for each reagent
-                foreach (var metabolizable in prototype.Metabolism)
-                {
-                    var reagentDelta = metabolizable.Metabolize(Body.Owner, reagent.ReagentId, frameTime);
-                    bloodstream.Solution.TryRemoveReagent(reagent.ReagentId, reagentDelta);
-                }
-            }
         }
     }
 }
diff --git a/Content.Server/Body/Behavior/StomachBehavior.cs b/Content.Server/Body/Behavior/StomachBehavior.cs
index a6c903efe9..813b8a3a5e 100644
--- a/Content.Server/Body/Behavior/StomachBehavior.cs
+++ b/Content.Server/Body/Behavior/StomachBehavior.cs
@@ -30,6 +30,8 @@ namespace Content.Server.Body.Behavior
         /// </param>
         public override void Update(float frameTime)
         {
+
+            // Do not metabolise if the organ does not have a body.
             if (Body == null)
             {
                 return;
@@ -45,7 +47,9 @@ namespace Content.Server.Body.Behavior
 
             _accumulatedFrameTime -= 1;
 
-            if (!Body.Owner.TryGetComponent(out SolutionContainerComponent? solution) ||
+            // Note that "Owner" should be the organ that has this behaviour/mechanism, and it should have a dedicated
+            // solution container. "Body.Owner" is something else, and may have more than one solution container.
+            if (!Owner.TryGetComponent(out SolutionContainerComponent? solution) ||
                 !Body.Owner.TryGetComponent(out BloodstreamComponent? bloodstream))
             {
                 return;
@@ -61,8 +65,19 @@ namespace Content.Server.Body.Behavior
                 delta.Increment(1);
                 if (delta.Lifetime > _digestionDelay)
                 {
-                    solution.TryRemoveReagent(delta.ReagentId, delta.Quantity);
-                    transferSolution.AddReagent(delta.ReagentId, delta.Quantity);
+                    // This reagent has been in the somach long enough, TRY to transfer it.
+                    // But first, check if the reagent still exists, and how much is left.
+                    // Some poor spessman may have washed down a potassium snack with some water.
+                    if (solution.Solution.ContainsReagent(delta.ReagentId, out ReagentUnit quantity)){
+
+                        if (quantity > delta.Quantity) {
+                            quantity = delta.Quantity;
+                        }
+
+                        solution.TryRemoveReagent(delta.ReagentId, quantity);
+                        transferSolution.AddReagent(delta.ReagentId, quantity);
+                    }
+
                     _reagentDeltas.Remove(delta);
                 }
             }
@@ -133,10 +148,10 @@ namespace Content.Server.Body.Behavior
 
         public bool TryTransferSolution(Solution solution)
         {
-            if (Body == null || !CanTransferSolution(solution))
+            if (Owner == null || !CanTransferSolution(solution))
                 return false;
 
-            if (!Body.Owner.TryGetComponent(out SolutionContainerComponent? solutionComponent))
+            if (!Owner.TryGetComponent(out SolutionContainerComponent? solutionComponent))
             {
                 return false;
             }
diff --git a/Content.Server/Body/Circulatory/BloodstreamComponent.cs b/Content.Server/Body/Circulatory/BloodstreamComponent.cs
index df90cd6fc6..998e3d97bb 100644
--- a/Content.Server/Body/Circulatory/BloodstreamComponent.cs
+++ b/Content.Server/Body/Circulatory/BloodstreamComponent.cs
@@ -2,8 +2,8 @@ using System;
 using System.Linq;
 using Content.Server.Atmos;
 using Content.Server.Atmos.EntitySystems;
+using Content.Server.Body.Respiratory;
 using Content.Server.Chemistry.Components;
-using Content.Server.Metabolism;
 using Content.Shared.Atmos;
 using Content.Shared.Body.Networks;
 using Content.Shared.Chemistry.Reagent;
@@ -72,7 +72,7 @@ namespace Content.Server.Body.Circulatory
         {
             var atmosphereSystem = EntitySystem.Get<AtmosphereSystem>();
 
-            if (!Owner.TryGetComponent(out MetabolismComponent? metabolism))
+            if (!Owner.TryGetComponent(out RespiratorComponent? metabolism))
             {
                 atmosphereSystem.Merge(to, Air);
                 Air.Clear();
diff --git a/Content.Server/Body/Metabolism/MetabolizerComponent.cs b/Content.Server/Body/Metabolism/MetabolizerComponent.cs
new file mode 100644
index 0000000000..b74926ff57
--- /dev/null
+++ b/Content.Server/Body/Metabolism/MetabolizerComponent.cs
@@ -0,0 +1,57 @@
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using Content.Shared.Chemistry.Reagent;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Serialization.Manager.Attributes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary;
+
+namespace Content.Server.Body.Metabolism
+{
+    /// <summary>
+    ///     Handles metabolizing various reagents with given effects.
+    /// </summary>
+    [RegisterComponent]
+    public class MetabolizerComponent : Component
+    {
+        public override string Name => "Metabolizer";
+
+        public float AccumulatedFrametime = 0.0f;
+
+        /// <summary>
+        ///     How often to metabolize reagents, in seconds.
+        /// </summary>
+        /// <returns></returns>
+        [DataField("updateFrequency")]
+        public float UpdateFrequency = 1.0f;
+
+        /// <summary>
+        ///     Whether this metabolizer should attempt to metabolize chemicals in its parent bodies' bloodstream,
+        ///     as opposed to a solution container on the metabolizing entity itself.
+        /// </summary>
+        [DataField("takeFromBloodstream")]
+        public bool TakeFromBloodstream = true;
+
+        /// <summary>
+        ///     A dictionary mapping reagent string IDs to a list of effects & associated metabolism rate.
+        /// </summary>
+        /// <returns></returns>
+        [DataField("metabolisms", required: true, customTypeSerializer:typeof(PrototypeIdDictionarySerializer<ReagentEffectsEntry, ReagentPrototype>))]
+        public Dictionary<string, ReagentEffectsEntry> Metabolisms = default!;
+    }
+
+    [DataDefinition]
+    public class ReagentEffectsEntry
+    {
+        /// <summary>
+        ///     Amount of reagent to metabolize, per metabolism cycle.
+        /// </summary>
+        [DataField("metabolismRate")]
+        public ReagentUnit MetabolismRate = ReagentUnit.New(1.0f);
+
+        /// <summary>
+        ///     A list of effects to apply when these reagents are metabolized.
+        /// </summary>
+        [DataField("effects", required: true)]
+        public ReagentEffect[] Effects = default!;
+    }
+}
diff --git a/Content.Server/Body/Metabolism/MetabolizerSystem.cs b/Content.Server/Body/Metabolism/MetabolizerSystem.cs
new file mode 100644
index 0000000000..249ca13391
--- /dev/null
+++ b/Content.Server/Body/Metabolism/MetabolizerSystem.cs
@@ -0,0 +1,107 @@
+using System.Collections.Generic;
+using System.Linq;
+using Content.Server.Body.Circulatory;
+using Content.Server.Chemistry.Components;
+using Content.Shared.Body.Components;
+using Content.Shared.Body.Mechanism;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Chemistry.Solution;
+using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Body.Metabolism
+{
+    // TODO mirror in the future working on mechanisms move updating here to BodySystem so it can be ordered?
+    public class MetabolizerSystem : EntitySystem
+    {
+        public override void Update(float frameTime)
+        {
+            base.Update(frameTime);
+
+            foreach (var metab in ComponentManager.EntityQuery<MetabolizerComponent>(false))
+            {
+                metab.AccumulatedFrametime += frameTime;
+
+                // Only update as frequently as it should
+                if (metab.AccumulatedFrametime >= metab.UpdateFrequency)
+                {
+                    metab.AccumulatedFrametime = 0.0f;
+                    TryMetabolize(metab);
+                }
+            }
+        }
+
+        private void TryMetabolize(MetabolizerComponent comp)
+        {
+            var owner = comp.Owner;
+            var reagentList = new List<Solution.ReagentQuantity>();
+            SolutionContainerComponent? solution = null;
+            SharedBodyComponent? body = null;
+
+            // if this field is passed we should try and take from the bloodstream over anything else
+            if (comp.TakeFromBloodstream && owner.TryGetComponent<SharedMechanismComponent>(out var mech))
+            {
+                body = mech.Body;
+                if (body != null)
+                {
+                    if (body.Owner.TryGetComponent<BloodstreamComponent>(out var bloodstream)
+                        && bloodstream.Solution.CurrentVolume >= ReagentUnit.Zero)
+                    {
+                        solution = bloodstream.Solution;
+                        reagentList = bloodstream.Solution.ReagentList.ToList();
+                    }
+                }
+            }
+            else if (owner.TryGetComponent<SolutionContainerComponent>(out var sol))
+            {
+                // if we have no mechanism/body but a solution container instead,
+                // we'll just use that to metabolize from
+                solution = sol;
+                reagentList = sol.ReagentList.ToList();
+            }
+            if (solution == null || reagentList.Count == 0)
+            {
+                // We're all outta ideas on where to metabolize from
+                return;
+            }
+
+            // Run metabolism for each reagent, remove metabolized reagents
+            foreach (var reagent in reagentList)
+            {
+                if (!comp.Metabolisms.ContainsKey(reagent.ReagentId))
+                    continue;
+
+                var metabolism = comp.Metabolisms[reagent.ReagentId];
+                // Run metabolism code for each reagent
+                foreach (var effect in metabolism.Effects)
+                {
+                    var ent = body != null ? body.Owner : owner;
+                    var conditionsMet = true;
+                    if (effect.Conditions != null)
+                    {
+                        // yes this is 3 nested for loops, but all of these lists are
+                        // basically guaranteed to be small or empty
+                        foreach (var condition in effect.Conditions)
+                        {
+                            if (!condition.Condition(ent, reagent))
+                            {
+                                conditionsMet = false;
+                                break;
+                            }
+                        }
+                    }
+
+                    if (!conditionsMet)
+                        return;
+
+                    // If we're part of a body, pass that entity to Metabolize
+                    // Otherwise, just pass our owner entity, maybe we're a plant or something
+                    effect.Metabolize(ent, reagent);
+                }
+
+                solution.TryRemoveReagent(reagent.ReagentId, metabolism.MetabolismRate);
+            }
+        }
+    }
+}
diff --git a/Content.Server/Metabolism/MetabolismComponent.cs b/Content.Server/Body/Respiratory/RespiratorComponent.cs
similarity index 98%
rename from Content.Server/Metabolism/MetabolismComponent.cs
rename to Content.Server/Body/Respiratory/RespiratorComponent.cs
index 4898692ab9..2aec76e351 100644
--- a/Content.Server/Metabolism/MetabolismComponent.cs
+++ b/Content.Server/Body/Respiratory/RespiratorComponent.cs
@@ -13,7 +13,6 @@ using Content.Shared.Atmos;
 using Content.Shared.Body.Components;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Components;
-using Content.Shared.Metabolism.Events;
 using Content.Shared.MobState;
 using Content.Shared.Notification.Managers;
 using Robust.Shared.GameObjects;
@@ -21,14 +20,14 @@ using Robust.Shared.Localization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.Metabolism
+namespace Content.Server.Body.Respiratory
 {
     [RegisterComponent]
-    public class MetabolismComponent : Component
+    public class RespiratorComponent : Component
     {
         [ComponentDependency] private readonly SharedBodyComponent? _body = default!;
 
-        public override string Name => "Metabolism";
+        public override string Name => "Respirator";
 
         private float _accumulatedFrameTime;
 
diff --git a/Content.Server/Metabolism/MetabolismSystem.cs b/Content.Server/Body/Respiratory/RespiratorSystem.cs
similarity index 50%
rename from Content.Server/Metabolism/MetabolismSystem.cs
rename to Content.Server/Body/Respiratory/RespiratorSystem.cs
index 6616d013d5..424b1e4dce 100644
--- a/Content.Server/Metabolism/MetabolismSystem.cs
+++ b/Content.Server/Body/Respiratory/RespiratorSystem.cs
@@ -1,18 +1,18 @@
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.Metabolism
+namespace Content.Server.Body.Respiratory
 {
     [UsedImplicitly]
-    public class MetabolismSystem : EntitySystem
+    public class RespiratorSystem : EntitySystem
     {
         public override void Update(float frameTime)
         {
             base.Update(frameTime);
 
-            foreach (var metabolism in ComponentManager.EntityQuery<MetabolismComponent>(true))
+            foreach (var respirator in ComponentManager.EntityQuery<RespiratorComponent>(false))
             {
-                metabolism.Update(frameTime);
+                respirator.Update(frameTime);
             }
         }
     }
diff --git a/Content.Server/Body/Surgery/Components/SurgeryToolSystem.cs b/Content.Server/Body/Surgery/Components/SurgeryToolSystem.cs
index b628e7f89c..5e95ace8be 100644
--- a/Content.Server/Body/Surgery/Components/SurgeryToolSystem.cs
+++ b/Content.Server/Body/Surgery/Components/SurgeryToolSystem.cs
@@ -6,12 +6,15 @@ using Content.Shared.Interaction.Events;
 using Content.Shared.Interaction.Helpers;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 
 namespace Content.Server.Body.Surgery.Components
 {
     [UsedImplicitly]
     public class SurgeryToolSystem : EntitySystem
     {
+        [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!;
+
         private readonly HashSet<SurgeryToolComponent> _openSurgeryUIs = new();
 
         public override void Initialize()
@@ -54,7 +57,7 @@ namespace Content.Server.Body.Surgery.Components
                     continue;
                 }
 
-                if (!Get<ActionBlockerSystem>().CanInteract(tool.PerformerCache) ||
+                if (!_actionBlockerSystem.CanInteract(tool.PerformerCache) ||
                     !tool.PerformerCache.InRangeUnobstructed(tool.BodyCache))
                 {
                     tool.CloseAllSurgeryUIs();
diff --git a/Content.Server/Chemistry/Metabolism/DefaultDrink.cs b/Content.Server/Chemistry/Metabolism/DefaultDrink.cs
deleted file mode 100644
index 3b32776c85..0000000000
--- a/Content.Server/Chemistry/Metabolism/DefaultDrink.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using Content.Server.Nutrition.Components;
-using Content.Shared.Chemistry;
-using Content.Shared.Chemistry.Metabolizable;
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Serialization.Manager.Attributes;
-
-namespace Content.Server.Chemistry.Metabolism
-{
-    /// <summary>
-    /// Default metabolism for drink reagents. Attempts to find a ThirstComponent on the target,
-    /// and to update it's thirst values.
-    /// </summary>
-    [DataDefinition]
-    public class DefaultDrink : IMetabolizable
-    {
-        //Rate of metabolism in units / second
-        [DataField("rate")]
-        public ReagentUnit MetabolismRate { get; set; } = ReagentUnit.New(1);
-
-        //How much thirst is satiated when 1u of the reagent is metabolized
-        [DataField("hydrationFactor")]
-        public float HydrationFactor { get; set; } = 30.0f;
-
-        //Remove reagent at set rate, satiate thirst if a ThirstComponent can be found
-        ReagentUnit IMetabolizable.Metabolize(IEntity solutionEntity, string reagentId, float tickTime)
-        {
-            var metabolismAmount = MetabolismRate * tickTime;
-            if (solutionEntity.TryGetComponent(out ThirstComponent? thirst))
-                thirst.UpdateThirst(metabolismAmount.Float() * HydrationFactor);
-
-            //Return amount of reagent to be removed, remove reagent regardless of ThirstComponent presence
-            return metabolismAmount;
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/Metabolism/DefaultFood.cs b/Content.Server/Chemistry/Metabolism/DefaultFood.cs
deleted file mode 100644
index aeba8ed95d..0000000000
--- a/Content.Server/Chemistry/Metabolism/DefaultFood.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using Content.Server.Nutrition.Components;
-using Content.Shared.Chemistry;
-using Content.Shared.Chemistry.Metabolizable;
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Serialization.Manager.Attributes;
-
-namespace Content.Server.Chemistry.Metabolism
-{
-    /// <summary>
-    /// Default metabolism for food reagents. Attempts to find a HungerComponent on the target,
-    /// and to update it's hunger values.
-    /// </summary>
-    [DataDefinition]
-    public class DefaultFood : IMetabolizable
-    {
-        /// <summary>
-        ///     Rate of metabolism in units / second
-        /// </summary>
-        [DataField("rate")] public ReagentUnit MetabolismRate { get; private set; } = ReagentUnit.New(1.0);
-
-        /// <summary>
-        ///     How much hunger is satiated when 1u of the reagent is metabolized
-        /// </summary>
-        [DataField("nutritionFactor")] public float NutritionFactor { get; set; } = 30.0f;
-
-        //Remove reagent at set rate, satiate hunger if a HungerComponent can be found
-        ReagentUnit IMetabolizable.Metabolize(IEntity solutionEntity, string reagentId, float tickTime)
-        {
-            var metabolismAmount = MetabolismRate * tickTime;
-            if (solutionEntity.TryGetComponent(out HungerComponent? hunger))
-                hunger.UpdateFood(metabolismAmount.Float() * NutritionFactor);
-
-            //Return amount of reagent to be removed, remove reagent regardless of HungerComponent presence
-            return metabolismAmount;
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffectConditions/ReagentThreshold.cs b/Content.Server/Chemistry/ReagentEffectConditions/ReagentThreshold.cs
new file mode 100644
index 0000000000..cfc0177d41
--- /dev/null
+++ b/Content.Server/Chemistry/ReagentEffectConditions/ReagentThreshold.cs
@@ -0,0 +1,26 @@
+using Content.Shared.Body.Components;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Chemistry.Solution;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Serialization.Manager.Attributes;
+
+namespace Content.Server.Chemistry.ReagentEffectConditions
+{
+    /// <summary>
+    ///     Used for implementing reagent effects that require a certain amount of reagent before it should be applied.
+    ///     For instance, overdoses.
+    /// </summary>
+    public class ReagentThreshold : ReagentEffectCondition
+    {
+        [DataField("min")]
+        public ReagentUnit Min = ReagentUnit.Zero;
+
+        [DataField("max")]
+        public ReagentUnit Max = ReagentUnit.MaxValue;
+
+        public override bool Condition(IEntity solutionEntity, Solution.ReagentQuantity reagent)
+        {
+            return reagent.Quantity >= Min && reagent.Quantity < Max;
+        }
+    }
+}
diff --git a/Content.Server/Chemistry/Metabolism/HealthChangeMetabolism.cs b/Content.Server/Chemistry/ReagentEffects/HealthChange.cs
similarity index 59%
rename from Content.Server/Chemistry/Metabolism/HealthChangeMetabolism.cs
rename to Content.Server/Chemistry/ReagentEffects/HealthChange.cs
index 45bbff68d7..47b640cdfc 100644
--- a/Content.Server/Chemistry/Metabolism/HealthChangeMetabolism.cs
+++ b/Content.Server/Chemistry/ReagentEffects/HealthChange.cs
@@ -1,31 +1,24 @@
 using Content.Shared.Chemistry;
-using Content.Shared.Chemistry.Metabolizable;
 using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Chemistry.Solution;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Components;
 
-namespace Content.Server.Chemistry.Metabolism
+namespace Content.Server.Chemistry.ReagentEffects
 {
     /// <summary>
     /// Default metabolism for medicine reagents. Attempts to find a DamageableComponent on the target,
     /// and to update its damage values.
     /// </summary>
-    [DataDefinition]
-    public class HealthChangeMetabolism : IMetabolizable
+    public class HealthChange : ReagentEffect
     {
-        /// <summary>
-        /// How much of the reagent should be metabolized each sec.
-        /// </summary>
-        [DataField("rate")]
-        public ReagentUnit MetabolismRate { get; set; } = ReagentUnit.New(1);
-
         /// <summary>
         /// How much damage is changed when 1u of the reagent is metabolized.
         /// </summary>
         [DataField("healthChange")]
-        public float HealthChange { get; set; } = 1.0f;
+        public float AmountToChange { get; set; } = 1.0f;
 
         /// <summary>
         /// Class of damage changed, Brute, Burn, Toxin, Airloss.
@@ -36,18 +29,14 @@ namespace Content.Server.Chemistry.Metabolism
         private float _accumulatedHealth;
 
         /// <summary>
-        /// Remove reagent at set rate, changes damage if a DamageableComponent can be found.
+        ///     Changes damage if a DamageableComponent can be found.
         /// </summary>
-        /// <param name="solutionEntity"></param>
-        /// <param name="reagentId"></param>
-        /// <param name="tickTime"></param>
-        /// <returns></returns>
-        ReagentUnit IMetabolizable.Metabolize(IEntity solutionEntity, string reagentId, float tickTime)
+        public override void Metabolize(IEntity solutionEntity, Solution.ReagentQuantity amount)
         {
             if (solutionEntity.TryGetComponent(out IDamageableComponent? health))
             {
-                health.ChangeDamage(DamageType, (int)HealthChange, true);
-                float decHealthChange = (float) (HealthChange - (int) HealthChange);
+                health.ChangeDamage(DamageType, (int)AmountToChange, true);
+                float decHealthChange = (float) (AmountToChange - (int) AmountToChange);
                 _accumulatedHealth += decHealthChange;
 
                 if (_accumulatedHealth >= 1)
@@ -62,7 +51,6 @@ namespace Content.Server.Chemistry.Metabolism
                     _accumulatedHealth += 1;
                 }
             }
-            return MetabolismRate;
         }
     }
 }
diff --git a/Content.Server/Chemistry/ReagentEffects/MovespeedModifier.cs b/Content.Server/Chemistry/ReagentEffects/MovespeedModifier.cs
new file mode 100644
index 0000000000..9031737443
--- /dev/null
+++ b/Content.Server/Chemistry/ReagentEffects/MovespeedModifier.cs
@@ -0,0 +1,69 @@
+using Content.Shared.Chemistry.Reagent;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Serialization.Manager.Attributes;
+using Content.Shared.Movement.Components;
+using Content.Shared.Chemistry.Components;
+using Robust.Shared.Timing;
+using Robust.Shared.IoC;
+using System;
+using Content.Shared.Chemistry.Solution;
+
+namespace Content.Server.Chemistry.ReagentEffects
+{
+    /// <summary>
+    /// Default metabolism for stimulants and tranqs. Attempts to find a MovementSpeedModifier on the target,
+    /// adding one if not there and to change the movespeed
+    /// </summary>
+    public class MovespeedModifier : ReagentEffect
+    {
+        /// <summary>
+        /// How much the entities' walk speed is multiplied by.
+        /// </summary>
+        [DataField("walkSpeedModifier")]
+        public float WalkSpeedModifier { get; set; } = 1;
+
+        /// <summary>
+        /// How much the entities' run speed is multiplied by.
+        /// </summary>
+        [DataField("sprintSpeedModifier")]
+        public float SprintSpeedModifier { get; set; } = 1;
+
+        /// <summary>
+        /// How long the modifier applies (in seconds) when metabolized.
+        /// </summary>
+        [DataField("statusLifetime")]
+        public float StatusLifetime = 2f;
+
+        /// <summary>
+        /// Remove reagent at set rate, changes the movespeed modifiers and adds a MovespeedModifierMetabolismComponent if not already there.
+        /// </summary>
+        public override void Metabolize(IEntity solutionEntity, Solution.ReagentQuantity amount)
+        {
+            if (!solutionEntity.TryGetComponent(out MovementSpeedModifierComponent? movement)) return;
+
+            solutionEntity.EnsureComponent(out MovespeedModifierMetabolismComponent status);
+
+            // Only refresh movement if we need to.
+            var modified = !status.WalkSpeedModifier.Equals(WalkSpeedModifier) ||
+                           !status.SprintSpeedModifier.Equals(SprintSpeedModifier);
+
+            status.WalkSpeedModifier = WalkSpeedModifier;
+            status.SprintSpeedModifier = SprintSpeedModifier;
+
+            IncreaseTimer(status, StatusLifetime * amount.Quantity.Float());
+
+            if (modified)
+                movement.RefreshMovementSpeedModifiers();
+
+        }
+        public void IncreaseTimer(MovespeedModifierMetabolismComponent status, float time)
+        {
+            var gameTiming = IoCManager.Resolve<IGameTiming>();
+
+            var offsetTime = Math.Max(status.ModifierTimer.TotalSeconds, gameTiming.CurTime.TotalSeconds);
+
+            status.ModifierTimer = TimeSpan.FromSeconds(offsetTime + time);
+            status.Dirty();
+        }
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffects/SatiateHunger.cs b/Content.Server/Chemistry/ReagentEffects/SatiateHunger.cs
new file mode 100644
index 0000000000..983d30b565
--- /dev/null
+++ b/Content.Server/Chemistry/ReagentEffects/SatiateHunger.cs
@@ -0,0 +1,28 @@
+using Content.Server.Nutrition.Components;
+using Content.Shared.Chemistry;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Chemistry.Solution;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Serialization.Manager.Attributes;
+
+namespace Content.Server.Chemistry.ReagentEffects
+{
+    /// <summary>
+    /// Attempts to find a HungerComponent on the target,
+    /// and to update it's hunger values.
+    /// </summary>
+    public class SatiateHunger : ReagentEffect
+    {
+        /// <summary>
+        ///     How much hunger is satiated when 1u of the reagent is metabolized
+        /// </summary>
+        [DataField("nutritionFactor")] public float NutritionFactor { get; set; } = 3.0f;
+
+        //Remove reagent at set rate, satiate hunger if a HungerComponent can be found
+        public override void Metabolize(IEntity solutionEntity, Solution.ReagentQuantity amount)
+        {
+            if (solutionEntity.TryGetComponent(out HungerComponent? hunger))
+                hunger.UpdateFood(NutritionFactor);
+        }
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffects/SatiateThirst.cs b/Content.Server/Chemistry/ReagentEffects/SatiateThirst.cs
new file mode 100644
index 0000000000..637c56f235
--- /dev/null
+++ b/Content.Server/Chemistry/ReagentEffects/SatiateThirst.cs
@@ -0,0 +1,28 @@
+using Content.Server.Nutrition.Components;
+using Content.Shared.Chemistry;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Chemistry.Solution;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Serialization.Manager.Attributes;
+
+namespace Content.Server.Chemistry.ReagentEffects
+{
+    /// <summary>
+    /// Default metabolism for drink reagents. Attempts to find a ThirstComponent on the target,
+    /// and to update it's thirst values.
+    /// </summary>
+    public class SatiateThirst : ReagentEffect
+    {
+        /// How much thirst is satiated each metabolism tick. Not currently tied to
+        /// rate or anything.
+        [DataField("hydrationFactor")]
+        public float HydrationFactor { get; set; } = 3.0f;
+
+        /// Satiate thirst if a ThirstComponent can be found
+        public override void Metabolize(IEntity solutionEntity, Solution.ReagentQuantity amount)
+        {
+            if (solutionEntity.TryGetComponent(out ThirstComponent? thirst))
+                thirst.UpdateThirst(HydrationFactor);
+        }
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEntityReactions/AddToSolutionReaction.cs b/Content.Server/Chemistry/ReagentEntityReactions/AddToSolutionReaction.cs
index 3218e4f983..f509fa0d56 100644
--- a/Content.Server/Chemistry/ReagentEntityReactions/AddToSolutionReaction.cs
+++ b/Content.Server/Chemistry/ReagentEntityReactions/AddToSolutionReaction.cs
@@ -10,7 +10,6 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototy
 namespace Content.Server.Chemistry.ReagentEntityReactions
 {
     [UsedImplicitly]
-    [DataDefinition]
     public class AddToSolutionReaction : ReagentEntityReaction
     {
         [DataField("reagents", true, customTypeSerializer:typeof(PrototypeIdHashSetSerializer<ReagentPrototype>))]
diff --git a/Content.Server/Chemistry/ReagentEntityReactions/ExtinguishReaction.cs b/Content.Server/Chemistry/ReagentEntityReactions/ExtinguishReaction.cs
index 9078eef2d1..860df2c423 100644
--- a/Content.Server/Chemistry/ReagentEntityReactions/ExtinguishReaction.cs
+++ b/Content.Server/Chemistry/ReagentEntityReactions/ExtinguishReaction.cs
@@ -10,7 +10,6 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototy
 namespace Content.Server.Chemistry.ReagentEntityReactions
 {
     [UsedImplicitly]
-    [DataDefinition]
     public class ExtinguishReaction : ReagentEntityReaction
     {
         [DataField("reagents", true, customTypeSerializer:typeof(PrototypeIdHashSetSerializer<ReagentPrototype>))]
diff --git a/Content.Server/Chemistry/ReagentEntityReactions/FlammableReaction.cs b/Content.Server/Chemistry/ReagentEntityReactions/FlammableReaction.cs
index 5242565e0e..8c71a8904d 100644
--- a/Content.Server/Chemistry/ReagentEntityReactions/FlammableReaction.cs
+++ b/Content.Server/Chemistry/ReagentEntityReactions/FlammableReaction.cs
@@ -10,7 +10,6 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototy
 namespace Content.Server.Chemistry.ReagentEntityReactions
 {
     [UsedImplicitly]
-    [DataDefinition]
     public class FlammableReaction : ReagentEntityReaction
     {
         [DataField("reagents", true, customTypeSerializer:typeof(PrototypeIdHashSetSerializer<ReagentPrototype>))]
diff --git a/Content.Server/Chemistry/ReagentEntityReactions/WashCreamPieReaction.cs b/Content.Server/Chemistry/ReagentEntityReactions/WashCreamPieReaction.cs
index 44774ffcc9..8005384562 100644
--- a/Content.Server/Chemistry/ReagentEntityReactions/WashCreamPieReaction.cs
+++ b/Content.Server/Chemistry/ReagentEntityReactions/WashCreamPieReaction.cs
@@ -10,7 +10,6 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototy
 namespace Content.Server.Chemistry.ReagentEntityReactions
 {
     [UsedImplicitly]
-    [DataDefinition]
     public class WashCreamPieReaction : ReagentEntityReaction
     {
         [DataField("reagents", true, customTypeSerializer:typeof(PrototypeIdHashSetSerializer<ReagentPrototype>))]
diff --git a/Content.Server/Construction/ConstructionSystem.cs b/Content.Server/Construction/ConstructionSystem.cs
index 11e7c41f72..f69cffd012 100644
--- a/Content.Server/Construction/ConstructionSystem.cs
+++ b/Content.Server/Construction/ConstructionSystem.cs
@@ -39,6 +39,8 @@ namespace Content.Server.Construction
     {
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IRobustRandom _robustRandom = default!;
+        [Dependency] private readonly DoAfterSystem _doAfterSystem = default!;
+        [Dependency] private readonly StackSystem _stackSystem = default!;
 
         private readonly Dictionary<ICommonSession, HashSet<int>> _beingBuilt = new();
 
@@ -170,7 +172,7 @@ namespace Content.Server.Construction
                             if (!materialStep.EntityValid(entity, out var stack))
                                 continue;
 
-                            var splitStack = Get<StackSystem>().Split(entity.Uid, stack, materialStep.Amount, user.ToCoordinates());
+                            var splitStack = _stackSystem.Split(entity.Uid, stack, materialStep.Amount, user.ToCoordinates());
 
                             if (splitStack == null)
                                 continue;
@@ -226,8 +228,6 @@ namespace Content.Server.Construction
                 return null;
             }
 
-            var doAfterSystem = Get<DoAfterSystem>();
-
             var doAfterArgs = new DoAfterEventArgs(user, doAfterTime)
             {
                 BreakOnDamage = true,
@@ -237,7 +237,7 @@ namespace Content.Server.Construction
                 NeedHand = false,
             };
 
-            if (await doAfterSystem.WaitDoAfter(doAfterArgs) == DoAfterStatus.Cancelled)
+            if (await _doAfterSystem.WaitDoAfter(doAfterArgs) == DoAfterStatus.Cancelled)
             {
                 FailCleanup();
                 return null;
diff --git a/Content.Server/Destructible/DestructibleSystem.cs b/Content.Server/Destructible/DestructibleSystem.cs
index f2ad5d4922..1be935c9f6 100644
--- a/Content.Server/Destructible/DestructibleSystem.cs
+++ b/Content.Server/Destructible/DestructibleSystem.cs
@@ -11,17 +11,7 @@ namespace Content.Server.Destructible
     public class DestructibleSystem : EntitySystem
     {
         [Dependency] public readonly IRobustRandom Random = default!;
-
-        public AudioSystem AudioSystem { get; private set; } = default!;
-
-        public ActSystem ActSystem { get; private set; } = default!;
-
-        public override void Initialize()
-        {
-            base.Initialize();
-
-            AudioSystem = Get<AudioSystem>();
-            ActSystem = Get<ActSystem>();
-        }
+        [Dependency] public readonly AudioSystem AudioSystem = default!;
+        [Dependency] public readonly ActSystem ActSystem = default!;
     }
 }
diff --git a/Content.Server/Doors/Components/AirlockComponent.cs b/Content.Server/Doors/Components/AirlockComponent.cs
index 42e3bc2369..dda64b4cda 100644
--- a/Content.Server/Doors/Components/AirlockComponent.cs
+++ b/Content.Server/Doors/Components/AirlockComponent.cs
@@ -7,12 +7,14 @@ using Content.Shared.Doors;
 using Content.Shared.Interaction;
 using Content.Shared.Notification;
 using Content.Shared.Notification.Managers;
+using Content.Shared.Sound;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using Robust.Shared.Player;
+using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 using static Content.Shared.Wires.SharedWiresComponent;
 using static Content.Shared.Wires.SharedWiresComponent.WiresAction;
@@ -23,30 +25,41 @@ namespace Content.Server.Doors.Components
     /// Companion component to ServerDoorComponent that handles airlock-specific behavior -- wires, requiring power to operate, bolts, and allowing automatic closing.
     /// </summary>
     [RegisterComponent]
-    [ComponentReference(typeof(IDoorCheck))]
-    public class AirlockComponent : Component, IWires, IDoorCheck
+    public class AirlockComponent : Component, IWires
     {
         public override string Name => "Airlock";
 
         [ComponentDependency]
-        private readonly ServerDoorComponent? _doorComponent = null;
+        public readonly ServerDoorComponent? DoorComponent = null;
 
         [ComponentDependency]
-        private readonly SharedAppearanceComponent? _appearanceComponent = null;
+        public readonly SharedAppearanceComponent? AppearanceComponent = null;
 
         [ComponentDependency]
-        private readonly ApcPowerReceiverComponent? _receiverComponent = null;
+        public readonly ApcPowerReceiverComponent? ReceiverComponent = null;
 
         [ComponentDependency]
-        private readonly WiresComponent? _wiresComponent = null;
+        public readonly WiresComponent? WiresComponent = null;
+
+        /// <summary>
+        /// Sound to play when the bolts on the airlock go up.
+        /// </summary>
+        [DataField("boltUpSound")]
+        public SoundSpecifier BoltUpSound = new SoundPathSpecifier("/Audio/Machines/boltsup.ogg");
+
+        /// <summary>
+        /// Sound to play when the bolts on the airlock go down.
+        /// </summary>
+        [DataField("boltDownSound")]
+        public SoundSpecifier BoltDownSound = new SoundPathSpecifier("/Audio/Machines/boltsdown.ogg");
 
         /// <summary>
         /// Duration for which power will be disabled after pulsing either power wire.
         /// </summary>
-        private static readonly TimeSpan PowerWiresTimeout = TimeSpan.FromSeconds(5.0);
+        [DataField("powerWiresTimeout")]
+        public float PowerWiresTimeout = 5.0f;
 
         private CancellationTokenSource _powerWiresPulsedTimerCancel = new();
-
         private bool _powerWiresPulsed;
 
         /// <summary>
@@ -83,7 +96,7 @@ namespace Content.Server.Doors.Components
         private bool BoltLightsVisible
         {
             get => _boltLightsWirePulsed && BoltsDown && IsPowered()
-                && _doorComponent != null && _doorComponent.State == SharedDoorComponent.DoorState.Closed;
+                && DoorComponent != null && DoorComponent.State == SharedDoorComponent.DoorState.Closed;
             set
             {
                 _boltLightsWirePulsed = value;
@@ -91,120 +104,53 @@ namespace Content.Server.Doors.Components
             }
         }
 
-        private static readonly TimeSpan AutoCloseDelayFast = TimeSpan.FromSeconds(1);
+        [ViewVariables(VVAccess.ReadWrite)]
+        [DataField("autoClose")]
+        public bool AutoClose = true;
 
         [ViewVariables(VVAccess.ReadWrite)]
-        private bool _autoClose = true;
+        [DataField("autoCloseDelayModifier")]
+        public float AutoCloseDelayModifier = 1.0f;
 
         [ViewVariables(VVAccess.ReadWrite)]
-        private bool _normalCloseSpeed = true;
-
-        [ViewVariables(VVAccess.ReadWrite)]
-        private bool _safety = true;
+        public bool Safety = true;
 
         protected override void Initialize()
         {
             base.Initialize();
 
-            if (_receiverComponent != null && _appearanceComponent != null)
+            if (ReceiverComponent != null && AppearanceComponent != null)
             {
-                _appearanceComponent.SetData(DoorVisuals.Powered, _receiverComponent.Powered);
+                AppearanceComponent.SetData(DoorVisuals.Powered, ReceiverComponent.Powered);
             }
         }
 
-        public override void HandleMessage(ComponentMessage message, IComponent? component)
-        {
-            base.HandleMessage(message, component);
-            switch (message)
-            {
-                case PowerChangedMessage powerChanged:
-                    PowerDeviceOnOnPowerStateChanged(powerChanged);
-                    break;
-            }
-        }
-
-        void IDoorCheck.OnStateChange(SharedDoorComponent.DoorState doorState)
-        {
-            // Only show the maintenance panel if the airlock is closed
-            if (_wiresComponent != null)
-            {
-                _wiresComponent.IsPanelVisible = doorState != SharedDoorComponent.DoorState.Open;
-            }
-            // If the door is closed, we should look if the bolt was locked while closing
-            UpdateBoltLightStatus();
-        }
-
-        bool IDoorCheck.OpenCheck() => CanChangeState();
-
-        bool IDoorCheck.CloseCheck() => CanChangeState();
-
-        bool IDoorCheck.DenyCheck() => CanChangeState();
-
-        bool IDoorCheck.SafetyCheck() => _safety;
-
-        bool IDoorCheck.AutoCloseCheck() => _autoClose;
-
-        TimeSpan? IDoorCheck.GetCloseSpeed()
-        {
-            if (_normalCloseSpeed)
-            {
-                return null;
-            }
-            return AutoCloseDelayFast;
-        }
-
-        bool IDoorCheck.BlockActivate(ActivateEventArgs eventArgs)
-        {
-            if (_wiresComponent != null && _wiresComponent.IsPanelOpen &&
-                eventArgs.User.TryGetComponent(out ActorComponent? actor))
-            {
-                _wiresComponent.OpenInterface(actor.PlayerSession);
-                return true;
-            }
-            return false;
-        }
-
-        bool IDoorCheck.CanPryCheck(InteractUsingEventArgs eventArgs)
-        {
-            if (IsBolted())
-            {
-                Owner.PopupMessage(eventArgs.User, Loc.GetString("airlock-component-cannot-pry-is-bolted-message"));
-                return false;
-            }
-            if (IsPowered())
-            {
-                Owner.PopupMessage(eventArgs.User, Loc.GetString("airlock-component-cannot-pry-is-powered-message"));
-                return false;
-            }
-            return true;
-        }
-
-        private bool CanChangeState()
+        public bool CanChangeState()
         {
             return IsPowered() && !IsBolted();
         }
 
-        private bool IsBolted()
+        public bool IsBolted()
         {
             return _boltsDown;
         }
 
-        private bool IsPowered()
+        public bool IsPowered()
         {
-            return _receiverComponent == null || _receiverComponent.Powered;
+            return ReceiverComponent == null || ReceiverComponent.Powered;
         }
 
-        private void UpdateBoltLightStatus()
+        public void UpdateBoltLightStatus()
         {
-            if (_appearanceComponent != null)
+            if (AppearanceComponent != null)
             {
-                _appearanceComponent.SetData(DoorVisuals.BoltLights, BoltLightsVisible);
+                AppearanceComponent.SetData(DoorVisuals.BoltLights, BoltLightsVisible);
             }
         }
 
-        private void UpdateWiresStatus()
+        public void UpdateWiresStatus()
         {
-            if (_doorComponent == null)
+            if (DoorComponent == null)
             {
                 return;
             }
@@ -214,9 +160,9 @@ namespace Content.Server.Doors.Components
             {
                 powerLight = new StatusLightData(Color.Yellow, StatusLightState.BlinkingFast, "POWR");
             }
-            else if (_wiresComponent != null &&
-                     _wiresComponent.IsWireCut(Wires.MainPower) &&
-                     _wiresComponent.IsWireCut(Wires.BackupPower))
+            else if (WiresComponent != null &&
+                     WiresComponent.IsWireCut(Wires.MainPower) &&
+                     WiresComponent.IsWireCut(Wires.BackupPower))
             {
                 powerLight = new StatusLightData(Color.Red, StatusLightState.On, "POWR");
             }
@@ -226,63 +172,59 @@ namespace Content.Server.Doors.Components
             var boltLightsStatus = new StatusLightData(Color.Lime,
                 _boltLightsWirePulsed ? StatusLightState.On : StatusLightState.Off, "BLTL");
 
+            var ev = new DoorGetCloseTimeModifierEvent();
+            Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, ev, false);
+
             var timingStatus =
-                new StatusLightData(Color.Orange, !_autoClose ? StatusLightState.Off :
-                                                    !_normalCloseSpeed ? StatusLightState.BlinkingSlow :
+                new StatusLightData(Color.Orange, !AutoClose ? StatusLightState.Off :
+                                                    !MathHelper.CloseTo(ev.CloseTimeModifier, 1.0f) ? StatusLightState.BlinkingSlow :
                                                     StatusLightState.On,
                                                     "TIME");
 
             var safetyStatus =
-                new StatusLightData(Color.Red, _safety ? StatusLightState.On : StatusLightState.Off, "SAFE");
+                new StatusLightData(Color.Red, Safety ? StatusLightState.On : StatusLightState.Off, "SAFE");
 
-            if (_wiresComponent == null)
+            if (WiresComponent == null)
             {
                 return;
             }
 
-            _wiresComponent.SetStatus(AirlockWireStatus.PowerIndicator, powerLight);
-            _wiresComponent.SetStatus(AirlockWireStatus.BoltIndicator, boltStatus);
-            _wiresComponent.SetStatus(AirlockWireStatus.BoltLightIndicator, boltLightsStatus);
-            _wiresComponent.SetStatus(AirlockWireStatus.AIControlIndicator, new StatusLightData(Color.Purple, StatusLightState.BlinkingSlow, "AICT"));
-            _wiresComponent.SetStatus(AirlockWireStatus.TimingIndicator, timingStatus);
-            _wiresComponent.SetStatus(AirlockWireStatus.SafetyIndicator, safetyStatus);
-            /*
-            _wires.SetStatus(6, powerLight);
-            _wires.SetStatus(7, powerLight);
-            _wires.SetStatus(8, powerLight);
-            _wires.SetStatus(9, powerLight);
-            _wires.SetStatus(10, powerLight);
-            _wires.SetStatus(11, powerLight);*/
+            WiresComponent.SetStatus(AirlockWireStatus.PowerIndicator, powerLight);
+            WiresComponent.SetStatus(AirlockWireStatus.BoltIndicator, boltStatus);
+            WiresComponent.SetStatus(AirlockWireStatus.BoltLightIndicator, boltLightsStatus);
+            WiresComponent.SetStatus(AirlockWireStatus.AIControlIndicator, new StatusLightData(Color.Purple, StatusLightState.BlinkingSlow, "AICT"));
+            WiresComponent.SetStatus(AirlockWireStatus.TimingIndicator, timingStatus);
+            WiresComponent.SetStatus(AirlockWireStatus.SafetyIndicator, safetyStatus);
         }
 
         private void UpdatePowerCutStatus()
         {
-            if (_receiverComponent == null)
+            if (ReceiverComponent == null)
             {
                 return;
             }
 
             if (PowerWiresPulsed)
             {
-                _receiverComponent.PowerDisabled = true;
+                ReceiverComponent.PowerDisabled = true;
                 return;
             }
 
-            if (_wiresComponent == null)
+            if (WiresComponent == null)
             {
                 return;
             }
 
-            _receiverComponent.PowerDisabled =
-                _wiresComponent.IsWireCut(Wires.MainPower) ||
-                _wiresComponent.IsWireCut(Wires.BackupPower);
+            ReceiverComponent.PowerDisabled =
+                WiresComponent.IsWireCut(Wires.MainPower) ||
+                WiresComponent.IsWireCut(Wires.BackupPower);
         }
 
         private void PowerDeviceOnOnPowerStateChanged(PowerChangedMessage e)
         {
-            if (_appearanceComponent != null)
+            if (AppearanceComponent != null)
             {
-                _appearanceComponent.SetData(DoorVisuals.Powered, e.Powered);
+                AppearanceComponent.SetData(DoorVisuals.Powered, e.Powered);
             }
 
             // BoltLights also got out
@@ -341,19 +283,13 @@ namespace Content.Server.Doors.Components
             builder.CreateWire(Wires.BoltLight);
             builder.CreateWire(Wires.Timing);
             builder.CreateWire(Wires.Safety);
-            /*
-            builder.CreateWire(6);
-            builder.CreateWire(7);
-            builder.CreateWire(8);
-            builder.CreateWire(9);
-            builder.CreateWire(10);
-            builder.CreateWire(11);*/
+
             UpdateWiresStatus();
         }
 
         public void WiresUpdate(WiresUpdateEventArgs args)
         {
-            if(_doorComponent == null)
+            if(DoorComponent == null)
             {
                 return;
             }
@@ -367,7 +303,7 @@ namespace Content.Server.Doors.Components
                         PowerWiresPulsed = true;
                         _powerWiresPulsedTimerCancel.Cancel();
                         _powerWiresPulsedTimerCancel = new CancellationTokenSource();
-                        Owner.SpawnTimer(PowerWiresTimeout,
+                        Owner.SpawnTimer(TimeSpan.FromSeconds(PowerWiresTimeout),
                             () => PowerWiresPulsed = false,
                             _powerWiresPulsedTimerCancel.Token);
                         break;
@@ -390,11 +326,11 @@ namespace Content.Server.Doors.Components
                         BoltLightsVisible = !_boltLightsWirePulsed;
                         break;
                     case Wires.Timing:
-                        _normalCloseSpeed = !_normalCloseSpeed;
-                        _doorComponent.RefreshAutoClose();
+                        AutoCloseDelayModifier = 0.5f;
+                        DoorComponent.RefreshAutoClose();
                         break;
                     case Wires.Safety:
-                        _safety = !_safety;
+                        Safety = !Safety;
                         break;
                 }
             }
@@ -413,11 +349,11 @@ namespace Content.Server.Doors.Components
                         BoltLightsVisible = true;
                         break;
                     case Wires.Timing:
-                        _autoClose = true;
-                        _doorComponent.RefreshAutoClose();
+                        AutoClose = true;
+                        DoorComponent.RefreshAutoClose();
                         break;
                     case Wires.Safety:
-                        _safety = true;
+                        Safety = true;
                         break;
                 }
             }
@@ -433,11 +369,11 @@ namespace Content.Server.Doors.Components
                         BoltLightsVisible = false;
                         break;
                     case Wires.Timing:
-                        _autoClose = false;
-                        _doorComponent.RefreshAutoClose();
+                        AutoClose = false;
+                        DoorComponent.RefreshAutoClose();
                         break;
                     case Wires.Safety:
-                        _safety = false;
+                        Safety = false;
                         break;
                 }
             }
@@ -455,7 +391,7 @@ namespace Content.Server.Doors.Components
 
             BoltsDown = newBolts;
 
-            SoundSystem.Play(Filter.Broadcast(), newBolts ? "/Audio/Machines/boltsdown.ogg" : "/Audio/Machines/boltsup.ogg", Owner);
+            SoundSystem.Play(Filter.Broadcast(), newBolts ? BoltDownSound.GetSound() : BoltUpSound.GetSound(), Owner);
         }
     }
 }
diff --git a/Content.Server/Atmos/Components/FirelockComponent.cs b/Content.Server/Doors/Components/FirelockComponent.cs
similarity index 59%
rename from Content.Server/Atmos/Components/FirelockComponent.cs
rename to Content.Server/Doors/Components/FirelockComponent.cs
index b1849cd757..ee7154bb28 100644
--- a/Content.Server/Atmos/Components/FirelockComponent.cs
+++ b/Content.Server/Doors/Components/FirelockComponent.cs
@@ -1,3 +1,4 @@
+using Content.Server.Atmos.Components;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Doors;
 using Content.Server.Doors.Components;
@@ -6,26 +7,34 @@ using Content.Shared.Interaction;
 using Content.Shared.Notification.Managers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
+using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.Atmos.Components
+namespace Content.Server.Doors.Components
 {
     /// <summary>
-    /// Companion component to ServerDoorComponent that handles firelock-specific behavior -- primarily prying, and not being openable on open-hand click.
+    /// Companion component to ServerDoorComponent that handles firelock-specific behavior -- primarily prying,
+    /// and not being openable on open-hand click.
     /// </summary>
     [RegisterComponent]
-    [ComponentReference(typeof(IDoorCheck))]
-    public class FirelockComponent : Component, IDoorCheck
+    public class FirelockComponent : Component
     {
         public override string Name => "Firelock";
 
         [ComponentDependency]
-        private readonly ServerDoorComponent? _doorComponent = null;
+        public readonly ServerDoorComponent? DoorComponent = null;
+
+        /// <summary>
+        /// Pry time modifier to be used when the firelock is currently closed due to fire or pressure.
+        /// </summary>
+        /// <returns></returns>
+        [DataField("lockedPryTimeModifier")]
+        public float LockedPryTimeModifier = 1.5f;
 
         public bool EmergencyPressureStop()
         {
-            if (_doorComponent != null && _doorComponent.State == SharedDoorComponent.DoorState.Open && _doorComponent.CanCloseGeneric())
+            if (DoorComponent != null && DoorComponent.State == SharedDoorComponent.DoorState.Open && DoorComponent.CanCloseGeneric())
             {
-                _doorComponent.Close();
+                DoorComponent.Close();
                 if (Owner.TryGetComponent(out AirtightComponent? airtight))
                 {
                     EntitySystem.Get<AirtightSystem>().SetAirblocked(airtight, true);
@@ -35,41 +44,6 @@ namespace Content.Server.Atmos.Components
             return false;
         }
 
-        bool IDoorCheck.OpenCheck()
-        {
-            return !IsHoldingFire() && !IsHoldingPressure();
-        }
-
-        bool IDoorCheck.DenyCheck() => false;
-
-        float? IDoorCheck.GetPryTime()
-        {
-            if (IsHoldingFire() || IsHoldingPressure())
-            {
-                return 1.5f;
-            }
-            return null;
-        }
-
-        bool IDoorCheck.BlockActivate(ActivateEventArgs eventArgs) => true;
-
-        void IDoorCheck.OnStartPry(InteractUsingEventArgs eventArgs)
-        {
-            if (_doorComponent == null || _doorComponent.State != SharedDoorComponent.DoorState.Closed)
-            {
-                return;
-            }
-
-            if (IsHoldingPressure())
-            {
-                Owner.PopupMessage(eventArgs.User, Loc.GetString("firelock-component-is-holding-pressure-message"));
-            }
-            else if (IsHoldingFire())
-            {
-                Owner.PopupMessage(eventArgs.User, Loc.GetString("firelock-component-is-holding-fire-message"));
-            }
-        }
-
         public bool IsHoldingPressure(float threshold = 20)
         {
             var atmosphereSystem = EntitySystem.Get<AtmosphereSystem>();
diff --git a/Content.Server/Doors/Components/ServerDoorComponent.cs b/Content.Server/Doors/Components/ServerDoorComponent.cs
index 8449074d65..1feb49a3b6 100644
--- a/Content.Server/Doors/Components/ServerDoorComponent.cs
+++ b/Content.Server/Doors/Components/ServerDoorComponent.cs
@@ -14,6 +14,7 @@ using Content.Shared.Damage;
 using Content.Shared.Damage.Components;
 using Content.Shared.Doors;
 using Content.Shared.Interaction;
+using Content.Shared.Sound;
 using Content.Shared.Tool;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
@@ -37,9 +38,6 @@ namespace Content.Server.Doors.Components
     [ComponentReference(typeof(SharedDoorComponent))]
     public class ServerDoorComponent : SharedDoorComponent, IActivate, IInteractUsing, IMapInit
     {
-        [ComponentDependency]
-        private readonly IDoorCheck? _doorCheck = null;
-
         [ViewVariables]
         [DataField("board")]
         private string? _boardPrototype;
@@ -63,11 +61,8 @@ namespace Content.Server.Doors.Components
                     _ => throw new ArgumentOutOfRangeException(),
                 };
 
-                if (_doorCheck != null)
-                {
-                    _doorCheck.OnStateChange(State);
-                    RefreshAutoClose();
-                }
+                Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, new DoorStateChangedEvent(State), false);
+                _autoCloseCancelTokenSource?.Cancel();
 
                 Dirty();
             }
@@ -105,7 +100,7 @@ namespace Content.Server.Doors.Components
         /// Handled in Startup().
         /// </summary>
         [ViewVariables(VVAccess.ReadWrite)] [DataField("startOpen")]
-        private bool _startOpen;
+        private bool _startOpen = false;
 
         /// <summary>
         /// Whether the airlock is welded shut. Can be set by the prototype, although this will fail if the door isn't weldable.
@@ -139,6 +134,41 @@ namespace Content.Server.Doors.Components
         [DataField("weldable")]
         private bool _weldable = true;
 
+        /// <summary>
+        /// Sound to play when the door opens.
+        /// </summary>
+        [DataField("openSound")]
+        public SoundSpecifier? OpenSound;
+
+        /// <summary>
+        /// Sound to play when the door closes.
+        /// </summary>
+        [DataField("closeSound")]
+        public SoundSpecifier? CloseSound;
+
+        /// <summary>
+        /// Sound to play if the door is denied.
+        /// </summary>
+        [DataField("denySound")]
+        public SoundSpecifier? DenySound;
+
+        /// <summary>
+        /// Default time that the door should take to pry open.
+        /// </summary>
+        [DataField("pryTime")]
+        public float PryTime = 0.5f;
+
+        /// <summary>
+        ///     Minimum interval allowed between deny sounds in milliseconds.
+        /// </summary>
+        [DataField("denySoundMinimumInterval")]
+        public float DenySoundMinimumInterval = 250.0f;
+
+        /// <summary>
+        ///     Used to stop people from spamming the deny sound.
+        /// </summary>
+        private TimeSpan LastDenySoundTime = TimeSpan.Zero;
+
         /// <summary>
         /// Whether the door can currently be welded.
         /// </summary>
@@ -149,6 +179,7 @@ namespace Content.Server.Doors.Components
         /// </summary>
         private bool _beingWelded;
 
+
         //[ViewVariables(VVAccess.ReadWrite)]
         //[DataField("canCrush")]
         //private bool _canCrush = true; // TODO implement door crushing
@@ -187,7 +218,7 @@ namespace Content.Server.Doors.Components
                     Logger.Warning("{0} prototype loaded with incompatible flags: 'welded' and 'startOpen' are both true.", Owner.Name);
                     return;
                 }
-                QuickOpen();
+                QuickOpen(false);
             }
 
             CreateDoorElectronicsBoard();
@@ -195,10 +226,10 @@ namespace Content.Server.Doors.Components
 
         void IActivate.Activate(ActivateEventArgs eventArgs)
         {
-            if (_doorCheck != null && _doorCheck.BlockActivate(eventArgs))
-            {
+            DoorClickShouldActivateEvent ev = new DoorClickShouldActivateEvent(eventArgs);
+            Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, ev, false);
+            if (ev.Handled)
                 return;
-            }
 
             if (State == DoorState.Open)
             {
@@ -279,12 +310,10 @@ namespace Content.Server.Doors.Components
             {
                 return false;
             }
-            if(_doorCheck != null)
-            {
-                return _doorCheck.OpenCheck();
-            }
 
-            return true;
+            var ev = new BeforeDoorOpenedEvent();
+            Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, ev, false);
+            return !ev.Cancelled;
         }
 
         /// <summary>
@@ -301,12 +330,19 @@ namespace Content.Server.Doors.Components
             _stateChangeCancelTokenSource?.Cancel();
             _stateChangeCancelTokenSource = new();
 
+            if (OpenSound != null)
+            {
+                SoundSystem.Play(Filter.Pvs(Owner), OpenSound.GetSound(),
+                    AudioParams.Default.WithVolume(-5));
+            }
+
             Owner.SpawnTimer(OpenTimeOne, async () =>
             {
                 OnPartialOpen();
                 await Timer.Delay(OpenTimeTwo, _stateChangeCancelTokenSource.Token);
 
                 State = DoorState.Open;
+                RefreshAutoClose();
             }, _stateChangeCancelTokenSource.Token);
         }
 
@@ -320,7 +356,7 @@ namespace Content.Server.Doors.Components
             Owner.EntityManager.EventBus.RaiseEvent(EventSource.Local, new AccessReaderChangeMessage(Owner, false));
         }
 
-        private void QuickOpen()
+        private void QuickOpen(bool refresh)
         {
             if (Occludes && Owner.TryGetComponent(out OccluderComponent? occluder))
             {
@@ -328,6 +364,8 @@ namespace Content.Server.Doors.Components
             }
             OnPartialOpen();
             State = DoorState.Open;
+            if(refresh)
+                RefreshAutoClose();
         }
 
         #endregion
@@ -366,17 +404,19 @@ namespace Content.Server.Doors.Components
         /// <returns>Boolean describing whether this door can close.</returns>
         public bool CanCloseGeneric()
         {
-            if (_doorCheck != null && !_doorCheck.CloseCheck())
-            {
+            var ev = new BeforeDoorClosedEvent();
+            Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, ev, false);
+            if (ev.Cancelled)
                 return false;
-            }
 
             return !IsSafetyColliding();
         }
 
         private bool SafetyCheck()
         {
-            return (_doorCheck != null && _doorCheck.SafetyCheck()) || _inhibitCrush;
+            var ev = new DoorSafetyEnabledEvent();
+            Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, ev, false);
+            return ev.Safety || _inhibitCrush;
         }
 
         /// <summary>
@@ -412,6 +452,13 @@ namespace Content.Server.Doors.Components
 
             _stateChangeCancelTokenSource?.Cancel();
             _stateChangeCancelTokenSource = new();
+
+            if (CloseSound != null)
+            {
+                SoundSystem.Play(Filter.Pvs(Owner), CloseSound.GetSound(),
+                    AudioParams.Default.WithVolume(-10));
+            }
+
             Owner.SpawnTimer(CloseTimeOne, async () =>
             {
                 // if somebody walked into the door as it was closing, and we don't crush things
@@ -504,10 +551,10 @@ namespace Content.Server.Doors.Components
 
         public void Deny()
         {
-            if (_doorCheck != null && !_doorCheck.DenyCheck())
-            {
+            var ev = new BeforeDoorDeniedEvent();
+            Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, ev, false);
+            if (ev.Cancelled)
                 return;
-            }
 
             if (State == DoorState.Open || IsWeldedShut)
                 return;
@@ -515,6 +562,25 @@ namespace Content.Server.Doors.Components
             _stateChangeCancelTokenSource?.Cancel();
             _stateChangeCancelTokenSource = new();
             SetAppearance(DoorVisualState.Deny);
+
+            if (DenySound != null)
+            {
+                if (LastDenySoundTime == TimeSpan.Zero)
+                {
+                    LastDenySoundTime = _gameTiming.CurTime;
+                }
+                else
+                {
+                    var difference = _gameTiming.CurTime - LastDenySoundTime;
+                    if (difference < TimeSpan.FromMilliseconds(DenySoundMinimumInterval))
+                        return;
+                }
+
+                LastDenySoundTime = _gameTiming.CurTime;
+                SoundSystem.Play(Filter.Pvs(Owner), DenySound.GetSound(),
+                    AudioParams.Default.WithVolume(-3));
+            }
+
             Owner.SpawnTimer(DenyTime, () =>
             {
                 SetAppearance(DoorVisualState.Closed);
@@ -522,19 +588,24 @@ namespace Content.Server.Doors.Components
         }
 
         /// <summary>
-        /// Stops the current auto-close timer if there is one. Starts a new one if this is appropriate (i.e. entity has an IDoorCheck component that allows auto-closing).
+        /// Starts a new auto close timer if this is appropriate
+        /// (i.e. event raised is not cancelled).
         /// </summary>
         public void RefreshAutoClose()
         {
-            _autoCloseCancelTokenSource?.Cancel();
-
-            if (State != DoorState.Open || _doorCheck == null || !_doorCheck.AutoCloseCheck())
-            {
+            if (State != DoorState.Open)
                 return;
-            }
+
+            var autoev = new BeforeDoorAutoCloseEvent();
+            Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, autoev, false);
+            if (autoev.Cancelled)
+                return;
+
             _autoCloseCancelTokenSource = new();
 
-            var realCloseTime = _doorCheck.GetCloseSpeed() ?? AutoCloseDelay;
+            var ev = new DoorGetCloseTimeModifierEvent();
+            Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, ev, false);
+            var realCloseTime = AutoCloseDelay * ev.CloseTimeModifier;
 
             Owner.SpawnRepeatingTimer(realCloseTime, async () =>
             {
@@ -556,21 +627,18 @@ namespace Content.Server.Doors.Components
             // for prying doors
             if (tool.HasQuality(ToolQuality.Prying) && !IsWeldedShut)
             {
-                var successfulPry = false;
+                var ev = new DoorGetPryTimeModifierEvent();
+                Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, ev, false);
 
-                if (_doorCheck != null)
-                {
-                    _doorCheck.OnStartPry(eventArgs);
-                    successfulPry = await tool.UseTool(eventArgs.User, Owner,
-                        _doorCheck.GetPryTime() ?? 0.5f, ToolQuality.Prying, () => _doorCheck.CanPryCheck(eventArgs));
-                }
-                else
-                {
-                    successfulPry = await tool.UseTool(eventArgs.User, Owner, 0.5f, ToolQuality.Prying);
-                }
+                var canEv = new BeforeDoorPryEvent(eventArgs);
+                Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, canEv, false);
+
+                var successfulPry = await tool.UseTool(eventArgs.User, Owner,
+                        ev.PryTimeModifier * PryTime, ToolQuality.Prying, () => !canEv.Cancelled);
 
                 if (successfulPry && !IsWeldedShut)
                 {
+                    Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, new OnDoorPryEvent(eventArgs), false);
                     if (State == DoorState.Closed)
                     {
                         Open();
diff --git a/Content.Server/Doors/DoorEvents.cs b/Content.Server/Doors/DoorEvents.cs
new file mode 100644
index 0000000000..73a0986664
--- /dev/null
+++ b/Content.Server/Doors/DoorEvents.cs
@@ -0,0 +1,141 @@
+#nullable enable
+using System;
+using Content.Shared.Doors;
+using Content.Shared.Interaction;
+using Robust.Shared.GameObjects;
+
+namespace Content.Server.Doors
+{
+    /// <summary>
+    /// Raised when the door's State variable is changed to a new variable that it was not equal to before.
+    /// </summary>
+    public class DoorStateChangedEvent : EntityEventArgs
+    {
+        public SharedDoorComponent.DoorState State;
+
+        public DoorStateChangedEvent(SharedDoorComponent.DoorState state)
+        {
+            State = state;
+        }
+    }
+
+    /// <summary>
+    /// Raised when the door is determining whether it is able to open.
+    /// Cancel to stop the door from being opened.
+    /// </summary>
+    public class BeforeDoorOpenedEvent : CancellableEntityEventArgs
+    {
+    }
+
+    /// <summary>
+    /// Raised when the door is successfully opened.
+    /// </summary>
+    public class OnDoorOpenedEvent : HandledEntityEventArgs
+    {
+    }
+
+    /// <summary>
+    /// Raised when the door is determining whether it is able to close.
+    /// Cancel to stop the door from being closed.
+    /// </summary>
+    public class BeforeDoorClosedEvent : CancellableEntityEventArgs
+    {
+    }
+
+    /// <summary>
+    /// Raised when the door is successfully  closed.
+    /// </summary>
+    public class OnDoorClosedEvent : HandledEntityEventArgs
+    {
+    }
+
+    /// <summary>
+    /// Called when the door is determining whether it is able to deny.
+    /// Cancel to stop the door from being able to deny.
+    /// </summary>
+    public class BeforeDoorDeniedEvent : CancellableEntityEventArgs
+    {
+    }
+
+    /// <summary>
+    /// Raised when access to the door is denied.
+    /// </summary>
+    public class OnDoorDeniedEvent : HandledEntityEventArgs
+    {
+    }
+
+    /// <summary>
+    /// Raised to determine whether the door's safety is on.
+    /// Modify Safety to set the door's safety.
+    /// </summary>
+    public class DoorSafetyEnabledEvent : HandledEntityEventArgs
+    {
+        public bool Safety = false;
+    }
+
+    /// <summary>
+    /// Raised to determine whether the door should automatically close.
+    /// Cancel to stop it from automatically closing.
+    /// </summary>
+    public class BeforeDoorAutoCloseEvent : CancellableEntityEventArgs
+    {
+    }
+
+    /// <summary>
+    /// Raised to determine how long the door's pry time should be modified by.
+    /// Multiply PryTimeModifier by the desired amount.
+    /// </summary>
+    public class DoorGetPryTimeModifierEvent : EntityEventArgs
+    {
+        public float PryTimeModifier = 1.0f;
+    }
+
+    /// <summary>
+    /// Raised to determine how long the door's close time should be modified by.
+    /// Multiply CloseTimeModifier by the desired amount.
+    /// </summary>
+    public class DoorGetCloseTimeModifierEvent : EntityEventArgs
+    {
+        public float CloseTimeModifier = 1.0f;
+    }
+
+    /// <summary>
+    /// Raised to determine whether clicking the door should open/close it.
+    /// </summary>
+    public class DoorClickShouldActivateEvent : HandledEntityEventArgs
+    {
+        public ActivateEventArgs Args;
+
+        public DoorClickShouldActivateEvent(ActivateEventArgs args)
+        {
+            Args = args;
+        }
+    }
+
+    /// <summary>
+    /// Raised when an attempt to pry open the door is made.
+    /// Cancel to stop the door from being pried open.
+    /// </summary>
+    public class BeforeDoorPryEvent : CancellableEntityEventArgs
+    {
+        public InteractUsingEventArgs Args;
+
+        public BeforeDoorPryEvent(InteractUsingEventArgs args)
+        {
+            Args = args;
+        }
+    }
+
+    /// <summary>
+    /// Raised when a door is successfully pried open.
+    /// </summary>
+    public class OnDoorPryEvent : EntityEventArgs
+    {
+        public InteractUsingEventArgs Args;
+
+        public OnDoorPryEvent(InteractUsingEventArgs args)
+        {
+            Args = args;
+        }
+    }
+}
diff --git a/Content.Server/Doors/IDoorCheck.cs b/Content.Server/Doors/IDoorCheck.cs
deleted file mode 100644
index 3c5989a5d8..0000000000
--- a/Content.Server/Doors/IDoorCheck.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-using System;
-using Content.Shared.Doors;
-using Content.Shared.Interaction;
-
-namespace Content.Server.Doors
-{
-    public interface IDoorCheck
-    {
-        /// <summary>
-        /// Called when the door's State variable is changed to a new variable that it was not equal to before.
-        /// </summary>
-        void OnStateChange(SharedDoorComponent.DoorState doorState) { }
-
-        /// <summary>
-        /// Called when the door is determining whether it is able to open.
-        /// </summary>
-        /// <returns>True if the door should open, false if it should not.</returns>
-        bool OpenCheck() => true;
-
-        /// <summary>
-        /// Called when the door is determining whether it is able to close.
-        /// </summary>
-        /// <returns>True if the door should close, false if it should not.</returns>
-        bool CloseCheck() => true;
-
-        /// <summary>
-        /// Called when the door is determining whether it is able to deny.
-        /// </summary>
-        /// <returns>True if the door should deny, false if it should not.</returns>
-        bool DenyCheck() => true;
-
-        /// <summary>
-        /// Whether the door's safety is on.
-        /// </summary>
-        /// <returns>True if safety is on, false if it is not.</returns>
-        bool SafetyCheck() => false;
-
-        /// <summary>
-        /// Whether the door should close automatically.
-        /// </summary>
-        /// <returns>True if the door should close automatically, false if it should not.</returns>
-        bool AutoCloseCheck() => false;
-
-        /// <summary>
-        /// Gets an override for the amount of time to pry open the door, or null if there is no override.
-        /// </summary>
-        /// <returns>Float if there is an override, null otherwise.</returns>
-        float? GetPryTime() => null;
-
-        /// <summary>
-        /// Gets an override for the amount of time before the door automatically closes, or null if there is no override.
-        /// </summary>
-        /// <returns>TimeSpan if there is an override, null otherwise.</returns>
-        TimeSpan? GetCloseSpeed() => null;
-
-        /// <summary>
-        /// A check to determine whether or not a click on the door should interact with it with the intent to open/close.
-        /// </summary>
-        /// <returns>True if the door's IActivate should not run, false otherwise.</returns>
-        bool BlockActivate(ActivateEventArgs eventArgs) => false;
-
-        /// <summary>
-        /// Called when somebody begins to pry open the door.
-        /// </summary>
-        /// <param name="eventArgs">The eventArgs of the InteractUsing method that called this function.</param>
-        void OnStartPry(InteractUsingEventArgs eventArgs) { }
-
-        /// <summary>
-        /// Check representing whether or not the door can be pried open.
-        /// </summary>
-        /// <param name="eventArgs">The eventArgs of the InteractUsing method that called this function.</param>
-        /// <returns>True if the door can be pried open, false if it cannot.</returns>
-        bool CanPryCheck(InteractUsingEventArgs eventArgs) => true;
-
-    }
-}
diff --git a/Content.Server/Doors/Systems/AirlockSystem.cs b/Content.Server/Doors/Systems/AirlockSystem.cs
new file mode 100644
index 0000000000..73d6508272
--- /dev/null
+++ b/Content.Server/Doors/Systems/AirlockSystem.cs
@@ -0,0 +1,109 @@
+using Content.Server.Doors.Components;
+using Content.Server.Power.Components;
+using Content.Shared.Doors;
+using Content.Shared.Notification.Managers;
+using Robust.Server.GameObjects;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Localization;
+
+namespace Content.Server.Doors.Systems
+{
+    public class AirlockSystem : EntitySystem
+    {
+        public override void Initialize()
+        {
+            base.Initialize();
+
+            SubscribeLocalEvent<AirlockComponent, PowerChangedEvent>(OnPowerChanged);
+            SubscribeLocalEvent<AirlockComponent, DoorStateChangedEvent>(OnStateChanged);
+            SubscribeLocalEvent<AirlockComponent, BeforeDoorOpenedEvent>(OnBeforeDoorOpened);
+            SubscribeLocalEvent<AirlockComponent, BeforeDoorClosedEvent>(OnBeforeDoorClosed);
+            SubscribeLocalEvent<AirlockComponent, BeforeDoorDeniedEvent>(OnBeforeDoorDenied);
+            SubscribeLocalEvent<AirlockComponent, DoorSafetyEnabledEvent>(OnDoorSafetyCheck);
+            SubscribeLocalEvent<AirlockComponent, BeforeDoorAutoCloseEvent>(OnDoorAutoCloseCheck);
+            SubscribeLocalEvent<AirlockComponent, DoorGetCloseTimeModifierEvent>(OnDoorCloseTimeModifier);
+            SubscribeLocalEvent<AirlockComponent, DoorClickShouldActivateEvent>(OnDoorClickShouldActivate);
+            SubscribeLocalEvent<AirlockComponent, BeforeDoorPryEvent>(OnDoorPry);
+        }
+
+        private void OnPowerChanged(EntityUid uid, AirlockComponent component, PowerChangedEvent args)
+        {
+            if (component.AppearanceComponent != null)
+            {
+                component.AppearanceComponent.SetData(DoorVisuals.Powered, args.Powered);
+            }
+
+            // BoltLights also got out
+            component.UpdateBoltLightStatus();
+        }
+
+        private void OnStateChanged(EntityUid uid, AirlockComponent component, DoorStateChangedEvent args)
+        {
+            // Only show the maintenance panel if the airlock is closed
+            if (component.WiresComponent != null)
+            {
+                component.WiresComponent.IsPanelVisible = args.State != SharedDoorComponent.DoorState.Open;
+            }
+            // If the door is closed, we should look if the bolt was locked while closing
+            component.UpdateBoltLightStatus();
+        }
+
+        private void OnBeforeDoorOpened(EntityUid uid, AirlockComponent component, BeforeDoorOpenedEvent args)
+        {
+            if (!component.CanChangeState())
+                args.Cancel();
+        }
+
+        private void OnBeforeDoorClosed(EntityUid uid, AirlockComponent component, BeforeDoorClosedEvent args)
+        {
+            if (!component.CanChangeState())
+                args.Cancel();
+        }
+
+        private void OnBeforeDoorDenied(EntityUid uid, AirlockComponent component, BeforeDoorDeniedEvent args)
+        {
+            if (!component.CanChangeState())
+                args.Cancel();
+        }
+
+        private void OnDoorSafetyCheck(EntityUid uid, AirlockComponent component, DoorSafetyEnabledEvent args)
+        {
+            args.Safety = component.Safety;
+        }
+
+        private void OnDoorAutoCloseCheck(EntityUid uid, AirlockComponent component, BeforeDoorAutoCloseEvent args)
+        {
+            if (!component.AutoClose)
+                args.Cancel();
+        }
+
+        private void OnDoorCloseTimeModifier(EntityUid uid, AirlockComponent component, DoorGetCloseTimeModifierEvent args)
+        {
+            args.CloseTimeModifier *= component.AutoCloseDelayModifier;
+        }
+
+        private void OnDoorClickShouldActivate(EntityUid uid, AirlockComponent component, DoorClickShouldActivateEvent args)
+        {
+            if (component.WiresComponent != null && component.WiresComponent.IsPanelOpen &&
+                args.Args.User.TryGetComponent(out ActorComponent? actor))
+            {
+                component.WiresComponent.OpenInterface(actor.PlayerSession);
+                args.Handled = true;
+            }
+        }
+
+        private void OnDoorPry(EntityUid uid, AirlockComponent component, BeforeDoorPryEvent args)
+        {
+            if (component.IsBolted())
+            {
+                component.Owner.PopupMessage(args.Args.User, Loc.GetString("airlock-component-cannot-pry-is-bolted-message"));
+                args.Cancel();
+            }
+            if (component.IsPowered())
+            {
+                component.Owner.PopupMessage(args.Args.User, Loc.GetString("airlock-component-cannot-pry-is-powered-message"));
+                args.Cancel();
+            }
+        }
+    }
+}
diff --git a/Content.Server/Doors/DoorSystem.cs b/Content.Server/Doors/Systems/DoorSystem.cs
similarity index 100%
rename from Content.Server/Doors/DoorSystem.cs
rename to Content.Server/Doors/Systems/DoorSystem.cs
diff --git a/Content.Server/Doors/Systems/FirelockSystem.cs b/Content.Server/Doors/Systems/FirelockSystem.cs
new file mode 100644
index 0000000000..49ab584471
--- /dev/null
+++ b/Content.Server/Doors/Systems/FirelockSystem.cs
@@ -0,0 +1,69 @@
+using Content.Server.Doors.Components;
+using Content.Shared.Doors;
+using Content.Shared.Notification.Managers;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Localization;
+
+namespace Content.Server.Doors.Systems
+{
+    public class FirelockSystem : EntitySystem
+    {
+        public override void Initialize()
+        {
+            base.Initialize();
+
+            SubscribeLocalEvent<FirelockComponent, BeforeDoorOpenedEvent>(OnBeforeDoorOpened);
+            SubscribeLocalEvent<FirelockComponent, BeforeDoorDeniedEvent>(OnBeforeDoorDenied);
+            SubscribeLocalEvent<FirelockComponent, DoorGetPryTimeModifierEvent>(OnDoorGetPryTimeModifier);
+            SubscribeLocalEvent<FirelockComponent, DoorClickShouldActivateEvent>(OnDoorClickShouldActivate);
+            SubscribeLocalEvent<FirelockComponent, BeforeDoorPryEvent>(OnBeforeDoorPry);
+            SubscribeLocalEvent<FirelockComponent, BeforeDoorAutoCloseEvent>(OnBeforeDoorAutoclose);
+        }
+
+        private void OnBeforeDoorOpened(EntityUid uid, FirelockComponent component, BeforeDoorOpenedEvent args)
+        {
+            if (component.IsHoldingFire() || component.IsHoldingPressure())
+                args.Cancel();
+        }
+
+        private void OnBeforeDoorDenied(EntityUid uid, FirelockComponent component, BeforeDoorDeniedEvent args)
+        {
+            args.Cancel();
+        }
+
+        private void OnDoorGetPryTimeModifier(EntityUid uid, FirelockComponent component, DoorGetPryTimeModifierEvent args)
+        {
+            if (component.IsHoldingFire() || component.IsHoldingPressure())
+                args.PryTimeModifier *= component.LockedPryTimeModifier;
+        }
+
+        private void OnDoorClickShouldActivate(EntityUid uid, FirelockComponent component, DoorClickShouldActivateEvent args)
+        {
+            // We're a firelock, you can't click to open it
+            args.Handled = true;
+        }
+
+        private void OnBeforeDoorPry(EntityUid uid, FirelockComponent component, BeforeDoorPryEvent args)
+        {
+            if (component.DoorComponent == null || component.DoorComponent.State != SharedDoorComponent.DoorState.Closed)
+            {
+                return;
+            }
+
+            if (component.IsHoldingPressure())
+            {
+                component.Owner.PopupMessage(args.Args.User, Loc.GetString("firelock-component-is-holding-pressure-message"));
+            }
+            else if (component.IsHoldingFire())
+            {
+                component.Owner.PopupMessage(args.Args.User, Loc.GetString("firelock-component-is-holding-fire-message"));
+            }
+        }
+
+        private void OnBeforeDoorAutoclose(EntityUid uid, FirelockComponent component, BeforeDoorAutoCloseEvent args)
+        {
+            // Firelocks can't autoclose, they must be manually closed
+            args.Cancel();
+        }
+    }
+}
diff --git a/Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs b/Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs
index fcf4bb1d85..61bfad8791 100644
--- a/Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs
+++ b/Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs
@@ -16,6 +16,8 @@ namespace Content.Server.Engineering.EntitySystems
     public class SpawnAfterInteractSystem : EntitySystem
     {
         [Dependency] private readonly IMapManager _mapManager = default!;
+        [Dependency] private readonly DoAfterSystem _doAfterSystem = default!;
+        [Dependency] private readonly StackSystem _stackSystem = default!;
 
         public override void Initialize()
         {
@@ -41,7 +43,7 @@ namespace Content.Server.Engineering.EntitySystems
             if (!IsTileClear())
                 return;
 
-            if (component.DoAfterTime > 0 && TryGet<DoAfterSystem>(out var doAfterSystem))
+            if (component.DoAfterTime > 0)
             {
                 var doAfterArgs = new DoAfterEventArgs(args.User, component.DoAfterTime)
                 {
@@ -49,7 +51,7 @@ namespace Content.Server.Engineering.EntitySystems
                     BreakOnStun = true,
                     PostCheck = IsTileClear,
                 };
-                var result = await doAfterSystem.WaitDoAfter(doAfterArgs);
+                var result = await _doAfterSystem.WaitDoAfter(doAfterArgs);
 
                 if (result != DoAfterStatus.Finished)
                     return;
@@ -59,7 +61,7 @@ namespace Content.Server.Engineering.EntitySystems
                 return;
 
             if (component.Owner.TryGetComponent<SharedStackComponent>(out var stackComp)
-                && component.RemoveOnInteract && !Get<StackSystem>().Use(uid, stackComp, 1))
+                && component.RemoveOnInteract && !_stackSystem.Use(uid, stackComp, 1))
             {
                 return;
             }
diff --git a/Content.Server/Explosion/TriggerSystem.cs b/Content.Server/Explosion/TriggerSystem.cs
index 8f1a03fef9..bc598de1e2 100644
--- a/Content.Server/Explosion/TriggerSystem.cs
+++ b/Content.Server/Explosion/TriggerSystem.cs
@@ -112,6 +112,7 @@ namespace Content.Server.Explosion
 
             Timer.Spawn(delay, () =>
             {
+                if (triggered.Deleted) return;
                 Trigger(triggered, user);
             });
         }
diff --git a/Content.Server/Fluids/Components/SpillableComponent.cs b/Content.Server/Fluids/Components/SpillableComponent.cs
index 79e1f267a7..bd5dca6d3d 100644
--- a/Content.Server/Fluids/Components/SpillableComponent.cs
+++ b/Content.Server/Fluids/Components/SpillableComponent.cs
@@ -2,6 +2,7 @@ using Content.Shared.ActionBlocker;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Chemistry.Solution.Components;
 using Content.Shared.DragDrop;
+using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Notification.Managers;
 using Content.Shared.Verbs;
diff --git a/Content.Server/GameTicking/GameTicker.CVars.cs b/Content.Server/GameTicking/GameTicker.CVars.cs
index f8cd9faea6..a00299df4b 100644
--- a/Content.Server/GameTicking/GameTicker.CVars.cs
+++ b/Content.Server/GameTicking/GameTicker.CVars.cs
@@ -21,14 +21,22 @@ namespace Content.Server.GameTicking
         [ViewVariables]
         public bool DisallowLateJoin { get; private set; } = false;
 
+        [ViewVariables]
+        public bool StationOffset { get; private set; } = false;
+
+        [ViewVariables]
+        public float MaxStationOffset { get; private set; } = 0f;
+
         private void InitializeCVars()
         {
             _configurationManager.OnValueChanged(CCVars.GameLobbyEnabled, value => LobbyEnabled = value, true);
             _configurationManager.OnValueChanged(CCVars.GameDummyTicker, value => DummyTicker = value, true);
             _configurationManager.OnValueChanged(CCVars.GameMap, value => ChosenMap = value, true);
             _configurationManager.OnValueChanged(CCVars.GameLobbyDuration, value => LobbyDuration = TimeSpan.FromSeconds(value), true);
-            _configurationManager.OnValueChanged(CCVars.GameDisallowLateJoins, invokeImmediately:true,
-                onValueChanged:value => { DisallowLateJoin = value; UpdateLateJoinStatus(); UpdateJobsAvailable(); });
+            _configurationManager.OnValueChanged(CCVars.GameDisallowLateJoins,
+                value => { DisallowLateJoin = value; UpdateLateJoinStatus(); UpdateJobsAvailable(); }, true);
+            _configurationManager.OnValueChanged(CCVars.StationOffset, value => StationOffset = value, true);
+            _configurationManager.OnValueChanged(CCVars.MaxStationOffset, value => MaxStationOffset = value, true);
         }
     }
 }
diff --git a/Content.Server/GameTicking/GameTicker.RoundFlow.cs b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
index e47c36c58a..e65c191f1c 100644
--- a/Content.Server/GameTicking/GameTicker.RoundFlow.cs
+++ b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
@@ -11,6 +11,7 @@ using Robust.Server.Player;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Log;
+using Robust.Shared.Maths;
 using Robust.Shared.Player;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
@@ -62,6 +63,14 @@ namespace Content.Server.GameTicking
                 throw new InvalidOperationException($"No grid found for map {map}");
             }
 
+            if (StationOffset)
+            {
+                // Apply a random offset to the station grid entity.
+                var x = _robustRandom.NextFloat() * MaxStationOffset * 2 - MaxStationOffset;
+                var y = _robustRandom.NextFloat() * MaxStationOffset * 2 - MaxStationOffset;
+                EntityManager.GetEntity(grid.GridEntityId).Transform.LocalPosition = new Vector2(x, y);
+            }
+
             DefaultGridId = grid.Index;
             _spawnPoint = grid.ToCoordinates();
 
@@ -280,7 +289,7 @@ namespace Content.Server.GameTicking
             }
 
             // Delete all entities.
-            foreach (var entity in _entityManager.GetEntities().ToList())
+            foreach (var entity in EntityManager.GetEntities().ToList())
             {
                 // TODO: Maybe something less naive here?
                 // FIXME: Actually, definitely.
diff --git a/Content.Server/GameTicking/GameTicker.Spawning.cs b/Content.Server/GameTicking/GameTicker.Spawning.cs
index 840af56302..cab3c3c1d1 100644
--- a/Content.Server/GameTicking/GameTicker.Spawning.cs
+++ b/Content.Server/GameTicking/GameTicker.Spawning.cs
@@ -155,7 +155,7 @@ namespace Content.Server.GameTicking
         private IEntity SpawnPlayerMob(Job job, HumanoidCharacterProfile? profile, bool lateJoin = true)
         {
             var coordinates = lateJoin ? GetLateJoinSpawnPoint() : GetJobSpawnPoint(job.Prototype.ID);
-            var entity = _entityManager.SpawnEntity(PlayerPrototypeName, coordinates);
+            var entity = EntityManager.SpawnEntity(PlayerPrototypeName, coordinates);
 
             if (job.StartingGear != null)
             {
@@ -175,7 +175,7 @@ namespace Content.Server.GameTicking
         private IEntity SpawnObserverMob()
         {
             var coordinates = GetObserverSpawnPoint();
-            return _entityManager.SpawnEntity(ObserverPrototypeName, coordinates);
+            return EntityManager.SpawnEntity(ObserverPrototypeName, coordinates);
         }
         #endregion
 
@@ -189,7 +189,7 @@ namespace Content.Server.GameTicking
                     var equipmentStr = startingGear.GetGear(slot, profile);
                     if (equipmentStr != string.Empty)
                     {
-                        var equipmentEntity = _entityManager.SpawnEntity(equipmentStr, entity.Transform.Coordinates);
+                        var equipmentEntity = EntityManager.SpawnEntity(equipmentStr, entity.Transform.Coordinates);
                         inventory.Equip(slot, equipmentEntity.GetComponent<ItemComponent>());
                     }
                 }
@@ -200,7 +200,7 @@ namespace Content.Server.GameTicking
                 var inhand = startingGear.Inhand;
                 foreach (var (hand, prototype) in inhand)
                 {
-                    var inhandEntity = _entityManager.SpawnEntity(prototype, entity.Transform.Coordinates);
+                    var inhandEntity = EntityManager.SpawnEntity(prototype, entity.Transform.Coordinates);
                     handsComponent.TryPickupEntity(hand, inhandEntity, checkActionBlocker: false);
                 }
             }
diff --git a/Content.Server/GameTicking/GameTicker.cs b/Content.Server/GameTicking/GameTicker.cs
index 5400e0348a..9ed3eda9da 100644
--- a/Content.Server/GameTicking/GameTicker.cs
+++ b/Content.Server/GameTicking/GameTicker.cs
@@ -72,7 +72,6 @@ namespace Content.Server.GameTicking
             UpdateRoundFlow(frameTime);
         }
 
-        [Dependency] private readonly IEntityManager _entityManager = default!;
         [Dependency] private readonly IMapManager _mapManager = default!;
         [Dependency] private readonly IMapLoader _mapLoader = default!;
         [Dependency] private readonly IGameTiming _gameTiming = default!;
diff --git a/Content.Server/Hands/Components/HandsComponent.cs b/Content.Server/Hands/Components/HandsComponent.cs
index c3f65060b5..f8b84c9992 100644
--- a/Content.Server/Hands/Components/HandsComponent.cs
+++ b/Content.Server/Hands/Components/HandsComponent.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
@@ -10,7 +11,6 @@ using Content.Shared.Audio;
 using Content.Shared.Body.Part;
 using Content.Shared.Hands.Components;
 using Content.Shared.Notification.Managers;
-using Content.Shared.Physics.Pull;
 using Content.Shared.Pulling.Components;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
@@ -19,9 +19,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Map;
-using Robust.Shared.Network;
 using Robust.Shared.Player;
-using Robust.Shared.Players;
 
 namespace Content.Server.Hands.Components
 {
@@ -35,48 +33,6 @@ namespace Content.Server.Hands.Components
 
         int IDisarmedAct.Priority => int.MaxValue; // We want this to be the last disarm act to run.
 
-        public override void HandleMessage(ComponentMessage message, IComponent? component)
-        {
-            base.HandleMessage(message, component);
-
-            switch (message)
-            {
-                case PullAttemptMessage msg:
-                    AttemptPull(msg);
-                    break;
-                case PullStartedMessage:
-                    StartPulling();
-                    break;
-                case PullStoppedMessage:
-                    StopPulling();
-                    break;
-            }
-        }
-
-        public override void HandleNetworkMessage(ComponentMessage message, INetChannel channel, ICommonSession? session = null)
-        {
-            base.HandleNetworkMessage(message, channel, session);
-
-            switch (message)
-            {
-                case ClientChangedHandMsg msg:
-                    ActiveHand = msg.HandName;
-                    break;
-                case ClientAttackByInHandMsg msg:
-                    InteractHandWithActiveHand(msg.HandName);
-                    break;
-                case UseInHandMsg:
-                    UseActiveHeldEntity();
-                    break;
-                case ActivateInHandMsg msg:
-                    ActivateHeldEntity(msg.HandName);
-                    break;
-                case MoveItemFromHandMsg msg:
-                    TryMoveHeldEntityToActiveHand(msg.HandName);
-                    break;
-            }
-        }
-
         protected override void OnHeldEntityRemovedFromHand(IEntity heldEntity, HandState handState)
         {
             if (heldEntity.TryGetComponent(out ItemComponent? item))
@@ -141,7 +97,8 @@ namespace Content.Server.Hands.Components
             if (pickupDirection == initialPosition.ToMapPos(Owner.EntityManager))
                 return;
 
-            SendNetworkMessage(new PickupAnimationMessage(entity.Uid, pickupDirection, initialPosition));
+            Owner.EntityManager.EntityNetManager!.SendSystemNetworkMessage(
+                new PickupAnimationMessage(entity.Uid, pickupDirection, initialPosition));
         }
 
         #region Pull/Disarm
@@ -151,9 +108,17 @@ namespace Content.Server.Hands.Components
             if (args.Part.PartType != BodyPartType.Hand)
                 return;
 
-            var handLocation = ReadOnlyHands.Count == 0 ? HandLocation.Right : HandLocation.Left; //TODO: make hand body part have a handlocation?
+            // If this annoys you, which it should.
+            // Ping Smugleaf.
+            var location = args.Part.Symmetry switch
+            {
+                BodyPartSymmetry.None => HandLocation.Middle,
+                BodyPartSymmetry.Left => HandLocation.Left,
+                BodyPartSymmetry.Right => HandLocation.Right,
+                _ => throw new ArgumentOutOfRangeException()
+            };
 
-            AddHand(args.Slot, handLocation);
+            AddHand(args.Slot, location);
         }
 
         void IBodyPartRemoved.BodyPartRemoved(BodyPartRemovedEventArgs args)
@@ -205,41 +170,13 @@ namespace Content.Server.Hands.Components
             return pullable.TryStopPull();
         }
 
-        private void AttemptPull(PullAttemptMessage msg)
-        {
-            if (!ReadOnlyHands.Any(hand => hand.Enabled))
-            {
-                msg.Cancelled = true;
-            }
-        }
-
-        private void StartPulling()
-        {
-            var firstFreeHand = Hands.FirstOrDefault(hand => hand.Enabled);
-
-            if (firstFreeHand == null)
-                return;
-
-            DisableHand(firstFreeHand);
-        }
-
-        private void StopPulling()
-        {
-            var firstOccupiedHand = Hands.FirstOrDefault(hand => !hand.Enabled);
-
-            if (firstOccupiedHand == null)
-                return;
-
-            EnableHand(firstOccupiedHand);
-        }
-
         #endregion
 
         #region Old public methods
 
-        public IEnumerable<string> HandNames => ReadOnlyHands.Select(h => h.Name);
+        public IEnumerable<string> HandNames => Hands.Select(h => h.Name);
 
-        public int Count => ReadOnlyHands.Count;
+        public int Count => Hands.Count;
 
         /// <summary>
         ///     Returns a list of all hand names, with the active hand being first.
@@ -249,9 +186,9 @@ namespace Content.Server.Hands.Components
             if (ActiveHand != null)
                 yield return ActiveHand;
 
-            foreach (var hand in ReadOnlyHands)
+            foreach (var hand in Hands)
             {
-                if (hand.Name == ActiveHand || !hand.Enabled)
+                if (hand.Name == ActiveHand)
                     continue;
 
                 yield return hand.Name;
diff --git a/Content.Server/Hands/Systems/HandVirtualPullSystem.cs b/Content.Server/Hands/Systems/HandVirtualPullSystem.cs
new file mode 100644
index 0000000000..f95a4747ca
--- /dev/null
+++ b/Content.Server/Hands/Systems/HandVirtualPullSystem.cs
@@ -0,0 +1,57 @@
+using Content.Server.Pulling;
+using Content.Shared.Hands;
+using Content.Shared.Hands.Components;
+using Content.Shared.Interaction;
+using JetBrains.Annotations;
+using Robust.Shared.GameObjects;
+
+namespace Content.Server.Hands
+{
+    [UsedImplicitly]
+    public sealed class HandVirtualPullSystem : EntitySystem
+    {
+        public override void Initialize()
+        {
+            base.Initialize();
+
+            SubscribeLocalEvent<HandVirtualPullComponent, DroppedEvent>(HandlePullerDropped);
+            SubscribeLocalEvent<HandVirtualPullComponent, UnequippedHandEvent>(HandlePullerUnequipped);
+
+            SubscribeLocalEvent<HandVirtualPullComponent, BeforeInteractEvent>(HandleBeforeInteract);
+        }
+
+        private static void HandleBeforeInteract(
+            EntityUid uid,
+            HandVirtualPullComponent component,
+            BeforeInteractEvent args)
+        {
+            // No interactions with a virtual pull, please.
+            args.Handled = true;
+        }
+
+        // If the virtual pull gets removed from the hands for any reason, cancel the pull and delete it.
+        private void HandlePullerUnequipped(EntityUid uid, HandVirtualPullComponent component, UnequippedHandEvent args)
+        {
+            MaybeDelete(component, args.User);
+        }
+
+        private void HandlePullerDropped(EntityUid uid, HandVirtualPullComponent component, DroppedEvent args)
+        {
+            MaybeDelete(component, args.User);
+        }
+
+        private void MaybeDelete(HandVirtualPullComponent comp, IEntity? user)
+        {
+            var pulled = comp.PulledEntity;
+
+            if (!ComponentManager.TryGetComponent(pulled, out PullableComponent? pullable))
+                return;
+
+            if (pullable.Puller != user)
+                return;
+
+            pullable.TryStopPull(user);
+            comp.Owner.QueueDelete();
+        }
+    }
+}
diff --git a/Content.Server/Hands/HandsSystem.cs b/Content.Server/Hands/Systems/HandsSystem.cs
similarity index 55%
rename from Content.Server/Hands/HandsSystem.cs
rename to Content.Server/Hands/Systems/HandsSystem.cs
index 712c0867a6..7e6adca66c 100644
--- a/Content.Server/Hands/HandsSystem.cs
+++ b/Content.Server/Hands/Systems/HandsSystem.cs
@@ -13,15 +13,17 @@ using Content.Shared.Hands;
 using Content.Shared.Hands.Components;
 using Content.Shared.Input;
 using Content.Shared.Notification.Managers;
+using Content.Shared.Physics.Pull;
 using JetBrains.Annotations;
 using Robust.Server.Player;
-using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Input.Binding;
+using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Players;
+using Robust.Shared.Utility;
 using static Content.Shared.Inventory.EquipmentSlotDefines;
 
 namespace Content.Server.Hands
@@ -29,20 +31,134 @@ namespace Content.Server.Hands
     [UsedImplicitly]
     internal sealed class HandsSystem : SharedHandsSystem
     {
+        [Dependency] private readonly InteractionSystem _interactionSystem = default!;
+        [Dependency] private readonly StackSystem _stackSystem = default!;
+
         public override void Initialize()
         {
             base.Initialize();
 
             SubscribeLocalEvent<HandsComponent, ExaminedEvent>(HandleExamined);
+            SubscribeNetworkEvent<ActivateInHandMsg>(HandleActivateInHand);
+            SubscribeNetworkEvent<ClientInteractUsingInHandMsg>(HandleInteractUsingInHand);
+            SubscribeNetworkEvent<UseInHandMsg>(HandleUseInHand);
+            SubscribeNetworkEvent<MoveItemFromHandMsg>(HandleMoveItemFromHand);
+
+            SubscribeLocalEvent<HandsComponent, PullAttemptMessage>(HandlePullAttempt);
+            SubscribeLocalEvent<HandsComponent, PullStartedMessage>(HandlePullStarted);
+            SubscribeLocalEvent<HandsComponent, PullStoppedMessage>(HandlePullStopped);
 
             CommandBinds.Builder
                 .Bind(ContentKeyFunctions.ActivateItemInHand, InputCmdHandler.FromDelegate(HandleActivateItem))
                 .Bind(ContentKeyFunctions.ThrowItemInHand, new PointerInputCmdHandler(HandleThrowItem))
                 .Bind(ContentKeyFunctions.SmartEquipBackpack, InputCmdHandler.FromDelegate(HandleSmartEquipBackpack))
                 .Bind(ContentKeyFunctions.SmartEquipBelt, InputCmdHandler.FromDelegate(HandleSmartEquipBelt))
+                .Bind(ContentKeyFunctions.SwapHands, InputCmdHandler.FromDelegate(SwapHandsPressed, handle: false))
+                .Bind(ContentKeyFunctions.Drop, new PointerInputCmdHandler(DropPressed))
                 .Register<HandsSystem>();
         }
 
+        private static void HandlePullAttempt(EntityUid uid, HandsComponent component, PullAttemptMessage args)
+        {
+            // Cancel pull if all hands full.
+            if (component.Hands.All(hand => !hand.IsEmpty))
+                args.Cancelled = true;
+        }
+
+        private void HandlePullStarted(EntityUid uid, HandsComponent component, PullStartedMessage args)
+        {
+            foreach (var handName in component.ActivePriorityEnumerable())
+            {
+                var hand = component.GetHand(handName);
+                if (!hand.IsEmpty)
+                    continue;
+
+                var pos = component.Owner.Transform.Coordinates;
+                var virtualPull = EntityManager.SpawnEntity("HandVirtualPull", pos);
+                var virtualPullComp = virtualPull.GetComponent<HandVirtualPullComponent>();
+                virtualPullComp.PulledEntity = args.Pulled.Owner.Uid;
+                component.PutEntityIntoHand(hand, virtualPull);
+                return;
+            }
+
+            DebugTools.Assert("Unable to find available hand when starting pulling??");
+        }
+
+        private void HandlePullStopped(EntityUid uid, HandsComponent component, PullStoppedMessage args)
+        {
+            // Try find hand that is doing this pull.
+            // and clear it.
+            foreach (var hand in component.Hands)
+            {
+                if (hand.HeldEntity == null
+                    || !hand.HeldEntity.TryGetComponent(out HandVirtualPullComponent? virtualPull)
+                    || virtualPull.PulledEntity != args.Pulled.Owner.Uid)
+                    continue;
+
+                hand.HeldEntity.Delete();
+                break;
+            }
+        }
+
+        private void SwapHandsPressed(ICommonSession? session)
+        {
+            var player = session?.AttachedEntity;
+
+            if (player == null)
+                return;
+
+            if (!player.TryGetComponent(out SharedHandsComponent? hands))
+                return;
+
+            if (!hands.TryGetSwapHandsResult(out var nextHand))
+                return;
+
+            hands.ActiveHand = nextHand;
+        }
+
+        private bool DropPressed(ICommonSession? session, EntityCoordinates coords, EntityUid uid)
+        {
+            var player = session?.AttachedEntity;
+
+            if (player == null)
+                return false;
+
+            if (!player.TryGetComponent(out SharedHandsComponent? hands))
+                return false;
+
+            var activeHand = hands.ActiveHand;
+
+            if (activeHand == null)
+                return false;
+
+            hands.TryDropHand(activeHand, coords);
+            return false;
+        }
+
+        private void HandleMoveItemFromHand(MoveItemFromHandMsg msg, EntitySessionEventArgs args)
+        {
+            if (!TryGetHandsComp(args.SenderSession, out var hands))
+                return;
+
+            hands.TryMoveHeldEntityToActiveHand(msg.HandName);
+        }
+
+        private void HandleUseInHand(UseInHandMsg msg, EntitySessionEventArgs args)
+        {
+            if (!TryGetHandsComp(args.SenderSession, out var hands))
+                return;
+
+            hands.UseActiveHeldEntity();
+        }
+
+        private void HandleInteractUsingInHand(ClientInteractUsingInHandMsg msg, EntitySessionEventArgs args)
+        {
+            if (!TryGetHandsComp(args.SenderSession, out var hands))
+                return;
+
+            hands.InteractHandWithActiveHand(msg.HandName);
+        }
+
         public override void Shutdown()
         {
             base.Shutdown();
@@ -50,6 +166,14 @@ namespace Content.Server.Hands
             CommandBinds.Unregister<HandsSystem>();
         }
 
+        private void HandleActivateInHand(ActivateInHandMsg msg, EntitySessionEventArgs args)
+        {
+            if (!TryGetHandsComp(args.SenderSession, out var hands))
+                return;
+
+            hands.ActivateHeldEntity(msg.HandName);
+        }
+
         protected override void DropAllItemsInHands(IEntity entity, bool doMobChecks = true)
         {
             base.DropAllItemsInHands(entity, doMobChecks);
@@ -71,25 +195,21 @@ namespace Content.Server.Hands
             }
         }
 
-        protected override void HandleContainerModified(EntityUid uid, SharedHandsComponent component, ContainerModifiedMessage args)
-        {
-            component.Dirty();
-        }
-
-        private bool TryGetHandsComp(ICommonSession? session, [NotNullWhen(true)] out SharedHandsComponent? hands)
+        private static bool TryGetHandsComp(
+            ICommonSession? session,
+            [NotNullWhen(true)] out SharedHandsComponent? hands)
         {
             hands = default;
 
             if (session is not IPlayerSession playerSession)
                 return false;
 
-            var playerEnt = playerSession?.AttachedEntity;
+            var playerEnt = playerSession.AttachedEntity;
 
             if (playerEnt == null || !playerEnt.IsValid())
                 return false;
 
-            playerEnt.TryGetComponent(out hands);
-            return hands != null;
+            return playerEnt.TryGetComponent(out hands);
         }
 
         private void HandleActivateItem(ICommonSession? session)
@@ -113,12 +233,12 @@ namespace Content.Server.Hands
             if (!hands.TryGetActiveHeldEntity(out var throwEnt))
                 return false;
 
-            if (!Get<InteractionSystem>().TryThrowInteraction(hands.Owner, throwEnt))
+            if (!_interactionSystem.TryThrowInteraction(hands.Owner, throwEnt))
                 return false;
 
             if (throwEnt.TryGetComponent(out StackComponent? stack) && stack.Count > 1 && stack.ThrowIndividually)
             {
-                var splitStack = Get<StackSystem>().Split(throwEnt.Uid, stack, 1, playerEnt.Transform.Coordinates);
+                var splitStack = _stackSystem.Split(throwEnt.Uid, stack, 1, playerEnt.Transform.Coordinates);
 
                 if (splitStack == null)
                     return false;
diff --git a/Content.Server/Interaction/InteractionSystem.cs b/Content.Server/Interaction/InteractionSystem.cs
index efb01638c4..6908b146b5 100644
--- a/Content.Server/Interaction/InteractionSystem.cs
+++ b/Content.Server/Interaction/InteractionSystem.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Content.Server.Buckle.Components;
 using Content.Server.CombatMode;
+using Content.Server.DoAfter;
 using Content.Server.Hands.Components;
 using Content.Server.Items;
 using Content.Server.Pulling;
@@ -46,6 +47,7 @@ namespace Content.Server.Interaction
     {
         [Dependency] private readonly IEntityManager _entityManager = default!;
         [Dependency] private readonly IRobustRandom _random = default!;
+        [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!;
 
         public override void Initialize()
         {
@@ -175,9 +177,7 @@ namespace Content.Server.Interaction
 
         private void InteractionActivate(IEntity user, IEntity used)
         {
-            var actionBlocker = Get<ActionBlockerSystem>();
-
-            if (!actionBlocker.CanInteract(user) || ! actionBlocker.CanUse(user))
+            if (!_actionBlockerSystem.CanInteract(user) || ! _actionBlockerSystem.CanUse(user))
                 return;
 
             // all activates should only fire when in range / unobstructed
@@ -275,7 +275,7 @@ namespace Content.Server.Interaction
             if (!ValidateInteractAndFace(user, coordinates))
                 return;
 
-            if (!Get<ActionBlockerSystem>().CanInteract(user))
+            if (!_actionBlockerSystem.CanInteract(user))
                 return;
 
             // Get entity clicked upon from UID if valid UID, if not assume no entity clicked upon and null
@@ -344,7 +344,7 @@ namespace Content.Server.Interaction
             if (diff.LengthSquared <= 0.01f)
                 return;
             var diffAngle = Angle.FromWorldVec(diff);
-            if (Get<ActionBlockerSystem>().CanChangeDirection(user))
+            if (_actionBlockerSystem.CanChangeDirection(user))
             {
                 user.Transform.WorldRotation = diffAngle;
             }
@@ -387,6 +387,18 @@ namespace Content.Server.Interaction
             return false;
         }
 
+        private async Task<bool> InteractDoBefore(
+            IEntity user,
+            IEntity used,
+            IEntity? target,
+            EntityCoordinates clickLocation,
+            bool canReach)
+        {
+            var ev = new BeforeInteractEvent(user, used, target, clickLocation, canReach);
+            RaiseLocalEvent(used.Uid, ev, false);
+            return ev.Handled;
+        }
+
         /// <summary>
         /// Uses a item/object on an entity
         /// Finds components with the InteractUsing interface and calls their function
@@ -394,7 +406,10 @@ namespace Content.Server.Interaction
         /// </summary>
         public async Task InteractUsing(IEntity user, IEntity used, IEntity target, EntityCoordinates clickLocation)
         {
-            if (!Get<ActionBlockerSystem>().CanInteract(user))
+            if (!_actionBlockerSystem.CanInteract(user))
+                return;
+
+            if (await InteractDoBefore(user, used, target, clickLocation, true))
                 return;
 
             // all interactions should only happen when in range / unobstructed, so no range check is needed
@@ -424,7 +439,7 @@ namespace Content.Server.Interaction
         /// </summary>
         public void InteractHand(IEntity user, IEntity target)
         {
-            if (!Get<ActionBlockerSystem>().CanInteract(user))
+            if (!_actionBlockerSystem.CanInteract(user))
                 return;
 
             // all interactions should only happen when in range / unobstructed, so no range check is needed
@@ -457,7 +472,7 @@ namespace Content.Server.Interaction
         /// <param name="used"></param>
         public void TryUseInteraction(IEntity user, IEntity used)
         {
-            if (user != null && used != null && Get<ActionBlockerSystem>().CanUse(user))
+            if (user != null && used != null && _actionBlockerSystem.CanUse(user))
             {
                 UseInteraction(user, used);
             }
@@ -501,7 +516,7 @@ namespace Content.Server.Interaction
         /// </summary>
         public bool TryThrowInteraction(IEntity user, IEntity item)
         {
-            if (user == null || item == null || !Get<ActionBlockerSystem>().CanThrow(user)) return false;
+            if (user == null || item == null || !_actionBlockerSystem.CanThrow(user)) return false;
 
             ThrownInteraction(user, item);
             return true;
@@ -618,7 +633,7 @@ namespace Content.Server.Interaction
         /// </summary>
         public bool TryDroppedInteraction(IEntity user, IEntity item, bool intentional)
         {
-            if (user == null || item == null || !Get<ActionBlockerSystem>().CanDrop(user)) return false;
+            if (user == null || item == null || !_actionBlockerSystem.CanDrop(user)) return false;
 
             DroppedInteraction(user, item, intentional);
             return true;
@@ -696,6 +711,9 @@ namespace Content.Server.Interaction
         /// </summary>
         public async Task<bool> InteractUsingRanged(IEntity user, IEntity used, IEntity? target, EntityCoordinates clickLocation, bool inRangeUnobstructed)
         {
+            if (await InteractDoBefore(user, used, inRangeUnobstructed ? target : null, clickLocation, false))
+                return true;
+
             if (target != null)
             {
                 var rangedMsg = new RangedInteractEvent(user, used, target, clickLocation);
@@ -715,10 +733,7 @@ namespace Content.Server.Interaction
                 }
             }
 
-            if (inRangeUnobstructed)
-                return await InteractDoAfter(user, used, target, clickLocation, false);
-            else
-                return await InteractDoAfter(user, used, null, clickLocation, false);
+            return await InteractDoAfter(user, used, inRangeUnobstructed ? target : null, clickLocation, false);
         }
 
         public void DoAttack(IEntity user, EntityCoordinates coordinates, bool wideAttack, EntityUid targetUid = default)
@@ -726,7 +741,7 @@ namespace Content.Server.Interaction
             if (!ValidateInteractAndFace(user, coordinates))
                 return;
 
-            if (!Get<ActionBlockerSystem>().CanAttack(user))
+            if (!_actionBlockerSystem.CanAttack(user))
                 return;
 
             IEntity? targetEnt = null;
diff --git a/Content.Server/Inventory/Components/InventoryComponent.cs b/Content.Server/Inventory/Components/InventoryComponent.cs
index 6ba250d52d..8f1d0d7ad1 100644
--- a/Content.Server/Inventory/Components/InventoryComponent.cs
+++ b/Content.Server/Inventory/Components/InventoryComponent.cs
@@ -460,7 +460,7 @@ namespace Content.Server.Inventory.Components
         {
             if (!HasSlot(slot))
             {
-                throw new InvalidOperationException($"Slow '{slot}' does not exist.");
+                throw new InvalidOperationException($"Slot '{slot}' does not exist.");
             }
 
             ForceUnequip(slot);
diff --git a/Content.Server/Kitchen/Components/ReagentGrinderComponent.cs b/Content.Server/Kitchen/Components/ReagentGrinderComponent.cs
index 5811d7f650..d277d53d09 100644
--- a/Content.Server/Kitchen/Components/ReagentGrinderComponent.cs
+++ b/Content.Server/Kitchen/Components/ReagentGrinderComponent.cs
@@ -1,23 +1,8 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
 using Content.Server.Chemistry.Components;
-using Content.Server.Hands.Components;
-using Content.Server.Items;
-using Content.Server.Power.Components;
-using Content.Server.UserInterface;
-using Content.Shared.Chemistry.Solution;
 using Content.Shared.Interaction;
 using Content.Shared.Kitchen.Components;
-using Content.Shared.Notification.Managers;
-using Content.Shared.Random.Helpers;
-using Content.Shared.Tag;
-using Robust.Server.GameObjects;
-using Robust.Shared.Audio;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Localization;
-using Robust.Shared.Player;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
@@ -31,337 +16,27 @@ namespace Content.Server.Kitchen.Components
     /// it contained, juice an apple and get "apple juice".
     /// </summary>
     [RegisterComponent]
-    [ComponentReference(typeof(IActivate))]
-    public class ReagentGrinderComponent : SharedReagentGrinderComponent, IActivate, IInteractUsing
+    public class ReagentGrinderComponent : SharedReagentGrinderComponent
     {
-        private AudioSystem _audioSystem = default!;
-        [ViewVariables] private ContainerSlot _beakerContainer = default!;
+        [ViewVariables] public ContainerSlot BeakerContainer = default!;
 
         /// <summary>
         /// Can be null since we won't always have a beaker in the grinder.
         /// </summary>
-        [ViewVariables] private SolutionContainerComponent? _heldBeaker = default!;
+        [ViewVariables] public SolutionContainerComponent? HeldBeaker = default!;
 
         /// <summary>
         /// Contains the things that are going to be ground or juiced.
         /// </summary>
-        [ViewVariables] private Container _chamber = default!;
+        [ViewVariables] public Container Chamber = default!;
 
-        [ViewVariables] private bool ChamberEmpty => _chamber.ContainedEntities.Count <= 0;
-        [ViewVariables] private bool HasBeaker => _beakerContainer.ContainedEntity != null;
-        [ViewVariables] private BoundUserInterface? UserInterface => Owner.GetUIOrNull(ReagentGrinderUiKey.Key);
-
-        private bool Powered => !Owner.TryGetComponent(out ApcPowerReceiverComponent? receiver) || receiver.Powered;
-
-        /// <summary>
-        /// Should the BoundUI be told to update?
-        /// </summary>
-        private bool _uiDirty = true;
         /// <summary>
         /// Is the machine actively doing something and can't be used right now?
         /// </summary>
-        private bool _busy = false;
+        public bool Busy;
 
         //YAML serialization vars
-        [ViewVariables(VVAccess.ReadWrite)] [DataField("chamberCapacity")] private int _storageCap = 16;
-        [ViewVariables(VVAccess.ReadWrite)] [DataField("workTime")] private int _workTime = 3500; //3.5 seconds, completely arbitrary for now.
-
-        protected override void Initialize()
-        {
-            base.Initialize();
-            //A slot for the beaker where the grounds/juices will go.
-            _beakerContainer =
-                ContainerHelpers.EnsureContainer<ContainerSlot>(Owner, $"{Name}-reagentContainerContainer");
-
-            //A container for the things that WILL be ground/juiced. Useful for ejecting them instead of deleting them from the hands of the user.
-            _chamber =
-                ContainerHelpers.EnsureContainer<Container>(Owner, $"{Name}-entityContainerContainer");
-
-            if (UserInterface != null)
-            {
-                UserInterface.OnReceiveMessage += UserInterfaceOnReceiveMessage;
-            }
-
-            _audioSystem = EntitySystem.Get<AudioSystem>();
-        }
-
-        public override void HandleMessage(ComponentMessage message, IComponent? component)
-        {
-            base.HandleMessage(message, component);
-            switch (message)
-            {
-                case PowerChangedMessage powerChanged:
-                    OnPowerStateChanged(powerChanged);
-                    break;
-            }
-        }
-
-        protected override void OnRemove()
-        {
-            base.OnRemove();
-            if (UserInterface != null)
-            {
-                UserInterface.OnReceiveMessage -= UserInterfaceOnReceiveMessage;
-            }
-        }
-
-        private void UserInterfaceOnReceiveMessage(ServerBoundUserInterfaceMessage message)
-        {
-            if(_busy)
-            {
-                return;
-            }
-
-            switch(message.Message)
-            {
-                case ReagentGrinderGrindStartMessage msg:
-                    if (!Powered) break;
-                    ClickSound();
-                    DoWork(message.Session.AttachedEntity!, GrinderProgram.Grind);
-                    break;
-
-                case ReagentGrinderJuiceStartMessage msg:
-                    if (!Powered) break;
-                    ClickSound();
-                    DoWork(message.Session.AttachedEntity!, GrinderProgram.Juice);
-                    break;
-
-                case ReagentGrinderEjectChamberAllMessage msg:
-                    if(!ChamberEmpty)
-                    {
-                        ClickSound();
-                        for (var i = _chamber.ContainedEntities.Count - 1; i >= 0; i--)
-                        {
-                            EjectSolid(_chamber.ContainedEntities.ElementAt(i).Uid);
-                        }
-                    }
-                    break;
-
-                case ReagentGrinderEjectChamberContentMessage msg:
-                    if (!ChamberEmpty)
-                    {
-                        EjectSolid(msg.EntityID);
-                        ClickSound();
-                        _uiDirty = true;
-                    }
-                    break;
-
-                case ReagentGrinderEjectBeakerMessage msg:
-                    ClickSound();
-                    EjectBeaker(message.Session.AttachedEntity);
-                    //EjectBeaker will dirty the UI for us, we don't have to do it explicitly here.
-                    break;
-            }
-        }
-
-        private void OnPowerStateChanged(PowerChangedMessage e)
-        {
-            _uiDirty = true;
-        }
-
-        private void ClickSound()
-        {
-            SoundSystem.Play(Filter.Pvs(Owner), "/Audio/Machines/machine_switch.ogg", Owner, AudioParams.Default.WithVolume(-2f));
-        }
-
-        private void SetAppearance()
-        {
-            if (Owner.TryGetComponent(out AppearanceComponent? appearance))
-            {
-                appearance.SetData(ReagentGrinderVisualState.BeakerAttached, HasBeaker);
-            }
-        }
-
-        public void OnUpdate()
-        {
-            if(_uiDirty)
-            {
-                UpdateInterface();
-                _uiDirty = false;
-            }
-        }
-
-        // This doesn't check for UI dirtiness so handle that when calling this.
-        private void UpdateInterface()
-        {
-            bool canJuice = false;
-            bool canGrind = false;
-            if (HasBeaker)
-            {
-                foreach (var entity in _chamber.ContainedEntities)
-                {
-                    if (!canJuice && entity.HasComponent<JuiceableComponent>()) canJuice = true;
-                    if (!canGrind && entity.HasTag("Grindable")) canGrind = true;
-                    if (canJuice && canGrind) break;
-                }
-            }
-
-            UserInterface?.SetState(new ReagentGrinderInterfaceState
-            (
-                _busy,
-                HasBeaker,
-                Powered,
-                canJuice,
-                canGrind,
-                _chamber.ContainedEntities.Select(item => item.Uid).ToArray(),
-                //Remember the beaker can be null!
-                _heldBeaker?.Solution.Contents.ToArray()
-            ));
-            _uiDirty = false;
-        }
-
-        private void EjectSolid(EntityUid entityID)
-        {
-            if (_busy)
-                return;
-
-            if (Owner.EntityManager.TryGetEntity(entityID, out var entity))
-            {
-                _chamber.Remove(entity);
-
-                //Give the ejected entity a tiny bit of offset so each one is apparent in case of a big stack,
-                //but (hopefully) not enough to clip it through a solid (wall).
-                entity.RandomOffset(0.4f);
-            }
-            _uiDirty = true;
-        }
-
-        /// <summary>
-        /// Tries to eject whatever is in the beaker slot. Puts the item in the user's hands or failing that on top
-        /// of the grinder.
-        /// </summary>
-        private void EjectBeaker(IEntity? user)
-        {
-            if (!HasBeaker || _heldBeaker == null || _busy)
-                return;
-
-            var beaker = _beakerContainer.ContainedEntity;
-            if(beaker is null)
-                return;
-
-            _beakerContainer.Remove(beaker);
-
-            if (user == null || !user.TryGetComponent<HandsComponent>(out var hands) || !_heldBeaker.Owner.TryGetComponent<ItemComponent>(out var item))
-                return;
-            hands.PutInHandOrDrop(item);
-
-            _heldBeaker = null;
-            _uiDirty = true;
-            SetAppearance();
-        }
-
-        void IActivate.Activate(ActivateEventArgs eventArgs)
-        {
-            if (!eventArgs.User.TryGetComponent(out ActorComponent? actor))
-            {
-                return;
-            }
-            _uiDirty = true;
-            UserInterface?.Toggle(actor.PlayerSession);
-        }
-
-        async Task<bool> IInteractUsing.InteractUsing(InteractUsingEventArgs eventArgs)
-        {
-            if (!eventArgs.User.TryGetComponent(out IHandsComponent? hands))
-            {
-                Owner.PopupMessage(eventArgs.User, Loc.GetString("reagent-grinder-component-interact-using-no-hands"));
-                return true;
-            }
-
-            IEntity heldEnt = eventArgs.Using;
-
-            //First, check if user is trying to insert a beaker.
-            //No promise it will be a beaker right now, but whatever.
-            //Maybe this should whitelist "beaker" in the prototype id of heldEnt?
-            if(heldEnt.TryGetComponent(out SolutionContainerComponent? beaker) && beaker.Capabilities.HasFlag(SolutionContainerCaps.FitsInDispenser))
-            {
-                _beakerContainer.Insert(heldEnt);
-                _heldBeaker = beaker;
-                _uiDirty = true;
-                //We are done, return. Insert the beaker and exit!
-                SetAppearance();
-                ClickSound();
-                return true;
-            }
-
-            //Next, see if the user is trying to insert something they want to be ground/juiced.
-            if(!heldEnt.HasTag("Grindable") && !heldEnt.TryGetComponent(out JuiceableComponent? juice))
-            {
-                //Entity did NOT pass the whitelist for grind/juice.
-                //Wouldn't want the clown grinding up the Captain's ID card now would you?
-                //Why am I asking you? You're biased.
-                return false;
-            }
-
-            //Cap the chamber. Don't want someone putting in 500 entities and ejecting them all at once.
-            //Maybe I should have done that for the microwave too?
-            if (_chamber.ContainedEntities.Count >= _storageCap)
-            {
-                return false;
-            }
-
-            if (!_chamber.Insert(heldEnt))
-                return false;
-
-            _uiDirty = true;
-            return true;
-        }
-
-        /// <summary>
-        /// The wzhzhzh of the grinder. Processes the contents of the grinder and puts the output in the beaker.
-        /// </summary>
-        /// <param name="isJuiceIntent">true for wanting to juice, false for wanting to grind.</param>
-        private async void DoWork(IEntity user, GrinderProgram program)
-        {
-            //Have power, are  we busy, chamber has anything to grind, a beaker for the grounds to go?
-            if(!Powered || _busy || ChamberEmpty || !HasBeaker || _heldBeaker == null)
-            {
-                return;
-            }
-
-            _busy = true;
-
-            UserInterface?.SendMessage(new ReagentGrinderWorkStartedMessage(program));
-            switch (program)
-            {
-                case GrinderProgram.Grind:
-                    SoundSystem.Play(Filter.Pvs(Owner), "/Audio/Machines/blender.ogg", Owner, AudioParams.Default);
-                    //Get each item inside the chamber and get the reagents it contains. Transfer those reagents to the beaker, given we have one in.
-                    Owner.SpawnTimer(_workTime, (Action) (() =>
-                    {
-                        foreach (var item in _chamber.ContainedEntities.ToList())
-                        {
-                            if (!item.HasTag("Grindable")) continue;
-                            if (!item.TryGetComponent<SolutionContainerComponent>(out var solution)) continue;
-                            if (_heldBeaker.CurrentVolume + solution.CurrentVolume > _heldBeaker.MaxVolume) continue;
-                            _heldBeaker.TryAddSolution(solution.Solution);
-                            solution.RemoveAllSolution();
-                            item.Delete();
-                        }
-
-                        _busy = false;
-                        _uiDirty = true;
-                        UserInterface?.SendMessage(new ReagentGrinderWorkCompleteMessage());
-                    }));
-                    break;
-
-                case GrinderProgram.Juice:
-                    SoundSystem.Play(Filter.Pvs(Owner), "/Audio/Machines/juicer.ogg", Owner, AudioParams.Default);
-                    Owner.SpawnTimer(_workTime, (Action) (() =>
-                    {
-                        foreach (var item in _chamber.ContainedEntities.ToList())
-                        {
-                            if (!item.TryGetComponent<JuiceableComponent>(out var juiceMe)) continue;
-                            if (_heldBeaker.CurrentVolume + juiceMe.JuiceResultSolution.TotalVolume > _heldBeaker.MaxVolume) continue;
-                            _heldBeaker.TryAddSolution(juiceMe.JuiceResultSolution);
-                            item.Delete();
-                        }
-                        UserInterface?.SendMessage(new ReagentGrinderWorkCompleteMessage());
-                        _busy = false;
-                        _uiDirty = true;
-                    }));
-                    break;
-            }
-        }
+        [ViewVariables(VVAccess.ReadWrite)] [DataField("chamberCapacity")] public int StorageCap = 16;
+        [ViewVariables(VVAccess.ReadWrite)] [DataField("workTime")] public int WorkTime = 3500; //3.5 seconds, completely arbitrary for now.
     }
 }
diff --git a/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs b/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs
index 95f3dbe5f8..e5e45b5967 100644
--- a/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs
+++ b/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs
@@ -1,19 +1,333 @@
-using Content.Server.Kitchen.Components;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Content.Server.Chemistry.Components;
+using Content.Server.Hands.Components;
+using Content.Server.Items;
+using Content.Server.Kitchen.Components;
+using Content.Server.Power.Components;
+using Content.Server.Stack;
+using Content.Server.UserInterface;
+using Content.Server.Kitchen.Events;
+using Content.Shared.Chemistry.Solution;
+using Content.Shared.Interaction;
+using Content.Shared.Kitchen.Components;
+using Content.Shared.Notification.Managers;
+using Content.Shared.Random.Helpers;
+using Content.Shared.Tag;
 using JetBrains.Annotations;
+using Robust.Server.GameObjects;
+using Robust.Shared.Audio;
+using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
+using Robust.Shared.Localization;
+using Robust.Shared.Player;
+using Robust.Shared.Utility;
 
 namespace Content.Server.Kitchen.EntitySystems
 {
     [UsedImplicitly]
     internal sealed class ReagentGrinderSystem : EntitySystem
     {
+        [Dependency] private readonly IEntityManager _entityManager = default!;
+
+        private Queue<ReagentGrinderComponent> _uiUpdateQueue = new();
+
+        public override void Initialize()
+        {
+            base.Initialize();
+
+            SubscribeLocalEvent<ReagentGrinderComponent, ComponentInit>(OnComponentInit);
+            SubscribeLocalEvent<ReagentGrinderComponent, PowerChangedEvent>((_, component, _) => EnqueueUiUpdate(component));
+            SubscribeLocalEvent<ReagentGrinderComponent, InteractHandEvent>(OnInteractHand);
+            SubscribeLocalEvent<ReagentGrinderComponent, InteractUsingEvent>(OnInteractUsing);
+            SubscribeLocalEvent<StackComponent, JuiceableScalingEvent>(JuiceableScaling);
+        }
+
+        private void JuiceableScaling(EntityUid uid, StackComponent component, JuiceableScalingEvent args)
+        {
+            args.Scalar *= component.Count; // multiply scalar by amount of items in stack
+        }
+
+        private void OnInteractUsing(EntityUid uid, ReagentGrinderComponent component, InteractUsingEvent args)
+        {
+            if (args.Handled) return;
+
+            if (!args.User.TryGetComponent(out IHandsComponent? hands))
+            {
+                component.Owner.PopupMessage(args.User, Loc.GetString("reagent-grinder-component-interact-using-no-hands"));
+                args.Handled = true;
+                return;
+            }
+
+            IEntity heldEnt = args.Used;
+
+            //First, check if user is trying to insert a beaker.
+            //No promise it will be a beaker right now, but whatever.
+            //Maybe this should whitelist "beaker" in the prototype id of heldEnt?
+            if (heldEnt.TryGetComponent(out SolutionContainerComponent? beaker) && beaker.Capabilities.HasFlag(SolutionContainerCaps.FitsInDispenser))
+            {
+                component.BeakerContainer.Insert(heldEnt);
+                component.HeldBeaker = beaker;
+                EnqueueUiUpdate(component);
+                //We are done, return. Insert the beaker and exit!
+                if (component.Owner.TryGetComponent(out AppearanceComponent? appearance))
+                {
+                    appearance.SetData(SharedReagentGrinderComponent.ReagentGrinderVisualState.BeakerAttached, component.BeakerContainer.ContainedEntity != null);
+                }
+                ClickSound(component);
+                args.Handled = true;
+                return;
+            }
+
+            //Next, see if the user is trying to insert something they want to be ground/juiced.
+            if (!heldEnt.HasTag("Grindable") && !heldEnt.TryGetComponent(out JuiceableComponent? juice))
+            {
+                //Entity did NOT pass the whitelist for grind/juice.
+                //Wouldn't want the clown grinding up the Captain's ID card now would you?
+                //Why am I asking you? You're biased.
+                return;
+            }
+
+            //Cap the chamber. Don't want someone putting in 500 entities and ejecting them all at once.
+            //Maybe I should have done that for the microwave too?
+            if (component.Chamber.ContainedEntities.Count >= component.StorageCap)
+            {
+                return;
+            }
+
+            if (!component.Chamber.Insert(heldEnt))
+            {
+                return;
+            }
+
+            EnqueueUiUpdate(component);
+            args.Handled = true;
+        }
+
+        private void OnInteractHand(EntityUid uid, ReagentGrinderComponent component, InteractHandEvent args)
+        {
+            if (args.Handled) return;
+
+            if (!args.User.TryGetComponent(out ActorComponent? actor))
+            {
+                return;
+            }
+            EnqueueUiUpdate(component);
+            component.Owner.GetUIOrNull(SharedReagentGrinderComponent.ReagentGrinderUiKey.Key)?.Toggle(actor.PlayerSession);
+            args.Handled = true;
+        }
+
+        private void EnqueueUiUpdate(ReagentGrinderComponent component)
+        {
+            if (!_uiUpdateQueue.Contains(component)) _uiUpdateQueue.Enqueue(component);
+        }
+
+        private void OnComponentInit(EntityUid uid, ReagentGrinderComponent component, ComponentInit args)
+        {
+            EnqueueUiUpdate(component);
+
+            //A slot for the beaker where the grounds/juices will go.
+            component.BeakerContainer =
+                ContainerHelpers.EnsureContainer<ContainerSlot>(component.Owner, $"{component.Name}-reagentContainerContainer");
+
+            //A container for the things that WILL be ground/juiced. Useful for ejecting them instead of deleting them from the hands of the user.
+            component.Chamber =
+                ContainerHelpers.EnsureContainer<Container>(component.Owner, $"{component.Name}-entityContainerContainer");
+
+            var bui = component.Owner.GetUIOrNull(SharedReagentGrinderComponent.ReagentGrinderUiKey.Key);
+            if (bui != null)
+            {
+                bui.OnReceiveMessage += msg => OnUIMessageReceived(uid, component, msg);
+            }
+        }
+
+        private void OnUIMessageReceived(EntityUid uid, ReagentGrinderComponent component,
+            ServerBoundUserInterfaceMessage message)
+        {
+            if (component.Busy)
+            {
+                return;
+            }
+
+            switch (message.Message)
+            {
+                case SharedReagentGrinderComponent.ReagentGrinderGrindStartMessage msg:
+                    if (!component.Owner.TryGetComponent(out ApcPowerReceiverComponent? receiver) || !receiver.Powered) break;
+                    ClickSound(component);
+                    DoWork(component, message.Session.AttachedEntity!, SharedReagentGrinderComponent.GrinderProgram.Grind);
+                    break;
+
+                case SharedReagentGrinderComponent.ReagentGrinderJuiceStartMessage msg:
+                    if (!component.Owner.TryGetComponent(out ApcPowerReceiverComponent? receiver2) || !receiver2.Powered) break;
+                    ClickSound(component);
+                    DoWork(component, message.Session.AttachedEntity!, SharedReagentGrinderComponent.GrinderProgram.Juice);
+                    break;
+
+                case SharedReagentGrinderComponent.ReagentGrinderEjectChamberAllMessage msg:
+                    if (component.Chamber.ContainedEntities.Count > 0)
+                    {
+                        ClickSound(component);
+                        for (var i = component.Chamber.ContainedEntities.Count - 1; i >= 0; i--)
+                        {
+                            var entity = component.Chamber.ContainedEntities[i];
+                            component.Chamber.Remove(entity);
+                            entity.RandomOffset(0.4f);
+                        }
+                        EnqueueUiUpdate(component);
+                    }
+                    break;
+
+                case SharedReagentGrinderComponent.ReagentGrinderEjectChamberContentMessage msg:
+                    if (component.Chamber.ContainedEntities.TryFirstOrDefault(x => x.Uid == msg.EntityID, out var ent))
+                    {
+                        component.Chamber.Remove(ent);
+                        ent.RandomOffset(0.4f);
+                        EnqueueUiUpdate(component);
+                        ClickSound(component);
+                    }
+                    break;
+
+                case SharedReagentGrinderComponent.ReagentGrinderEjectBeakerMessage msg:
+                    ClickSound(component);
+                    EjectBeaker(component, message.Session.AttachedEntity);
+                    EnqueueUiUpdate(component);
+                    break;
+            }
+        }
+
         public override void Update(float frameTime)
         {
             base.Update(frameTime);
-            foreach (var comp in ComponentManager.EntityQuery<ReagentGrinderComponent>(true))
+
+            while (_uiUpdateQueue.TryDequeue(out var comp))
             {
-                comp.OnUpdate();
+                if(comp.Deleted)
+                    continue;
+
+                bool canJuice = false;
+                bool canGrind = false;
+                if (comp.BeakerContainer.ContainedEntity != null)
+                {
+                    foreach (var entity in comp.Chamber.ContainedEntities)
+                    {
+                        if (!canJuice && entity.HasComponent<JuiceableComponent>()) canJuice = true;
+                        if (!canGrind && entity.HasTag("Grindable")) canGrind = true;
+                        if (canJuice && canGrind) break;
+                    }
+                }
+
+                comp.Owner.GetUIOrNull(SharedReagentGrinderComponent.ReagentGrinderUiKey.Key)?.SetState(new ReagentGrinderInterfaceState
+                (
+                    comp.Busy,
+                    comp.BeakerContainer.ContainedEntity != null,
+                    comp.Owner.TryGetComponent(out ApcPowerReceiverComponent? receiver) && receiver.Powered,
+                    canJuice,
+                    canGrind,
+                    comp.Chamber.ContainedEntities.Select(item => item.Uid).ToArray(),
+                    //Remember the beaker can be null!
+                    comp.HeldBeaker?.Solution.Contents.ToArray()
+                ));
             }
         }
+
+        /// <summary>
+        /// Tries to eject whatever is in the beaker slot. Puts the item in the user's hands or failing that on top
+        /// of the grinder.
+        /// </summary>
+        private void EjectBeaker(ReagentGrinderComponent component, IEntity? user)
+        {
+            if (component.BeakerContainer.ContainedEntity == null || component.HeldBeaker == null || component.Busy)
+                return;
+
+            var beaker = component.BeakerContainer.ContainedEntity;
+            if (beaker is null)
+                return;
+
+            component.BeakerContainer.Remove(beaker);
+
+            if (user == null || !user.TryGetComponent<HandsComponent>(out var hands) || !component.HeldBeaker.Owner.TryGetComponent<ItemComponent>(out var item))
+                return;
+            hands.PutInHandOrDrop(item);
+
+            component.HeldBeaker = null;
+            EnqueueUiUpdate(component);
+            if (component.Owner.TryGetComponent(out AppearanceComponent? appearance))
+            {
+                appearance.SetData(SharedReagentGrinderComponent.ReagentGrinderVisualState.BeakerAttached, component.BeakerContainer.ContainedEntity != null);
+            }
+        }
+
+        /// <summary>
+        /// The wzhzhzh of the grinder. Processes the contents of the grinder and puts the output in the beaker.
+        /// </summary>
+        /// <param name="isJuiceIntent">true for wanting to juice, false for wanting to grind.</param>
+        private void DoWork(ReagentGrinderComponent component, IEntity user, SharedReagentGrinderComponent.GrinderProgram program)
+        {
+            //Have power, are  we busy, chamber has anything to grind, a beaker for the grounds to go?
+            if (!component.Owner.TryGetComponent(out ApcPowerReceiverComponent? receiver) || !receiver.Powered || component.Busy || component.Chamber.ContainedEntities.Count <= 0 || component.BeakerContainer.ContainedEntity == null || component.HeldBeaker == null)
+            {
+                return;
+            }
+
+            component.Busy = true;
+
+            var bui = component.Owner.GetUIOrNull(SharedReagentGrinderComponent.ReagentGrinderUiKey.Key);
+            bui?.SendMessage(new SharedReagentGrinderComponent.ReagentGrinderWorkStartedMessage(program));
+            switch (program)
+            {
+                case SharedReagentGrinderComponent.GrinderProgram.Grind:
+                    SoundSystem.Play(Filter.Pvs(component.Owner), "/Audio/Machines/blender.ogg", component.Owner, AudioParams.Default);
+                    //Get each item inside the chamber and get the reagents it contains. Transfer those reagents to the beaker, given we have one in.
+                    component.Owner.SpawnTimer(component.WorkTime, (Action) (() =>
+                    {
+                        foreach (var item in component.Chamber.ContainedEntities.ToList())
+                        {
+                            if (!item.HasTag("Grindable")) continue;
+                            if (!item.TryGetComponent<SolutionContainerComponent>(out var solution)) continue;
+                            var juiceEvent = new JuiceableScalingEvent(); // default of scalar is always 1.0
+                            RaiseLocalEvent<JuiceableScalingEvent>(item.Uid, juiceEvent, false);
+                            if (component.HeldBeaker.CurrentVolume + solution.CurrentVolume * juiceEvent.Scalar > component.HeldBeaker.MaxVolume) continue;
+                            solution.Solution.ScaleSolution(juiceEvent.Scalar);
+                            component.HeldBeaker.TryAddSolution(solution.Solution);
+                            solution.RemoveAllSolution();
+                            item.Delete();
+                        }
+                        component.Busy = false;
+                        EnqueueUiUpdate(component);
+                        bui?.SendMessage(new SharedReagentGrinderComponent.ReagentGrinderWorkCompleteMessage());
+                    }));
+                    break;
+
+                case SharedReagentGrinderComponent.GrinderProgram.Juice:
+                    SoundSystem.Play(Filter.Pvs(component.Owner), "/Audio/Machines/juicer.ogg", component.Owner, AudioParams.Default);
+                    component.Owner.SpawnTimer(component.WorkTime, (Action) (() =>
+                    {
+                        foreach (var item in component.Chamber.ContainedEntities.ToList())
+                        {
+                            if (!item.TryGetComponent<JuiceableComponent>(out var juiceMe)) continue;
+                            var juiceEvent = new JuiceableScalingEvent(); // default of scalar is always 1.0
+                            if (item.HasComponent<StackComponent>())
+                            {
+                                RaiseLocalEvent<JuiceableScalingEvent>(item.Uid, juiceEvent);
+                            }
+                            if (component.HeldBeaker.CurrentVolume + juiceMe.JuiceResultSolution.TotalVolume * juiceEvent.Scalar > component.HeldBeaker.MaxVolume) continue;
+                            juiceMe.JuiceResultSolution.ScaleSolution(juiceEvent.Scalar);  
+                            component.HeldBeaker.TryAddSolution(juiceMe.JuiceResultSolution);
+                            item.Delete();
+                        }
+                        bui?.SendMessage(new SharedReagentGrinderComponent.ReagentGrinderWorkCompleteMessage());
+                        component.Busy = false;
+                        EnqueueUiUpdate(component);
+                    }));
+                    break;
+            }
+        }
+
+        private void ClickSound(ReagentGrinderComponent component)
+        {
+            SoundSystem.Play(Filter.Pvs(component.Owner), "/Audio/Machines/machine_switch.ogg", component.Owner, AudioParams.Default.WithVolume(-2f));
+        }
     }
 }
diff --git a/Content.Server/Kitchen/Events/JuiceableScalingEvent.cs b/Content.Server/Kitchen/Events/JuiceableScalingEvent.cs
new file mode 100644
index 0000000000..f904097e0a
--- /dev/null
+++ b/Content.Server/Kitchen/Events/JuiceableScalingEvent.cs
@@ -0,0 +1,23 @@
+using Robust.Shared.GameObjects;
+
+namespace Content.Server.Kitchen.Events
+{
+    /// <summary>
+    /// Used in scaling amount of solution to extract in juicing
+    /// </summary>
+    public class JuiceableScalingEvent : EntityEventArgs
+    {
+        
+        public JuiceableScalingEvent()
+        {
+            Scalar = 1f;
+        }
+
+        public float Scalar
+        {
+            get;
+            set;
+        }
+
+    }
+}
diff --git a/Content.Server/Light/Components/EmergencyLightComponent.cs b/Content.Server/Light/Components/EmergencyLightComponent.cs
index 5d7fd2a933..b5df55fb28 100644
--- a/Content.Server/Light/Components/EmergencyLightComponent.cs
+++ b/Content.Server/Light/Components/EmergencyLightComponent.cs
@@ -142,7 +142,7 @@ namespace Content.Server.Light.Components
 
         void IExamine.Examine(FormattedMessage message, bool inDetailsRange)
         {
-            message.AddMarkup(Loc.GetString("emergency-light-component-on-examine",("batteryStateText", BatteryStateText[State])));
+            message.AddMarkup(Loc.GetString("emergency-light-component-on-examine",("batteryStateText", Loc.GetString(BatteryStateText[State]))));
         }
 
         public enum EmergencyLightState
diff --git a/Content.Server/Light/Components/ExpendableLightComponent.cs b/Content.Server/Light/Components/ExpendableLightComponent.cs
index 1f1c4a9df5..180e791009 100644
--- a/Content.Server/Light/Components/ExpendableLightComponent.cs
+++ b/Content.Server/Light/Components/ExpendableLightComponent.cs
@@ -20,8 +20,6 @@ namespace Content.Server.Light.Components
     [RegisterComponent]
     public class ExpendableLightComponent : SharedExpendableLightComponent, IUse
     {
-        private static readonly AudioParams LoopedSoundParams = new(0, 1, "Master", 62.5f, 1, true, 0.3f);
-
         /// <summary>
         ///     Status of light, whether or not it is emitting light.
         /// </summary>
@@ -56,7 +54,7 @@ namespace Content.Server.Light.Components
         /// </summary>
         private bool TryActivate()
         {
-            if (!Activated)
+            if (!Activated && CurrentState == ExpendableLightState.BrandNew)
             {
                 if (Owner.TryGetComponent<ItemComponent>(out var item))
                 {
@@ -77,18 +75,20 @@ namespace Content.Server.Light.Components
 
         private void UpdateVisualizer()
         {
+            _appearance?.SetData(ExpendableLightVisuals.State, CurrentState);
+
             switch (CurrentState)
             {
                 case ExpendableLightState.Lit:
-                    _appearance?.SetData(ExpendableLightVisuals.State, TurnOnBehaviourID);
+                    _appearance?.SetData(ExpendableLightVisuals.Behavior, TurnOnBehaviourID);
                     break;
 
                 case ExpendableLightState.Fading:
-                    _appearance?.SetData(ExpendableLightVisuals.State, FadeOutBehaviourID);
+                    _appearance?.SetData(ExpendableLightVisuals.Behavior, FadeOutBehaviourID);
                     break;
 
                 case ExpendableLightState.Dead:
-                    _appearance?.SetData(ExpendableLightVisuals.State, string.Empty);
+                    _appearance?.SetData(ExpendableLightVisuals.Behavior, string.Empty);
                     break;
             }
         }
@@ -100,12 +100,6 @@ namespace Content.Server.Light.Components
                 switch (CurrentState)
                 {
                     case ExpendableLightState.Lit:
-
-                        if (LoopedSound != string.Empty && Owner.TryGetComponent<LoopingLoopingSoundComponent>(out var loopingSound))
-                        {
-                            loopingSound.Play(LoopedSound, LoopedSoundParams);
-                        }
-
                         if (LitSound != string.Empty)
                         {
                             SoundSystem.Play(Filter.Pvs(Owner), LitSound, Owner);
@@ -131,11 +125,6 @@ namespace Content.Server.Light.Components
                             SoundSystem.Play(Filter.Pvs(Owner), DieSound, Owner);
                         }
 
-                        if (LoopedSound != string.Empty && Owner.TryGetComponent<LoopingLoopingSoundComponent>(out var loopSound))
-                        {
-                            loopSound.StopAllSounds();
-                        }
-
                         sprite.LayerSetState(0, IconStateSpent);
                         sprite.LayerSetShader(0, "shaded");
                         sprite.LayerSetVisible(1, false);
diff --git a/Content.Server/Lock/LockComponent.cs b/Content.Server/Lock/LockComponent.cs
new file mode 100644
index 0000000000..966548e607
--- /dev/null
+++ b/Content.Server/Lock/LockComponent.cs
@@ -0,0 +1,64 @@
+using Content.Server.Lock;
+using Content.Shared.ActionBlocker;
+using Content.Shared.Interaction;
+using Content.Shared.Interaction.Helpers;
+using Content.Shared.Sound;
+using Content.Shared.Verbs;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Localization;
+using Robust.Shared.Serialization.Manager.Attributes;
+using Robust.Shared.ViewVariables;
+
+namespace Content.Server.Storage.Components
+{
+    /// <summary>
+    /// Allows locking/unlocking, with access determined by AccessReader
+    /// </summary>
+    [RegisterComponent]
+    public class LockComponent : Component
+    {
+        public override string Name => "Lock";
+
+        [ViewVariables(VVAccess.ReadWrite)] [DataField("locked")] public bool Locked { get; set; } = true;
+        [ViewVariables(VVAccess.ReadWrite)] [DataField("unlockingSound")] public SoundSpecifier? UnlockSound { get; set; } = new SoundPathSpecifier("/Audio/Machines/door_lock_off.ogg");
+        [ViewVariables(VVAccess.ReadWrite)] [DataField("lockingSound")] public SoundSpecifier? LockSound { get; set; } = new SoundPathSpecifier("/Audio/Machines/door_lock_off.ogg");
+
+        [Verb]
+        private sealed class ToggleLockVerb : Verb<LockComponent>
+        {
+            protected override void GetData(IEntity user, LockComponent component, VerbData data)
+            {
+                if (!EntitySystem.Get<ActionBlockerSystem>().CanInteract(user) ||
+                    component.Owner.TryGetComponent(out EntityStorageComponent? entityStorageComponent) && entityStorageComponent.Open)
+                {
+                    data.Visibility = VerbVisibility.Invisible;
+                    return;
+                }
+
+                data.Text = Loc.GetString(component.Locked ? "toggle-lock-verb-unlock" : "toggle-lock-verb-lock");
+            }
+
+            protected override void Activate(IEntity user, LockComponent component)
+            {
+                // Do checks
+                if (!EntitySystem.Get<ActionBlockerSystem>().CanInteract(user) ||
+                    !user.InRangeUnobstructed(component))
+                {
+                    return;
+                }
+
+                // Call relevant entity system
+                var lockSystem = user.EntityManager.EntitySysManager.GetEntitySystem<LockSystem>();
+                var eventData = new ActivateInWorldEvent(user, component.Owner);
+                if (component.Locked)
+                {
+                    lockSystem.DoUnlock(component, eventData);
+                }
+                else
+                {
+                    lockSystem.DoLock(component, eventData);
+                }
+            }
+        }
+    }
+}
diff --git a/Content.Server/Lock/LockSystem.cs b/Content.Server/Lock/LockSystem.cs
new file mode 100644
index 0000000000..063ac1656a
--- /dev/null
+++ b/Content.Server/Lock/LockSystem.cs
@@ -0,0 +1,116 @@
+using Content.Server.Access.Components;
+using Content.Server.Storage.Components;
+using Content.Shared.Examine;
+using Content.Shared.Interaction;
+using Content.Shared.Notification.Managers;
+using Content.Shared.Storage;
+using JetBrains.Annotations;
+using Robust.Server.GameObjects;
+using Robust.Shared.Audio;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Localization;
+using Robust.Shared.Player;
+
+namespace Content.Server.Lock
+{
+    /// <summary>
+    /// Handles (un)locking and examining of Lock components
+    /// </summary>
+    [UsedImplicitly]
+    public class LockSystem : EntitySystem
+    {
+        /// <inheritdoc />
+        public override void Initialize()
+        {
+            base.Initialize();
+            SubscribeLocalEvent<LockComponent, ComponentStartup>(OnStartup);
+            SubscribeLocalEvent<LockComponent, ActivateInWorldEvent>(OnActivated);
+            SubscribeLocalEvent<LockComponent, ExaminedEvent>(OnExamined);
+        }
+
+        private void OnStartup(EntityUid eUI, LockComponent lockComp, ComponentStartup args)
+        {
+            if (lockComp.Owner.TryGetComponent(out AppearanceComponent? appearance))
+            {
+                appearance.SetData(StorageVisuals.CanLock, true);
+            }
+        }
+
+        private void OnActivated(EntityUid eUI, LockComponent lockComp, ActivateInWorldEvent args)
+        {
+            // Only attempt an unlock by default on Activate
+            if (lockComp.Locked)
+            {
+                DoUnlock(lockComp, args);
+            }
+        }
+
+        private void OnExamined(EntityUid eUI, LockComponent lockComp, ExaminedEvent args)
+        {
+            args.Message.AddText("\n");
+            args.Message.AddText(Loc.GetString(lockComp.Locked
+                                                   ? "lock-comp-on-examined-is-locked"
+                                                   : "lock-comp-on-examined-is-unlocked",
+                                               ("entityName", lockComp.Owner.Name)));
+        }
+
+        public void DoLock(LockComponent lockComp, ActivateInWorldEvent args)
+        {
+            if (!HasUserAccess(lockComp, args.User))
+            {
+                return;
+            }
+
+            lockComp.Owner.PopupMessage(args.User, Loc.GetString("lock-comp-do-lock-success", ("entityName",lockComp.Owner.Name)));
+            lockComp.Locked = true;
+            if(lockComp.LockSound != null)
+            {
+                SoundSystem.Play(Filter.Pvs(lockComp.Owner), lockComp.LockSound.GetSound(), lockComp.Owner, AudioParams.Default.WithVolume(-5));
+            }
+            
+            if (lockComp.Owner.TryGetComponent(out AppearanceComponent? appearanceComp))
+            {
+                appearanceComp.SetData(StorageVisuals.Locked, true);
+            }
+
+            args.Handled = true;
+        }
+
+        public void DoUnlock(LockComponent lockComp, ActivateInWorldEvent args )
+        {
+            if (!HasUserAccess(lockComp, args.User))
+            {
+                return;
+            }
+
+            lockComp.Owner.PopupMessage(args.User, Loc.GetString("lock-comp-do-unlock-success", ("entityName", lockComp.Owner.Name)));
+            lockComp.Locked = false;
+            if(lockComp.UnlockSound != null)
+            {
+                SoundSystem.Play(Filter.Pvs(lockComp.Owner), lockComp.UnlockSound.GetSound(), lockComp.Owner, AudioParams.Default.WithVolume(-5));
+            }
+            
+            if (lockComp.Owner.TryGetComponent(out AppearanceComponent? appearanceComp))
+            {
+                appearanceComp.SetData(StorageVisuals.Locked, false);
+            }
+
+            // To stop EntityStorageComponent from opening right after the container gets unlocked
+            args.Handled = true;
+        }
+
+        private static bool HasUserAccess(LockComponent lockComp, IEntity user)
+        {
+            if (lockComp.Owner.TryGetComponent(out AccessReader? reader))
+            {
+                if (!reader.IsAllowed(user))
+                {
+                    lockComp.Owner.PopupMessage(user, Loc.GetString("lock-comp-has-user-access-fail"));
+                    return false;
+                }
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/Content.Server/Morgue/Components/MorgueEntityStorageComponent.cs b/Content.Server/Morgue/Components/MorgueEntityStorageComponent.cs
index 0699c6e19f..7f38b3807d 100644
--- a/Content.Server/Morgue/Components/MorgueEntityStorageComponent.cs
+++ b/Content.Server/Morgue/Components/MorgueEntityStorageComponent.cs
@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using Content.Server.Storage.Components;
 using Content.Shared.Body.Components;
 using Content.Shared.Directions;
@@ -12,6 +13,7 @@ using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using Robust.Shared.Player;
@@ -132,6 +134,20 @@ namespace Content.Server.Morgue.Components
             }
         }
 
+        protected override IEnumerable<IEntity> DetermineCollidingEntities()
+        {
+            if (_tray == null)
+            {
+                yield break;
+            }
+
+            var entityLookup = IoCManager.Resolve<IEntityLookup>();
+            foreach (var entity in entityLookup.GetEntitiesIntersecting(_tray))
+            {
+                yield return entity;
+            }
+        }
+
         //Called every 10 seconds
         public void Update()
         {
diff --git a/Content.Server/Pointing/EntitySystems/PointingSystem.cs b/Content.Server/Pointing/EntitySystems/PointingSystem.cs
index f31155ff11..e855c9270c 100644
--- a/Content.Server/Pointing/EntitySystems/PointingSystem.cs
+++ b/Content.Server/Pointing/EntitySystems/PointingSystem.cs
@@ -31,6 +31,7 @@ namespace Content.Server.Pointing.EntitySystems
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!;
         [Dependency] private readonly IGameTiming _gameTiming = default!;
+        [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!;
 
         private static readonly TimeSpan PointDelay = TimeSpan.FromSeconds(0.5f);
 
@@ -112,7 +113,7 @@ namespace Content.Server.Pointing.EntitySystems
                 return false;
             }
 
-            if (EntitySystem.Get<ActionBlockerSystem>().CanChangeDirection(player))
+            if (_actionBlockerSystem.CanChangeDirection(player))
             {
                 var diff = coords.ToMapPos(EntityManager) - player.Transform.MapPosition.Position;
                 if (diff.LengthSquared > 0.01f)
diff --git a/Content.Server/Power/EntitySystems/BatterySystem.cs b/Content.Server/Power/EntitySystems/BatterySystem.cs
index 44126d6810..e97b007861 100644
--- a/Content.Server/Power/EntitySystems/BatterySystem.cs
+++ b/Content.Server/Power/EntitySystems/BatterySystem.cs
@@ -11,23 +11,25 @@ namespace Content.Server.Power.EntitySystems
         {
             base.Initialize();
 
-            SubscribeLocalEvent<BatteryComponent, NetworkBatteryPreSync>(PreSync);
-            SubscribeLocalEvent<BatteryComponent, NetworkBatteryPostSync>(PostSync);
+            SubscribeLocalEvent<NetworkBatteryPreSync>(PreSync);
+            SubscribeLocalEvent<NetworkBatteryPostSync>(PostSync);
         }
 
-        private void PreSync(EntityUid uid, BatteryComponent component, NetworkBatteryPreSync args)
+        private void PreSync(NetworkBatteryPreSync ev)
         {
-            var networkBattery = ComponentManager.GetComponent<PowerNetworkBatteryComponent>(uid);
-
-            networkBattery.NetworkBattery.Capacity = component.MaxCharge;
-            networkBattery.NetworkBattery.CurrentStorage = component.CurrentCharge;
+            foreach (var (bat, netBat) in ComponentManager.EntityQuery<BatteryComponent, PowerNetworkBatteryComponent>())
+            {
+                netBat.NetworkBattery.Capacity = bat.MaxCharge;
+                netBat.NetworkBattery.CurrentStorage = bat.CurrentCharge;
+            }
         }
 
-        private void PostSync(EntityUid uid, BatteryComponent component, NetworkBatteryPostSync args)
+        private void PostSync(NetworkBatteryPostSync ev)
         {
-            var networkBattery = ComponentManager.GetComponent<PowerNetworkBatteryComponent>(uid);
-
-            component.CurrentCharge = networkBattery.NetworkBattery.CurrentStorage;
+            foreach (var (bat, netBat) in ComponentManager.EntityQuery<BatteryComponent, PowerNetworkBatteryComponent>())
+            {
+                bat.CurrentCharge = netBat.NetworkBattery.CurrentStorage;
+            }
         }
 
         public override void Update(float frameTime)
diff --git a/Content.Server/Power/EntitySystems/PowerNetSystem.cs b/Content.Server/Power/EntitySystems/PowerNetSystem.cs
index 3b7f81fb25..d8eee5d111 100644
--- a/Content.Server/Power/EntitySystems/PowerNetSystem.cs
+++ b/Content.Server/Power/EntitySystems/PowerNetSystem.cs
@@ -19,7 +19,6 @@ namespace Content.Server.Power.EntitySystems
         private readonly HashSet<PowerNet> _powerNetReconnectQueue = new();
         private readonly HashSet<ApcNet> _apcNetReconnectQueue = new();
 
-        private int _nextId = 1;
         private readonly BatteryRampPegSolver _solver = new();
 
         public override void Initialize()
@@ -50,7 +49,7 @@ namespace Content.Server.Power.EntitySystems
         private void ApcPowerReceiverShutdown(EntityUid uid, ApcPowerReceiverComponent component,
             ComponentShutdown args)
         {
-            _powerState.Loads.Remove(component.NetworkLoad.Id);
+            _powerState.Loads.Free(component.NetworkLoad.Id);
         }
 
         private static void ApcPowerReceiverPaused(
@@ -68,7 +67,7 @@ namespace Content.Server.Power.EntitySystems
 
         private void BatteryShutdown(EntityUid uid, PowerNetworkBatteryComponent component, ComponentShutdown args)
         {
-            _powerState.Batteries.Remove(component.NetworkBattery.Id);
+            _powerState.Batteries.Free(component.NetworkBattery.Id);
         }
 
         private static void BatteryPaused(EntityUid uid, PowerNetworkBatteryComponent component, EntityPausedEvent args)
@@ -83,7 +82,7 @@ namespace Content.Server.Power.EntitySystems
 
         private void PowerConsumerShutdown(EntityUid uid, PowerConsumerComponent component, ComponentShutdown args)
         {
-            _powerState.Loads.Remove(component.NetworkLoad.Id);
+            _powerState.Loads.Free(component.NetworkLoad.Id);
         }
 
         private static void PowerConsumerPaused(EntityUid uid, PowerConsumerComponent component, EntityPausedEvent args)
@@ -98,7 +97,7 @@ namespace Content.Server.Power.EntitySystems
 
         private void PowerSupplierShutdown(EntityUid uid, PowerSupplierComponent component, ComponentShutdown args)
         {
-            _powerState.Supplies.Remove(component.NetworkSupply.Id);
+            _powerState.Supplies.Free(component.NetworkSupply.Id);
         }
 
         private static void PowerSupplierPaused(EntityUid uid, PowerSupplierComponent component, EntityPausedEvent args)
@@ -113,7 +112,7 @@ namespace Content.Server.Power.EntitySystems
 
         public void DestroyPowerNet(PowerNet powerNet)
         {
-            _powerState.Networks.Remove(powerNet.NetworkNode.Id);
+            _powerState.Networks.Free(powerNet.NetworkNode.Id);
         }
 
         public void QueueReconnectPowerNet(PowerNet powerNet)
@@ -128,7 +127,7 @@ namespace Content.Server.Power.EntitySystems
 
         public void DestroyApcNet(ApcNet apcNet)
         {
-            _powerState.Networks.Remove(apcNet.NetworkNode.Id);
+            _powerState.Networks.Free(apcNet.NetworkNode.Id);
         }
 
         public void QueueReconnectApcNet(ApcNet apcNet)
@@ -175,19 +174,13 @@ namespace Content.Server.Power.EntitySystems
             }
 
             // Synchronize batteries
-            foreach (var battery in ComponentManager.EntityQuery<PowerNetworkBatteryComponent>())
-            {
-                RaiseLocalEvent(battery.Owner.Uid, new NetworkBatteryPreSync());
-            }
+            RaiseLocalEvent(new NetworkBatteryPreSync());
 
             // Run power solver.
             _solver.Tick(frameTime, _powerState);
 
             // Synchronize batteries, the other way around.
-            foreach (var battery in ComponentManager.EntityQuery<PowerNetworkBatteryComponent>())
-            {
-                RaiseLocalEvent(battery.Owner.Uid, new NetworkBatteryPostSync());
-            }
+            RaiseLocalEvent(new NetworkBatteryPostSync());
 
             // Send events where necessary.
             {
@@ -219,26 +212,22 @@ namespace Content.Server.Power.EntitySystems
 
         private void AllocLoad(PowerState.Load load)
         {
-            load.Id = AllocId();
-            _powerState.Loads.Add(load.Id, load);
+            _powerState.Loads.Allocate(out load.Id) = load;
         }
 
         private void AllocSupply(PowerState.Supply supply)
         {
-            supply.Id = AllocId();
-            _powerState.Supplies.Add(supply.Id, supply);
+            _powerState.Supplies.Allocate(out supply.Id) = supply;
         }
 
         private void AllocBattery(PowerState.Battery battery)
         {
-            battery.Id = AllocId();
-            _powerState.Batteries.Add(battery.Id, battery);
+            _powerState.Batteries.Allocate(out battery.Id) = battery;
         }
 
         private void AllocNetwork(PowerState.Network network)
         {
-            network.Id = AllocId();
-            _powerState.Networks.Add(network.Id, network);
+            _powerState.Networks.Allocate(out network.Id) = network;
         }
 
         private static void DoReconnectApcNet(ApcNet net)
@@ -302,18 +291,13 @@ namespace Content.Server.Power.EntitySystems
                 battery.NetworkBattery.LinkedNetworkDischarging = netNode.Id;
             }
         }
-
-        private PowerState.NodeId AllocId()
-        {
-            return new(_nextId++);
-        }
     }
 
     /// <summary>
     ///     Raised before power network simulation happens, to synchronize battery state from
     ///     components like <see cref="BatteryComponent"/> into <see cref="PowerNetworkBatteryComponent"/>.
     /// </summary>
-    public sealed class NetworkBatteryPreSync : EntityEventArgs
+    public struct NetworkBatteryPreSync
     {
     }
 
@@ -321,7 +305,7 @@ namespace Content.Server.Power.EntitySystems
     ///     Raised after power network simulation happens, to synchronize battery charge changes from
     ///     <see cref="PowerNetworkBatteryComponent"/> to components like <see cref="BatteryComponent"/>.
     /// </summary>
-    public sealed class NetworkBatteryPostSync : EntityEventArgs
+    public struct NetworkBatteryPostSync
     {
     }
 
diff --git a/Content.Server/Power/Pow3r/GraphWalkSolver.cs b/Content.Server/Power/Pow3r/GraphWalkSolver.cs
deleted file mode 100644
index 981aad8120..0000000000
--- a/Content.Server/Power/Pow3r/GraphWalkSolver.cs
+++ /dev/null
@@ -1,181 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using static Content.Server.Power.Pow3r.PowerState;
-
-namespace Content.Server.Power.Pow3r
-{
-    /// <summary>
-    ///     Partial implementation of full-graph-walking power solving under pow3r.
-    ///     Concept described at https://hackmd.io/@ss14/lowpower
-    /// </summary>
-    /// <remarks>
-    ///     Many features like batteries, cycle detection, join handling, etc... are not implemented at all.
-    ///     Seriously, this implementation barely works. Ah well.
-    ///     <see cref="BatteryRampPegSolver"/> is better.
-    /// </remarks>
-    public class GraphWalkSolver : IPowerSolver
-    {
-        public void Tick(float frameTime, PowerState state)
-        {
-            foreach (var load in state.Loads.Values)
-            {
-                load.ReceivingPower = 0;
-            }
-
-            foreach (var supply in state.Supplies.Values)
-            {
-                supply.CurrentSupply = 0;
-            }
-
-            foreach (var network in state.Networks.Values)
-            {
-                // Clear some stuff.
-                network.LocalDemandMet = 0;
-
-                // Add up demands in network.
-                network.LocalDemandTotal = network.Loads
-                    .Select(l => state.Loads[l])
-                    .Where(c => c.Enabled)
-                    .Sum(c => c.DesiredPower);
-
-                // Add up supplies in network.
-                var availableSupplySum = 0f;
-                var maxSupplySum = 0f;
-                foreach (var supplyId in network.Supplies)
-                {
-                    var supply = state.Supplies[supplyId];
-                    if (!supply.Enabled)
-                        continue;
-
-                    var rampMax = supply.SupplyRampPosition + supply.SupplyRampTolerance;
-                    var effectiveSupply = Math.Min(rampMax, supply.MaxSupply);
-                    supply.EffectiveMaxSupply = effectiveSupply;
-                    availableSupplySum += effectiveSupply;
-                    maxSupplySum += supply.MaxSupply;
-                }
-
-                network.AvailableSupplyTotal = availableSupplySum;
-                network.TheoreticalSupplyTotal = maxSupplySum;
-            }
-
-            // Sort networks by tree height so that suppliers that have less possible loads go FIRST.
-            // Idea being that a backup generator on a small subnet should do more work
-            // so that a larger generator that covers more networks can put its power elsewhere.
-            var sortedByHeight = state.Networks.Values.OrderBy(v => TotalSubLoadCount(state, v)).ToArray();
-
-            // Go over every network with supply to send power.
-            foreach (var network in sortedByHeight)
-            {
-                // Find all loads recursively, and sum them up.
-                var subNets = new List<Network>();
-                var totalDemand = 0f;
-                GetLoadingNetworksRecursively(state, network, subNets, ref totalDemand);
-
-                if (totalDemand == 0)
-                    continue;
-
-                // Calculate power delivered.
-                var power = Math.Min(totalDemand, network.AvailableSupplyTotal);
-
-                // Distribute load across supplies in network.
-                foreach (var supplyId in network.Supplies)
-                {
-                    var supply = state.Supplies[supplyId];
-                    if (!supply.Enabled)
-                        continue;
-
-                    if (supply.EffectiveMaxSupply != 0)
-                    {
-                        var ratio = supply.EffectiveMaxSupply / network.AvailableSupplyTotal;
-
-                        supply.CurrentSupply = ratio * power;
-                    }
-                    else
-                    {
-                        supply.CurrentSupply = 0;
-                    }
-
-                    if (supply.MaxSupply != 0)
-                    {
-                        var ratio = supply.MaxSupply / network.TheoreticalSupplyTotal;
-
-                        supply.SupplyRampTarget = ratio * totalDemand;
-                    }
-                    else
-                    {
-                        supply.SupplyRampTarget = 0;
-                    }
-                }
-
-                // Distribute supply across subnet loads.
-                foreach (var subNet in subNets)
-                {
-                    var rem = subNet.RemainingDemand;
-                    var ratio = rem / totalDemand;
-
-                    subNet.LocalDemandMet += ratio * power;
-                }
-            }
-
-            // Distribute power across loads in networks.
-            foreach (var network in state.Networks.Values)
-            {
-                if (network.LocalDemandMet == 0)
-                    continue;
-
-                foreach (var loadId in network.Loads)
-                {
-                    var load = state.Loads[loadId];
-                    if (!load.Enabled)
-                        continue;
-
-                    var ratio = load.DesiredPower / network.LocalDemandTotal;
-                    load.ReceivingPower = ratio * network.LocalDemandMet;
-                }
-            }
-
-            PowerSolverShared.UpdateRampPositions(frameTime, state);
-        }
-
-        private int TotalSubLoadCount(PowerState state, Network network)
-        {
-            // TODO: Cycle detection.
-            var height = network.Loads.Count;
-
-            foreach (var batteryId in network.BatteriesCharging)
-            {
-                var battery = state.Batteries[batteryId];
-                if (battery.LinkedNetworkDischarging != default)
-                {
-                    height += TotalSubLoadCount(state, state.Networks[battery.LinkedNetworkDischarging]);
-                }
-            }
-
-            return height;
-        }
-
-        private void GetLoadingNetworksRecursively(
-            PowerState state,
-            Network network,
-            List<Network> networks,
-            ref float totalDemand)
-        {
-            networks.Add(network);
-            totalDemand += network.LocalDemandTotal - network.LocalDemandMet;
-
-            foreach (var batteryId in network.BatteriesCharging)
-            {
-                var battery = state.Batteries[batteryId];
-                if (battery.LinkedNetworkDischarging != default)
-                {
-                    GetLoadingNetworksRecursively(
-                        state,
-                        state.Networks[battery.LinkedNetworkDischarging],
-                        networks,
-                        ref totalDemand);
-                }
-            }
-        }
-    }
-}
diff --git a/Content.Server/Power/Pow3r/PowerState.cs b/Content.Server/Power/Pow3r/PowerState.cs
index 276fc785a9..0d220b9259 100644
--- a/Content.Server/Power/Pow3r/PowerState.cs
+++ b/Content.Server/Power/Pow3r/PowerState.cs
@@ -1,40 +1,51 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using System.Numerics;
+using System.Linq;
+using System.Runtime.CompilerServices;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Power.Pow3r
 {
     public sealed class PowerState
     {
-        public const int MaxTickData = 180;
-
         public static readonly JsonSerializerOptions SerializerOptions = new()
         {
             IncludeFields = true,
             Converters = {new NodeIdJsonConverter()}
         };
 
-        public Dictionary<NodeId, Supply> Supplies = new();
-        public Dictionary<NodeId, Network> Networks = new();
-        public Dictionary<NodeId, Load> Loads = new();
-        public Dictionary<NodeId, Battery> Batteries = new();
+        public GenIdStorage<Supply> Supplies = new();
+        public GenIdStorage<Network> Networks = new();
+        public GenIdStorage<Load> Loads = new();
+        public GenIdStorage<Battery> Batteries = new();
 
         public readonly struct NodeId : IEquatable<NodeId>
         {
-            public readonly int Id;
+            public readonly int Index;
+            public readonly int Generation;
 
-            public NodeId(int id)
+            public long Combined => (uint) Index | ((long) Generation << 32);
+
+            public NodeId(int index, int generation)
             {
-                Id = id;
+                Index = index;
+                Generation = generation;
+            }
+
+            public NodeId(long combined)
+            {
+                Index = (int) combined;
+                Generation = (int) (combined >> 32);
             }
 
             public bool Equals(NodeId other)
             {
-                return Id == other.Id;
+                return Index == other.Index && Generation == other.Generation;
             }
 
             public override bool Equals(object? obj)
@@ -44,7 +55,7 @@ namespace Content.Server.Power.Pow3r
 
             public override int GetHashCode()
             {
-                return Id;
+                return HashCode.Combine(Index, Generation);
             }
 
             public static bool operator ==(NodeId left, NodeId right)
@@ -59,7 +70,261 @@ namespace Content.Server.Power.Pow3r
 
             public override string ToString()
             {
-                return Id.ToString();
+                return $"{Index} (G{Generation})";
+            }
+        }
+
+        public static class GenIdStorage
+        {
+            public static GenIdStorage<T> FromEnumerable<T>(IEnumerable<(NodeId, T)> enumerable)
+            {
+                return GenIdStorage<T>.FromEnumerable(enumerable);
+            }
+        }
+
+        public sealed class GenIdStorage<T>
+        {
+            // This is an implementation of "generational index" storage.
+            //
+            // The advantage of this storage method is extremely fast, O(1) lookup (way faster than Dictionary).
+            // Resolving a value in the storage is a single array load and generation compare. Extremely fast.
+            // Indices can also be cached into temporary
+            // Disadvantages are that storage cannot be shrunk, and sparse storage is inefficient space wise.
+            // Also this implementation does not have optimizations necessary to make sparse iteration efficient.
+            //
+            // The idea here is that the index type (NodeId in this case) has both an index and a generation.
+            // The index is an integer index into the storage array, the generation is used to avoid use-after-free.
+            //
+            // Empty slots in the array form a linked list of free slots.
+            // When we allocate a new slot, we pop one link off this linked list and hand out its index + generation.
+            //
+            // When we free a node, we bump the generation of the slot and make it the head of the linked list.
+            // The generation being bumped means that any IDs to this slot will fail to resolve (generation mismatch).
+            //
+
+            // Index of the next free slot to use when allocating a new one.
+            // If this is int.MaxValue,
+            // it basically means "no slot available" and the next allocation call should resize the array storage.
+            private int _nextFree = int.MaxValue;
+            private Slot[] _storage;
+
+            public int Count { get; private set; }
+
+            public ref T this[NodeId id]
+            {
+                [MethodImpl(MethodImplOptions.AggressiveInlining)]
+                get
+                {
+                    ref var slot = ref _storage[id.Index];
+                    if (slot.Generation != id.Generation)
+                        ThrowKeyNotFound();
+
+                    return ref slot.Value;
+                }
+            }
+
+            public GenIdStorage()
+            {
+                _storage = Array.Empty<Slot>();
+            }
+
+            public static GenIdStorage<T> FromEnumerable(IEnumerable<(NodeId, T)> enumerable)
+            {
+                var storage = new GenIdStorage<T>();
+
+                // Cache enumerable to array to do double enumeration.
+                var cache = enumerable.ToArray();
+
+                if (cache.Length == 0)
+                    return storage;
+
+                // Figure out max size necessary and set storage size to that.
+                var maxSize = cache.Max(tup => tup.Item1.Index) + 1;
+                storage._storage = new Slot[maxSize];
+
+                // Fill in slots.
+                foreach (var (id, value) in cache)
+                {
+                    DebugTools.Assert(id.Generation != 0, "Generation cannot be 0");
+
+                    ref var slot = ref storage._storage[id.Index];
+                    DebugTools.Assert(slot.Generation == 0, "Duplicate key index!");
+
+                    slot.Generation = id.Generation;
+                    slot.Value = value;
+                }
+
+                // Go through empty slots and build the free chain.
+                var nextFree = int.MaxValue;
+                for (var i = 0; i < storage._storage.Length; i++)
+                {
+                    ref var slot = ref storage._storage[i];
+
+                    if (slot.Generation != 0)
+                        // Slot in use.
+                        continue;
+
+                    slot.NextSlot = nextFree;
+                    nextFree = i;
+                }
+
+                storage.Count = cache.Length;
+                storage._nextFree = nextFree;
+
+                return storage;
+            }
+
+            public ref T Allocate(out NodeId id)
+            {
+                if (_nextFree == int.MaxValue)
+                    ReAllocate();
+
+                var idx = _nextFree;
+                ref var slot = ref _storage[idx];
+
+                Count += 1;
+                _nextFree = slot.NextSlot;
+                // NextSlot = -1 indicates filled.
+                slot.NextSlot = -1;
+
+                id = new NodeId(idx, slot.Generation);
+                return ref slot.Value;
+            }
+
+            public void Free(NodeId id)
+            {
+                var idx = id.Index;
+                ref var slot = ref _storage[idx];
+                if (slot.Generation != id.Generation)
+                    ThrowKeyNotFound();
+
+                if (RuntimeHelpers.IsReferenceOrContainsReferences<T>())
+                    slot.Value = default!;
+
+                Count -= 1;
+                slot.Generation += 1;
+                slot.NextSlot = _nextFree;
+                _nextFree = idx;
+            }
+
+            [MethodImpl(MethodImplOptions.NoInlining)]
+            private void ReAllocate()
+            {
+                var oldLength = _storage.Length;
+                var newLength = Math.Max(oldLength, 2) * 2;
+
+                ReAllocateTo(newLength);
+            }
+
+            private void ReAllocateTo(int newSize)
+            {
+                var oldLength = _storage.Length;
+                DebugTools.Assert(newSize >= oldLength, "Cannot shrink GenIdStorage");
+
+                Array.Resize(ref _storage, newSize);
+
+                for (var i = oldLength; i < newSize - 1; i++)
+                {
+                    // Build linked list chain for newly allocated segment.
+                    ref var slot = ref _storage[i];
+                    slot.NextSlot = i + 1;
+                    // Every slot starts at generation 1.
+                    slot.Generation = 1;
+                }
+
+                _storage[^1].NextSlot = _nextFree;
+
+                _nextFree = oldLength;
+            }
+
+            public ValuesCollection Values => new(this);
+
+            private struct Slot
+            {
+                // Next link on the free list. if int.MaxValue then this is the tail.
+                // If negative, this slot is occupied.
+                public int NextSlot;
+                // Generation of this slot.
+                public int Generation;
+                public T Value;
+            }
+
+            [MethodImpl(MethodImplOptions.NoInlining)]
+            private static void ThrowKeyNotFound()
+            {
+                throw new KeyNotFoundException();
+            }
+
+            public readonly struct ValuesCollection : IReadOnlyCollection<T>
+            {
+                private readonly GenIdStorage<T> _owner;
+
+                public ValuesCollection(GenIdStorage<T> owner)
+                {
+                    _owner = owner;
+                }
+
+                public Enumerator GetEnumerator()
+                {
+                    return new Enumerator(_owner);
+                }
+
+                public int Count => _owner.Count;
+
+                IEnumerator IEnumerable.GetEnumerator()
+                {
+                    return GetEnumerator();
+                }
+
+                IEnumerator<T> IEnumerable<T>.GetEnumerator()
+                {
+                    return GetEnumerator();
+                }
+
+                public struct Enumerator : IEnumerator<T>
+                {
+                    // Save the array in the enumerator here to avoid a few pointer dereferences.
+                    private readonly Slot[] _owner;
+                    private int _index;
+
+                    public Enumerator(GenIdStorage<T> owner)
+                    {
+                        _owner = owner._storage;
+                        Current = default!;
+                        _index = -1;
+                    }
+
+                    public bool MoveNext()
+                    {
+                        while (true)
+                        {
+                            _index += 1;
+                            if (_index >= _owner.Length)
+                                return false;
+
+                            ref var slot = ref _owner[_index];
+
+                            if (slot.NextSlot < 0)
+                            {
+                                Current = slot.Value;
+                                return true;
+                            }
+                        }
+                    }
+
+                    public void Reset()
+                    {
+                        _index = -1;
+                    }
+
+                    object IEnumerator.Current => Current!;
+
+                    public T Current { get; private set; }
+
+                    public void Dispose()
+                    {
+                    }
+                }
             }
         }
 
@@ -67,12 +332,12 @@ namespace Content.Server.Power.Pow3r
         {
             public override NodeId Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
             {
-                return new(reader.GetInt32());
+                return new NodeId(reader.GetInt64());
             }
 
             public override void Write(Utf8JsonWriter writer, NodeId value, JsonSerializerOptions options)
             {
-                writer.WriteNumberValue(value.Id);
+                writer.WriteNumberValue(value.Combined);
             }
         }
 
@@ -186,22 +451,8 @@ namespace Content.Server.Power.Pow3r
             // "Supplying" means the network is connected to the OUTPUT port of the battery.
             [ViewVariables] public List<NodeId> BatteriesDischarging = new();
 
-            // Calculation parameters used by GraphWalkSolver.
-            // Unused by BatteryRampPegSolver.
-            [JsonIgnore] public float LocalDemandTotal;
-            [JsonIgnore] public float LocalDemandMet;
-            [JsonIgnore] public float GroupDemandTotal;
-            [JsonIgnore] public float GroupDemandMet;
-
             [ViewVariables] [JsonIgnore] public int Height;
             [JsonIgnore] public bool HeightTouched;
-
-            // Supply available this tick.
-            [JsonIgnore] public float AvailableSupplyTotal;
-
-            // Max theoretical supply assuming max ramp.
-            [JsonIgnore] public float TheoreticalSupplyTotal;
-            public float RemainingDemand => LocalDemandTotal - LocalDemandMet;
         }
     }
 }
diff --git a/Content.Server/Sound/Components/LoopingLoopingSoundComponent.cs b/Content.Server/Sound/Components/LoopingLoopingSoundComponent.cs
deleted file mode 100644
index 4230e39d8e..0000000000
--- a/Content.Server/Sound/Components/LoopingLoopingSoundComponent.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-using Content.Shared.Sound;
-using Robust.Shared.Audio;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Network;
-
-namespace Content.Server.Sound.Components
-{
-    [RegisterComponent]
-    public class LoopingLoopingSoundComponent : SharedLoopingSoundComponent
-    {
-        /// <summary>
-        /// Stops all sounds.
-        /// </summary>
-        /// <param name="channel">User that will be affected.</param>
-        public void StopAllSounds(INetChannel? channel)
-        {
-            SendNetworkMessage(new StopAllSoundsMessage(), channel);
-        }
-
-        /// <summary>
-        /// Stops a certain scheduled sound from playing.
-        /// </summary>
-        /// <param name="channel">User that will be affected.</param>
-        public void StopScheduledSound(string filename, INetChannel? channel)
-        {
-            SendNetworkMessage(new StopSoundScheduleMessage() {Filename = filename}, channel);
-        }
-
-        /// <summary>
-        /// Adds an scheduled sound to be played.
-        /// </summary>
-        /// <param name="channel">User that will be affected.</param>
-        public void AddScheduledSound(ScheduledSound schedule, INetChannel? channel)
-        {
-            SendNetworkMessage(new ScheduledSoundMessage() {Schedule = schedule}, channel);
-        }
-
-        public override void StopAllSounds()
-        {
-            StopAllSounds(null);
-        }
-
-        public override void StopScheduledSound(string filename)
-        {
-            StopScheduledSound(filename, null);
-        }
-
-        public override void AddScheduledSound(ScheduledSound schedule)
-        {
-            AddScheduledSound(schedule, null);
-        }
-
-        /// <summary>
-        ///     Play an audio file following the entity.
-        /// </summary>
-        /// <param name="filename">The resource path to the OGG Vorbis file to play.</param>
-        /// <param name="channel">User that will be affected.</param>
-        public void Play(string filename, AudioParams? audioParams = null, INetChannel? channel = null)
-        {
-            AddScheduledSound(new ScheduledSound()
-            {
-                Filename = filename,
-                AudioParams = audioParams,
-            }, channel);
-        }
-    }
-}
diff --git a/Content.Server/Storage/Components/EntityStorageComponent.cs b/Content.Server/Storage/Components/EntityStorageComponent.cs
index 5face20f31..9fb9e995e8 100644
--- a/Content.Server/Storage/Components/EntityStorageComponent.cs
+++ b/Content.Server/Storage/Components/EntityStorageComponent.cs
@@ -24,7 +24,6 @@ using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using Robust.Shared.Physics;
-using Robust.Shared.Physics.Broadphase;
 using Robust.Shared.Player;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Timing;
@@ -131,7 +130,8 @@ namespace Content.Server.Storage.Components
         private bool _beingWelded;
 
         [ViewVariables(VVAccess.ReadWrite)]
-        public bool CanWeldShut {
+        public bool CanWeldShut
+        {
             get => _canWeldShut;
             set
             {
@@ -160,6 +160,13 @@ namespace Content.Server.Storage.Components
 
         public virtual void Activate(ActivateEventArgs eventArgs)
         {
+            // HACK until EntityStorageComponent gets refactored to the new ECS system
+            if (Owner.TryGetComponent<LockComponent>(out var @lock) && @lock.Locked)
+            {
+                // Do nothing, LockSystem is responsible for handling this case
+                return;
+            }
+
             ToggleOpen(eventArgs.User);
         }
 
@@ -167,7 +174,7 @@ namespace Content.Server.Storage.Components
         {
             if (IsWeldedShut)
             {
-                if(!silent) Owner.PopupMessage(user, Loc.GetString("entity-storage-component-welded-shut-message"));
+                if (!silent) Owner.PopupMessage(user, Loc.GetString("entity-storage-component-welded-shut-message"));
                 return false;
             }
             return true;
@@ -436,7 +443,7 @@ namespace Content.Server.Storage.Components
             EmptyContents();
         }
 
-        protected IEnumerable<IEntity> DetermineCollidingEntities()
+        protected virtual IEnumerable<IEntity> DetermineCollidingEntities()
         {
             var entityLookup = IoCManager.Resolve<IEntityLookup>();
             return entityLookup.GetEntitiesIntersecting(Owner);
@@ -465,7 +472,8 @@ namespace Content.Server.Storage.Components
 
         protected virtual void OpenVerbGetData(IEntity user, EntityStorageComponent component, VerbData data)
         {
-            if (!EntitySystem.Get<ActionBlockerSystem>().CanInteract(user))
+            if (!EntitySystem.Get<ActionBlockerSystem>().CanInteract(user) ||
+                component.Owner.TryGetComponent(out LockComponent? lockComponent) && lockComponent.Locked) // HACK extra check, until EntityStorage gets refactored
             {
                 data.Visibility = VerbVisibility.Invisible;
                 return;
@@ -475,7 +483,7 @@ namespace Content.Server.Storage.Components
             {
                 data.Visibility = VerbVisibility.Disabled;
                 var verb = Loc.GetString(component.Open ? "open-toggle-verb-close" : "open-toggle-verb-open");
-                data.Text = Loc.GetString("open-toggle-verb-welded-shut-message",("verb", verb));
+                data.Text = Loc.GetString("open-toggle-verb-welded-shut-message", ("verb", verb));
                 return;
             }
 
diff --git a/Content.Server/Storage/Components/SecretStashComponent.cs b/Content.Server/Storage/Components/SecretStashComponent.cs
index b202ab19db..30af3865fc 100644
--- a/Content.Server/Storage/Components/SecretStashComponent.cs
+++ b/Content.Server/Storage/Components/SecretStashComponent.cs
@@ -81,7 +81,7 @@ namespace Content.Server.Storage.Components
             if (_itemContainer.ContainedEntity == null)
                 return false;
 
-            Owner.PopupMessage(user, Loc.GetString("There was something inside {0}!", ("stash", SecretPartName)));
+            Owner.PopupMessage(user, Loc.GetString("comp-secret-stash-action-get-item-found-something", ("stash", SecretPartName)));
 
             if (user.TryGetComponent(out HandsComponent? hands))
             {
diff --git a/Content.Server/Storage/Components/SecureEntityStorageComponent.cs b/Content.Server/Storage/Components/SecureEntityStorageComponent.cs
deleted file mode 100644
index 5dcaf78cf4..0000000000
--- a/Content.Server/Storage/Components/SecureEntityStorageComponent.cs
+++ /dev/null
@@ -1,148 +0,0 @@
-using Content.Server.Access.Components;
-using Content.Shared.ActionBlocker;
-using Content.Shared.Interaction;
-using Content.Shared.Interaction.Events;
-using Content.Shared.Notification.Managers;
-using Content.Shared.Storage;
-using Content.Shared.Verbs;
-using Robust.Server.GameObjects;
-using Robust.Shared.Audio;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Localization;
-using Robust.Shared.Player;
-using Robust.Shared.Serialization.Manager.Attributes;
-using Robust.Shared.ViewVariables;
-
-namespace Content.Server.Storage.Components
-{
-    [RegisterComponent]
-    [ComponentReference(typeof(EntityStorageComponent))]
-    [ComponentReference(typeof(IActivate))]
-    [ComponentReference(typeof(IStorageComponent))]
-    public class SecureEntityStorageComponent : EntityStorageComponent
-    {
-        public override string Name => "SecureEntityStorage";
-        [DataField("locked")]
-        private bool _locked = true;
-
-        [ViewVariables(VVAccess.ReadWrite)]
-        public bool Locked
-        {
-            get => _locked;
-            set
-            {
-                _locked = value;
-
-                if (Owner.TryGetComponent(out AppearanceComponent? appearance))
-                {
-                    appearance.SetData(StorageVisuals.Locked, _locked);
-                }
-            }
-        }
-
-        protected override void Startup()
-        {
-            base.Startup();
-
-            if (Owner.TryGetComponent(out AppearanceComponent? appearance))
-            {
-                appearance.SetData(StorageVisuals.CanLock, true);
-            }
-        }
-
-        public override void Activate(ActivateEventArgs eventArgs)
-        {
-            if (Locked)
-            {
-                DoToggleLock(eventArgs.User);
-                return;
-            }
-
-            base.Activate(eventArgs);
-        }
-
-        public override bool CanOpen(IEntity user, bool silent = false)
-        {
-            if (Locked)
-            {
-                Owner.PopupMessage(user, "It's locked!");
-                return false;
-            }
-            return base.CanOpen(user, silent);
-        }
-
-        protected override void OpenVerbGetData(IEntity user, EntityStorageComponent component, VerbData data)
-        {
-            if (Locked)
-            {
-                data.Visibility = VerbVisibility.Invisible;
-
-                return;
-            }
-
-            base.OpenVerbGetData(user, component, data);
-        }
-
-        private void DoToggleLock(IEntity user)
-        {
-            if (Locked)
-            {
-                DoUnlock(user);
-            }
-            else
-            {
-                DoLock(user);
-            }
-        }
-
-        private void DoUnlock(IEntity user)
-        {
-            if (!CheckAccess(user)) return;
-
-            Locked = false;
-            SoundSystem.Play(Filter.Pvs(Owner), "/Audio/Machines/door_lock_off.ogg", Owner, AudioParams.Default.WithVolume(-5));
-        }
-
-        private void DoLock(IEntity user)
-        {
-            if (!CheckAccess(user)) return;
-
-            Locked = true;
-            SoundSystem.Play(Filter.Pvs(Owner), "/Audio/Machines/door_lock_on.ogg", Owner, AudioParams.Default.WithVolume(-5));
-        }
-
-        private bool CheckAccess(IEntity user)
-        {
-            if (Owner.TryGetComponent(out AccessReader? reader))
-            {
-                if (!reader.IsAllowed(user))
-                {
-                    Owner.PopupMessage(user, Loc.GetString("secure-entity-storage-component-not-allowed-message"));
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        [Verb]
-        private sealed class ToggleLockVerb : Verb<SecureEntityStorageComponent>
-        {
-            protected override void GetData(IEntity user, SecureEntityStorageComponent component, VerbData data)
-            {
-                if (!EntitySystem.Get<ActionBlockerSystem>().CanInteract(user) || component.Open)
-                {
-                    data.Visibility = VerbVisibility.Invisible;
-                    return;
-                }
-
-                data.Text = Loc.GetString(component.Locked ? "toggle-lock-verb-unlock" : "toggle-lock-verb-lock");
-            }
-
-            protected override void Activate(IEntity user, SecureEntityStorageComponent component)
-            {
-                component.DoToggleLock(user);
-            }
-        }
-    }
-}
diff --git a/Content.Server/Throwing/ThrowHelper.cs b/Content.Server/Throwing/ThrowHelper.cs
index 7230c6b534..ae4ec3d96d 100644
--- a/Content.Server/Throwing/ThrowHelper.cs
+++ b/Content.Server/Throwing/ThrowHelper.cs
@@ -69,7 +69,9 @@ namespace Content.Server.Throwing
                     EntitySystem.Get<InteractionSystem>().ThrownInteraction(user, entity);
             }
 
-            physicsComponent.ApplyLinearImpulse(direction.Normalized * strength * physicsComponent.Mass);
+            var impulseVector = direction.Normalized * strength * physicsComponent.Mass;
+            physicsComponent.ApplyLinearImpulse(impulseVector);
+            
             // Estimate time to arrival so we can apply OnGround status and slow it much faster.
             var time = (direction / strength).Length;
 
@@ -96,7 +98,7 @@ namespace Content.Server.Throwing
 
                 if (!msg.Cancelled)
                 {
-                    body.ApplyLinearImpulse(-direction * pushbackRatio);
+                    body.ApplyLinearImpulse(-impulseVector * pushbackRatio);
                 }
             }
         }
diff --git a/Content.Shared/ActionBlocker/ActionBlockerSystem.cs b/Content.Shared/ActionBlocker/ActionBlockerSystem.cs
index a4f3080583..253475235b 100644
--- a/Content.Shared/ActionBlocker/ActionBlockerSystem.cs
+++ b/Content.Shared/ActionBlocker/ActionBlockerSystem.cs
@@ -4,7 +4,7 @@ using Content.Shared.Emoting;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Inventory.Events;
 using Content.Shared.Item;
-using Content.Shared.Metabolism.Events;
+using Content.Shared.Body.Metabolism;
 using Content.Shared.Movement;
 using Content.Shared.Speech;
 using Content.Shared.Throwing;
diff --git a/Content.Shared/Atmos/Piping/EnabledAtmosDeviceVisuals.cs b/Content.Shared/Atmos/Piping/EnabledAtmosDeviceVisuals.cs
index e95188cc0b..5f3883a25c 100644
--- a/Content.Shared/Atmos/Piping/EnabledAtmosDeviceVisuals.cs
+++ b/Content.Shared/Atmos/Piping/EnabledAtmosDeviceVisuals.cs
@@ -4,31 +4,37 @@ using Robust.Shared.Serialization;
 namespace Content.Shared.Atmos.Piping
 {
     [Serializable, NetSerializable]
-    public enum OutletInjectorVisuals
+    public enum OutletInjectorVisuals : byte
     {
         Enabled,
     }
 
     [Serializable, NetSerializable]
-    public enum PassiveVentVisuals
+    public enum PassiveVentVisuals : byte
     {
         Enabled,
     }
 
     [Serializable, NetSerializable]
-    public enum VentScrubberVisuals
+    public enum VentScrubberVisuals : byte
     {
         Enabled,
     }
 
     [Serializable, NetSerializable]
-    public enum ThermoMachineVisuals
+    public enum ThermoMachineVisuals : byte
     {
         Enabled,
     }
 
     [Serializable, NetSerializable]
-    public enum PressurePumpVisuals
+    public enum PressurePumpVisuals : byte
+    {
+        Enabled,
+    }
+
+    [Serializable, NetSerializable]
+    public enum FilterVisuals : byte
     {
         Enabled,
     }
diff --git a/Content.Shared/Metabolism/Events/ShiverAttemptEvent.cs b/Content.Shared/Body/Metabolism/ShiverAttemptEvent.cs
similarity index 85%
rename from Content.Shared/Metabolism/Events/ShiverAttemptEvent.cs
rename to Content.Shared/Body/Metabolism/ShiverAttemptEvent.cs
index da05d74ffd..d84630fa3c 100644
--- a/Content.Shared/Metabolism/Events/ShiverAttemptEvent.cs
+++ b/Content.Shared/Body/Metabolism/ShiverAttemptEvent.cs
@@ -1,6 +1,6 @@
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.Metabolism.Events
+namespace Content.Shared.Body.Metabolism
 {
     public class ShiverAttemptEvent : CancellableEntityEventArgs
     {
diff --git a/Content.Shared/Metabolism/Events/SweatAttemptEvent.cs b/Content.Shared/Body/Metabolism/SweatAttemptEvent.cs
similarity index 85%
rename from Content.Shared/Metabolism/Events/SweatAttemptEvent.cs
rename to Content.Shared/Body/Metabolism/SweatAttemptEvent.cs
index b920639aff..6c6180eb00 100644
--- a/Content.Shared/Metabolism/Events/SweatAttemptEvent.cs
+++ b/Content.Shared/Body/Metabolism/SweatAttemptEvent.cs
@@ -1,6 +1,6 @@
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.Metabolism.Events
+namespace Content.Shared.Body.Metabolism
 {
     public class SweatAttemptEvent : CancellableEntityEventArgs
     {
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index 966377ae77..450cc14727 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -55,6 +55,18 @@ namespace Content.Shared.CCVar
         public static readonly CVarDef<string>
             GameMap = CVarDef.Create("game.map", "Maps/saltern.yml", CVar.SERVERONLY);
 
+        /// <summary>
+        ///     Whether a random position offset will be applied to the station on roundstart.
+        /// </summary>
+        public static readonly CVarDef<bool> StationOffset =
+            CVarDef.Create<bool>("game.station_offset", false);
+
+        /// <summary>
+        /// When the default blueprint is loaded what is the maximum amount it can be offset from 0,0.
+        /// </summary>
+        public static readonly CVarDef<float> MaxStationOffset =
+            CVarDef.Create("game.maxstationoffset", 1000.0f);
+
         /// <summary>
         ///     When enabled, guests will be assigned permanent UIDs and will have their preferences stored.
         /// </summary>
@@ -291,7 +303,6 @@ namespace Content.Shared.CCVar
         public static readonly CVarDef<bool> AtmosGridImpulse =
             CVarDef.Create("atmos.grid_impulse", false, CVar.SERVERONLY);
 
-
         /// <summary>
         ///     Whether atmos superconduction is enabled.
         /// </summary>
@@ -299,10 +310,17 @@ namespace Content.Shared.CCVar
         public static readonly CVarDef<bool> Superconduction =
             CVarDef.Create("atmos.superconduction", false, CVar.SERVERONLY);
 
+        /// <summary>
+        ///     Whether excited groups will be processed and created.
+        /// </summary>
+        public static readonly CVarDef<bool> ExcitedGroups =
+            CVarDef.Create("atmos.excited_groups", true, CVar.SERVERONLY);
+
         /// <summary>
         ///     Whether all tiles in an excited group will clear themselves once being exposed to space.
         ///     Similar to <see cref="MonstermosDepressurization"/>, without none of the tile ripping or
         ///     things being thrown around very violently.
+        ///     Needs <see cref="ExcitedGroups"/> to be enabled to work.
         /// </summary>
         public static readonly CVarDef<bool> ExcitedGroupsSpaceIsAllConsuming =
             CVarDef.Create("atmos.excited_groups_space_is_all_consuming", false, CVar.SERVERONLY);
diff --git a/Content.Shared/Chemistry/Components/MovespeedModifierMetabolismComponent.cs b/Content.Shared/Chemistry/Components/MovespeedModifierMetabolismComponent.cs
new file mode 100644
index 0000000000..afcd0f3f42
--- /dev/null
+++ b/Content.Shared/Chemistry/Components/MovespeedModifierMetabolismComponent.cs
@@ -0,0 +1,54 @@
+using Content.Shared.Movement.Components;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Players;
+using Robust.Shared.Serialization;
+using Robust.Shared.ViewVariables;
+using System;
+using Robust.Shared.GameStates;
+using Robust.Shared.Timing;
+using Robust.Shared.IoC;
+
+namespace Content.Shared.Chemistry.Components
+{
+    //TODO: refactor movement modifier component because this is a pretty poor solution
+    [RegisterComponent]
+    [NetworkedComponent]
+    public sealed class MovespeedModifierMetabolismComponent : Component, IMoveSpeedModifier
+    {
+        [ViewVariables]
+        public override string Name => "MovespeedModifierMetabolism";
+
+        [ViewVariables]
+        public float WalkSpeedModifier { get; set; }
+
+        [ViewVariables]
+        public float SprintSpeedModifier { get; set; }
+
+        /// <summary>
+        /// When the current modifier is expected to end.
+        /// </summary>
+        [ViewVariables]
+        public TimeSpan ModifierTimer { get; set; } = TimeSpan.Zero;
+
+        public override ComponentState GetComponentState(ICommonSession player)
+        {
+            return new MovespeedModifierMetabolismComponentState(WalkSpeedModifier, SprintSpeedModifier, ModifierTimer);
+        }
+
+        [Serializable, NetSerializable]
+        public class MovespeedModifierMetabolismComponentState : ComponentState
+        {
+            public float WalkSpeedModifier { get; }
+            public float SprintSpeedModifier { get; }
+            public TimeSpan ModifierTimer { get; }
+
+            public MovespeedModifierMetabolismComponentState(float walkSpeedModifier, float sprintSpeedModifier, TimeSpan modifierTimer)
+            {
+                WalkSpeedModifier = walkSpeedModifier;
+                SprintSpeedModifier = sprintSpeedModifier;
+                ModifierTimer = modifierTimer;
+            }
+        }
+    }
+}
+
diff --git a/Content.Shared/Chemistry/MetabolismMovespeedModifierSystem.cs b/Content.Shared/Chemistry/MetabolismMovespeedModifierSystem.cs
new file mode 100644
index 0000000000..e67f5ae7da
--- /dev/null
+++ b/Content.Shared/Chemistry/MetabolismMovespeedModifierSystem.cs
@@ -0,0 +1,77 @@
+using Content.Shared.Chemistry.Components;
+using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
+using Robust.Shared.IoC;
+using Robust.Shared.Timing;
+using System.Collections.Generic;
+using System.Linq;
+using Content.Shared.Movement.Components;
+using static Content.Shared.Chemistry.Components.MovespeedModifierMetabolismComponent;
+
+namespace Content.Shared.Chemistry
+{
+    public class MetabolismMovespeedModifierSystem : EntitySystem
+    {
+        [Dependency] private readonly IGameTiming _gameTiming = default!;
+
+        private readonly List<MovespeedModifierMetabolismComponent> _components = new();
+
+        public override void Initialize()
+        {
+            base.Initialize();
+
+            SubscribeLocalEvent<MovespeedModifierMetabolismComponent, ComponentHandleState>(OnMovespeedHandleState);
+            SubscribeLocalEvent<MovespeedModifierMetabolismComponent, ComponentStartup>(AddComponent);
+        }
+
+        private void OnMovespeedHandleState(EntityUid uid, MovespeedModifierMetabolismComponent component, ComponentHandleState args)
+        {
+            if (args.Current is not MovespeedModifierMetabolismComponentState cast)
+                return;
+
+            if (ComponentManager.TryGetComponent<MovementSpeedModifierComponent>(uid, out var modifier) &&
+                (!component.WalkSpeedModifier.Equals(cast.WalkSpeedModifier) ||
+                !component.SprintSpeedModifier.Equals(cast.SprintSpeedModifier)))
+            {
+                modifier.RefreshMovementSpeedModifiers();
+            }
+
+            component.WalkSpeedModifier = cast.WalkSpeedModifier;
+            component.SprintSpeedModifier = cast.SprintSpeedModifier;
+            component.ModifierTimer = cast.ModifierTimer;
+
+        }
+        private void AddComponent(EntityUid uid, MovespeedModifierMetabolismComponent component, ComponentStartup args)
+        {
+            _components.Add(component);
+        }
+
+        public override void Update(float frameTime)
+        {
+            base.Update(frameTime);
+
+            var currentTime = _gameTiming.CurTime;
+
+            for (var i = _components.Count - 1; i >= 0; i--)
+            {
+                var component = _components[i];
+
+                if (component.Deleted)
+                {
+                    _components.RemoveAt(i);
+                    continue;
+                }
+
+                if (component.ModifierTimer > currentTime) continue;
+
+                _components.RemoveAt(i);
+                ComponentManager.RemoveComponent<MovespeedModifierMetabolismComponent>(component.Owner.Uid);
+
+                if (component.Owner.TryGetComponent(out MovementSpeedModifierComponent? modifier))
+                {
+                    modifier.RefreshMovementSpeedModifiers();
+                }
+            }
+        }
+    }
+}
diff --git a/Content.Shared/Chemistry/Metabolizable/DefaultMetabolizable.cs b/Content.Shared/Chemistry/Metabolizable/DefaultMetabolizable.cs
deleted file mode 100644
index cbd10016a5..0000000000
--- a/Content.Shared/Chemistry/Metabolizable/DefaultMetabolizable.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Serialization.Manager.Attributes;
-
-namespace Content.Shared.Chemistry.Metabolizable
-{
-    /// <summary>
-    ///     Default metabolism for reagents. Metabolizes the reagent with no effects
-    /// </summary>
-    [DataDefinition]
-    public class DefaultMetabolizable : IMetabolizable
-    {
-        /// <summary>
-        ///     Rate of metabolism in units / second
-        /// </summary>
-        [DataField("rate")]
-        public double MetabolismRate { get; set; } = 1;
-
-        ReagentUnit IMetabolizable.Metabolize(IEntity solutionEntity, string reagentId, float tickTime)
-        {
-            return ReagentUnit.New(MetabolismRate * tickTime);
-        }
-    }
-}
diff --git a/Content.Shared/Chemistry/Metabolizable/IMetabolizable.cs b/Content.Shared/Chemistry/Metabolizable/IMetabolizable.cs
deleted file mode 100644
index e08e209a0c..0000000000
--- a/Content.Shared/Chemistry/Metabolizable/IMetabolizable.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.GameObjects;
-
-namespace Content.Shared.Chemistry.Metabolizable
-{
-    /// <summary>
-    /// Metabolism behavior for a reagent.
-    /// </summary>
-    public interface IMetabolizable
-    {
-        /// <summary>
-        /// Metabolize the attached reagent. Return the amount of reagent to be removed from the solution.
-        /// You shouldn't remove the reagent yourself to avoid invalidating the iterator of the metabolism
-        /// organ that is processing it's reagents.
-        /// </summary>
-        /// <param name="solutionEntity">The entity containing the solution.</param>
-        /// <param name="reagentId">The reagent id</param>
-        /// <param name="tickTime">The time since the last metabolism tick in seconds.</param>
-        /// <returns>The amount of reagent to be removed. The metabolizing organ should handle removing the reagent.</returns>
-        ReagentUnit Metabolize(IEntity solutionEntity, string reagentId, float tickTime);
-    }
-}
diff --git a/Content.Shared/Chemistry/Reagent/ReagentEffect.cs b/Content.Shared/Chemistry/Reagent/ReagentEffect.cs
new file mode 100644
index 0000000000..78ca370df0
--- /dev/null
+++ b/Content.Shared/Chemistry/Reagent/ReagentEffect.cs
@@ -0,0 +1,23 @@
+using System.Collections.Generic;
+using Content.Shared.Chemistry.Reagent;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Serialization.Manager.Attributes;
+
+namespace Content.Shared.Chemistry.Reagent
+{
+    /// <summary>
+    ///     Reagent effects describe behavior that occurs when a reagent is ingested and metabolized by some
+    ///     organ. They only trigger when their conditions (<see cref="ReagentEffectCondition"/>
+    /// </summary>
+    [ImplicitDataDefinitionForInheritors]
+    public abstract class ReagentEffect
+    {
+        /// <summary>
+        ///     The list of conditions required for the effect to activate. Not required.
+        /// </summary>
+        [DataField("conditions")]
+        public ReagentEffectCondition[]? Conditions;
+
+        public abstract void Metabolize(IEntity solutionEntity, Solution.Solution.ReagentQuantity amount);
+    }
+}
diff --git a/Content.Shared/Chemistry/Reagent/ReagentEffectCondition.cs b/Content.Shared/Chemistry/Reagent/ReagentEffectCondition.cs
new file mode 100644
index 0000000000..54253d1c6d
--- /dev/null
+++ b/Content.Shared/Chemistry/Reagent/ReagentEffectCondition.cs
@@ -0,0 +1,13 @@
+using Content.Shared.Body.Components;
+using Content.Shared.Chemistry.Solution;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Serialization.Manager.Attributes;
+
+namespace Content.Shared.Chemistry.Reagent
+{
+    [ImplicitDataDefinitionForInheritors]
+    public abstract class ReagentEffectCondition
+    {
+        public abstract bool Condition(IEntity solutionEntity, Solution.Solution.ReagentQuantity reagent);
+    }
+}
diff --git a/Content.Shared/Chemistry/Reagent/ReagentEntityReaction.cs b/Content.Shared/Chemistry/Reagent/ReagentEntityReaction.cs
index 59f931e871..fe8e081e25 100644
--- a/Content.Shared/Chemistry/Reagent/ReagentEntityReaction.cs
+++ b/Content.Shared/Chemistry/Reagent/ReagentEntityReaction.cs
@@ -12,7 +12,7 @@ namespace Content.Shared.Chemistry.Reagent
         Ingestion,
     }
 
-    [DataDefinition]
+    [ImplicitDataDefinitionForInheritors]
     public abstract class ReagentEntityReaction
     {
         [ViewVariables]
diff --git a/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs b/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs
index 30de264604..321dacd497 100644
--- a/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs
+++ b/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using Content.Shared.Botany;
-using Content.Shared.Chemistry.Metabolizable;
 using Content.Shared.Chemistry.Reaction;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
@@ -16,9 +15,6 @@ namespace Content.Shared.Chemistry.Reagent
     [DataDefinition]
     public class ReagentPrototype : IPrototype
     {
-        [DataField("metabolism", serverOnly: true)]
-        private readonly List<IMetabolizable> _metabolism = new() {new DefaultMetabolizable()};
-
         [DataField("tileReactions", serverOnly: true)]
         private readonly List<ITileReaction> _tileReactions = new(0);
 
@@ -60,7 +56,6 @@ namespace Content.Shared.Chemistry.Reagent
         public string SpriteReplacementPath { get; } = string.Empty;
 
         //List of metabolism effects this reagent has, should really only be used server-side.
-        public IReadOnlyList<IMetabolizable> Metabolism => _metabolism;
         public IReadOnlyList<ITileReaction> TileReactions => _tileReactions;
         public IReadOnlyList<IPlantMetabolizable> PlantMetabolism => _plantMetabolism;
 
diff --git a/Content.Shared/Chemistry/Solution/Solution.cs b/Content.Shared/Chemistry/Solution/Solution.cs
index ceae2a17f7..8b89f0631a 100644
--- a/Content.Shared/Chemistry/Solution/Solution.cs
+++ b/Content.Shared/Chemistry/Solution/Solution.cs
@@ -115,6 +115,27 @@ namespace Content.Shared.Chemistry.Solution
             TotalVolume += quantity;
         }
 
+        /// <summary>
+        ///     Scales the amount of solution.
+        /// </summary>
+        /// <param name="scale">The scalar to modify the solution by.</param>
+        public void ScaleSolution(float scale)
+        {
+            if (scale == 1) return;
+            var tempContents = new List<ReagentQuantity>(_contents);
+            foreach(ReagentQuantity current in tempContents)
+            {
+                if(scale > 1)
+                {
+                    AddReagent(current.ReagentId, current.Quantity * scale - current.Quantity);
+                }
+                else
+                {
+                    RemoveReagent(current.ReagentId, current.Quantity - current.Quantity * scale);
+                }
+            }
+        }
+
         /// <summary>
         ///     Returns the amount of a single reagent inside the solution.
         /// </summary>
diff --git a/Content.Shared/Doors/SharedDoorComponent.cs b/Content.Shared/Doors/SharedDoorComponent.cs
index db6902c5c6..e85da53ff9 100644
--- a/Content.Shared/Doors/SharedDoorComponent.cs
+++ b/Content.Shared/Doors/SharedDoorComponent.cs
@@ -22,6 +22,9 @@ namespace Content.Shared.Doors
         [ComponentDependency]
         protected readonly IPhysBody? PhysicsComponent = null;
 
+        [Dependency]
+        protected readonly IGameTiming _gameTiming = default!;
+
         [ViewVariables]
         private DoorState _state = DoorState.Closed;
         /// <summary>
diff --git a/Content.Shared/Hands/Components/HandVirtualPullComponent.cs b/Content.Shared/Hands/Components/HandVirtualPullComponent.cs
new file mode 100644
index 0000000000..42f6bd85f3
--- /dev/null
+++ b/Content.Shared/Hands/Components/HandVirtualPullComponent.cs
@@ -0,0 +1,50 @@
+using System;
+using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
+using Robust.Shared.Players;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Hands.Components
+{
+    [RegisterComponent]
+    [NetworkedComponent]
+    public sealed class HandVirtualPullComponent : Component
+    {
+        private EntityUid _pulledEntity;
+        public override string Name => "HandVirtualPull";
+
+        public EntityUid PulledEntity
+        {
+            get => _pulledEntity;
+            set
+            {
+                _pulledEntity = value;
+                Dirty();
+            }
+        }
+
+        public override ComponentState GetComponentState(ICommonSession player)
+        {
+            return new VirtualPullComponentState(_pulledEntity);
+        }
+
+        public override void HandleComponentState(ComponentState? curState, ComponentState? nextState)
+        {
+            if (curState is not VirtualPullComponentState pullState)
+                return;
+
+            _pulledEntity = pullState.PulledEntity;
+        }
+
+        [Serializable, NetSerializable]
+        public sealed class VirtualPullComponentState : ComponentState
+        {
+            public readonly EntityUid PulledEntity;
+
+            public VirtualPullComponentState(EntityUid pulledEntity)
+            {
+                PulledEntity = pulledEntity;
+            }
+        }
+    }
+}
diff --git a/Content.Shared/Hands/Components/SharedHandsComponent.cs b/Content.Shared/Hands/Components/SharedHandsComponent.cs
index 15a2ca3d69..9e1978b06f 100644
--- a/Content.Shared/Hands/Components/SharedHandsComponent.cs
+++ b/Content.Shared/Hands/Components/SharedHandsComponent.cs
@@ -55,11 +55,11 @@ namespace Content.Shared.Hands.Components
                 }
             }
         }
+
         private string? _activeHand;
 
         [ViewVariables]
-        public IReadOnlyList<IReadOnlyHand> ReadOnlyHands => Hands;
-        protected readonly List<Hand> Hands = new();
+        public readonly List<Hand> Hands = new();
 
         /// <summary>
         ///     The amount of throw impulse per distance the player is from the throw target.
@@ -89,7 +89,10 @@ namespace Content.Shared.Hands.Components
 
         public virtual void HandsModified()
         {
+            // todo axe all this for ECS.
             Dirty();
+
+            Owner.EntityManager.EventBus.RaiseEvent(EventSource.Local, new HandsModifiedMessage { Hands = this });
         }
 
         public void AddHand(string handName, HandLocation handLocation)
@@ -100,7 +103,7 @@ namespace Content.Shared.Hands.Components
             var container = ContainerHelpers.CreateContainer<ContainerSlot>(Owner, handName);
             container.OccludesLight = false;
 
-            Hands.Add(new Hand(handName, true, handLocation, container));
+            Hands.Add(new Hand(handName, handLocation, container));
 
             if (ActiveHand == null)
                 ActiveHand = handName;
@@ -125,48 +128,55 @@ namespace Content.Shared.Hands.Components
             Hands.Remove(hand);
 
             if (ActiveHand == hand.Name)
-                ActiveHand = ReadOnlyHands.FirstOrDefault()?.Name;
+                ActiveHand = Hands.FirstOrDefault()?.Name;
 
             HandCountChanged();
 
             HandsModified();
         }
 
-        public bool HasHand(string handName)
-        {
-            foreach (var hand in Hands)
-            {
-                if (hand.Name == handName)
-                    return true;
-            }
-            return false;
-        }
-
-        private Hand? GetHand(string handName)
-        {
-            foreach (var hand in Hands)
-            {
-                if (hand.Name == handName)
-                    return hand;
-            }
-            return null;
-        }
-
         private Hand? GetActiveHand()
         {
             if (ActiveHand == null)
                 return null;
 
-            return GetHand(ActiveHand);
+            return GetHandOrNull(ActiveHand);
         }
 
-        protected bool TryGetHand(string handName, [NotNullWhen(true)] out Hand? foundHand)
+        public bool HasHand(string handName)
         {
-            foundHand = GetHand(handName);
-            return foundHand != null;
+            return TryGetHand(handName, out _);
         }
 
-        protected bool TryGetActiveHand([NotNullWhen(true)] out Hand? activeHand)
+        public Hand? GetHandOrNull(string handName)
+        {
+            return TryGetHand(handName, out var hand) ? hand : null;
+        }
+
+        public Hand GetHand(string handName)
+        {
+            if (!TryGetHand(handName, out var hand))
+                throw new KeyNotFoundException($"Unable to find hand with name {handName}");
+
+            return hand;
+        }
+
+        public bool TryGetHand(string handName, [NotNullWhen(true)] out Hand? foundHand)
+        {
+            foreach (var hand in Hands)
+            {
+                if (hand.Name == handName)
+                {
+                    foundHand = hand;
+                    return true;
+                };
+            }
+
+            foundHand = null;
+            return false;
+        }
+
+        public bool TryGetActiveHand([NotNullWhen(true)] out Hand? activeHand)
         {
             activeHand = GetActiveHand();
             return activeHand != null;
@@ -211,7 +221,7 @@ namespace Content.Shared.Hands.Components
 
         public IEnumerable<IEntity> GetAllHeldEntities()
         {
-            foreach (var hand in ReadOnlyHands)
+            foreach (var hand in Hands)
             {
                 if (hand.HeldEntity != null)
                     yield return hand.HeldEntity;
@@ -416,7 +426,7 @@ namespace Content.Shared.Hands.Components
         /// <summary>
         ///     Drops a hands contents to the target location.
         /// </summary>
-        private void DropHeldEntity(Hand hand, EntityCoordinates targetDropLocation, bool intentionalDrop = true)
+        public void DropHeldEntity(Hand hand, EntityCoordinates targetDropLocation, bool intentionalDrop = true)
         {
             var heldEntity = hand.HeldEntity;
 
@@ -538,16 +548,7 @@ namespace Content.Shared.Hands.Components
 
         public bool CanPickupEntityToActiveHand(IEntity entity, bool checkActionBlocker = true)
         {
-            if (!TryGetActiveHand(out var hand))
-                return false;
-
-            if (checkActionBlocker && !PlayerCanPickup())
-                return false;
-
-            if (!CanInsertEntityIntoHand(hand, entity))
-                return false;
-
-            return true;
+            return ActiveHand != null && CanPickupEntity(ActiveHand, entity, checkActionBlocker);
         }
 
         /// <summary>
@@ -563,10 +564,7 @@ namespace Content.Shared.Hands.Components
 
         public bool TryPickupEntityToActiveHand(IEntity entity, bool checkActionBlocker = true)
         {
-            if (!TryGetActiveHand(out var hand))
-                return false;
-
-            return TryPickupEntity(hand, entity, checkActionBlocker);
+            return ActiveHand != null && TryPickupEntity(ActiveHand, entity, checkActionBlocker);
         }
 
         /// <summary>
@@ -574,9 +572,6 @@ namespace Content.Shared.Hands.Components
         /// </summary>
         protected bool CanInsertEntityIntoHand(Hand hand, IEntity entity)
         {
-            if (!hand.Enabled)
-                return false;
-
             var handContainer = hand.Container;
             if (handContainer == null)
                 return false;
@@ -602,7 +597,7 @@ namespace Content.Shared.Hands.Components
         /// <summary>
         ///     Puts an entity into the player's hand, assumes that the insertion is allowed.
         /// </summary>
-        private void PutEntityIntoHand(Hand hand, IEntity entity)
+        public void PutEntityIntoHand(Hand hand, IEntity entity)
         {
             var handContainer = hand.Container;
             if (handContainer == null)
@@ -658,7 +653,7 @@ namespace Content.Shared.Hands.Components
             if (newActiveIndex > finalHandIndex)
                 newActiveIndex = 0;
 
-            nextHand = ReadOnlyHands[newActiveIndex].Name;
+            nextHand = Hands[newActiveIndex].Name;
             return true;
         }
 
@@ -752,7 +747,7 @@ namespace Content.Shared.Hands.Components
             Hand? priorityHand = null;
 
             if (priorityHandName != null)
-                priorityHand = GetHand(priorityHandName);
+                priorityHand = GetHandOrNull(priorityHandName);
 
             return TryPutInAnyHand(entity, priorityHand, checkActionBlocker);
         }
@@ -793,43 +788,16 @@ namespace Content.Shared.Hands.Components
         protected virtual void DoActivate(IEntity heldEntity) { }
 
         protected virtual void HandlePickupAnimation(IEntity entity) { }
-
-        protected void EnableHand(Hand hand)
-        {
-            hand.Enabled = true;
-            Dirty();
-        }
-
-        protected void DisableHand(Hand hand)
-        {
-            hand.Enabled = false;
-            DropHeldEntityToFloor(hand, intentionalDrop: false);
-            Dirty();
-        }
     }
 
-    public interface IReadOnlyHand
+    public class Hand
     {
+        [ViewVariables]
         public string Name { get; }
 
-        public bool Enabled { get; }
-
+        [ViewVariables]
         public HandLocation Location { get; }
 
-        public abstract IEntity? HeldEntity { get; }
-    }
-
-    public class Hand : IReadOnlyHand
-    {
-        [ViewVariables]
-        public string Name { get; set; }
-
-        [ViewVariables]
-        public bool Enabled { get; set; }
-
-        [ViewVariables]
-        public HandLocation Location { get; set; }
-
         /// <summary>
         ///     The container used to hold the contents of this hand. Nullable because the client must get the containers via <see cref="ContainerManagerComponent"/>,
         ///     which may not be synced with the server when the client hands are created.
@@ -840,37 +808,36 @@ namespace Content.Shared.Hands.Components
         [ViewVariables]
         public IEntity? HeldEntity => Container?.ContainedEntities?.FirstOrDefault();
 
-        public Hand(string name, bool enabled, HandLocation location, IContainer? container = null)
+        public bool IsEmpty => HeldEntity == null;
+
+        public Hand(string name, HandLocation location, IContainer? container = null)
         {
             Name = name;
-            Enabled = enabled;
             Location = location;
             Container = container;
         }
 
         public HandState ToHandState()
         {
-            return new(Name, Location, Enabled);
+            return new(Name, Location);
         }
     }
 
     [Serializable, NetSerializable]
-    public sealed class HandState
+    public struct HandState
     {
         public string Name { get; }
         public HandLocation Location { get; }
-        public bool Enabled { get; }
 
-        public HandState(string name, HandLocation location, bool enabled)
+        public HandState(string name, HandLocation location)
         {
             Name = name;
             Location = location;
-            Enabled = enabled;
         }
     }
 
     [Serializable, NetSerializable]
-    public class HandsComponentState : ComponentState
+    public sealed class HandsComponentState : ComponentState
     {
         public HandState[] Hands { get; }
         public string? ActiveHand { get; }
@@ -886,25 +853,20 @@ namespace Content.Shared.Hands.Components
     /// A message that calls the use interaction on an item in hand, presumed for now the interaction will occur only on the active hand.
     /// </summary>
     [Serializable, NetSerializable]
-    public class UseInHandMsg : ComponentMessage
+    public sealed class UseInHandMsg : EntityEventArgs
     {
-        public UseInHandMsg()
-        {
-            Directed = true;
-        }
     }
 
     /// <summary>
     /// A message that calls the activate interaction on the item in the specified hand.
     /// </summary>
     [Serializable, NetSerializable]
-    public class ActivateInHandMsg : ComponentMessage
+    public class ActivateInHandMsg : EntityEventArgs
     {
         public string HandName { get; }
 
         public ActivateInHandMsg(string handName)
         {
-            Directed = true;
             HandName = handName;
         }
     }
@@ -913,13 +875,12 @@ namespace Content.Shared.Hands.Components
     ///     Uses the item in the active hand on the item in the specified hand.
     /// </summary>
     [Serializable, NetSerializable]
-    public class ClientAttackByInHandMsg : ComponentMessage
+    public class ClientInteractUsingInHandMsg : EntityEventArgs
     {
         public string HandName { get; }
 
-        public ClientAttackByInHandMsg(string handName)
+        public ClientInteractUsingInHandMsg(string handName)
         {
-            Directed = true;
             HandName = handName;
         }
     }
@@ -928,28 +889,12 @@ namespace Content.Shared.Hands.Components
     ///     Moves an item from one hand to the active hand.
     /// </summary>
     [Serializable, NetSerializable]
-    public class MoveItemFromHandMsg : ComponentMessage
+    public class MoveItemFromHandMsg : EntityEventArgs
     {
         public string HandName { get; }
 
         public MoveItemFromHandMsg(string handName)
         {
-            Directed = true;
-            HandName = handName;
-        }
-    }
-
-    /// <summary>
-    ///     Sets the player's active hand to a specified hand.
-    /// </summary>
-    [Serializable, NetSerializable]
-    public class ClientChangedHandMsg : ComponentMessage
-    {
-        public string HandName { get; }
-
-        public ClientChangedHandMsg(string handName)
-        {
-            Directed = true;
             HandName = handName;
         }
     }
@@ -975,7 +920,7 @@ namespace Content.Shared.Hands.Components
     }
 
     [Serializable, NetSerializable]
-    public class PickupAnimationMessage : ComponentMessage
+    public class PickupAnimationMessage : EntityEventArgs
     {
         public EntityUid EntityUid { get; }
         public EntityCoordinates InitialPosition { get; }
@@ -983,10 +928,15 @@ namespace Content.Shared.Hands.Components
 
         public PickupAnimationMessage(EntityUid entityUid, Vector2 pickupDirection, EntityCoordinates initialPosition)
         {
-            Directed = true;
             EntityUid = entityUid;
             PickupDirection = pickupDirection;
             InitialPosition = initialPosition;
         }
     }
+
+    [Serializable, NetSerializable]
+    public struct HandsModifiedMessage
+    {
+        public SharedHandsComponent Hands;
+    }
 }
diff --git a/Content.Shared/Hands/SharedHandsSystem.cs b/Content.Shared/Hands/SharedHandsSystem.cs
index 9a9bdec3d8..96bd96d793 100644
--- a/Content.Shared/Hands/SharedHandsSystem.cs
+++ b/Content.Shared/Hands/SharedHandsSystem.cs
@@ -1,7 +1,6 @@
 using Content.Shared.Hands.Components;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Map;
 using Robust.Shared.Serialization;
 using System;
 
@@ -16,11 +15,7 @@ namespace Content.Shared.Hands
             SubscribeLocalEvent<SharedHandsComponent, EntRemovedFromContainerMessage>(HandleContainerModified);
             SubscribeLocalEvent<SharedHandsComponent, EntInsertedIntoContainerMessage>(HandleContainerModified);
 
-            SubscribeLocalEvent<RequestSetHandEvent>(HandleSetHand);
-            SubscribeNetworkEvent<RequestSetHandEvent>(HandleSetHand);
-
-            SubscribeLocalEvent<RequestDropHeldEntityEvent>(HandleDrop);
-            SubscribeNetworkEvent<RequestDropHeldEntityEvent>(HandleDrop);
+            SubscribeAllEvent<RequestSetHandEvent>(HandleSetHand);
         }
 
         public void DropHandItems(IEntity entity, bool doMobChecks = true)
@@ -38,14 +33,16 @@ namespace Content.Shared.Hands
 
             eventBus.RaiseLocalEvent(uid, msg);
 
-            if (msg.Cancelled) return;
+            if (msg.Cancelled)
+                return;
 
             if (entity.TryGetContainerMan(out var containerManager))
             {
                 var parentMsg = new ContainedEntityDropHandItemsAttemptEvent(uid);
                 eventBus.RaiseLocalEvent(containerManager.Owner.Uid, parentMsg);
 
-                if (parentMsg.Cancelled) return;
+                if (parentMsg.Cancelled)
+                    return;
             }
 
             DropAllItemsInHands(entity, doMobChecks);
@@ -55,9 +52,9 @@ namespace Content.Shared.Hands
         {
         }
 
-        private void HandleSetHand(RequestSetHandEvent msg, EntitySessionEventArgs eventArgs)
+        private static void HandleSetHand(RequestSetHandEvent msg, EntitySessionEventArgs eventArgs)
         {
-            var entity = eventArgs.SenderSession?.AttachedEntity;
+            var entity = eventArgs.SenderSession.AttachedEntity;
 
             if (entity == null || !entity.TryGetComponent(out SharedHandsComponent? hands))
                 return;
@@ -65,17 +62,13 @@ namespace Content.Shared.Hands
             hands.ActiveHand = msg.HandName;
         }
 
-        private void HandleDrop(RequestDropHeldEntityEvent msg, EntitySessionEventArgs eventArgs)
+        protected virtual void HandleContainerModified(
+            EntityUid uid,
+            SharedHandsComponent component,
+            ContainerModifiedMessage args)
         {
-            var entity = eventArgs.SenderSession?.AttachedEntity;
-
-            if (entity == null || !entity.TryGetComponent(out SharedHandsComponent? hands))
-                return;
-
-            hands.TryDropHand(msg.HandName, msg.DropTarget);
+            component.Dirty();
         }
-
-        protected abstract void HandleContainerModified(EntityUid uid, SharedHandsComponent component, ContainerModifiedMessage args);
     }
 
     public sealed class ContainedEntityDropHandItemsAttemptEvent : CancellableEntityEventArgs
@@ -103,21 +96,4 @@ namespace Content.Shared.Hands
             HandName = handName;
         }
     }
-
-    [Serializable, NetSerializable]
-    public class RequestDropHeldEntityEvent : EntityEventArgs
-    {
-        /// <summary>
-        ///     The hand to drop from.
-        /// </summary>
-        public string HandName { get; }
-
-        public EntityCoordinates DropTarget { get; }
-
-        public RequestDropHeldEntityEvent(string handName, EntityCoordinates dropTarget)
-        {
-            HandName = handName;
-            DropTarget = dropTarget;
-        }
-    }
 }
diff --git a/Content.Shared/Interaction/BeforeInteract.cs b/Content.Shared/Interaction/BeforeInteract.cs
new file mode 100644
index 0000000000..2c8bb5ca83
--- /dev/null
+++ b/Content.Shared/Interaction/BeforeInteract.cs
@@ -0,0 +1,53 @@
+using JetBrains.Annotations;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Map;
+
+namespace Content.Shared.Interaction
+{
+    /// <summary>
+    ///     Raised directed on the used object when clicking on another object before an interaction is handled.
+    /// </summary>
+    [PublicAPI]
+    public class BeforeInteractEvent : HandledEntityEventArgs
+    {
+        /// <summary>
+        ///     Entity that triggered the interaction.
+        /// </summary>
+        public IEntity User { get; }
+
+        /// <summary>
+        ///     Entity that the user used to interact.
+        /// </summary>
+        public IEntity Used { get; }
+
+        /// <summary>
+        ///     Entity that was interacted on. This can be null if the attack did not click on an entity.
+        /// </summary>
+        public IEntity? Target { get; }
+
+        /// <summary>
+        ///     Location that the user clicked outside of their interaction range.
+        /// </summary>
+        public EntityCoordinates ClickLocation { get; }
+
+        /// <summary>
+        /// Is the click location close enough to reach by the player? This does not check for obstructions, just that the target is within
+        /// reach radius around the user.
+        /// </summary>
+        public bool CanReach { get; }
+
+        public BeforeInteractEvent(
+            IEntity user,
+            IEntity used,
+            IEntity? target,
+            EntityCoordinates clickLocation,
+            bool canReach)
+        {
+            User = user;
+            Used = used;
+            Target = target;
+            ClickLocation = clickLocation;
+            CanReach = canReach;
+        }
+    }
+}
diff --git a/Content.Shared/DragDrop/IDropped.cs b/Content.Shared/Interaction/IDropped.cs
similarity index 97%
rename from Content.Shared/DragDrop/IDropped.cs
rename to Content.Shared/Interaction/IDropped.cs
index c09f7fc7df..b1daed20fc 100644
--- a/Content.Shared/DragDrop/IDropped.cs
+++ b/Content.Shared/Interaction/IDropped.cs
@@ -3,7 +3,7 @@ using JetBrains.Annotations;
 using Robust.Shared.Analyzers;
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.DragDrop
+namespace Content.Shared.Interaction
 {
     /// <summary>
     ///     This interface gives components behavior when they're dropped by a mob.
diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs
index 7f50cf0063..0d02792593 100644
--- a/Content.Shared/Interaction/SharedInteractionSystem.cs
+++ b/Content.Shared/Interaction/SharedInteractionSystem.cs
@@ -4,6 +4,7 @@ using Content.Shared.Notification.Managers;
 using Content.Shared.Physics;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Map;
 using Robust.Shared.Physics;
@@ -17,6 +18,8 @@ namespace Content.Shared.Interaction
     [UsedImplicitly]
     public class SharedInteractionSystem : EntitySystem
     {
+        [Dependency] private readonly SharedBroadphaseSystem _sharedBroadphaseSystem = default!;
+
         public const float InteractionRange = 2;
         public const float InteractionRangeSquared = InteractionRange * InteractionRange;
 
@@ -46,7 +49,7 @@ namespace Content.Shared.Interaction
 
             predicate ??= _ => false;
             var ray = new CollisionRay(origin.Position, dir.Normalized, collisionMask);
-            var rayResults = Get<SharedBroadphaseSystem>().IntersectRayWithPredicate(origin.MapId, ray, dir.Length, predicate.Invoke, false).ToList();
+            var rayResults = _sharedBroadphaseSystem.IntersectRayWithPredicate(origin.MapId, ray, dir.Length, predicate.Invoke, false).ToList();
 
             if (rayResults.Count == 0) return dir.Length;
             return (rayResults[0].HitPos - origin.Position).Length;
@@ -122,7 +125,7 @@ namespace Content.Shared.Interaction
             predicate ??= _ => false;
 
             var ray = new CollisionRay(origin.Position, dir.Normalized, (int) collisionMask);
-            var rayResults = Get<SharedBroadphaseSystem>().IntersectRayWithPredicate(origin.MapId, ray, dir.Length, predicate.Invoke, false).ToList();
+            var rayResults = _sharedBroadphaseSystem.IntersectRayWithPredicate(origin.MapId, ray, dir.Length, predicate.Invoke, false).ToList();
 
             if (rayResults.Count == 0) return true;
 
diff --git a/Content.Shared/Kitchen/Components/SharedReagentGrinderComponent.cs b/Content.Shared/Kitchen/Components/SharedReagentGrinderComponent.cs
index ca1eae6923..0effbe15db 100644
--- a/Content.Shared/Kitchen/Components/SharedReagentGrinderComponent.cs
+++ b/Content.Shared/Kitchen/Components/SharedReagentGrinderComponent.cs
@@ -51,16 +51,6 @@ namespace Content.Shared.Kitchen.Components
             }
         }
 
-        [Serializable, NetSerializable]
-        public class ReagentGrinderVaporizeReagentIndexedMessage : BoundUserInterfaceMessage
-        {
-            public Solution.ReagentQuantity ReagentQuantity;
-            public ReagentGrinderVaporizeReagentIndexedMessage(Solution.ReagentQuantity reagentQuantity)
-            {
-                ReagentQuantity = reagentQuantity;
-            }
-        }
-
         [Serializable, NetSerializable]
         public class ReagentGrinderWorkStartedMessage : BoundUserInterfaceMessage
         {
diff --git a/Content.Shared/Light/Component/SharedExpendableLightComponent.cs b/Content.Shared/Light/Component/SharedExpendableLightComponent.cs
index f6f057ea23..9c0e2960b2 100644
--- a/Content.Shared/Light/Component/SharedExpendableLightComponent.cs
+++ b/Content.Shared/Light/Component/SharedExpendableLightComponent.cs
@@ -1,4 +1,8 @@
 using System;
+using Robust.Shared.Audio;
+using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
+using Robust.Shared.Players;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
@@ -8,7 +12,8 @@ namespace Content.Shared.Light.Component
     [Serializable, NetSerializable]
     public enum ExpendableLightVisuals
     {
-        State
+        State,
+        Behavior
     }
 
     [Serializable, NetSerializable]
@@ -20,8 +25,11 @@ namespace Content.Shared.Light.Component
         Dead
     }
 
+    [NetworkedComponent]
     public abstract class SharedExpendableLightComponent: Robust.Shared.GameObjects.Component
     {
+        public static readonly AudioParams LoopedSoundParams = new(0, 1, "Master", 62.5f, 1, true, 0.3f);
+
         public sealed override string Name => "ExpendableLight";
 
         [ViewVariables(VVAccess.ReadOnly)]
@@ -65,7 +73,7 @@ namespace Content.Shared.Light.Component
 
         [ViewVariables]
         [DataField("loopedSound")]
-        protected string LoopedSound { get; set; } = string.Empty;
+        public string LoopedSound { get; set; } = string.Empty;
 
         [ViewVariables]
         [DataField("dieSound")]
diff --git a/Content.Shared/Pulling/Components/SharedPullableComponent.cs b/Content.Shared/Pulling/Components/SharedPullableComponent.cs
index 34890165eb..a25f3915ff 100644
--- a/Content.Shared/Pulling/Components/SharedPullableComponent.cs
+++ b/Content.Shared/Pulling/Components/SharedPullableComponent.cs
@@ -50,6 +50,8 @@ namespace Content.Shared.Pulling.Components
                     return;
                 }
 
+                var eventBus = Owner.EntityManager.EventBus;
+
                 // New value. Abandon being pulled by any existing object.
                 if (_puller != null)
                 {
@@ -64,10 +66,9 @@ namespace Content.Shared.Pulling.Components
                     {
                         var message = new PullStoppedMessage(oldPullerPhysics, _physics);
 
-                        oldPuller.SendMessage(null, message);
-                        Owner.SendMessage(null, message);
+                        eventBus.RaiseLocalEvent(oldPuller.Uid, message, broadcast: false);
+                        eventBus.RaiseLocalEvent(Owner.Uid, message);
 
-                        oldPuller.EntityManager.EventBus.RaiseEvent(EventSource.Local, message);
                         _physics.WakeBody();
                     }
                     // else-branch warning is handled below
@@ -125,14 +126,14 @@ namespace Content.Shared.Pulling.Components
 
                     var pullAttempt = new PullAttemptMessage(pullerPhysics, _physics);
 
-                    value.SendMessage(null, pullAttempt);
+                    eventBus.RaiseLocalEvent(value.Uid, pullAttempt, broadcast: false);
 
                     if (pullAttempt.Cancelled)
                     {
                         return;
                     }
 
-                    Owner.SendMessage(null, pullAttempt);
+                    eventBus.RaiseLocalEvent(Owner.Uid, pullAttempt);
 
                     if (pullAttempt.Cancelled)
                     {
@@ -147,10 +148,8 @@ namespace Content.Shared.Pulling.Components
 
                     var message = new PullStartedMessage(PullerPhysics, _physics);
 
-                    _puller.SendMessage(null, message);
-                    Owner.SendMessage(null, message);
-
-                    _puller.EntityManager.EventBus.RaiseEvent(EventSource.Local, message);
+                    eventBus.RaiseLocalEvent(_puller.Uid, message, broadcast: false);
+                    eventBus.RaiseLocalEvent(Owner.Uid, message);
 
                     var union = PullerPhysics.GetWorldAABB().Union(_physics.GetWorldAABB());
                     var length = Math.Max(union.Size.X, union.Size.Y) * 0.75f;
@@ -335,29 +334,6 @@ namespace Content.Shared.Pulling.Components
             Puller = entity;
         }
 
-        public override void HandleMessage(ComponentMessage message, IComponent? component)
-        {
-            base.HandleMessage(message, component);
-
-            if (message is not PullMessage pullMessage ||
-                pullMessage.Pulled.Owner != Owner)
-            {
-                return;
-            }
-
-            var pulledStatus = Owner.GetComponentOrNull<SharedAlertsComponent>();
-
-            switch (message)
-            {
-                case PullStartedMessage:
-                    pulledStatus?.ShowAlert(AlertType.Pulled);
-                    break;
-                case PullStoppedMessage:
-                    pulledStatus?.ClearAlert(AlertType.Pulled);
-                    break;
-            }
-        }
-
         protected override void OnRemove()
         {
             TryStopPull();
diff --git a/Content.Shared/Pulling/Components/SharedPullerComponent.cs b/Content.Shared/Pulling/Components/SharedPullerComponent.cs
index 12a539ab12..1579339958 100644
--- a/Content.Shared/Pulling/Components/SharedPullerComponent.cs
+++ b/Content.Shared/Pulling/Components/SharedPullerComponent.cs
@@ -1,6 +1,4 @@
-using Content.Shared.Alert;
-using Content.Shared.Movement.Components;
-using Content.Shared.Physics.Pull;
+using Content.Shared.Movement.Components;
 using Robust.Shared.GameObjects;
 using Component = Robust.Shared.GameObjects.Component;
 
@@ -46,30 +44,5 @@ namespace Content.Shared.Pulling.Components
 
             base.OnRemove();
         }
-
-        public override void HandleMessage(ComponentMessage message, IComponent? component)
-        {
-            base.HandleMessage(message, component);
-
-            if (message is not PullMessage pullMessage ||
-                pullMessage.Puller.Owner != Owner)
-            {
-                return;
-            }
-
-            SharedAlertsComponent? ownerStatus = Owner.GetComponentOrNull<SharedAlertsComponent>();
-
-            switch (message)
-            {
-                case PullStartedMessage msg:
-                    Pulling = msg.Pulled.Owner;
-                    ownerStatus?.ShowAlert(AlertType.Pulling);
-                    break;
-                case PullStoppedMessage _:
-                    Pulling = null;
-                    ownerStatus?.ClearAlert(AlertType.Pulling);
-                    break;
-            }
-        }
     }
 }
diff --git a/Content.Shared/Physics/Pull/PullAttemptMessage.cs b/Content.Shared/Pulling/Events/PullAttemptMessage.cs
similarity index 100%
rename from Content.Shared/Physics/Pull/PullAttemptMessage.cs
rename to Content.Shared/Pulling/Events/PullAttemptMessage.cs
diff --git a/Content.Shared/Physics/Pull/PullMessage.cs b/Content.Shared/Pulling/Events/PullMessage.cs
similarity index 87%
rename from Content.Shared/Physics/Pull/PullMessage.cs
rename to Content.Shared/Pulling/Events/PullMessage.cs
index cbdb5af3a1..4376720a03 100644
--- a/Content.Shared/Physics/Pull/PullMessage.cs
+++ b/Content.Shared/Pulling/Events/PullMessage.cs
@@ -3,7 +3,7 @@ using Robust.Shared.Physics;
 
 namespace Content.Shared.Physics.Pull
 {
-    public class PullMessage : ComponentMessage
+    public class PullMessage : EntityEventArgs
     {
         public readonly IPhysBody Puller;
         public readonly IPhysBody Pulled;
diff --git a/Content.Shared/Physics/Pull/PullStartedMessage.cs b/Content.Shared/Pulling/Events/PullStartedMessage.cs
similarity index 100%
rename from Content.Shared/Physics/Pull/PullStartedMessage.cs
rename to Content.Shared/Pulling/Events/PullStartedMessage.cs
diff --git a/Content.Shared/Physics/Pull/PullStoppedMessage.cs b/Content.Shared/Pulling/Events/PullStoppedMessage.cs
similarity index 100%
rename from Content.Shared/Physics/Pull/PullStoppedMessage.cs
rename to Content.Shared/Pulling/Events/PullStoppedMessage.cs
diff --git a/Content.Shared/Pulling/Systems/SharedPullerSystem.cs b/Content.Shared/Pulling/Systems/SharedPullerSystem.cs
new file mode 100644
index 0000000000..d05754c851
--- /dev/null
+++ b/Content.Shared/Pulling/Systems/SharedPullerSystem.cs
@@ -0,0 +1,44 @@
+using Content.Shared.Alert;
+using Content.Shared.Physics.Pull;
+using Content.Shared.Pulling.Components;
+using JetBrains.Annotations;
+using Robust.Shared.GameObjects;
+
+namespace Content.Shared.Pulling
+{
+    [UsedImplicitly]
+    public sealed class SharedPullerSystem : EntitySystem
+    {
+        public override void Initialize()
+        {
+            base.Initialize();
+
+            SubscribeLocalEvent<SharedPullerComponent, PullStartedMessage>(PullerHandlePullStarted);
+            SubscribeLocalEvent<SharedPullerComponent, PullStoppedMessage>(PullerHandlePullStopped);
+        }
+
+        private static void PullerHandlePullStarted(
+            EntityUid uid,
+            SharedPullerComponent component,
+            PullStartedMessage args)
+        {
+            if (args.Puller.Owner.Uid != uid)
+                return;
+
+            if (component.Owner.TryGetComponent(out SharedAlertsComponent? alerts))
+                alerts.ShowAlert(AlertType.Pulling);
+        }
+
+        private static void PullerHandlePullStopped(
+            EntityUid uid,
+            SharedPullerComponent component,
+            PullStoppedMessage args)
+        {
+            if (args.Puller.Owner.Uid != uid)
+                return;
+
+            if (component.Owner.TryGetComponent(out SharedAlertsComponent? alerts))
+                alerts.ClearAlert(AlertType.Pulling);
+        }
+    }
+}
diff --git a/Content.Shared/Pulling/SharedPullingSystem.cs b/Content.Shared/Pulling/Systems/SharedPullingSystem.cs
similarity index 88%
rename from Content.Shared/Pulling/SharedPullingSystem.cs
rename to Content.Shared/Pulling/Systems/SharedPullingSystem.cs
index 0bb04d19b4..5783ee332d 100644
--- a/Content.Shared/Pulling/SharedPullingSystem.cs
+++ b/Content.Shared/Pulling/Systems/SharedPullingSystem.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
+using Content.Shared.Alert;
 using Content.Shared.GameTicking;
 using Content.Shared.Input;
 using Content.Shared.Physics.Pull;
@@ -56,12 +57,34 @@ namespace Content.Shared.Pulling
             SubscribeLocalEvent<MoveEvent>(PullerMoved);
             SubscribeLocalEvent<EntInsertedIntoContainerMessage>(HandleContainerInsert);
 
+            SubscribeLocalEvent<SharedPullableComponent, PullStartedMessage>(PullableHandlePullStarted);
+            SubscribeLocalEvent<SharedPullableComponent, PullStoppedMessage>(PullableHandlePullStopped);
+
             CommandBinds.Builder
                 .Bind(ContentKeyFunctions.MovePulledObject, new PointerInputCmdHandler(HandleMovePulledObject))
                 .Bind(ContentKeyFunctions.ReleasePulledObject, InputCmdHandler.FromDelegate(HandleReleasePulledObject))
                 .Register<SharedPullingSystem>();
         }
 
+        // Raise a "you are being pulled" alert if the pulled entity has alerts.
+        private static void PullableHandlePullStarted(EntityUid uid, SharedPullableComponent component, PullStartedMessage args)
+        {
+            if (args.Pulled.Owner.Uid != uid)
+                return;
+
+            if (component.Owner.TryGetComponent(out SharedAlertsComponent? alerts))
+                alerts.ShowAlert(AlertType.Pulled);
+        }
+
+        private static void PullableHandlePullStopped(EntityUid uid, SharedPullableComponent component, PullStoppedMessage args)
+        {
+            if (args.Pulled.Owner.Uid != uid)
+                return;
+
+            if (component.Owner.TryGetComponent(out SharedAlertsComponent? alerts))
+                alerts.ClearAlert(AlertType.Pulled);
+        }
+
         public override void Update(float frameTime)
         {
             base.Update(frameTime);
diff --git a/Content.Shared/Sound/SharedLoopingSoundComponent.cs b/Content.Shared/Sound/SharedLoopingSoundComponent.cs
deleted file mode 100644
index b31234d03e..0000000000
--- a/Content.Shared/Sound/SharedLoopingSoundComponent.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-using System;
-using Robust.Shared.Audio;
-using Robust.Shared.GameObjects;
-using Robust.Shared.GameStates;
-using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.Manager.Attributes;
-
-namespace Content.Shared.Sound
-{
-    [NetworkedComponent()]
-    public class SharedLoopingSoundComponent : Component
-    {
-        public override string Name => "LoopingSound";
-
-        /// <summary>
-        /// Stops all sounds.
-        /// </summary>
-        public virtual void StopAllSounds()
-        {}
-
-        /// <summary>
-        /// Stops a certain scheduled sound from playing.
-        /// </summary>
-        public virtual void StopScheduledSound(string filename)
-        {}
-
-        /// <summary>
-        /// Adds an scheduled sound to be played.
-        /// </summary>
-        public virtual void AddScheduledSound(ScheduledSound scheduledSound)
-        {}
-
-        /// <summary>
-        ///     Play an audio file following the entity.
-        /// </summary>
-        /// <param name="filename">The resource path to the OGG Vorbis file to play.</param>
-        public void Play(string filename, AudioParams? audioParams = null)
-        {
-            AddScheduledSound(new ScheduledSound()
-            {
-                Filename = filename,
-                AudioParams = audioParams,
-            });
-        }
-    }
-
-    [NetSerializable, Serializable]
-    public class ScheduledSoundMessage : ComponentMessage
-    {
-        public ScheduledSound Schedule = new();
-        public ScheduledSoundMessage()
-        {
-            Directed = true;
-        }
-    }
-
-    [NetSerializable, Serializable]
-    public class StopSoundScheduleMessage : ComponentMessage
-    {
-        public string Filename = string.Empty;
-        public StopSoundScheduleMessage()
-        {
-            Directed = true;
-        }
-    }
-
-    [NetSerializable, Serializable]
-    public class StopAllSoundsMessage : ComponentMessage
-    {
-        public StopAllSoundsMessage()
-        {
-            Directed = true;
-        }
-    }
-
-    [Serializable, NetSerializable]
-    [DataDefinition]
-    public class ScheduledSound
-    {
-        [DataField("fileName")]
-        public string Filename = string.Empty;
-
-        /// <summary>
-        /// The parameters to play the sound with.
-        /// </summary>
-        [DataField("audioparams")]
-        public AudioParams? AudioParams;
-
-        /// <summary>
-        /// Delay in milliseconds before playing the sound,
-        /// and delay between repetitions if Times is not 0.
-        /// </summary>
-        [DataField("delay")]
-        public uint Delay;
-
-        /// <summary>
-        /// Maximum number of milliseconds to add to the delay randomly.
-        /// Useful for random ambience noises. Generated value differs from client to client.
-        /// </summary>
-        [DataField("randomdelay")]
-        public uint RandomDelay;
-
-        /// <summary>
-        /// How many times to repeat the sound. If it's 0, it will play the sound once.
-        /// If it's less than 0, it will repeat the sound indefinitely.
-        /// If it's greater than 0, it will play the sound n+1 times.
-        /// </summary>
-        [DataField("times")]
-        public int Times;
-
-        /// <summary>
-        /// Whether the sound will play or not.
-        /// </summary>
-        public bool Play = true;
-    }
-}
diff --git a/Content.Shared/Sound/SoundSpecifier.cs b/Content.Shared/Sound/SoundSpecifier.cs
index 616ccf9551..bb74337e8a 100644
--- a/Content.Shared/Sound/SoundSpecifier.cs
+++ b/Content.Shared/Sound/SoundSpecifier.cs
@@ -8,13 +8,12 @@ using Robust.Shared.Utility;
 
 namespace Content.Shared.Sound
 {
-    [DataDefinition]
+    [ImplicitDataDefinitionForInheritors]
     public abstract class SoundSpecifier
     {
         public abstract string GetSound();
     }
 
-    [DataDefinition]
     public sealed class SoundPathSpecifier : SoundSpecifier
     {
         public const string Node = "path";
@@ -42,7 +41,6 @@ namespace Content.Shared.Sound
         }
     }
 
-    [DataDefinition]
     public sealed class SoundCollectionSpecifier : SoundSpecifier
     {
         public const string Node = "collection";
diff --git a/Content.Shared/Spawning/EntitySystemExtensions.cs b/Content.Shared/Spawning/EntitySystemExtensions.cs
index 6ec0226358..a096d0f4d9 100644
--- a/Content.Shared/Spawning/EntitySystemExtensions.cs
+++ b/Content.Shared/Spawning/EntitySystemExtensions.cs
@@ -32,7 +32,7 @@ namespace Content.Shared.Spawning
             in Box2? box = null,
             SharedBroadphaseSystem? collision = null)
         {
-            var boxOrDefault = box.GetValueOrDefault(Box2.UnitCentered);
+            var boxOrDefault = box.GetValueOrDefault(Box2.UnitCentered).Translated(coordinates.Position);
             collision ??= EntitySystem.Get<SharedBroadphaseSystem>();
 
             foreach (var body in collision.GetCollidingEntities(coordinates.MapId, in boxOrDefault))
diff --git a/Content.Shared/SubFloor/SubFloorHideComponent.cs b/Content.Shared/SubFloor/SubFloorHideComponent.cs
index a76c73473e..100903c855 100644
--- a/Content.Shared/SubFloor/SubFloorHideComponent.cs
+++ b/Content.Shared/SubFloor/SubFloorHideComponent.cs
@@ -1,4 +1,10 @@
+using System;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
+using Robust.Shared.Players;
+using Robust.Shared.Serialization;
+using Robust.Shared.Serialization.Manager.Attributes;
+using Robust.Shared.ViewVariables;
 
 namespace Content.Shared.SubFloor
 {
@@ -8,10 +14,43 @@ namespace Content.Shared.SubFloor
     /// (plating).
     /// </summary>
     /// <seealso cref="P:Content.Shared.Maps.ContentTileDefinition.IsSubFloor" />
+    [NetworkedComponent]
     [RegisterComponent]
     public sealed class SubFloorHideComponent : Component
     {
         /// <inheritdoc />
         public override string Name => "SubFloorHide";
+
+        /// <summary>
+        ///     Whether the entity will be hid when not in subfloor.
+        /// </summary>
+        [ViewVariables(VVAccess.ReadWrite)]
+        [DataField("enabled")]
+        public bool Enabled { get; set; } = true;
+
+        /// <summary>
+        ///     This entity needs to be anchored to be hid when not in subfloor.
+        /// </summary>
+        [ViewVariables(VVAccess.ReadWrite)]
+        [DataField("requireAnchored")]
+        public bool RequireAnchored { get; set; } = true;
+
+        public override ComponentState GetComponentState(ICommonSession player)
+        {
+            return new SubFloorHideComponentState(Enabled, RequireAnchored);
+        }
+    }
+
+    [Serializable, NetSerializable]
+    public class SubFloorHideComponentState : ComponentState
+    {
+        public bool Enabled { get; }
+        public bool RequireAnchored { get; }
+
+        public SubFloorHideComponentState(bool enabled, bool requireAnchored)
+        {
+            Enabled = enabled;
+            RequireAnchored = requireAnchored;
+        }
     }
 }
diff --git a/Content.Shared/SubFloor/SubFloorHideSystem.cs b/Content.Shared/SubFloor/SubFloorHideSystem.cs
index 5dd30a86a3..d729e2b31a 100644
--- a/Content.Shared/SubFloor/SubFloorHideSystem.cs
+++ b/Content.Shared/SubFloor/SubFloorHideSystem.cs
@@ -1,9 +1,12 @@
+using System;
 using Content.Shared.Maps;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
+using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Shared.SubFloor
@@ -42,6 +45,7 @@ namespace Content.Shared.SubFloor
             SubscribeLocalEvent<SubFloorHideComponent, ComponentStartup>(OnSubFloorStarted);
             SubscribeLocalEvent<SubFloorHideComponent, ComponentShutdown>(OnSubFloorTerminating);
             SubscribeLocalEvent<SubFloorHideComponent, AnchorStateChangedEvent>(HandleAnchorChanged);
+            SubscribeLocalEvent<SubFloorHideComponent, ComponentHandleState>(HandleComponentState);
         }
 
         public override void Shutdown()
@@ -52,6 +56,20 @@ namespace Content.Shared.SubFloor
             _mapManager.TileChanged -= MapManagerOnTileChanged;
         }
 
+        public void SetEnabled(SubFloorHideComponent subFloor, bool enabled)
+        {
+            subFloor.Enabled = enabled;
+            subFloor.Dirty();
+            UpdateEntity(subFloor.Owner.Uid);
+        }
+
+        public void SetRequireAnchoring(SubFloorHideComponent subFloor, bool requireAnchored)
+        {
+            subFloor.RequireAnchored = requireAnchored;
+            subFloor.Dirty();
+            UpdateEntity(subFloor.Owner.Uid);
+        }
+
         private void OnSubFloorStarted(EntityUid uid, SubFloorHideComponent component, ComponentStartup _)
         {
             UpdateEntity(uid);
@@ -68,8 +86,17 @@ namespace Content.Shared.SubFloor
             var transform = ComponentManager.GetComponent<ITransformComponent>(uid);
 
             // We do this directly instead of calling UpdateEntity.
-            if(_mapManager.TryGetGrid(transform.GridID, out var grid))
-                UpdateTile(grid, grid.TileIndicesFor(transform.Coordinates));
+            UpdateEntity(uid);
+        }
+
+        private void HandleComponentState(EntityUid uid, SubFloorHideComponent component, ComponentHandleState args)
+        {
+            if (args.Current is not SubFloorHideComponentState state)
+                return;
+
+            component.Enabled = state.Enabled;
+            component.RequireAnchored = state.RequireAnchored;
+            UpdateEntity(uid);
         }
 
         private void MapManagerOnTileChanged(object? sender, TileChangedEventArgs e)
@@ -113,6 +140,7 @@ namespace Content.Shared.SubFloor
         private void UpdateEntity(EntityUid uid)
         {
             var transform = ComponentManager.GetComponent<ITransformComponent>(uid);
+
             if (!_mapManager.TryGetGrid(transform.GridID, out var grid))
             {
                 // Not being on a grid counts as no subfloor, unhide this.
@@ -134,10 +162,36 @@ namespace Content.Shared.SubFloor
             if (subFloorHideEvent.Handled)
                 return;
 
+            // We only need to query the subfloor component to check if it's enabled or not when we're not on subfloor.
+            // Getting components is expensive, after all.
+            if (!subFloor && ComponentManager.TryGetComponent(uid, out SubFloorHideComponent? subFloorHideComponent))
+            {
+                // If the component isn't enabled, then subfloor will always be true, and the entity will be shown.
+                if (!subFloorHideComponent.Enabled)
+                {
+                    subFloor = true;
+                }
+                // We only need to query the TransformComp if the SubfloorHide is enabled and requires anchoring.
+                else if (subFloorHideComponent.RequireAnchored && ComponentManager.TryGetComponent(uid, out ITransformComponent? transformComponent))
+                {
+                    // If we require the entity to be anchored but it's not, this will set subfloor to true, unhiding it.
+                    subFloor = !transformComponent.Anchored;
+                }
+            }
+
+            // Whether to show this entity as visible, visually.
+            var subFloorVisible = ShowAll || subFloor;
+
             // Show sprite
             if (ComponentManager.TryGetComponent(uid, out SharedSpriteComponent? spriteComponent))
             {
-                spriteComponent.Visible = ShowAll || subFloor;
+                spriteComponent.Visible = subFloorVisible;
+            }
+
+            // Set an appearance data value so visualizers can use this as needed.
+            if (ComponentManager.TryGetComponent(uid, out SharedAppearanceComponent? appearanceComponent))
+            {
+                appearanceComponent.SetData(SubFloorVisuals.SubFloor, subFloorVisible);
             }
 
             // So for collision all we care about is that the component is running.
@@ -157,4 +211,10 @@ namespace Content.Shared.SubFloor
             SubFloor = subFloor;
         }
     }
+
+    [Serializable, NetSerializable]
+    public enum SubFloorVisuals : byte
+    {
+        SubFloor,
+    }
 }
diff --git a/Pow3r/Program.SaveLoad.cs b/Pow3r/Program.SaveLoad.cs
index 2ffdc8eb4e..5fff64f662 100644
--- a/Pow3r/Program.SaveLoad.cs
+++ b/Pow3r/Program.SaveLoad.cs
@@ -20,15 +20,14 @@ namespace Pow3r
                 return;
 
             _paused = dat.Paused;
-            _nextId = dat.NextId;
             _currentSolver = dat.Solver;
 
             _state = new PowerState
             {
-                Networks = dat.Networks.ToDictionary(n => n.Id, n => n),
-                Supplies = dat.Supplies.ToDictionary(s => s.Id, s => s),
-                Loads = dat.Loads.ToDictionary(l => l.Id, l => l),
-                Batteries = dat.Batteries.ToDictionary(b => b.Id, b => b)
+                Networks = GenIdStorage.FromEnumerable(dat.Networks.Select(n => (n.Id, n))),
+                Supplies = GenIdStorage.FromEnumerable(dat.Supplies.Select(s => (s.Id, s))),
+                Loads = GenIdStorage.FromEnumerable(dat.Loads.Select(l => (l.Id, l))),
+                Batteries = GenIdStorage.FromEnumerable(dat.Batteries.Select(b => (b.Id, b)))
             };
 
             _displayLoads = dat.Loads.ToDictionary(n => n.Id, _ => new DisplayLoad());
@@ -44,7 +43,6 @@ namespace Pow3r
             var data = new DiskDat
             {
                 Paused = _paused,
-                NextId = _nextId,
                 Solver = _currentSolver,
 
                 Loads = _state.Loads.Values.ToList(),
@@ -59,7 +57,6 @@ namespace Pow3r
         private sealed class DiskDat
         {
             public bool Paused;
-            public int NextId;
             public int Solver;
 
             public List<Load> Loads;
diff --git a/Pow3r/Program.Simulation.cs b/Pow3r/Program.Simulation.cs
index 440e262f83..fac2dbc415 100644
--- a/Pow3r/Program.Simulation.cs
+++ b/Pow3r/Program.Simulation.cs
@@ -10,7 +10,6 @@ namespace Pow3r
     {
         private const int MaxTickData = 180;
 
-        private int _nextId = 1;
         private PowerState _state = new();
         private Network _linking;
         private int _tickDataIdx;
@@ -18,13 +17,11 @@ namespace Pow3r
 
         private readonly string[] _solverNames =
         {
-            nameof(GraphWalkSolver),
             nameof(BatteryRampPegSolver),
             nameof(NoOpSolver)
         };
 
         private readonly IPowerSolver[] _solvers = {
-            new GraphWalkSolver(),
             new BatteryRampPegSolver(),
             new NoOpSolver()
         };
@@ -35,11 +32,6 @@ namespace Pow3r
         private readonly Queue<object> _remQueue = new();
         private readonly Stopwatch _simStopwatch = new Stopwatch();
 
-        private NodeId AllocId()
-        {
-            return new(_nextId++);
-        }
-
         private void Tick(float frameTime)
         {
             if (_paused)
diff --git a/Pow3r/Program.UI.cs b/Pow3r/Program.UI.cs
index 96f7b90cf8..9a99a52699 100644
--- a/Pow3r/Program.UI.cs
+++ b/Pow3r/Program.UI.cs
@@ -36,30 +36,30 @@ namespace Pow3r
 
             if (Button("Generator"))
             {
-                var id = AllocId();
-                _state.Supplies.Add(id, new Supply { Id = id });
-                _displaySupplies.Add(id, new DisplaySupply());
+                var supply = new Supply();
+                _state.Supplies.Allocate(out supply.Id) = supply;
+                _displaySupplies.Add(supply.Id, new DisplaySupply());
             }
 
             if (Button("Load"))
             {
-                var id = AllocId();
-                _state.Loads.Add(id, new Load { Id = id });
-                _displayLoads.Add(id, new DisplayLoad());
+                var load = new Load();
+                _state.Loads.Allocate(out load.Id) = load;
+                _displayLoads.Add(load.Id, new DisplayLoad());
             }
 
             if (Button("Network"))
             {
-                var id = AllocId();
-                _state.Networks.Add(id, new Network { Id = id });
-                _displayNetworks.Add(id, new DisplayNetwork());
+                var network = new Network();
+                _state.Networks.Allocate(out network.Id) = network;
+                _displayNetworks.Add(network.Id, new DisplayNetwork());
             }
 
             if (Button("Battery"))
             {
-                var id = AllocId();
-                _state.Batteries.Add(id, new Battery { Id = id });
-                _displayBatteries.Add(id, new DisplayBattery());
+                var battery = new Battery();
+                _state.Batteries.Allocate(out battery.Id) = battery;
+                _displayBatteries.Add(battery.Id, new DisplayBattery());
             }
 
             Checkbox("Paused", ref _paused);
@@ -355,25 +355,25 @@ namespace Pow3r
                 switch (item)
                 {
                     case Network n:
-                        _state.Networks.Remove(n.Id);
+                        _state.Networks.Free(n.Id);
                         _displayNetworks.Remove(n.Id);
                         reLink = true;
                         break;
 
                     case Supply s:
-                        _state.Supplies.Remove(s.Id);
+                        _state.Supplies.Free(s.Id);
                         _state.Networks.Values.ForEach(n => n.Supplies.Remove(s.Id));
                         _displaySupplies.Remove(s.Id);
                         break;
 
                     case Load l:
-                        _state.Loads.Remove(l.Id);
+                        _state.Loads.Free(l.Id);
                         _state.Networks.Values.ForEach(n => n.Loads.Remove(l.Id));
                         _displayLoads.Remove(l.Id);
                         break;
 
                     case Battery b:
-                        _state.Batteries.Remove(b.Id);
+                        _state.Batteries.Free(b.Id);
                         _state.Networks.Values.ForEach(n => n.BatteriesCharging.Remove(b.Id));
                         _state.Networks.Values.ForEach(n => n.BatteriesDischarging.Remove(b.Id));
                         _displayBatteries.Remove(b.Id);
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 866ea757d5..e900669612 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1598,3 +1598,78 @@ Entries:
   - {message: Shuttle-relative movement for when we get shuttle rotation., type: Add}
   id: 284
   time: '2021-07-25T15:48:22.0000000+00:00'
+- author: Seth
+  changes:
+  - {message: Added Storage Room to Coats, type: Add}
+  id: 285
+  time: '2021-07-26T05:36:27.0000000+00:00'
+- author: Seth
+  changes:
+  - {message: Added a hardsuit into research directors locker, type: Add}
+  id: 286
+  time: '2021-07-26T22:14:10.0000000+00:00'
+- author: Seth
+  changes:
+  - {message: Added bio suits into bio lockers, type: Add}
+  id: 287
+  time: '2021-07-28T17:36:06.0000000+00:00'
+- author: PJB3005
+  changes:
+  - {message: Pulling is better integrated with hands now. It properly picks an empty
+      hand and dropping on the pulling hand stops the pull. You also see what you're
+      pulling in your hand!, type: Tweak}
+  id: 288
+  time: '2021-07-31T01:14:00.0000000+00:00'
+- author: plinyvic
+  changes:
+  - {message: Fixed reagent grinder not giving correct output with stacked items,
+    type: Fix}
+  id: 289
+  time: '2021-07-31T12:06:25.0000000+00:00'
+- author: michaelcooke
+  changes:
+  - {message: Throwing items in space will now push you in the opposite direction
+      to the thrown object, type: Fix}
+  id: 290
+  time: '2021-07-31T12:53:18.0000000+00:00'
+- author: Seth
+  changes:
+  - {message: Made plasma Grindable, type: Tweak}
+  id: 291
+  time: '2021-08-01T19:05:02.0000000+00:00'
+- author: mirrorcult
+  changes:
+  - {message: Door sounds no longer play twice sometimes., type: Fix}
+  id: 292
+  time: '2021-08-02T11:57:06.0000000+00:00'
+- author: scaly-chimp
+  changes:
+  - {message: Added everyone's favorite stimulant meth!, type: Add}
+  id: 293
+  time: '2021-08-03T03:32:08.0000000+00:00'
+- author: metalgearsloth
+  changes:
+  - {message: 'Station will spawn at a random position rather than 0,0.', type: Tweak}
+  id: 294
+  time: '2021-08-03T08:49:25.0000000+00:00'
+- author: metalgearsloth
+  changes:
+  - {message: Fix lerping for other physics bodies., type: Fix}
+  - {message: Fix joint prediction., type: Fix}
+  id: 295
+  time: '2021-08-03T15:02:44.0000000+00:00'
+- author: Zumorica
+  changes:
+  - {message: Fixes mobs not taking pressure damage on space., type: Fix}
+  id: 296
+  time: '2021-08-04T07:49:53.509340+00:00'
+- author: SweptWasTaken
+  changes:
+  - {message: Added an alternate jumpsuit for Botany, type: Add}
+  id: 297
+  time: '2021-08-05T10:18:05.0000000+00:00'
+- author: Seth
+  changes:
+  - {message: Added two new maintenance areas, type: Add}
+  id: 298
+  time: '2021-08-05T22:20:58.0000000+00:00'
diff --git a/Resources/Locale/en-US/chat/managers/chat-manager.ftl b/Resources/Locale/en-US/chat/managers/chat-manager.ftl
index 02b71db263..01b43a67c6 100644
--- a/Resources/Locale/en-US/chat/managers/chat-manager.ftl
+++ b/Resources/Locale/en-US/chat/managers/chat-manager.ftl
@@ -13,7 +13,7 @@ chat-manager-sender-announcement-wrap-message = {$sender} Announcement:
 chat-manager-entity-say-wrap-message = {$entityName} says: "{"{0}"}"
 chat-manager-entity-me-wrap-message = {$entityName} {"{0}"}
 chat-manager-send-ooc-wrap-message = OOC: {$playerName}: {"{0}"}
-chat-manager-send-ooc-patron-wrap-message = OOC: [color={$patronColor}]{$playerName}[/color]: {"{0}"}:
+chat-manager-send-ooc-patron-wrap-message = OOC: [color={$patronColor}]{$playerName}[/color]: {"{0}"}
 chat-manager-send-dead-chat-wrap-message = {$deadChannelName}: {$playerName}: {"{0}"}
 chat-manager-send-admin-dead-chat-wrap-message = {$adminChannelName}:({$userName}): {"{0}"}
 chat-manager-send-admin-chat-wrap-message = {$adminChannelName}: {$playerName}: {"{0}"}
@@ -21,4 +21,4 @@ chat-manager-send-admin-announcement-wrap-message = {$adminChannelName}: {"{0}"}
 chat-manager-send-hook-ooc-wrap-message = OOC: (D){$senderName}: {"{0}"}
 
 chat-manager-dead-channel-name = DEAD
-chat-manager-admin-channel-name = ADMIN
\ No newline at end of file
+chat-manager-admin-channel-name = ADMIN
diff --git a/Resources/Locale/en-US/lock/lock-component.ftl b/Resources/Locale/en-US/lock/lock-component.ftl
new file mode 100644
index 0000000000..f9f975c96e
--- /dev/null
+++ b/Resources/Locale/en-US/lock/lock-component.ftl
@@ -0,0 +1,10 @@
+lock-comp-on-examined-is-locked = The {$entityName} seems to be locked.
+lock-comp-on-examined-is-unlocked = The {$entityName} seems to be unlocked.
+lock-comp-do-lock-success = You lock the {$entityName}.
+lock-comp-do-unlock-success = You unlock the {$entityName}.
+lock-comp-has-user-access-fail = Access denied
+
+## ToggleLockVerb
+
+toggle-lock-verb-unlock = Unlock
+toggle-lock-verb-lock = Lock
\ No newline at end of file
diff --git a/Resources/Locale/en-US/storage/components/secure-entity-storage-component.ftl b/Resources/Locale/en-US/storage/components/secure-entity-storage-component.ftl
deleted file mode 100644
index 02082f2dcc..0000000000
--- a/Resources/Locale/en-US/storage/components/secure-entity-storage-component.ftl
+++ /dev/null
@@ -1,6 +0,0 @@
-secure-entity-storage-component-not-allowed-message = Access denied
-
-## ToggleLockVerb
-
-toggle-lock-verb-unlock = Unlock
-toggle-lock-verb-lock = Lock
\ No newline at end of file
diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml
index 2c0fd2c5ac..3e767d8f62 100644
--- a/Resources/Maps/saltern.yml
+++ b/Resources/Maps/saltern.yml
@@ -56,17 +56,17 @@ grids:
   - ind: "0,1"
     tiles: IQAAABYAAAAWAAAAFgAAABYAAAAWAAAAIQAAABYAAAAWAAAAFgAAABYAAAAhAAAAIAAAABgAAAAhAAAAGAAAABgAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAIQAAACAAAAAYAAAAIQAAAAAAAAAhAAAAFgAAABYAAAAWAAAAFgAAABYAAAAhAAAAFgAAABYAAAAWAAAAFgAAACEAAAAgAAAAGAAAACEAAAAAAAAAIQAAABYAAAAWAAAAFgAAABYAAAAWAAAAIQAAABYAAAAWAAAAFgAAABYAAAAhAAAAIAAAABgAAAAhAAAAAAAAABgAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAGAAAACAAAAAYAAAAIQAAAAAAAAAhAAAAFgAAABYAAAAWAAAAFgAAABYAAAAhAAAAFgAAABYAAAAWAAAAFgAAACEAAAAYAAAAGAAAACEAAAAAAAAAIQAAACEAAAAWAAAAIQAAABYAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAGAAAACEAAAAhAAAAAAAAAA8AAAAhAAAAFgAAABYAAAAWAAAAIQAAAB4AAAAeAAAAHgAAAB4AAAAhAAAAGAAAABgAAAAYAAAAIQAAAAAAAAAPAAAADwAAABYAAAAWAAAAFgAAACEAAAAeAAAAHgAAAB4AAAAeAAAAIQAAACAAAAAgAAAAIAAAACEAAAAAAAAADwAAAA8AAAAWAAAAFgAAABYAAAAWAAAAHgAAAB4AAAAeAAAAHgAAACEAAAAhAAAAIQAAACEAAAAhAAAAAAAAAA8AAAAhAAAAFgAAABYAAAAWAAAAIQAAAB4AAAAeAAAAHgAAAB4AAAAhAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAIQAAABYAAAAWAAAAFgAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAACEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAhAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAIQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAIQAAACEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
   - ind: "-2,0"
-    tiles: IQAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAFgAAABYAAAAWAAAAFgAAACEAAAAOAAAAFgAAABYAAAAWAAAAFgAAACEAAAAeAAAAHgAAAB4AAAAeAAAAIQAAACEAAAAWAAAAFgAAACEAAAAhAAAADgAAAA4AAAAOAAAADgAAABYAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAWAAAAFgAAABYAAAAWAAAAIQAAACEAAAAhAAAAIQAAACEAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAFgAAABYAAAAWAAAAFgAAACEAAAAhAAAAIQAAACEAAAAhAAAAGAAAACAAAAAhAAAAFgAAABYAAAAWAAAAIQAAACEAAAAWAAAAFgAAACEAAAAhAAAAFgAAABYAAAAhAAAAIAAAACAAAAAYAAAAIQAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAhAAAAFgAAABYAAAAWAAAAIQAAACAAAAAYAAAAGAAAACEAAAAWAAAAFgAAABYAAAAWAAAAIQAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAACEAAAAgAAAAGAAAABgAAAAhAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAACEAAAAWAAAAFgAAABYAAAAhAAAAIAAAABgAAAAYAAAAIQAAABYAAAAWAAAAFgAAABYAAAAhAAAAFgAAABYAAAAhAAAAIQAAABgAAAAhAAAAIQAAACAAAAAgAAAAGAAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAABgAAAAgAAAAGAAAABgAAAAgAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAIAAAACAAAAAgAAAAIAAAABgAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAhAAAAIQAAACAAAAAYAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACAAAAAgAAAAGAAAAA==
+    tiles: IQAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAFgAAABYAAAAWAAAAFgAAACEAAAAOAAAAFgAAABYAAAAWAAAAFgAAACEAAAAeAAAAHgAAAB4AAAAeAAAAIQAAACEAAAAWAAAAFgAAACEAAAAhAAAADgAAAA4AAAAOAAAADgAAABYAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAWAAAAFgAAABYAAAAWAAAAIQAAACEAAAAhAAAAIQAAACEAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAFgAAABYAAAAWAAAAFgAAACEAAAAhAAAAIQAAACEAAAAhAAAAGAAAACAAAAAhAAAAFgAAABYAAAAWAAAAIQAAACEAAAAWAAAAFgAAACEAAAAhAAAAFgAAABYAAAAhAAAAIAAAACAAAAAYAAAAIQAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAhAAAAFgAAABYAAAAWAAAAIQAAACAAAAAYAAAAGAAAACEAAAAWAAAAFgAAABYAAAAWAAAAIQAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAACEAAAAgAAAAGAAAABgAAAAhAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAACEAAAAWAAAAFgAAABYAAAAhAAAAIAAAABgAAAAYAAAAIQAAABYAAAAWAAAAFgAAABYAAAAhAAAAFgAAABYAAAAhAAAAIQAAABgAAAAhAAAAIQAAACAAAAAgAAAAGAAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAABgAAAAgAAAAGAAAABgAAAAgAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAIAAAACAAAAAgAAAAIAAAABgAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAhAAAAIQAAACAAAAAYAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIAAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACAAAAAgAAAAGAAAAA==
   - ind: "1,-1"
     tiles: GwAAABsAAAAbAAAAGwAAACEAAAAbAAAAGwAAABsAAAAbAAAAIQAAACAAAAAYAAAAIQAAAAAAAAAAAAAAAAAAABsAAAAbAAAAGwAAABsAAAAhAAAAGwAAABsAAAAbAAAAGwAAACEAAAAgAAAAGAAAACEAAAAAAAAAAAAAAAAAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAhAAAAIAAAABgAAAAhAAAAAAAAAAAAAAAAAAAAIQAAACEAAAAbAAAAGwAAACEAAAAbAAAAGwAAABsAAAAbAAAAIQAAACAAAAAYAAAAIQAAAAAAAAAAAAAAAAAAABsAAAAbAAAAGwAAABsAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAgAAAAGAAAACEAAAAAAAAAAAAAAAAAAAAbAAAAGwAAABsAAAAbAAAAGAAAACAAAAAYAAAAGAAAABgAAAAYAAAAIAAAABgAAAAhAAAAAAAAAAAAAAAAAAAAGwAAABsAAAAbAAAAGwAAACEAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAYAAAAIQAAAAAAAAAAAAAAAAAAABsAAAAbAAAAGwAAABsAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAgAAAAGAAAACEAAAAhAAAAIQAAACEAAAAbAAAAGwAAABsAAAAbAAAAIQAAABsAAAAbAAAAGwAAABsAAAAhAAAAIAAAABgAAAAhAAAAIAAAACAAAAAgAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAIQAAACAAAAAgAAAAIAAAACAAAAAYAAAAGAAAABsAAAAbAAAAGwAAABsAAAAhAAAAGwAAABsAAAAbAAAAGwAAACEAAAAgAAAAGAAAACEAAAAhAAAAIQAAACEAAAAbAAAAGwAAABsAAAAbAAAAIQAAABsAAAAbAAAAGwAAABsAAAAhAAAAIAAAABgAAAAhAAAAFgAAABYAAAAWAAAAIQAAABsAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACAAAAAYAAAAIQAAABYAAAAWAAAAFgAAABsAAAAbAAAAGwAAACEAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAGAAAACEAAAAWAAAAFgAAABYAAAAbAAAAGwAAABsAAAAhAAAAIAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAhAAAAFgAAABYAAAAWAAAAGwAAABsAAAAbAAAAIQAAACAAAAAYAAAAGAAAACAAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAFgAAAA==
   - ind: "0,-2"
     tiles: AAAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAAAAAAAAAAAAAAAAAhAAAAFgAAABYAAAAWAAAAIQAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAhAAAAAAAAAAAAAAAAAAAAIQAAABYAAAAWAAAAFgAAACEAAAAeAAAAHgAAAB4AAAAeAAAAIQAAAB4AAAAeAAAAIQAAAAAAAAAAAAAAIQAAACEAAAAWAAAAFgAAABYAAAAhAAAAHgAAAB4AAAAeAAAAHgAAACEAAAAhAAAAIQAAACEAAAAAAAAAAAAAABgAAAAhAAAAFgAAABYAAAAWAAAAIQAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAhAAAAAAAAAAAAAAAYAAAAIQAAABYAAAAWAAAAFgAAACEAAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAIQAAACEAAAAhAAAAGAAAACEAAAAWAAAAFgAAABYAAAAhAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAACEAAAAgAAAAIAAAABgAAAAhAAAAFgAAABYAAAAWAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAhAAAAIAAAABgAAAAgAAAAGAAAABYAAAAWAAAAFgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAIQAAACAAAAAYAAAAIQAAACEAAAAWAAAAFgAAABYAAAAhAAAAIQAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAACEAAAAgAAAAGAAAACEAAAAWAAAAFgAAABYAAAAWAAAAFgAAACEAAAAhAAAAGAAAACEAAAAhAAAAIQAAACEAAAAhAAAAIAAAABgAAAAbAAAAFgAAABYAAAAWAAAAFgAAABYAAAAhAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAYAAAAGwAAABYAAAAWAAAAFgAAABYAAAAWAAAAGAAAACAAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAgAAAAGAAAACEAAAAWAAAAFgAAABYAAAAWAAAAFgAAACEAAAAYAAAAGAAAABgAAAAYAAAAIQAAACEAAAAhAAAAGAAAACEAAAAhAAAAFgAAABYAAAAWAAAAFgAAABYAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAbAAAAGwAAABsAAAAbAAAAIQAAABYAAAAWAAAAFgAAABYAAAAWAAAAIQAAABsAAAAbAAAAGwAAABsAAAAhAAAAGwAAABsAAAAbAAAAGwAAAA==
   - ind: "1,-2"
-    tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAACAAAAAhAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAIQAAACEAAAAhAAAAIQAAABgAAAAgAAAAIQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAABsAAAAbAAAAGwAAACEAAAAYAAAAIAAAACEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACEAAAAbAAAAGwAAABsAAAAhAAAAGAAAACAAAAAhAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAGwAAABsAAAAbAAAAIQAAABgAAAAgAAAAIQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAABsAAAAbAAAAGwAAACEAAAAYAAAAIAAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAAAAAAAAAAAAAAAAAACEAAAAhAAAAIQAAABsAAAAhAAAAGAAAACAAAAAYAAAAGAAAABgAAAAYAAAAGAAAACEAAAAAAAAAAAAAAAAAAAAbAAAAGwAAABsAAAAbAAAAIQAAACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAABgAAAAhAAAAAAAAAAAAAAAAAAAAGwAAABsAAAAbAAAAGwAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACAAAAAYAAAAIQAAAAAAAAAAAAAAAAAAAA==
+    tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAABgAAAAYAAAAGAAAABgAAAAYAAAAAAAAAAAAAAAAAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACEAAAAYAAAAGAAAABgAAAAYAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAACAAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAAAAAAAAAAAAAAAAAhAAAAIQAAACEAAAAhAAAAIQAAABgAAAAgAAAAIQAAABgAAAAYAAAAGAAAABgAAAAYAAAAAAAAAAAAAAAAAAAAIQAAABsAAAAbAAAAGwAAACEAAAAYAAAAIAAAACEAAAAYAAAAGAAAABgAAAAYAAAAGAAAAAAAAAAAAAAAAAAAACEAAAAbAAAAGwAAABsAAAAhAAAAGAAAACAAAAAhAAAAGAAAABgAAAAYAAAAGAAAABgAAAAAAAAAAAAAAAAAAAAgAAAAGwAAABsAAAAbAAAAIQAAABgAAAAgAAAAIQAAABgAAAAYAAAAGAAAABgAAAAYAAAAAAAAAAAAAAAAAAAAGAAAABsAAAAbAAAAGwAAACEAAAAYAAAAIAAAACEAAAAhAAAAIQAAABgAAAAhAAAAIQAAAAAAAAAAAAAAAAAAACEAAAAhAAAAIQAAABsAAAAhAAAAGAAAACAAAAAYAAAAGAAAABgAAAAYAAAAGAAAACEAAAAAAAAAAAAAAAAAAAAbAAAAGwAAABsAAAAbAAAAIQAAACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAABgAAAAhAAAAAAAAAAAAAAAAAAAAGwAAABsAAAAbAAAAGwAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACAAAAAYAAAAIQAAAAAAAAAAAAAAAAAAAA==
   - ind: "-1,1"
     tiles: IQAAABYAAAAWAAAAFgAAABYAAAAhAAAAFgAAABYAAAAWAAAAFgAAABYAAAAhAAAAGAAAABgAAAAYAAAAGAAAACEAAAAhAAAAIQAAABYAAAAhAAAAIQAAABYAAAAWAAAAFgAAABYAAAAWAAAAIQAAABgAAAAYAAAAGAAAABgAAAAhAAAAEQAAABEAAAARAAAAEQAAACEAAAAhAAAAFgAAACEAAAAhAAAAIQAAACEAAAAYAAAAGAAAABgAAAAYAAAAIQAAABEAAAARAAAAEQAAABEAAAAhAAAACAAAAAgAAAAIAAAACAAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAARAAAAEQAAABEAAAARAAAAFgAAAAgAAAAeAAAAHgAAAB4AAAAhAAAAGAAAABgAAAAYAAAAGAAAACAAAAAhAAAAEQAAABEAAAARAAAAEQAAACEAAAAIAAAAHgAAAB4AAAAeAAAAIQAAACAAAAAgAAAAIAAAACAAAAAgAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAACAAAAB4AAAAeAAAAHgAAACEAAAAgAAAAIQAAACEAAAAPAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAABgAAAAYAAAAGAAAABgAAAAYAAAAIAAAACEAAAAPAAAADwAAAA8AAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAACAAAAAgAAAAIAAAACAAAAAhAAAADwAAAA8AAAAPAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAIQAAACEAAAAhAAAAIQAAAA8AAAAPAAAADwAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAAAAAAAAAAACEAAAAPAAAADwAAAA8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAIQAAACEAAAAhAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAABYAAAAWAAAAFgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACEAAAAWAAAAFgAAABYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAFgAAABYAAAAWAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAACEAAAAWAAAAFgAAAA==
   - ind: "-2,1"
-    tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAACAAAAAYAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACEAAAAgAAAAGAAAACEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAIAAAABgAAAAhAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAACAAAAAYAAAAIQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACEAAAAgAAAAGAAAACEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAIAAAABgAAAAhAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAACAAAAAYAAAAIQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACEAAAAgAAAAGAAAACEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAIAAAABgAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAACAAAAAgAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACEAAAAhAAAAIQAAACEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+    tiles: AAAAAAAAAAAAAAAAAAAAACEAAAAYAAAAIAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAACAAAAAYAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAGAAAACAAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAgAAAAGAAAACEAAAAAAAAAAAAAAAAAAAAAAAAAIQAAABgAAAAgAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAIAAAABgAAAAhAAAAAAAAAAAAAAAAAAAAAAAAACEAAAAYAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAYAAAAIQAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAACEAAAAgAAAAGAAAACEAAAAAAAAAAAAAAAAAAAAAAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAhAAAAIAAAABgAAAAhAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAACAAAAAYAAAAIQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACEAAAAgAAAAGAAAACEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAIAAAABgAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAACAAAAAgAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACEAAAAhAAAAIQAAACEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
   - ind: "-1,2"
     tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACEAAAAhAAAAFgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAACEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
   - ind: "1,1"
@@ -7968,10 +7968,9 @@ entities:
       stash: !type:ContainerSlot {}
     type: ContainerContainer
 - uid: 823
-  type: ClosetBase
+  type: ClosetMaintenanceFilledRandom
   components:
-  - rot: 4.371139006309477E-08 rad
-    pos: -11.5,-12.5
+  - pos: -11.5,-12.5
     parent: 853
     type: Transform
   - IsPlaceable: False
@@ -12315,18 +12314,92 @@ entities:
       45,-33: 0
       46,-34: 0
       47,-34: 0
+      24,-27: 0
+      24,-26: 0
+      24,-25: 0
+      24,-24: 0
+      24,-23: 0
+      24,-22: 0
+      24,-21: 0
+      25,-27: 0
+      25,-26: 0
+      25,-25: 0
+      25,-24: 0
+      25,-23: 0
+      25,-22: 0
+      25,-21: 0
+      26,-27: 0
+      26,-26: 0
+      26,-25: 0
+      26,-24: 0
+      26,-23: 0
+      26,-22: 0
+      26,-21: 0
+      27,-27: 0
+      27,-26: 0
+      27,-25: 0
+      27,-24: 0
+      27,-23: 0
+      27,-22: 0
+      27,-21: 0
+      28,-27: 0
+      28,-26: 0
+      28,-25: 0
+      28,-24: 0
+      28,-23: 0
+      28,-22: 0
+      28,-21: 0
+      -28,16: 0
+      -28,17: 0
+      -28,18: 0
+      -28,19: 0
+      -28,20: 0
+      -28,21: 0
+      -27,16: 0
+      -27,17: 0
+      -27,18: 0
+      -27,19: 0
+      -27,20: 0
+      -27,21: 0
+      -26,16: 0
+      -26,17: 0
+      -26,18: 0
+      -26,19: 0
+      -26,20: 0
+      -26,21: 0
+      -25,16: 0
+      -25,17: 0
+      -25,18: 0
+      -25,19: 0
+      -25,20: 0
+      -25,21: 0
+      -24,16: 0
+      -24,17: 0
+      -24,18: 0
+      -24,19: 0
+      -24,20: 0
+      -24,21: 0
+      -23,16: 0
+      -23,17: 0
+      -23,18: 0
+      -23,19: 0
+      -23,20: 0
+      -23,21: 0
+      -22,16: 0
+      -22,17: 0
+      -22,18: 0
+      -22,19: 0
+      -22,20: 0
+      -22,21: 0
+      -21,16: 0
+      -21,17: 0
+      -21,18: 0
+      -21,19: 0
+      -21,20: 0
+      -21,21: 0
     uniqueMixes:
     - volume: 2500
       temperature: 293.15
-      molesArchived:
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
       moles:
       - 21.824879
       - 82.10312
@@ -12449,16 +12522,6 @@ entities:
       mask: []
       layer: []
       mass: 256
-    - shape: !type:PolygonShape
-        vertices:
-        - -16,16
-        - -16,27
-        - -20,27
-        - -20,16
-      id: grid_chunk--2-1
-      mask: []
-      layer: []
-      mass: 44
     - shape: !type:PolygonShape
         vertices:
         - 0,32
@@ -12619,6 +12682,16 @@ entities:
       mask: []
       layer: []
       mass: 16
+    - shape: !type:PolygonShape
+        vertices:
+        - -16,16
+        - -16,27
+        - -28,27
+        - -28,16
+      id: grid_chunk--2-1
+      mask: []
+      layer: []
+      mass: 132
     bodyType: Dynamic
     type: Physics
 - uid: 854
@@ -15848,8 +15921,7 @@ entities:
 - uid: 1248
   type: WallSolid
   components:
-  - rot: 4.371139006309477E-08 rad
-    pos: -33.5,9.5
+  - pos: -33.5,9.5
     parent: 853
     type: Transform
 - uid: 1249
@@ -19324,9 +19396,9 @@ entities:
     parent: 853
     type: Transform
 - uid: 1657
-  type: WallReinforced
+  type: RandomSpawner
   components:
-  - pos: 23.5,-24.5
+  - pos: 26.5,-25.5
     parent: 853
     type: Transform
 - uid: 1658
@@ -19408,11 +19480,16 @@ entities:
     parent: 853
     type: Transform
 - uid: 1671
-  type: WallReinforced
+  type: CableApcExtension
   components:
-  - pos: 26.5,-19.5
+  - anchored: True
+    pos: 28.5,-24.5
     parent: 853
     type: Transform
+  - visible: False
+    type: Sprite
+  - canCollide: False
+    type: Physics
 - uid: 1672
   type: WallReinforced
   components:
@@ -19535,11 +19612,15 @@ entities:
     parent: 853
     type: Transform
 - uid: 1692
-  type: WallReinforced
+  type: AirlockMaint
   components:
-  - pos: -25.5,15.5
+  - pos: 23.5,-24.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 1693
   type: WallReinforced
   components:
@@ -19643,11 +19724,15 @@ entities:
     parent: 853
     type: Transform
 - uid: 1709
-  type: WallReinforced
+  type: AirlockMaint
   components:
-  - pos: -19.5,19.5
+  - pos: -25.5,15.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 1710
   type: WallReinforced
   components:
@@ -23163,12 +23248,15 @@ entities:
     parent: 853
     type: Transform
 - uid: 2210
-  type: WallSolid
+  type: AirlockMaint
   components:
-  - rot: 4.371139006309477E-08 rad
-    pos: 25.5,-15.5
+  - pos: -23.5,18.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 2211
   type: WallSolid
   components:
@@ -23228,8 +23316,7 @@ entities:
 - uid: 2219
   type: WallSolid
   components:
-  - rot: 4.371139006309477E-08 rad
-    pos: 20.5,-17.5
+  - pos: 20.5,-17.5
     parent: 853
     type: Transform
 - uid: 2220
@@ -24598,7 +24685,7 @@ entities:
     parent: 853
     type: Transform
 - uid: 2414
-  type: ClosetBase
+  type: ClosetMaintenanceFilledRandom
   components:
   - pos: -8.5,-25.5
     parent: 853
@@ -49227,4 +49314,1010 @@ entities:
     pos: 2.5,31.5
     parent: 853
     type: Transform
+- uid: 4961
+  type: WallReinforced
+  components:
+  - pos: 28.5,-22.5
+    parent: 853
+    type: Transform
+- uid: 4962
+  type: WallReinforced
+  components:
+  - pos: 24.5,-26.5
+    parent: 853
+    type: Transform
+- uid: 4963
+  type: WallReinforced
+  components:
+  - pos: 25.5,-26.5
+    parent: 853
+    type: Transform
+- uid: 4964
+  type: WallReinforced
+  components:
+  - pos: 26.5,-26.5
+    parent: 853
+    type: Transform
+- uid: 4965
+  type: WallReinforced
+  components:
+  - pos: 28.5,-20.5
+    parent: 853
+    type: Transform
+- uid: 4966
+  type: WallReinforced
+  components:
+  - pos: 28.5,-23.5
+    parent: 853
+    type: Transform
+- uid: 4967
+  type: WallReinforced
+  components:
+  - pos: 28.5,-21.5
+    parent: 853
+    type: Transform
+- uid: 4968
+  type: WallReinforced
+  components:
+  - pos: 28.5,-24.5
+    parent: 853
+    type: Transform
+- uid: 4969
+  type: WallReinforced
+  components:
+  - pos: 28.5,-25.5
+    parent: 853
+    type: Transform
+- uid: 4970
+  type: WallReinforced
+  components:
+  - pos: 28.5,-26.5
+    parent: 853
+    type: Transform
+- uid: 4971
+  type: WallReinforced
+  components:
+  - pos: 27.5,-26.5
+    parent: 853
+    type: Transform
+- uid: 4972
+  type: WallSolid
+  components:
+  - pos: 25.5,-24.5
+    parent: 853
+    type: Transform
+- uid: 4973
+  type: WallSolid
+  components:
+  - pos: 25.5,-25.5
+    parent: 853
+    type: Transform
+- uid: 4974
+  type: AirlockMaint
+  components:
+  - pos: 25.5,-23.5
+    parent: 853
+    type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
+- uid: 4975
+  type: WallSolid
+  components:
+  - pos: 25.5,-21.5
+    parent: 853
+    type: Transform
+- uid: 4976
+  type: WallSolid
+  components:
+  - pos: 27.5,-21.5
+    parent: 853
+    type: Transform
+- uid: 4977
+  type: WallSolid
+  components:
+  - pos: 26.5,-21.5
+    parent: 853
+    type: Transform
+- uid: 4978
+  type: WallSolid
+  components:
+  - pos: 25.5,-15.5
+    parent: 853
+    type: Transform
+- uid: 4979
+  type: AcousticGuitarInstrument
+  components:
+  - pos: 27.500875,-23.377102
+    parent: 853
+    type: Transform
+  - canCollide: False
+    type: Physics
+- uid: 4980
+  type: WallSolid
+  components:
+  - pos: 25.5,-22.5
+    parent: 853
+    type: Transform
+- uid: 4981
+  type: Table
+  components:
+  - pos: 27.5,-25.5
+    parent: 853
+    type: Transform
+- uid: 4982
+  type: Table
+  components:
+  - pos: 26.5,-25.5
+    parent: 853
+    type: Transform
+- uid: 4983
+  type: PoweredSmallLight
+  components:
+  - rot: -1.5707963267948966 rad
+    pos: 28,-24.5
+    parent: 853
+    type: Transform
+  - powerLoad: 0
+    type: ApcPowerReceiver
+  - containers:
+      light_bulb: !type:ContainerSlot {}
+    type: ContainerContainer
+- uid: 4984
+  type: PoweredSmallLight
+  components:
+  - pos: 25.5,-20
+    parent: 853
+    type: Transform
+  - powerLoad: 0
+    type: ApcPowerReceiver
+  - containers:
+      light_bulb: !type:ContainerSlot {}
+    type: ContainerContainer
+- uid: 4985
+  type: PoweredSmallLight
+  components:
+  - rot: 1.5707963267948966 rad
+    pos: 24,-23.5
+    parent: 853
+    type: Transform
+  - powerLoad: 0
+    type: ApcPowerReceiver
+  - containers:
+      light_bulb: !type:ContainerSlot {}
+    type: ContainerContainer
+- uid: 4986
+  type: ComfyChair
+  components:
+  - pos: 26.5,-24.5
+    parent: 853
+    type: Transform
+- uid: 4987
+  type: CableApcExtension
+  components:
+  - anchored: True
+    pos: 26.5,-19.5
+    parent: 853
+    type: Transform
+  - visible: False
+    type: Sprite
+  - canCollide: False
+    type: Physics
+- uid: 4988
+  type: CableApcExtension
+  components:
+  - anchored: True
+    pos: 26.5,-20.5
+    parent: 853
+    type: Transform
+  - visible: False
+    type: Sprite
+  - canCollide: False
+    type: Physics
+- uid: 4989
+  type: CableApcExtension
+  components:
+  - anchored: True
+    pos: 25.5,-19.5
+    parent: 853
+    type: Transform
+- uid: 4990
+  type: CableApcExtension
+  components:
+  - anchored: True
+    pos: 23.5,-24.5
+    parent: 853
+    type: Transform
+  - visible: False
+    type: Sprite
+  - canCollide: False
+    type: Physics
+- uid: 4991
+  type: CableApcExtension
+  components:
+  - anchored: True
+    pos: 23.5,-23.5
+    parent: 853
+    type: Transform
+- uid: 4992
+  type: CableApcExtension
+  components:
+  - anchored: True
+    pos: 23.5,-22.5
+    parent: 853
+    type: Transform
+- uid: 4993
+  type: CableApcExtension
+  components:
+  - anchored: True
+    pos: 23.5,-21.5
+    parent: 853
+    type: Transform
+- uid: 4994
+  type: CableApcExtension
+  components:
+  - anchored: True
+    pos: 23.5,-20.5
+    parent: 853
+    type: Transform
+- uid: 4995
+  type: CableApcExtension
+  components:
+  - anchored: True
+    pos: 23.5,-19.5
+    parent: 853
+    type: Transform
+- uid: 4996
+  type: CableApcExtension
+  components:
+  - anchored: True
+    pos: 24.5,-24.5
+    parent: 853
+    type: Transform
+  - visible: False
+    type: Sprite
+  - canCollide: False
+    type: Physics
+- uid: 4997
+  type: CableApcExtension
+  components:
+  - anchored: True
+    pos: 25.5,-24.5
+    parent: 853
+    type: Transform
+  - visible: False
+    type: Sprite
+  - canCollide: False
+    type: Physics
+- uid: 4998
+  type: CableApcExtension
+  components:
+  - anchored: True
+    pos: 26.5,-24.5
+    parent: 853
+    type: Transform
+  - visible: False
+    type: Sprite
+  - canCollide: False
+    type: Physics
+- uid: 4999
+  type: CableApcExtension
+  components:
+  - anchored: True
+    pos: 27.5,-24.5
+    parent: 853
+    type: Transform
+  - visible: False
+    type: Sprite
+  - canCollide: False
+    type: Physics
+- uid: 5000
+  type: AirlockMaint
+  components:
+  - pos: 26.5,-19.5
+    parent: 853
+    type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
+- uid: 5001
+  type: AirlockMaint
+  components:
+  - pos: -19.5,19.5
+    parent: 853
+    type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
+- uid: 5002
+  type: WallReinforced
+  components:
+  - pos: -27.5,16.5
+    parent: 853
+    type: Transform
+- uid: 5003
+  type: WallReinforced
+  components:
+  - pos: -27.5,17.5
+    parent: 853
+    type: Transform
+- uid: 5004
+  type: WallReinforced
+  components:
+  - pos: -27.5,18.5
+    parent: 853
+    type: Transform
+- uid: 5005
+  type: WallReinforced
+  components:
+  - pos: -27.5,19.5
+    parent: 853
+    type: Transform
+- uid: 5006
+  type: WallReinforced
+  components:
+  - pos: -27.5,20.5
+    parent: 853
+    type: Transform
+- uid: 5007
+  type: CrateEngineeringCableMV
+  components:
+  - pos: -20.5,16.5
+    parent: 853
+    type: Transform
+  - IsPlaceable: False
+    type: PlaceableSurface
+  - containers:
+      EntityStorageComponent: !type:Container
+        ents: []
+    type: ContainerContainer
+- uid: 5008
+  type: WallSolid
+  components:
+  - pos: -20.5,18.5
+    parent: 853
+    type: Transform
+- uid: 5009
+  type: WallSolid
+  components:
+  - pos: -22.5,18.5
+    parent: 853
+    type: Transform
+- uid: 5010
+  type: WallSolid
+  components:
+  - pos: -21.5,18.5
+    parent: 853
+    type: Transform
+- uid: 5011
+  type: WallSolid
+  components:
+  - pos: -24.5,18.5
+    parent: 853
+    type: Transform
+- uid: 5012
+  type: WallSolid
+  components:
+  - pos: -24.5,17.5
+    parent: 853
+    type: Transform
+- uid: 5013
+  type: WallSolid
+  components:
+  - pos: -24.5,16.5
+    parent: 853
+    type: Transform
+- uid: 5014
+  type: WallReinforced
+  components:
+  - pos: -27.5,21.5
+    parent: 853
+    type: Transform
+- uid: 5015
+  type: WallReinforced
+  components:
+  - pos: -26.5,21.5
+    parent: 853
+    type: Transform
+- uid: 5016
+  type: WallReinforced
+  components:
+  - pos: -25.5,21.5
+    parent: 853
+    type: Transform
+- uid: 5017
+  type: WallReinforced
+  components:
+  - pos: -24.5,21.5
+    parent: 853
+    type: Transform
+- uid: 5018
+  type: WallReinforced
+  components:
+  - pos: -23.5,21.5
+    parent: 853
+    type: Transform
+- uid: 5019
+  type: WallReinforced
+  components:
+  - pos: -22.5,21.5
+    parent: 853
+    type: Transform
+- uid: 5020
+  type: WallReinforced
+  components:
+  - pos: -21.5,21.5
+    parent: 853
+    type: Transform
+- uid: 5021
+  type: WallReinforced
+  components:
+  - pos: -20.5,21.5
+    parent: 853
+    type: Transform
+- uid: 5022
+  type: CableApcExtension
+  components:
+  - anchored: True
+    pos: -27.5,14.5
+    parent: 853
+    type: Transform
+- uid: 5023
+  type: CableApcExtension
+  components:
+  - anchored: True
+    pos: -26.5,14.5
+    parent: 853
+    type: Transform
+- uid: 5024
+  type: CableApcExtension
+  components:
+  - anchored: True
+    pos: -25.5,14.5
+    parent: 853
+    type: Transform
+- uid: 5025
+  type: CableApcExtension
+  components:
+  - anchored: True
+    pos: -25.5,15.5
+    parent: 853
+    type: Transform
+- uid: 5026
+  type: CableApcExtension
+  components:
+  - anchored: True
+    pos: -19.5,19.5
+    parent: 853
+    type: Transform
+- uid: 5027
+  type: CableApcExtension
+  components:
+  - anchored: True
+    pos: -18.5,19.5
+    parent: 853
+    type: Transform
+- uid: 5028
+  type: CableApcExtension
+  components:
+  - anchored: True
+    pos: -19.5,18.5
+    parent: 853
+    type: Transform
+  - visible: False
+    type: Sprite
+  - canCollide: False
+    type: Physics
+- uid: 5029
+  type: CableApcExtension
+  components:
+  - anchored: True
+    pos: -20.5,18.5
+    parent: 853
+    type: Transform
+  - visible: False
+    type: Sprite
+  - canCollide: False
+    type: Physics
+- uid: 5030
+  type: CableApcExtension
+  components:
+  - anchored: True
+    pos: -21.5,18.5
+    parent: 853
+    type: Transform
+  - visible: False
+    type: Sprite
+  - canCollide: False
+    type: Physics
+- uid: 5031
+  type: CableApcExtension
+  components:
+  - anchored: True
+    pos: -22.5,18.5
+    parent: 853
+    type: Transform
+  - visible: False
+    type: Sprite
+  - canCollide: False
+    type: Physics
+- uid: 5032
+  type: CableApcExtension
+  components:
+  - anchored: True
+    pos: -23.5,18.5
+    parent: 853
+    type: Transform
+  - visible: False
+    type: Sprite
+  - canCollide: False
+    type: Physics
+- uid: 5033
+  type: CableApcExtension
+  components:
+  - anchored: True
+    pos: -23.5,18.5
+    parent: 853
+    type: Transform
+  - visible: False
+    type: Sprite
+  - canCollide: False
+    type: Physics
+- uid: 5034
+  type: PoweredSmallLight
+  components:
+  - pos: -21.5,18
+    parent: 853
+    type: Transform
+  - powerLoad: 0
+    type: ApcPowerReceiver
+  - containers:
+      light_bulb: !type:ContainerSlot {}
+    type: ContainerContainer
+- uid: 5035
+  type: PoweredSmallLight
+  components:
+  - pos: -23.5,21
+    parent: 853
+    type: Transform
+  - powerLoad: 0
+    type: ApcPowerReceiver
+  - containers:
+      light_bulb: !type:ContainerSlot {}
+    type: ContainerContainer
+- uid: 5036
+  type: PoweredSmallLight
+  components:
+  - rot: 1.5707963267948966 rad
+    pos: -27,17.5
+    parent: 853
+    type: Transform
+  - powerLoad: 0
+    type: ApcPowerReceiver
+  - containers:
+      light_bulb: !type:ContainerSlot {}
+    type: ContainerContainer
+- uid: 5037
+  type: CrateEngineeringCableLV
+  components:
+  - pos: -20.5,17.5
+    parent: 853
+    type: Transform
+  - IsPlaceable: False
+    type: PlaceableSurface
+  - containers:
+      EntityStorageComponent: !type:Container
+        ents: []
+    type: ContainerContainer
+- uid: 5038
+  type: CableHVStack
+  components:
+  - pos: -22.628485,16.665777
+    parent: 853
+    type: Transform
+  - canCollide: False
+    type: Physics
+- uid: 5039
+  type: Rack
+  components:
+  - pos: -23.5,16.5
+    parent: 853
+    type: Transform
+- uid: 5040
+  type: RandomSpawner
+  components:
+  - pos: -20.5,17.5
+    parent: 853
+    type: Transform
+- uid: 5041
+  type: Rack
+  components:
+  - pos: -22.5,16.5
+    parent: 853
+    type: Transform
+- uid: 5042
+  type: ClothingMaskGas
+  components:
+  - pos: -23.68732,16.378263
+    parent: 853
+    type: Transform
+  - canCollide: False
+    type: Physics
+- uid: 5043
+  type: CableApcExtension
+  components:
+  - anchored: True
+    pos: 25.5,-23.5
+    parent: 853
+    type: Transform
+  - visible: False
+    type: Sprite
+  - canCollide: False
+    type: Physics
+- uid: 5044
+  type: CableApcExtension
+  components:
+  - anchored: True
+    pos: 25.5,-22.5
+    parent: 853
+    type: Transform
+  - visible: False
+    type: Sprite
+  - canCollide: False
+    type: Physics
+- uid: 5045
+  type: CableApcExtension
+  components:
+  - anchored: True
+    pos: 25.5,-23.5
+    parent: 853
+    type: Transform
+  - visible: False
+    type: Sprite
+  - canCollide: False
+    type: Physics
+- uid: 5046
+  type: CableApcExtension
+  components:
+  - anchored: True
+    pos: 25.5,-22.5
+    parent: 853
+    type: Transform
+  - visible: False
+    type: Sprite
+  - canCollide: False
+    type: Physics
+- uid: 5047
+  type: CableApcExtension
+  components:
+  - anchored: True
+    pos: 25.5,-23.5
+    parent: 853
+    type: Transform
+  - visible: False
+    type: Sprite
+  - canCollide: False
+    type: Physics
+- uid: 5048
+  type: CableApcExtension
+  components:
+  - anchored: True
+    pos: 25.5,-22.5
+    parent: 853
+    type: Transform
+  - visible: False
+    type: Sprite
+  - canCollide: False
+    type: Physics
+- uid: 5049
+  type: CableApcExtension
+  components:
+  - anchored: True
+    pos: 25.5,-24.5
+    parent: 853
+    type: Transform
+  - visible: False
+    type: Sprite
+  - canCollide: False
+    type: Physics
+- uid: 5050
+  type: CableApcExtension
+  components:
+  - anchored: True
+    pos: 25.5,-22.5
+    parent: 853
+    type: Transform
+  - visible: False
+    type: Sprite
+  - canCollide: False
+    type: Physics
+- uid: 5051
+  type: CableApcExtension
+  components:
+  - anchored: True
+    pos: -25.5,16.5
+    parent: 853
+    type: Transform
+- uid: 5052
+  type: CableApcExtension
+  components:
+  - anchored: True
+    pos: -25.5,17.5
+    parent: 853
+    type: Transform
+- uid: 5053
+  type: CableApcExtension
+  components:
+  - anchored: True
+    pos: -25.5,18.5
+    parent: 853
+    type: Transform
+- uid: 5054
+  type: CableApcExtension
+  components:
+  - anchored: True
+    pos: -24.5,18.5
+    parent: 853
+    type: Transform
+  - visible: False
+    type: Sprite
+  - canCollide: False
+    type: Physics
+- uid: 5055
+  type: CableApcExtension
+  components:
+  - anchored: True
+    pos: -23.5,18.5
+    parent: 853
+    type: Transform
+  - visible: False
+    type: Sprite
+  - canCollide: False
+    type: Physics
+- uid: 5056
+  type: CableApcExtension
+  components:
+  - anchored: True
+    pos: -22.5,18.5
+    parent: 853
+    type: Transform
+  - visible: False
+    type: Sprite
+  - canCollide: False
+    type: Physics
+- uid: 5057
+  type: CableApcExtension
+  components:
+  - anchored: True
+    pos: -21.5,18.5
+    parent: 853
+    type: Transform
+  - visible: False
+    type: Sprite
+  - canCollide: False
+    type: Physics
+- uid: 5058
+  type: CableApcExtension
+  components:
+  - anchored: True
+    pos: -23.5,18.5
+    parent: 853
+    type: Transform
+  - visible: False
+    type: Sprite
+  - canCollide: False
+    type: Physics
+- uid: 5059
+  type: CableApcExtension
+  components:
+  - anchored: True
+    pos: -24.5,18.5
+    parent: 853
+    type: Transform
+  - visible: False
+    type: Sprite
+  - canCollide: False
+    type: Physics
+- uid: 5060
+  type: Firelock
+  components:
+  - pos: 26.5,-19.5
+    parent: 853
+    type: Transform
+- uid: 5061
+  type: Firelock
+  components:
+  - pos: 23.5,-24.5
+    parent: 853
+    type: Transform
+- uid: 5062
+  type: Firelock
+  components:
+  - pos: -25.5,15.5
+    parent: 853
+    type: Transform
+- uid: 5063
+  type: Firelock
+  components:
+  - pos: -19.5,19.5
+    parent: 853
+    type: Transform
+- uid: 5064
+  type: ClosetMaintenanceFilledRandom
+  components:
+  - pos: 26.5,-22.5
+    parent: 853
+    type: Transform
+  - IsPlaceable: False
+    type: PlaceableSurface
+  - containers:
+      EntityStorageComponent: !type:Container
+        ents: []
+    type: ContainerContainer
+- uid: 5065
+  type: SignToolStorage
+  components:
+  - pos: 26.514614,-21.5
+    parent: 853
+    type: Transform
+- uid: 5066
+  type: Rack
+  components:
+  - pos: 27.5,-22.5
+    parent: 853
+    type: Transform
+- uid: 5067
+  type: CableMVStack
+  components:
+  - rot: 0.0004529799334704876 rad
+    pos: 27.736885,-22.289246
+    parent: 853
+    type: Transform
+  - canCollide: False
+    type: Physics
+- uid: 5068
+  type: Wirecutter
+  components:
+  - pos: 27.503157,-22.435783
+    parent: 853
+    type: Transform
+  - canCollide: False
+    type: Physics
+- uid: 5069
+  type: CableApcStack
+  components:
+  - pos: 27.36774,-22.300274
+    parent: 853
+    type: Transform
+  - canCollide: False
+    type: Physics
+- uid: 5070
+  type: SignEngineering
+  components:
+  - pos: -22.503485,18.5
+    parent: 853
+    type: Transform
+- uid: 5071
+  type: ClothingHandsGlovesCombat
+  components:
+  - pos: -23.447739,16.722254
+    parent: 853
+    type: Transform
+  - canCollide: False
+    type: Physics
+- uid: 5072
+  type: HarmonicaInstrument
+  components:
+  - pos: -22.46857,16.513775
+    parent: 853
+    type: Transform
+  - canCollide: False
+    type: Physics
+- uid: 5073
+  type: ClothingHeadHatOrangesoft
+  components:
+  - pos: -23.316175,16.5
+    parent: 853
+    type: Transform
+  - canCollide: False
+    type: Physics
+- uid: 5074
+  type: ClosetMaintenanceFilledRandom
+  components:
+  - pos: -26.5,19.5
+    parent: 853
+    type: Transform
+  - IsPlaceable: False
+    type: PlaceableSurface
+  - containers:
+      EntityStorageComponent: !type:Container
+        ents: []
+    type: ContainerContainer
+- uid: 5075
+  type: ClosetEmergencyFilledRandom
+  components:
+  - pos: -26.5,18.5
+    parent: 853
+    type: Transform
+  - IsPlaceable: False
+    type: PlaceableSurface
+  - containers:
+      EntityStorageComponent: !type:Container
+        ents: []
+    type: ContainerContainer
+- uid: 5076
+  type: ClosetFireFilled
+  components:
+  - pos: -26.5,17.5
+    parent: 853
+    type: Transform
+  - IsPlaceable: False
+    type: PlaceableSurface
+  - containers:
+      EntityStorageComponent: !type:Container
+        ents: []
+    type: ContainerContainer
+- uid: 5077
+  type: ClothingHandsGlovesColorYellow
+  components:
+  - pos: 27.39341,-25.414946
+    parent: 853
+    type: Transform
+  - canCollide: False
+    type: Physics
+- uid: 5078
+  type: DrinkBottleBeer
+  components:
+  - pos: 26.341326,-25.258587
+    parent: 853
+    type: Transform
+  - caps: Refillable, Drainable
+    type: SolutionContainer
+  - canCollide: False
+    type: Physics
+- uid: 5079
+  type: DrinkBeerglass
+  components:
+  - pos: 26.73716,-25.331554
+    parent: 853
+    type: Transform
+  - caps: Refillable, Drainable
+    type: SolutionContainer
+  - canCollide: False
+    type: Physics
+- uid: 5080
+  type: ClosetFireFilled
+  components:
+  - pos: 24.5,-25.5
+    parent: 853
+    type: Transform
+  - IsPlaceable: False
+    type: PlaceableSurface
+  - containers:
+      EntityStorageComponent: !type:Container
+        ents: []
+    type: ContainerContainer
+- uid: 5081
+  type: ClosetEmergencyFilledRandom
+  components:
+  - pos: 27.5,-20.5
+    parent: 853
+    type: Transform
+  - IsPlaceable: False
+    type: PlaceableSurface
+  - containers:
+      EntityStorageComponent: !type:Container
+        ents: []
+    type: ContainerContainer
+- uid: 5082
+  type: CableHVStack
+  components:
+  - pos: -22.638397,16.589691
+    parent: 853
+    type: Transform
+  - canCollide: False
+    type: Physics
 ...
diff --git a/Resources/Prototypes/Body/Mechanisms/human.yml b/Resources/Prototypes/Body/Mechanisms/human.yml
index aec9769c51..44652e4e65 100644
--- a/Resources/Prototypes/Body/Mechanisms/human.yml
+++ b/Resources/Prototypes/Body/Mechanisms/human.yml
@@ -50,18 +50,30 @@
     compatibility: Biological
 
 - type: entity
-  id: OrganHumanHeart
+  id: OrganHumanTongue
   parent: BaseHumanOrgan
-  name: heart
-  description: "I feel bad for the heartless bastard who lost this."
+  name: tongue
+  description: "A fleshy muscle mostly used for lying."
   components:
   - type: Sprite
-    state: heart-on
+    state: tongue
+  - type: Mechanism
+    size: 1
+    compatibility: Biological
+
+- type: entity
+  id: OrganHumanAppendix
+  parent: BaseHumanOrgan
+  name: appendix
+  components:
+  - type: Sprite
+    layers:
+    - state: appendix
+    - state: appendix-inflamed
+      visible: false
   - type: Mechanism
     size: 1
     compatibility: Biological
-    behaviors:
-    - !type:HeartBehavior {}
 
 - type: entity
   id: OrganHumanEars
@@ -91,6 +103,105 @@
     behaviors:
     - !type:LungBehavior {}
 
+- type: entity
+  id: OrganHumanHeart
+  parent: BaseHumanOrgan
+  name: heart
+  description: "I feel bad for the heartless bastard who lost this."
+  components:
+  - type: Sprite
+    state: heart-on
+  - type: Mechanism
+    size: 1
+    compatibility: Biological
+    behaviors:
+    - !type:HeartBehavior {}
+  # The heart 'metabolizes' medicines and poisons that aren't filtered out by other organs.
+  # This is done because these chemicals need to have some effect even if they aren't being filtered out of your body.
+  # You're technically 'immune to poison' without a heart, but.. uhh, you'll have bigger problems on your hands.
+  - type: Metabolizer
+    metabolisms:
+      Arithrazine:
+        effects:
+        - !type:HealthChange
+          damageClass: Toxin
+          healthChange: -1
+        - !type:HealthChange
+          damageClass: Brute
+          healthChange: 0.5
+      Bicaridine:
+        effects:
+        - !type:HealthChange
+          damageClass: Brute
+          healthChange: -2
+      Dermaline:
+        effects:
+        - !type:HealthChange
+          damageClass: Burn
+          healthChange: -3
+      Dexalin:
+        effects:
+        - !type:HealthChange
+          damageClass: Airloss
+          healthChange: -1
+      DexalinPlus:
+        effects:
+        - !type:HealthChange
+          damageClass: Airloss
+          healthChange: -3
+      Dylovene:
+        effects:
+          - !type:HealthChange
+            damageClass: Toxin
+            healthChange: -1
+      Ephedrine:
+        effects:
+          - !type:MovespeedModifier
+            walkSpeedModifier: 1.2
+            sprintSpeedModifier: 1.2
+      HeartbreakerToxin:
+        effects:
+        - !type:HealthChange
+          damageClass: Airloss
+          healthChange: 4
+      Kelotane:
+        effects:
+          - !type:HealthChange
+            damageClass: Burn
+            healthChange: -1
+      Lexorin:
+        effects:
+        - !type:HealthChange
+          damageClass: Airloss
+          healthChange: 7
+      Meth:
+        effects:
+          - !type:HealthChange
+            healthChange: 2.5
+            damageClass: Toxin
+          - !type:MovespeedModifier
+            walkSpeedModifier: 1.3
+            sprintSpeedModifier: 1.3
+      Omnizine:
+        effects:
+        - !type:HealthChange
+          healthChange: -2
+          damageClass: Burn
+        - !type:HealthChange
+          healthChange: -2
+          damageClass: Toxin
+        - !type:HealthChange
+          healthChange: -2
+          damageClass: Airloss
+        - !type:HealthChange
+          healthChange: -2
+          damageClass: Brute
+      Synaptizine:
+        effects:
+          - !type:HealthChange
+            damageClass: Toxin
+            healthChange: 0.5
+
 - type: entity
   id: OrganHumanStomach
   parent: BaseHumanOrgan
@@ -108,6 +219,93 @@
       digestionDelay: 20
   - type: SolutionContainer
     maxVol: 250
+  # The stomach metabolizes stuff like foods and drinks.
+  # TODO: Have it work off of the ent's solution container, and move this
+  # to intestines instead.
+  - type: Metabolizer # Release me from this hell called 1 reagent for every drink
+    # TODO please make every drink their own base thing
+    metabolisms:
+      Flour:
+        effects:
+        - !type:SatiateHunger
+      JuiceApple:
+        effects:
+        - !type:SatiateThirst
+      JuiceBerry:
+        effects:
+        - !type:SatiateThirst
+      JuiceBanana:
+        effects:
+        - !type:SatiateThirst
+      JuiceCarrot:
+        effects:
+        - !type:SatiateThirst
+      JuiceLime:
+        effects:
+        - !type:SatiateThirst
+      JuiceLemon:
+        effects:
+        - !type:SatiateThirst
+      JuiceGrape:
+        effects:
+        - !type:SatiateThirst
+      JuiceOrange:
+        effects:
+        - !type:SatiateThirst
+      JuiceTomato:
+        effects:
+        - !type:SatiateThirst
+      JuiceBerryPoison:
+        effects:
+        - !type:SatiateThirst
+        - !type:HealthChange
+          damageClass: Toxin
+          healthChange: 1
+      JuiceWatermelon:
+        effects:
+        - !type:SatiateThirst
+      JuicePineapple:
+        effects:
+        - !type:SatiateThirst
+      Nutriment:
+        effects:
+        - !type:SatiateHunger
+      Water:
+        effects:
+        - !type:SatiateThirst
+          hydrationFactor: 2
+      Coffee:
+        effects:
+        - !type:SatiateThirst
+      Tea:
+        effects:
+        - !type:SatiateThirst
+      Milk:
+        effects:
+        - !type:SatiateThirst
+      SpoiledMilk:
+        effects:
+        - !type:SatiateThirst
+          hydrationFactor: -2
+      MilkSoy:
+        effects:
+        - !type:SatiateThirst
+          hydrationFactor: 2 # soyboys stay winning
+      MilkOat:
+        effects:
+        - !type:SatiateThirst
+          hydrationFactor: 2 # oatboys stay winning
+      Cola:
+        effects:
+        - !type:SatiateThirst
+          hydrationFactor: 0.5 # sodaboys stay losing
+      ThirteenLoko:
+        effects:
+        - !type:SatiateThirst
+          hydrationFactor: 2
+        - !type:HealthChange
+          damageClass: Toxin
+          healthChange: 1
 
 - type: entity
   id: OrganHumanLiver
@@ -120,12 +318,17 @@
   - type: Mechanism
     size: 1
     compatibility: Biological
-    behaviors:
-    - !type:LiverBehavior
-      alcoholLethality: 0.005
-      alcoholExponent: 1.6
-      toxinTolerance: 3
-      toxinLethality: 0.01
+  - type: Metabolizer # The liver metabolizes certain chemicals only, like alcohol.
+    metabolisms: # TODO add the rest of alcohol
+      CreamyDelight:
+        effects:
+        - !type:SatiateThirst
+      Lean:
+        effects:
+        - !type:SatiateThirst
+      LeanShine: # who added this?
+        effects:
+        - !type:SatiateThirst
 
 - type: entity
   id: OrganHumanKidneys
@@ -141,28 +344,4 @@
     size: 1
     compatibility: Biological
 
-- type: entity
-  id: OrganHumanTongue
-  parent: BaseHumanOrgan
-  name: tongue
-  description: "A fleshy muscle mostly used for lying."
-  components:
-  - type: Sprite
-    state: tongue
-  - type: Mechanism
-    size: 1
-    compatibility: Biological
 
-- type: entity
-  id: OrganHumanAppendix
-  parent: BaseHumanOrgan
-  name: appendix
-  components:
-  - type: Sprite
-    layers:
-      - state: appendix
-      - state: appendix-inflamed
-        visible: false
-  - type: Mechanism
-    size: 1
-    compatibility: Biological
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/biohazard.yml b/Resources/Prototypes/Catalog/Fills/Lockers/biohazard.yml
index b9a6ce5322..79b38ef7cc 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/biohazard.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/biohazard.yml
@@ -1,24 +1,59 @@
-# - type: entity
-#   id: ClosetL3Filled
-#   suffix: Filled, Generic
-#  parent: ClosetL3
+ - type: entity
+   id: ClosetL3Filled
+   suffix: Filled, Generic
+   parent: ClosetL3
+   components:
+   - type: StorageFill
+     contents:
+       - id: ClothingOuterBioGeneral
+         prob: 1
+       - id: ClothingHeadHatHoodBioGeneral
+         prob: 1
 
  - type: entity
    id: ClosetL3VirologyFilled
    suffix: Filled, Virology
    parent: ClosetL3Virology
+   components:
+   - type: StorageFill
+     contents:
+       - id: ClothingOuterBioVirology
+         prob: 1
+       - id: ClothingHeadHatHoodBioVirology
+         prob: 1
 
  - type: entity
    id: ClosetL3SecurityFilled
    suffix: Filled, Security
    parent: ClosetL3Security
+   components:
+   - type: StorageFill
+     contents:
+       - id: ClothingOuterBioSecurity
+         prob: 1
+       - id: ClothingHeadHatHoodBioSecurity
+         prob: 1
 
  - type: entity
    id: ClosetL3JanitorFilled
    suffix: Filled, Janitor
    parent: ClosetL3Janitor
+   components:
+   - type: StorageFill
+     contents:
+       - id: ClothingOuterBioJanitor
+         prob: 1
+       - id: ClothingHeadHatHoodBioJanitor
+         prob: 1
 
-# - type: entity
-#   id: ClosetL3ScienceFilled
-#   suffix: Filled, Science
-#  parent: ClosetL3Virology
+ - type: entity
+   id: ClosetL3ScienceFilled
+   suffix: Filled, Science
+   parent: ClosetL3Virology
+   components:
+   - type: StorageFill
+     contents:
+       - id: ClothingOuterBioScientist
+         prob: 1
+       - id: ClothingHeadHatHoodBioScientist
+         prob: 1
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
index f8df3df691..415db3246d 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -147,6 +147,10 @@
         prob: 1
       - id: ClothingHeadsetMedicalScience
         prob: 1
+      - id: ClothingHeadHelmetHardsuitRd
+        prob: 1
+      - id: ClothingOuterHardsuitRd
+        prob: 1
       - id: PlushieSlime
         prob: 0.1
 
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
index 78cb14b62b..0a789fc616 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
@@ -32,3 +32,37 @@
           prob: 0.6
         - id: ClothingOuterSuitFire
           prob: 0.75
+
+- type: entity
+  id: ClosetMaintenanceFilledRandom
+  suffix: Filled, Random
+  parent: ClosetMaintenance
+  components:
+    - type: StorageFill
+      contents:
+        - id: lantern
+          prob: 0.66
+        - id: Wirecutter
+          prob: 0.44
+        - id: Screwdriver
+          prob: 0.44
+        - id: Wrench
+          prob: 0.44
+        - id: Crowbar
+          prob: 0.44
+        - id: Welder
+          prob: 0.44
+        - id: Multitool
+          prob: 0.44
+        - id: Soap
+          prob: 0.44
+        - id: PlushieCarp
+          prob: 0.2
+        - id: PlushieSlime
+          prob: 0.2
+        - id: PlushieSnake
+          prob: 0.2
+        - id: ClothingHandsGlovesColorYellow
+          prob: 0.33
+        - id: ClothingBeltUtility
+          prob: 0.33
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
index d2e13f35e9..8585bae168 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
@@ -84,3 +84,7 @@
         prob: 0.8
       - id: TomatoSeeds
         prob: 1
+      - id: ClothingUniformOveralls
+        prob: 1
+      - id: ClothingHeadHatTrucker
+        prob: 0.1
diff --git a/Resources/Prototypes/Catalog/ReagentDispensers/chemical.yml b/Resources/Prototypes/Catalog/ReagentDispensers/chemical.yml
index 70073d0dde..a13d46df4b 100644
--- a/Resources/Prototypes/Catalog/ReagentDispensers/chemical.yml
+++ b/Resources/Prototypes/Catalog/ReagentDispensers/chemical.yml
@@ -9,6 +9,7 @@
   - Fluorine
   - Glucose
   - Hydrogen
+  - Iodine
   - Iron
   - Lithium
   - Mercury
@@ -25,3 +26,4 @@
   - SulfuricAcid
   - Uranium
   - Water
+
diff --git a/Resources/Prototypes/Entities/Clothing/Head/base.yml b/Resources/Prototypes/Entities/Clothing/Head/base.yml
index c81acedf5c..ea2aa62164 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/base.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/base.yml
@@ -47,7 +47,6 @@
   - type: PointLight
     enabled: false
     radius: 3
-  - type: LoopingSound
   - type: Appearance
     visuals:
     - type: FlashLightVisualizer
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardhats.yml b/Resources/Prototypes/Entities/Clothing/Head/hardhats.yml
index e8e403ae9b..ab1d35e31f 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hardhats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hardhats.yml
@@ -15,7 +15,6 @@
   - type: PointLight
     enabled: false
     radius: 3
-  - type: LoopingSound
   - type: Appearance
     visuals:
       - type: FlashLightVisualizer
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
index 783c4e9186..fb84c0f136 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -23,7 +23,7 @@
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatBeretEngineering
-  name: engineering beret 
+  name: engineering beret
   description: A beret with the engineering insignia emblazoned on it. For engineers that are more inclined towards style than safety.
   components:
   - type: Sprite
@@ -360,3 +360,14 @@
     sprite: Clothing/Head/Hats/xmascrown.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/xmascrown.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatTrucker
+  name: truckers hat
+  description: Formerly Chucks, this hat is yours now.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hats/truckershat.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hats/truckershat.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
index b6654eec1b..e8662570c4 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
@@ -8,6 +8,8 @@
     sprite: Clothing/OuterClothing/Coats/bomber.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Coats/bomber.rsi
+  - type: Storage
+    capacity: 10
 
 - type: entity
   parent: ClothingOuterBase
@@ -19,6 +21,8 @@
     sprite: Clothing/OuterClothing/Coats/detective.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Coats/detective.rsi
+  - type: Storage
+    capacity: 10
 
 - type: entity
   parent: ClothingOuterBase
@@ -30,6 +34,8 @@
     sprite: Clothing/OuterClothing/Coats/gentlecoat.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Coats/gentlecoat.rsi
+  - type: Storage
+    capacity: 10
 
 - type: entity
   parent: ClothingOuterBase
@@ -41,6 +47,8 @@
     sprite: Clothing/OuterClothing/Coats/hos_trenchcoat.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Coats/hos_trenchcoat.rsi
+  - type: Storage
+    capacity: 10
 
 - type: entity
   parent: ClothingOuterBase
@@ -52,6 +60,8 @@
     sprite: Clothing/OuterClothing/Coats/insp_coat.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Coats/insp_coat.rsi
+  - type: Storage
+    capacity: 10
 
 - type: entity
   parent: ClothingOuterBase
@@ -63,6 +73,8 @@
     sprite: Clothing/OuterClothing/Coats/jensencoat.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Coats/jensencoat.rsi
+  - type: Storage
+    capacity: 10
 
 - type: entity
   parent: ClothingOuterBase
@@ -74,6 +86,8 @@
     sprite: Clothing/OuterClothing/Coats/labcoat.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Coats/labcoat.rsi
+  - type: Storage
+    capacity: 10
 
 - type: entity
   parent: ClothingOuterBase
@@ -85,6 +99,8 @@
     sprite: Clothing/OuterClothing/Coats/labcoat_chem.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Coats/labcoat_chem.rsi
+  - type: Storage
+    capacity: 10
 
 - type: entity
   parent: ClothingOuterBase
@@ -96,6 +112,8 @@
     sprite: Clothing/OuterClothing/Coats/labcoat_cmo.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Coats/labcoat_cmo.rsi
+  - type: Storage
+    capacity: 10
 
 - type: entity
   parent: ClothingOuterBase
@@ -107,3 +125,5 @@
     sprite: Clothing/OuterClothing/Coats/pirate.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Coats/pirate.rsi
+  - type: Storage
+    capacity: 10
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
index d9481657b5..8863546e1c 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
@@ -19,7 +19,6 @@
     sprite: Clothing/Shoes/Specific/clown.rsi
   - type: Clothing
     sprite: Clothing/Shoes/Specific/clown.rsi
-  - type: LoopingSound
   - type: FootstepModifier
     footstepSoundCollection: footstep_clown
 
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
index 77f7eb264e..f71364f361 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -571,3 +571,14 @@
     sprite: Clothing/Uniforms/Jumpsuit/rainbow.rsi
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpsuit/rainbow.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformOveralls
+  name: overalls
+  description: Great for working outdoors.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/overalls.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/overalls.rsi
diff --git a/Resources/Prototypes/Entities/Effects/puddle.yml b/Resources/Prototypes/Entities/Effects/puddle.yml
index 300ccbcf6e..6e018f8f0b 100644
--- a/Resources/Prototypes/Entities/Effects/puddle.yml
+++ b/Resources/Prototypes/Entities/Effects/puddle.yml
@@ -10,7 +10,6 @@
   - type: Puddle
     spill_sound: /Audio/Effects/Fluids/splat.ogg
     recolor: true
-  - type: LoopingSound
   - type: Clickable
   - type: Slippery
   - type: Physics
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 4ef1d7ba87..45b1b8e193 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -387,7 +387,6 @@
 # Eek! You can eat them alive for now until someone makes something that detects when
 # a mob is dead or something idk
   - type: Food
-  - type: LoopingSound
   - type: SolutionContainer
     contents:
       reagents:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
index cef117e5da..8ca13d7725 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
@@ -67,7 +67,7 @@
     currentTemperature: 310.15
     specificHeat: 42
     tempDamageCoefficient: 0.1
-  - type: Metabolism
+  - type: Respirator
     metabolismHeat: 5000
     radiatedHeat: 400
     implicitHeatRegulation: 5000
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
index 7b5b7dfcab..cbbabdf716 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
@@ -38,7 +38,7 @@
       0: !type:NormalMobState {}
       150: !type:CriticalMobState {}
       200: !type:DeadMobState {}
-  - type: Metabolism
+  - type: Respirator
   - type: UnarmedCombat
     range: 1.5
     arcwidth: 0
diff --git a/Resources/Prototypes/Entities/Mobs/Species/human.yml b/Resources/Prototypes/Entities/Mobs/Species/human.yml
index 915d97340a..a3b82f223e 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/human.yml
@@ -167,7 +167,7 @@
     preset: HumanPreset
   - type: Damageable
     damageContainer: biologicalDamageContainer
-  - type: Metabolism
+  - type: Respirator
     metabolismHeat: 5000
     radiatedHeat: 400
     implicitHeatRegulation: 5000
diff --git a/Resources/Prototypes/Entities/Mobs/Species/vox.yml b/Resources/Prototypes/Entities/Mobs/Species/vox.yml
index dd9f5119c7..1f097c19a2 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/vox.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/vox.yml
@@ -84,7 +84,7 @@
   - type: Body
     template: HumanoidTemplate
     preset: VoxPreset
-  - type: Metabolism
+  - type: Respirator
     needsGases:
       Nitrogen: 0.00060763888
     producesGases:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
index 5154e389c5..5e08078666 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
@@ -9,7 +9,6 @@
   - type: Sprite
     sprite: Objects/Consumable/Food/Baked/bread.rsi
     netsync: false
-  - type: LoopingSound
   - type: SolutionContainer
     maxVol: 20
     contents:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
index 5f792c0c8e..0ecb6b5fa6 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
@@ -10,7 +10,6 @@
   - type: Sprite
     sprite: Objects/Consumable/Food/Baked/cake.rsi
     netsync: false
-  - type: LoopingSound
   - type: SolutionContainer
     maxVol: 20
     contents:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml
index 25b22164db..5f71cd9431 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml
@@ -13,7 +13,6 @@
   - type: Sprite
     sprite: Objects/Consumable/Food/Baked/donut.rsi
     netsync: false
-  - type: LoopingSound
   - type: SolutionContainer
     maxVol: 5
     contents:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
index d697dd849f..416fcd82ff 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
@@ -9,7 +9,6 @@
   - type: Sprite
     sprite: Objects/Consumable/Food/Baked/misc.rsi
     netsync: false
-  - type: LoopingSound
   - type: SolutionContainer
     maxVol: 5
     contents:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
index c5d94a8ded..2a5c2fa711 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
@@ -10,7 +10,6 @@
   - type: Sprite
     sprite: Objects/Consumable/Food/Baked/pizza.rsi
     netsync: false
-  - type: LoopingSound
   - type: SolutionContainer
     maxVol: 15
     contents:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
index da91d4b718..b80ef6f762 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
@@ -92,7 +92,6 @@
           - box11
           - box12
   # Someday...
-  # - type: LoopingSound
   # - type: DamageOnLand
   #   amount: 5
   # - type: DamageOtherOnHit
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml
index f37b3c2670..fa7bc163fa 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml
@@ -78,7 +78,6 @@
       reagents:
       - ReagentId: Nutriment
         Quantity: 15
-  - type: LoopingSound
   - type: Food
     trash: FoodTinPeachesTrash
 
@@ -127,7 +126,6 @@
       reagents:
       - ReagentId: Nutriment
         Quantity: 15
-  - type: LoopingSound
   - type: Food
     trash: FoodTinPeachesMaintTrash
 
@@ -176,7 +174,6 @@
       reagents:
       - ReagentId: Nutriment
         Quantity: 15
-  - type: LoopingSound
   - type: Food
     trash: FoodTinBeansTrash
 
@@ -227,7 +224,6 @@
       reagents:
       - ReagentId: Nutriment
         Quantity: 15
-  - type: LoopingSound
   - type: Food
     trash: FoodTinMRETrash
 
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml
index 956cbabd68..7f4dfafec8 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml
@@ -10,7 +10,6 @@
   - type: Sprite
     sprite: Objects/Consumable/Food/burger.rsi
     netsync: false
-  - type: LoopingSound
   - type: SolutionContainer
     maxVol: 15
     contents:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml
index 886827dcd8..06c818d1b9 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml
@@ -23,7 +23,6 @@
       reagents:
       - ReagentId: Egg
         Quantity: 5
-  - type: LoopingSound
   - type: DamageOnLand
     amount: 1
   - type: DamageOtherOnHit
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml
index 86d65c8845..745d0ec100 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml
@@ -9,7 +9,6 @@
   - type: Sprite
     sprite: Objects/Consumable/Food/frozen.rsi
     netsync: false
-  - type: LoopingSound
   - type: SolutionContainer
     maxVol: 20 # For sprinkles or something? Idk.
     contents:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
index c04c0e016d..fef5800303 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
@@ -9,7 +9,6 @@
   - type: Sprite
     sprite: Objects/Consumable/Food/meat.rsi
     netsync: false
-  - type: LoopingSound
   - type: SolutionContainer
     maxVol: 20
     contents:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml
index 5c0f7ebce4..02ee16cf0c 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml
@@ -11,7 +11,6 @@
   - type: Sprite
     sprite: Objects/Consumable/Food/noodles.rsi
     netsync: false
-  - type: LoopingSound
   - type: SolutionContainer
     maxVol: 20
     contents:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml
index 704e8a7376..3de439686d 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml
@@ -10,7 +10,6 @@
   - type: Sprite
     sprite: Objects/Consumable/Food/skewer.rsi
     netsync: false
-  - type: LoopingSound
   - type: SolutionContainer
     maxVol: 20
     contents:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
index b3fe15a37c..2fcb644269 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
@@ -9,7 +9,6 @@
   - type: Sprite
     sprite: Objects/Consumable/Food/snacks.rsi
     netsync: false
-  - type: LoopingSound
   - type: SolutionContainer
     maxVol: 30 # Room for extra condiments
     contents:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml
index 95d8810b6b..73eb82633c 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml
@@ -5,14 +5,12 @@
   components:
   - type: Food
     trash: FoodBowlBig
-  - type: LoopingSound
   - type: SolutionContainer
     maxVol: 20
     contents:
       reagents:
       - ReagentId: Nutriment
         Quantity: 20
-    trash: BowlBigTrash
   - type: Sprite
     sprite: Objects/Consumable/Food/bowl.rsi
     netsync: false
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/trash_drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/trash_drinks.yml
index 25c6f54d7c..eb10d855f8 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/trash_drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/trash_drinks.yml
@@ -6,7 +6,6 @@
   id: DrinkBottleBaseEmpty
   description: That's an empty bottle.
   components:
-  - type: LoopingSound
   - type: Sprite
     state: icon
   - type: SolutionContainer
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index f52578dce9..cf36a7dfa6 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -28,7 +28,6 @@
     interfaces:
     - key: enum.PDAUiKey.Key
       type: PDABoundUserInterface
-  - type: LoopingSound
 
 - type: entity
   parent: BasePDA
diff --git a/Resources/Prototypes/Entities/Objects/Fun/skub.yml b/Resources/Prototypes/Entities/Objects/Fun/skub.yml
index e4695f5062..6f1e2e6842 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/skub.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/skub.yml
@@ -10,7 +10,6 @@
   - type: Item
     sprite: Objects/Misc/skub.rsi
   - type: ItemCooldown
-  - type: LoopingSound
   - type: EmitSoundOnUse
     sound:
       path: /Audio/Items/skub.ogg
diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index 0d8babe815..3ab1f035c5 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -5,7 +5,7 @@
   id: BasePlushie
   components:
   - type: EmitSoundOnUse
-    sound: 
+    sound:
       collection: ToySqueak
   - type: EmitSoundOnLand
     sound:
@@ -13,7 +13,6 @@
   - type: EmitSoundOnActivate
     sound:
       collection: ToySqueak
-  - type: LoopingSound
   - type: ItemCooldown
   - type: UseDelay
     delay: 1.0
@@ -91,7 +90,6 @@
     sprite: Objects/Fun/toys.rsi
     state: plushie_snake
   - type: ItemCooldown
-  - type: LoopingSound
   - type: EmitSoundOnUse
     sound:
       path: /Audio/Items/Toys/rattle.ogg
@@ -108,7 +106,6 @@
     sprite: Objects/Fun/toys.rsi
     state: toy_mouse
   - type: ItemCooldown
-  - type: LoopingSound
   - type: EmitSoundOnUse
     sound:
       path: /Audio/Items/Toys/mousesqueek.ogg
@@ -125,7 +122,6 @@
     sprite: Objects/Fun/toys.rsi
     state: plushie_vox
   - type: ItemCooldown
-  - type: LoopingSound
   - type: EmitSoundOnUse
     sound:
       path: /Audio/Voice/Vox/shriek1.ogg
@@ -151,7 +147,6 @@
     sound:
       path: /Audio/Items/Toys/helpme.ogg
   - type: ItemCooldown
-  - type: LoopingSound
   - type: EmitSoundOnUse
     sound:
       path: /Audio/Items/Toys/helpme.ogg
@@ -170,12 +165,11 @@
   - type: Item
     sprite: Objects/Misc/carvings.rsi
   - type: EmitSoundOnThrow
-    sound: 
+    sound:
       path: /Audio/Items/Toys/hellothere.ogg
   - type: ItemCooldown
-  - type: LoopingSound
   - type: EmitSoundOnUse
-    sound: 
+    sound:
       path: /Audio/Items/Toys/hellothere.ogg
   - type: UseDelay
     delay: 1.0
@@ -195,9 +189,8 @@
     sound:
       path: /Audio/Items/Toys/thankyou.ogg
   - type: ItemCooldown
-  - type: LoopingSound
   - type: EmitSoundOnUse
-    sound: 
+    sound:
       path: /Audio/Items/Toys/thankyou.ogg
   - type: UseDelay
     delay: 1.0
@@ -214,12 +207,11 @@
   - type: Item
     sprite: Objects/Misc/carvings.rsi
   - type: EmitSoundOnThrow
-    sound: 
+    sound:
       path: /Audio/Items/Toys/verygood.ogg
   - type: ItemCooldown
-  - type: LoopingSound
   - type: EmitSoundOnUse
-    sound: 
+    sound:
       path: /Audio/Items/Toys/verygood.ogg
   - type: UseDelay
     delay: 1.0
@@ -239,7 +231,6 @@
     sound:
       path: /Audio/Items/Toys/imsorry.ogg
   - type: ItemCooldown
-  - type: LoopingSound
   - type: EmitSoundOnUse
     sound:
       path: /Audio/Items/Toys/imsorry.ogg
@@ -311,7 +302,6 @@
     sprite: Objects/Fun/toys.rsi
     state: ian
   - type: ItemCooldown
-  - type: LoopingSound
   - type: EmitSoundOnUse
     sound:
       path: /Audio/Items/Toys/ian.ogg
diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
index 71c81c55d0..6a4d77d8aa 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
@@ -92,6 +92,16 @@
       - plasma
       - plasma_2
       - plasma_3
+  - type: SolutionContainer
+    caps: 1
+    contents:
+      reagents:
+      - ReagentId: Plasma
+        Quantity: 10
+  - type: Tag
+    tags:
+    - Grindable
+    - Sheet
 
 - type: entity
   parent: SheetPlasma
diff --git a/Resources/Prototypes/Entities/Objects/Misc/torch.yml b/Resources/Prototypes/Entities/Objects/Misc/torch.yml
index e2ca2f54ec..605ac31e3b 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/torch.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/torch.yml
@@ -29,7 +29,6 @@
     - type: Item
       sprite: Objects/Misc/torch.rsi
       HeldPrefix: unlit
-    - type: LoopingSound
     - type: Construction
       graph: lightTorch
       node: torch
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/sprays.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/sprays.yml
index a53113ae72..abc6ffceea 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/sprays.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/sprays.yml
@@ -50,7 +50,7 @@
   name: pest spray
   id: PestSpray
   parent: WeedSpray
-  description: Objects/Tools/Hydroponics/sprays.rsi
+  description: It's some pest eliminator spray! Do not inhale!
   suffix: "Filled"
   components:
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Objects/Tools/bucket.yml b/Resources/Prototypes/Entities/Objects/Tools/bucket.yml
index 9646bdce26..be03c43997 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/bucket.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/bucket.yml
@@ -12,6 +12,7 @@
     sprite: Objects/Tools/bucket.rsi
     state: icon
   - type: Clothing
+    size: 100
     sprite: Objects/Tools/bucket.rsi
     Slots:
     - Helmet
diff --git a/Resources/Prototypes/Entities/Objects/Tools/flare.yml b/Resources/Prototypes/Entities/Objects/Tools/flare.yml
index 88f24071e3..cf2d18ee78 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/flare.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/flare.yml
@@ -32,7 +32,6 @@
       sprite: Objects/Misc/flare.rsi
       color: "#FF0000"
       HeldPrefix: unlit
-    - type: LoopingSound
     - type: Appearance
       visuals:
         - type: ExpendableLightVisualizer
diff --git a/Resources/Prototypes/Entities/Objects/Tools/flashlight.yml b/Resources/Prototypes/Entities/Objects/Tools/flashlight.yml
index cf5bff920b..80ffa05614 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/flashlight.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/flashlight.yml
@@ -23,7 +23,6 @@
     - type: PointLight
       enabled: false
       radius: 3
-    - type: LoopingSound
     - type: Appearance
       visuals:
         - type: FlashLightVisualizer
diff --git a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
index 4c93eab341..48b667a26d 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
@@ -11,6 +11,7 @@
     - key: enum.SharedGasTankUiKey.Key
       type: GasTankBoundUserInterface
   - type: Clothing
+    size: 15
     sprite: Objects/Tanks/generic.rsi
     QuickEquip: false
   - type: GasTank
@@ -80,6 +81,7 @@
       volume: 2
       temperature: 293.15
   - type: Clothing
+    size: 10
     sprite: Objects/Tanks/emergency.rsi
     Slots:
     - Pocket
@@ -100,6 +102,7 @@
       volume: 6
       temperature: 293.15
   - type: Clothing
+    size: 10
     sprite: Objects/Tanks/emergency_yellow.rsi
     Slots:
     - Pocket
@@ -118,6 +121,7 @@
       volume: 10
       temperature: 293.15
   - type: Clothing
+    size: 10
     sprite: Objects/Tanks/emergency_double.rsi
     Slots:
     - Pocket
@@ -157,6 +161,7 @@
         volume: 70
         temperature: 293.15
     - type: Clothing
+      size: 10
       sprite: Objects/Tanks/plasma.rsi
       Slots:
         - Belt
diff --git a/Resources/Prototypes/Entities/Objects/Tools/lantern.yml b/Resources/Prototypes/Entities/Objects/Tools/lantern.yml
index e50fc08d74..11fc7a70db 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/lantern.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/lantern.yml
@@ -23,7 +23,6 @@
       radius: 3
       energy: 2.5
       color: "#FFC458"
-    - type: LoopingSound
     - type: Appearance
       visuals:
         - type: LanternVisualizer
@@ -39,4 +38,3 @@
       radius: 5
       energy: 10
       color: "#FFC458"
-    - type: LoopingSound
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
index ec7cf4e96a..39f1b8bf96 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
@@ -17,4 +17,3 @@
     size: 24
     sprite: Objects/Weapons/Melee/pickaxe.rsi
     prefix: inhand
-  - type: LoopingSound
diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/base.yml b/Resources/Prototypes/Entities/Structures/Dispensers/base.yml
index 412c455d39..2f33762b74 100644
--- a/Resources/Prototypes/Entities/Structures/Dispensers/base.yml
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/base.yml
@@ -26,7 +26,6 @@
     interfaces:
     - key: enum.ReagentDispenserUiKey.Key
       type: ReagentDispenserBoundUserInterface
-  - type: LoopingSound
   - type: Anchorable
   - type: Pullable
   - type: Damageable
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base.yml
index 7b88ff7002..c570660647 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base.yml
@@ -38,13 +38,16 @@
       - SmallImpassable
   - type: Door
     board: DoorElectronics
+    openSound:
+      path: /Audio/Machines/airlock_open.ogg
+    closeSound:
+      path: /Audio/Machines/airlock_close.ogg
+    denySound:
+      path: /Audio/Machines/airlock_deny.ogg
   - type: Airlock
   - type: Appearance
     visuals:
     - type: AirlockVisualizer
-      open_sound: /Audio/Machines/airlock_open.ogg
-      close_sound: /Audio/Machines/airlock_close.ogg
-      deny_sound: /Audio/Machines/airlock_deny.ogg
     - type: WiresVisualizer
   - type: ApcPowerReceiver
   - type: Wires
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml
index b33fa434c7..931987b355 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml
@@ -6,12 +6,15 @@
   components:
   - type: Door
     bumpOpen: false
+    openSound:
+      path: /Audio/Machines/airlock_ext_open.ogg
+    closeSound:
+      path: /Audio/Machines/airlock_ext_close.ogg
+    denySound:
+      path: /Audio/Machines/airlock_deny.ogg
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Standard/external.rsi
   - type: Appearance
     visuals:
     - type: AirlockVisualizer
-      open_sound: /Audio/Machines/airlock_ext_open.ogg
-      close_sound: /Audio/Machines/airlock_ext_close.ogg
-      deny_sound: /Audio/Machines/airlock_deny.ogg
     - type: WiresVisualizer
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
index ec7f8eacd0..bc416c41ec 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
@@ -54,13 +54,16 @@
       startOpen: true
       bumpOpen: false
       inhibitCrush: false
+      openSound:
+        path: /Audio/Machines/airlock_open.ogg
+      closeSound:
+        path: /Audio/Machines/airlock_close.ogg
+      denySound:
+        path: /Audio/Machines/airlock_deny.ogg
     - type: Firelock
     - type: Appearance
       visuals:
         - type: AirlockVisualizer
-          open_sound: /Audio/Machines/airlock_open.ogg
-          close_sound: /Audio/Machines/airlock_close.ogg
-          deny_sound: /Audio/Machines/airlock_deny.ogg
           animation_time: 0.6
         - type: WiresVisualizer
     - type: Wires
diff --git a/Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml b/Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml
index bfbeb05fb5..f06d0cdae4 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml
@@ -25,6 +25,9 @@
     - shape:
         !type:PhysShapeAabb
           bounds: "-1.5,-1.5,1.5,1.5"
+      mass: 500
+      mask:
+      - Impassable
       layer:
       - Opaque
       - Impassable
diff --git a/Resources/Prototypes/Entities/Structures/Machines/microwave.yml b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
index aa9093711a..4210bdcac9 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
@@ -11,7 +11,6 @@
   - type: Appearance
     visuals:
     - type: MicrowaveVisualizer
-  - type: LoopingSound
   - type: UserInterface
     interfaces:
     - key: enum.MicrowaveUiKey.Key
diff --git a/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml b/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml
index 4a9a89d5a2..1ab00ae0d5 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml
@@ -14,7 +14,6 @@
   - type: Appearance
     visuals:
     - type: ReagentGrinderVisualizer
-  - type: LoopingSound
   - type: Physics
     fixtures:
     - shape:
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml
index f7d23a40a4..c62a227933 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml
@@ -33,11 +33,14 @@
       state: pipeStraight
       map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
     - state: pumpPressure
+      map: [ "enum.SubFloorShowLayerVisualizer+Layers.FirstLayer", "enum.PressurePumpVisualizer+Layers.Enabled" ]
   - type: Appearance
     visuals:
+    - type: SubFloorShowLayerVisualizer
     - type: PipeConnectorVisualizer
     - type: PipeColorVisualizer
     - type: PressurePumpVisualizer
+      disabledState: pumpPressure
       enabledState: pumpPressureOn
   - type: GasPressurePump
 
@@ -57,6 +60,12 @@
           state: pipeStraight
           map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
         - state: pumpVolume
+          map: [ "enum.SubFloorShowLayerVisualizer+Layers.FirstLayer" ]
+    - type: Appearance
+      visuals:
+        - type: SubFloorShowLayerVisualizer
+        - type: PipeConnectorVisualizer
+        - type: PipeColorVisualizer
     - type: GasVolumePump
 
 - type: entity
@@ -75,6 +84,12 @@
           state: pipeStraight
           map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
         - state: pumpPassiveGate
+          map: [ "enum.SubFloorShowLayerVisualizer+Layers.FirstLayer" ]
+    - type: Appearance
+      visuals:
+        - type: SubFloorShowLayerVisualizer
+        - type: PipeConnectorVisualizer
+        - type: PipeColorVisualizer
     - type: GasPassiveGate
 
 - type: entity
@@ -94,6 +109,12 @@
           state: pipeStraight
           map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
         - state: pumpPassiveGate
+          map: [ "enum.SubFloorShowLayerVisualizer+Layers.FirstLayer" ]
+    - type: Appearance
+      visuals:
+        - type: SubFloorShowLayerVisualizer
+        - type: PipeConnectorVisualizer
+        - type: PipeColorVisualizer
     - type: GasValve
     - type: NodeContainer
       nodes:
@@ -118,6 +139,12 @@
           state: pipeHalf
           map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
         - state: gasCanisterPort
+          map: [ "enum.SubFloorShowLayerVisualizer+Layers.FirstLayer" ]
+    - type: Appearance
+      visuals:
+        - type: SubFloorShowLayerVisualizer
+        - type: PipeConnectorVisualizer
+        - type: PipeColorVisualizer
     - type: GasPort
     - type: NodeContainer
       nodes:
@@ -142,9 +169,10 @@
           state: pipeStraight
           map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
         - state: vent_off
-          map: ["enum.VentVisualLayers.Vent"]
+          map: [ "enum.VentVisualLayers.Vent", "enum.SubFloorShowLayerVisualizer+Layers.FirstLayer" ]
     - type: Appearance
       visuals:
+        - type: SubFloorShowLayerVisualizer
         - type: PipeConnectorVisualizer
         - type: PipeColorVisualizer
         - type: VentPumpVisualizer
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
index df3534b3d3..ed58aecde5 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
@@ -33,6 +33,7 @@
   - type: NodeContainer
   - type: AtmosUnsafeUnanchor
   - type: AtmosPipeColor
+  - type: SubFloorHide
 
 #Note: The PipeDirection of the PipeNode should be the south-facing version, because the entity starts at an angle of 0 (south)
 
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml
index 916ba7302e..55b541dd2a 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml
@@ -38,6 +38,15 @@
           state: pipeTJunction
           map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
         - state: gasFilter
+          map: [ "enum.SubFloorShowLayerVisualizer+Layers.FirstLayer", "enum.GasFilterVisualizer+Layers.Enabled" ]
+    - type: Appearance
+      visuals:
+        - type: SubFloorShowLayerVisualizer
+        - type: PipeConnectorVisualizer
+        - type: PipeColorVisualizer
+        - type: GasFilterVisualizer
+          disabledState: gasFilter
+          enabledState: gasFilterOn
     - type: GasFilter
 
 - type: entity
@@ -57,6 +66,12 @@
           state: pipeTJunction
           map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
         - state: gasFilter
+          map: [ "enum.SubFloorShowLayerVisualizer+Layers.FirstLayer" ]
+    - type: Appearance
+      visuals:
+        - type: SubFloorShowLayerVisualizer
+        - type: PipeConnectorVisualizer
+        - type: PipeColorVisualizer
     - type: GasMixer
       inletOne: inlet
       inletTwo: filter
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
index 14be2b9c3a..f628e58595 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
@@ -29,9 +29,10 @@
           state: pipeHalf
           map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
         - state: vent_off
-          map: ["enum.VentVisualLayers.Vent"]
+          map: [ "enum.VentVisualLayers.Vent", "enum.SubFloorShowLayerVisualizer+Layers.FirstLayer" ]
     - type: Appearance
       visuals:
+        - type: SubFloorShowLayerVisualizer
         - type: PipeConnectorVisualizer
         - type: PipeColorVisualizer
         - type: VentPumpVisualizer
@@ -54,8 +55,10 @@
           state: pipeHalf
           map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
         - state: vent_off
+          map: [ "enum.SubFloorShowLayerVisualizer+Layers.FirstLayer" ]
     - type: Appearance
       visuals:
+        - type: SubFloorShowLayerVisualizer
         - type: PipeConnectorVisualizer
         - type: PipeColorVisualizer
     - type: GasPassiveVent
@@ -76,9 +79,10 @@
           state: pipeHalf
           map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
         - state: scrub_off
-          map: ["enum.ScrubberVisualLayers.Scrubber"]
+          map: [ "enum.ScrubberVisualLayers.Scrubber", "enum.SubFloorShowLayerVisualizer+Layers.FirstLayer" ]
     - type: Appearance
       visuals:
+        - type: SubFloorShowLayerVisualizer
         - type: PipeConnectorVisualizer
         - type: PipeColorVisualizer
         - type: ScrubberVisualizer
@@ -93,18 +97,24 @@
   placement:
     mode: SnapgridCenter
   components:
-    - type: GasOutletInjector
+
     # TODO ATMOS: Actual sprite for this.
     - type: Sprite
       netsync: false
       layers:
         - state: pipeHalf
           sprite: Structures/Piping/Atmospherics/pipe.rsi
-          map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
+          map: [ "enum.PipeColorVisualizer+Layers.Pipe", "enum.SubFloorShowLayerVisualizer+Layers.FirstLayer" ]
+    - type: Appearance
+      visuals:
+        - type: SubFloorShowLayerVisualizer
+        - type: PipeConnectorVisualizer
+        - type: PipeColorVisualizer
+    - type: GasOutletInjector
 
 - type: entity
-  parent: GasUnaryBase
-  id: GasThermoMachineBase
+  parent: BaseMachinePowered
+  id: BaseGasThermoMachine
   name: thermomachine
   description: Heats or cools gas in connected pipes.
   abstract: true
@@ -117,10 +127,19 @@
     - type: Appearance
       visuals:
         - type: PipeConnectorVisualizer
+        - type: PipeColorVisualizer
     - type: GasThermoMachine
+    - type: AtmosPipeColor
+    - type: AtmosDevice
+    - type: NodeContainer
+      nodes:
+        pipe:
+          !type:PipeNode
+          nodeGroupID: Pipe
+          pipeDirection: South
 
 - type: entity
-  parent: GasThermoMachineBase
+  parent: BaseGasThermoMachine
   id: GasThermoMachineFreezer
   name: freezer
   placement:
@@ -129,18 +148,22 @@
     - type: Sprite
       layers:
         - state: freezer_off
+          map: [ "enum.ThermoMachineVisualizer+Layers.Enabled" ]
         - state: pipe
+          map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
     - type: Appearance
       visuals:
         - type: PipeConnectorVisualizer
+        - type: PipeColorVisualizer
         - type: ThermoMachineVisualizer
+          disabledState: freezer_off
           enabledState: freezer_on
     - type: GasThermoMachine
       mode: Freezer
       minTemperature: 73.15
 
 - type: entity
-  parent: GasThermoMachineBase
+  parent: BaseGasThermoMachine
   id: GasThermoMachineHeater
   name: heater
   placement:
@@ -149,11 +172,15 @@
     - type: Sprite
       layers:
         - state: heater_off
+          map: [ "enum.ThermoMachineVisualizer+Layers.Enabled" ]
         - state: pipe
+          map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
     - type: Appearance
       visuals:
         - type: PipeConnectorVisualizer
+        - type: PipeColorVisualizer
         - type: ThermoMachineVisualizer
+          disabledState: heater_off
           enabledState: heater_on
     - type: GasThermoMachine
       mode: Heater
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Canisters/base.yml b/Resources/Prototypes/Entities/Structures/Storage/Canisters/base.yml
deleted file mode 100644
index 2be102cc95..0000000000
--- a/Resources/Prototypes/Entities/Structures/Storage/Canisters/base.yml
+++ /dev/null
@@ -1,72 +0,0 @@
-- type: entity
-  abstract: true
-  id: GasCanister
-  name: gas canister
-  description: A canister that can contain any type of gas. It can be attached to connector ports using a wrench.
-  parent: BaseStructureDynamic
-  components:
-  - type: InteractionOutline
-  - type: Sprite
-    netsync: false
-    sprite: Structures/Storage/canister.rsi
-    state: grey
-  - type: Appearance
-    visuals:
-      - type: GasPortableVisualizer
-        stateConnected: can-connector
-      - type: GasCanisterVisualizer
-        insertedTankState: can-open
-        pressureStates:
-          - can-o0
-          - can-o1
-          - can-o2
-          - can-o3
-  - type: UserInterface
-    interfaces:
-      - key: enum.GasCanisterUiKey.Key
-        type: GasCanisterBoundUserInterface
-  - type: Destructible
-    thresholds:
-      - trigger:
-          !type:DamageTrigger
-          damage: 300
-        behaviors:
-          - !type:PlaySoundBehavior
-            sound: /Audio/Effects/metalbreak.ogg
-          - !type:SpawnEntitiesBehavior
-            spawn:
-              GasCanisterBrokenBase:
-                min: 1
-                max: 1
-          - !type:DoActsBehavior
-            acts: [ "Destruction" ]
-  - type: Damageable
-    resistances: metallicResistances
-  - type: Physics
-    bodyType: Dynamic
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.25,-0.25,0.25,0.25"
-      mass: 25
-      mask:
-        - MobImpassable
-      layer:
-        - Opaque
-        - MobImpassable
-        - SmallImpassable
-        - VaultImpassable
-  - type: AtmosDevice
-    requireAnchored: false
-  - type: ContainerContainer
-    containers:
-      GasCanisterTankHolder: !type:ContainerSlot {}
-  - type: NodeContainer
-    nodes:
-      port:
-        !type:PortablePipeNode
-        nodeGroupID: Pipe
-        rotationsEnabled: false
-        volume: 1
-  - type: GasPortable
-  - type: GasCanister
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
index 7144edd6f1..45a3e65145 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
@@ -1,3 +1,77 @@
+- type: entity
+  abstract: true
+  id: GasCanister
+  name: gas canister
+  description: A canister that can contain any type of gas. It can be attached to connector ports using a wrench.
+  parent: BaseStructureDynamic
+  components:
+    - type: InteractionOutline
+    - type: Sprite
+      netsync: false
+      sprite: Structures/Storage/canister.rsi
+      state: grey
+    - type: Appearance
+      visuals:
+        - type: GasPortableVisualizer
+          stateConnected: can-connector
+        - type: GasCanisterVisualizer
+          insertedTankState: can-open
+          pressureStates:
+            - can-o0
+            - can-o1
+            - can-o2
+            - can-o3
+    - type: UserInterface
+      interfaces:
+        - key: enum.GasCanisterUiKey.Key
+          type: GasCanisterBoundUserInterface
+    - type: Destructible
+      thresholds:
+        - trigger:
+            !type:DamageTrigger
+            damage: 300
+          behaviors:
+            - !type:PlaySoundBehavior
+              sound: /Audio/Effects/metalbreak.ogg
+            - !type:SpawnEntitiesBehavior
+              spawn:
+                GasCanisterBrokenBase:
+                  min: 1
+                  max: 1
+            - !type:DoActsBehavior
+              acts: [ "Destruction" ]
+    - type: Damageable
+      resistances: metallicResistances
+    - type: Physics
+      bodyType: Dynamic
+      fixtures:
+        - shape:
+            !type:PhysShapeAabb
+            bounds: "-0.25,-0.25,0.25,0.25"
+          mass: 25
+          mask:
+            - MobImpassable
+          layer:
+            - Opaque
+            - MobImpassable
+            - SmallImpassable
+            - VaultImpassable
+    - type: AtmosDevice
+      requireAnchored: false
+      joinSystem: true
+    - type: ContainerContainer
+      containers:
+        GasCanisterTankHolder: !type:ContainerSlot {}
+    - type: NodeContainer
+      nodes:
+        port:
+          !type:PortablePipeNode
+          nodeGroupID: Pipe
+          rotationsEnabled: false
+          volume: 1
+    - type: GasPortable
+    - type: GasCanister
+
 - type: entity
   parent: GasCanister
   id: StorageCanister
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base.yml
index 1b33400a9f..a8fe9b1a7e 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base.yml
@@ -4,7 +4,7 @@
   abstract: true
   components:
   - type: AccessReader
-  - type: SecureEntityStorage
+  - type: Lock
   - type: Sprite
     netsync: false
     sprite: Structures/Storage/closet.rsi
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/base.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/base.yml
index 7c387a93d4..b64910f093 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/base.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/base.yml
@@ -57,4 +57,3 @@
     - type: StorageVisualizer
       state_open: generic_open
       state_closed: generic_door
-  - type: LoopingSound
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/closets.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/closets.yml
index ad7a284db0..41c491a005 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/closets.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/closets.yml
@@ -103,3 +103,16 @@
     visuals:
     - type: StorageVisualizer
       state: bio_jan
+
+# Maintenance closet
+- type: entity
+  id: ClosetMaintenance
+  name: maintenance closet 
+  parent: ClosetBase
+  description: It's a storage unit.
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state_open: generic_open
+      state_closed: generic_door
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/base.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/base.yml
index eec102958c..2177b328c2 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Crates/base.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/base.yml
@@ -49,4 +49,3 @@
     - type: StorageVisualizer
       state_open: crate_open
       state_closed: crate_door
-  - type: LoopingSound
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
index dae7bc4c1c..70e4f09b5d 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
@@ -261,7 +261,7 @@
   components:
   - type: AccessReader
     access: [["Security"]]
-  - type: SecureEntityStorage
+  - type: Lock
   - type: Sprite
     sprite: Structures/Storage/Crates/sec_gear.rsi
     layers:
@@ -290,7 +290,7 @@
   components:
   - type: AccessReader
     access: [["Engineering"]]
-  - type: SecureEntityStorage
+  - type: Lock
   - type: Sprite
     sprite: Structures/Storage/Crates/engicrate_secure.rsi
     layers:
@@ -319,7 +319,7 @@
   components:
   - type: AccessReader
     access: [["Medical"]]
-  - type: SecureEntityStorage
+  - type: Lock
   - type: Sprite
     sprite: Structures/Storage/Crates/medicalcrate_secure.rsi
     layers:
@@ -347,7 +347,7 @@
   parent: CrateGeneric
   components:
   - type: AccessReader
-  - type: SecureEntityStorage
+  - type: Lock
   - type: Sprite
     sprite: Structures/Storage/Crates/privatecrate_secure.rsi
     layers:
@@ -376,7 +376,7 @@
   components:
   - type: AccessReader
     access: [["Research"]]
-  - type: SecureEntityStorage
+  - type: Lock
   - type: Sprite
     sprite: Structures/Storage/Crates/scicrate_secure.rsi
     layers:
@@ -405,7 +405,7 @@
   components:
   - type: AccessReader
     access: [["Engineering"]]
-  - type: SecureEntityStorage
+  - type: Lock
   - type: Sprite
     sprite: Structures/Storage/Crates/plasma.rsi
     layers:
@@ -433,7 +433,7 @@
   parent: CrateGeneric
   components:
   - type: AccessReader
-  - type: SecureEntityStorage
+  - type: Lock
   - type: Sprite
     sprite: Structures/Storage/Crates/secure.rsi
     layers:
@@ -462,7 +462,7 @@
   components:
   - type: AccessReader
     access: [["Service"]]
-  - type: SecureEntityStorage
+  - type: Lock
   - type: Sprite
     sprite: Structures/Storage/Crates/hydro_secure.rsi
     layers:
@@ -491,7 +491,7 @@
   components:
   - type: AccessReader
     access: [["Security"]]
-  - type: SecureEntityStorage
+  - type: Lock
   - type: Sprite
     sprite: Structures/Storage/Crates/weapon.rsi
     layers:
diff --git a/Resources/Prototypes/Entities/Structures/Storage/morgue.yml b/Resources/Prototypes/Entities/Structures/Storage/morgue.yml
index a4dab64e39..2415993a28 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/morgue.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/morgue.yml
@@ -54,6 +54,18 @@
   name: morgue tray
   description: If you lay down to have a rest on this, you'll soon have a problem.
   components:
+  - type: Physics
+    bodyType: Static
+    fixtures:
+      - shape:
+          !type:PhysShapeAabb
+          bounds: "-0.5, -0.5, 0.5, 0.5"
+        mass: 25
+        mask:
+          - Impassable
+          - MobImpassable
+          - VaultImpassable
+          - SmallImpassable
   - type: Sprite
     netsync: false
     sprite: Structures/Storage/morgue.rsi
@@ -105,7 +117,6 @@
     openSound: /Audio/Items/deconstruct.ogg
     trayPrototype: CrematoriumTray
     doSoulBeep: false
-  - type: LoopingSound
   - type: Appearance
     visuals:
     - type: CrematoriumVisualizer
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/lighting.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/lighting.yml
index 620f13a43d..de20894f6d 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/lighting.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/lighting.yml
@@ -16,7 +16,6 @@
         !type:PhysShapeAabb
           bounds: "-0.45, -0.15, 0.45, 0.35"
       layer: [ Passable ]
-  - type: LoopingSound
   - type: Sprite
     sprite: Structures/Wallmounts/Lighting/light_tube.rsi
     layers:
diff --git a/Resources/Prototypes/Entities/Virtual/virtual_pull_item.yml b/Resources/Prototypes/Entities/Virtual/virtual_pull_item.yml
new file mode 100644
index 0000000000..aa5b7bdb22
--- /dev/null
+++ b/Resources/Prototypes/Entities/Virtual/virtual_pull_item.yml
@@ -0,0 +1,8 @@
+# This item is stored in the hand slot while you are pulling something, to represent that and what you are pulling.
+- type: entity
+  id: HandVirtualPull
+  name: VIRTUAL PULL YOU SHOULD NOT SEE THIS
+  abstract: true
+  components:
+  - type: Item
+  - type: HandVirtualPull
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
index b31d59a19d..bff9a06605 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
@@ -183,9 +183,6 @@
   desc: A combination of cream, wine and moonshine. Why would you do this?
   physicalDesc: foul
   color: "#a6969a"
-  metabolism:
-    - !type:DefaultDrink
-      rate: 1
 
 - type: reagent
   id: Lean
@@ -193,9 +190,6 @@
   desc: Turn up for days.
   physicalDesc: bubbly
   color: "#9400D3"
-  metabolism:
-    - !type:DefaultDrink
-      rate: 1
 
 - type: reagent
   id: LeanShine
@@ -203,8 +197,3 @@
   desc: Lean mixed with moonshine. Turn up for months.
   physicalDesc: bubbly
   color: "#9d5fb8"
-  metabolism:
-    - !type:DefaultDrink
-      rate: 1
-
-  
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
index b4c5009d35..baa8792dd2 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
@@ -4,9 +4,6 @@
   desc: A drink made from brewed coffee beans. Contains a moderate amount of caffeine.
   physicalDesc: aromatic
   color: "#664300"
-  metabolism:
-    - !type:DefaultDrink
-      rate: 1
 
 - type: reagent
   id: Tea
@@ -14,9 +11,6 @@
   desc: A drink made by boiling leaves of the tea tree, Camellia sinensis.
   physicalDesc: aromatic
   color: "#8a5a3a"
-  metabolism:
-    - !type:DefaultDrink
-      rate: 1
 
 - type: reagent
   id: Cream
@@ -24,9 +18,6 @@
   desc: The fatty, still liquid part of milk. Why don't you mix this with sum scotch, eh?
   physicalDesc: creamy
   color: "#DFD7AF"
-  metabolism:
-    - !type:DefaultDrink
-      rate: 1
 
 - type: reagent
   id: Milk
@@ -34,9 +25,6 @@
   desc: An opaque white liquid produced by the mammary glands of mammals.
   physicalDesc: opaque
   color: "#DFDFDF"
-  metabolism:
-    - !type:DefaultDrink
-      rate: 1
   plantMetabolism:
     - !type:AdjustNutrition
       amount: 0.1
@@ -49,9 +37,6 @@
   desc: This milk has gone rancid.
   physicalDesc: putrid
   color: "#faffba"
-  metabolism:
-    - !type:DefaultDrink
-      rate: 1
 
 - type: reagent
   id: MilkSoy
@@ -59,9 +44,6 @@
   desc: Surprisingly tasty.
   physicalDesc: refreshing
   color: "#302000"
-  metabolism:
-    - !type:DefaultDrink
-      rate: 1
 
 - type: reagent
   id: MilkOat
@@ -69,6 +51,3 @@
   desc: Surprisingly tasty.
   physicalDesc: refreshing
   color: "#302000"
-  metabolism:
-    - !type:DefaultDrink
-      rate: 1
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml b/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml
index 44a75bbd1d..ac4a65a2f5 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml
@@ -4,9 +4,6 @@
   desc: It's a little piece of Eden.
   physicalDesc: crisp
   color: "#FDAD01"
-  metabolism:
-    - !type:DefaultDrink
-      rate: 1
 
 - type: reagent
   id: JuiceBerry
@@ -14,9 +11,6 @@
   desc: A delicious blend of several different kinds of berries.
   physicalDesc: sweet
   color: "#660099"
-  metabolism:
-    - !type:DefaultDrink
-      rate: 1
 
 - type: reagent
   id: JuiceBanana
@@ -24,9 +18,6 @@
   desc: The raw essence of a banana. HONK.
   physicalDesc: crisp
   color: "#FFE777"
-  metabolism:
-    - !type:DefaultDrink
-      rate: 1
 
 #TODO: port on_mob_life: restore eyesight
 #if(..())
@@ -45,9 +36,6 @@
   desc: It's like a carrot, but less crunchy.
   physicalDesc: crisp
   color: "#FF8820"
-  metabolism:
-    - !type:DefaultDrink
-      rate: 1
 
 - type: reagent
   id: JuiceLime
@@ -55,9 +43,6 @@
   desc: The sweet-sour juice of limes.
   physicalDesc: citric
   color: "#99bb43"
-  metabolism:
-    - !type:DefaultDrink
-      rate: 1
 
 - type: reagent
   id: JuiceLemon
@@ -65,9 +50,6 @@
   desc: This juice is VERY sour.
   physicalDesc: citric
   color: "#fff690"
-  metabolism:
-    - !type:DefaultDrink
-      rate: 1
 
 - type: reagent
   id: JuiceGrape
@@ -75,9 +57,6 @@
   desc: Freshly squeezed juice from red grapes. Quite sweet.
   physicalDesc: crisp
   color: "#512284"
-  metabolism:
-    - !type:DefaultDrink
-      rate: 1
 
 # /datum/reagent/drink/orangejuice/on_mob_life(var/mob/living/M)
 
@@ -93,9 +72,6 @@
   desc: Both delicious AND rich in Vitamin C. What more do you need?
   physicalDesc: citric
   color: "#E78108"
-  metabolism:
-    - !type:DefaultDrink
-      rate: 1
 
 - type: reagent
   id: JuiceTomato
@@ -103,9 +79,6 @@
   desc: Tomatoes made into juice. What a waste of good tomatoes, huh?
   physicalDesc: saucey
   color: "#731008"
-  metabolism:
-    - !type:DefaultDrink
-      rate: 1
 
 # /datum/reagent/drink/poisonberryjuice/on_mob_life(var/mob/living/M)
 
@@ -120,9 +93,6 @@
   desc: A surprisingly tasty juice blended from various kinds of very deadly and toxic berries.
   physicalDesc: aromatic #maybe should be 'sickly'?
   color: "#6600CC"
-  metabolism:
-    - !type:DefaultDrink
-      rate: 1
 
 - type: reagent
   id: JuiceWatermelon
@@ -130,9 +100,6 @@
   desc: The delicious juice of a watermelon.
   physicalDesc: sweet
   color: "#EF3520"
-  metabolism:
-    - !type:DefaultDrink
-      rate: 1
 
 - type: reagent
   id: JuicePineapple
@@ -140,9 +107,6 @@
   desc: The delicious juice of a pineapple.
   physicalDesc: tropical
   color: yellow
-  metabolism:
-    - !type:DefaultDrink
-      rate: 1
 
 # - type: reagent
 #   id: PotatoJuice
@@ -150,6 +114,3 @@
 #   desc: Juice of the potato. Bleh.
 #   physicalDesc: starchy
 #   color: "#302000"
-#   metabolism:
-#     - !type:DefaultDrink
-#       rate: 1
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
index eb2b34041b..b28baa70f1 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
@@ -4,9 +4,6 @@
   desc: A sweet, carbonated soft drink. Caffeine free.
   physicalDesc: fizzy
   color: "#422912"
-  metabolism:
-    - !type:DefaultDrink
-      rate: 1
   plantMetabolism:
     - !type:AdjustNutrition
       amount: 0.1
@@ -21,12 +18,6 @@
   desc: A highly processed liquid substance barely-passing intergalatic health standarts for a soft drink.
   physicalDesc: fizzy
   color: "#deb928"
-  metabolism:
-    - !type:DefaultDrink
-      rate: 1
-    - !type:HealthChangeMetabolism 
-      healthChange: 2
-      damageClass: Toxin
   plantMetabolism:
     - !type:AdjustNutrition
       amount: 0.1
diff --git a/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml b/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml
index 88183dbfb6..8cdcb5903a 100644
--- a/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml
@@ -4,9 +4,6 @@
   desc: The sweetness of a thousand sugars but none of the calories.
 #  physicalDesc:
   color: aquamarine
-  metabolism:
-    - !type:DefaultFood
-      rate: 1
 
 - type: reagent
   id: BbqSauce
@@ -14,9 +11,6 @@
   desc: Hand wipes not included.
   physicalDesc: Gloopy.
   color: darkred
-  metabolism:
-    - !type:DefaultFood
-      rate: 1
 
 - type: reagent
   id: Cornoil
@@ -24,9 +18,6 @@
   desc: Corn oil, A delicious oil used in cooking. Made from corn.
 #  physicalDesc:
   color: yellow
-  metabolism:
-    - !type:DefaultFood
-      rate: 1
 
 - type: reagent
   id: Frostoil
@@ -34,9 +25,6 @@
   desc: Leaves the tongue numb in its passage.
 #  physicalDesc:
   color: skyblue
-  metabolism:
-    - !type:DefaultFood
-      rate: 1
 
 - type: reagent
   id: HorseradishSauce
@@ -44,9 +32,6 @@
   desc: Smelly horseradish sauce.
   physicalDesc: Overpowering.
   color: gray
-  metabolism:
-    - !type:DefaultFood
-      rate: 1
 
 - type: reagent
   id: Hotsauce
@@ -54,9 +39,6 @@
   desc: Burns so good.
 #  physicalDesc:
   color: red
-  metabolism:
-    - !type:DefaultFood
-      rate: 1
 
 - type: reagent
   id: Ketchup
@@ -64,9 +46,6 @@
   desc: Made from pureed tomatoes and flavored with spices.
 #  physicalDesc:
   color: red
-  metabolism:
-    - !type:DefaultFood
-      rate: 1
 
 - type: reagent
   id: Soysauce
@@ -74,6 +53,3 @@
   desc: A salty soy-based flavoring.
 #  physicalDesc:
   color: saddlebrown
-  metabolism:
-    - !type:DefaultFood
-      rate: 1
diff --git a/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml b/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml
index ee13427ec1..bfeed21bb5 100644
--- a/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml
@@ -4,9 +4,6 @@
   desc: Used for baking.
   physicalDesc: powdery
   color: white
-  metabolism:
-    - !type:DefaultFood
-      rate: 1
 
 - type: reagent
   id: Oats
@@ -14,18 +11,12 @@
   desc: Used for a variety of tasty purposes.
   physicalDesc: coarse
   color: tan
-  metabolism:
-    - !type:DefaultFood
-      rate: 1
 
 - type: reagent
   id: Enzyme
   name: universal enzyme
   desc: Used in cooking various dishes.
   color: "#009900"
-  metabolism:
-    - !type:DefaultFood
-      rate: 1
 
 - type: reagent
   id: Egg
@@ -33,9 +24,6 @@
   desc: Used for baking.
   physicalDesc: mucus-like
   color: white
-  metabolism:
-    - !type:DefaultFood
-      rate: 1
 
 - type: reagent
   id: Sugar
@@ -43,9 +31,6 @@
   desc: Tasty spacey sugar!
   physicalDesc:
   color: white
-  metabolism:
-    - !type:DefaultFood
-      rate: 1
 
 - type: reagent
   id: Salt
@@ -53,9 +38,6 @@
   desc: Salt. From space oceans, presumably.
   physicalDesc: Coarse.
   color: white
-  metabolism:
-    - !type:DefaultFood
-      rate: 1
 
 - type: reagent
   id: Blackpepper
@@ -63,33 +45,21 @@
   desc: Often used to flavor food or make people sneeze.
   physicalDesc: Grainy.
   color: black
-  metabolism:
-    - !type:DefaultFood
-      rate: 1
 
 - type: reagent
   id: Vinegar
   name: vinegar
   desc: Often used to flavor food.
   color: tan
-  metabolism:
-    - !type:DefaultFood
-      rate: 1
 
 - type: reagent
   id: Rice
   name: rice
   desc: Hard, small white grains.
   color: white
-  metabolism:
-    - !type:DefaultFood
-      rate: 1
 
 - type: reagent
   id: OilOlive
   name: olive oil
   desc: Viscous and fragrant.
   color: olive
-  metabolism:
-    - !type:DefaultFood
-      rate: 1
diff --git a/Resources/Prototypes/Reagents/chemicals.yml b/Resources/Prototypes/Reagents/chemicals.yml
index 3d6d49be64..fb5be33970 100644
--- a/Resources/Prototypes/Reagents/chemicals.yml
+++ b/Resources/Prototypes/Reagents/chemicals.yml
@@ -89,9 +89,6 @@
   desc: All the vitamins, minerals, and carbohydrates the body needs in pure form.
   physicalDesc: opaque
   color: "#664330"
-  metabolism:
-    - !type:DefaultFood
-      rate: 1
   plantMetabolism:
     - !type:AdjustNutrition
       amount: 1
@@ -180,7 +177,7 @@
       amount: 10
     - !type:AdjustHealth
       amount: -5
-      
+
 - type: reagent
   id: SulfuricAcid
   name: sulfuric acid
@@ -218,9 +215,6 @@
   color: "#c0e0ff20"
   boilingPoint: 100.0
   meltingPoint: 0.0
-  metabolism:
-    - !type:DefaultDrink
-      rate: 1
   tileReactions:
     - !type:ExtinguishTileReaction {}
     - !type:SpillIfPuddlePresentTileReaction {}
@@ -228,13 +222,40 @@
     - !type:AdjustWater
       amount: 1
 
+- type: reagent
+  id: Meth
+  name: meth
+  desc: Methamphetamine, more commonly know as meth, is a potent stimulant, with dangerous side-effects if too much is consumed.
+  physicalDesc: translucent
+  color: "#FAFAFA"
+  boilingPoint: 212.0 #Meth vape when?
+  meltingPoint: 170.0
+
+- type: reagent
+  id: Iodine
+  name: iodine
+  desc: Commonly added to table salt as a nutrient. On its own it tastes far less pleasing.
+  physicalDesc: Dark Brown
+  color: "#BC8A00"
+  boilingPoint: 184.3
+  meltingPoint: 113.7
+
+- type: reagent
+  id: Ephedrine
+  name: ephedrine
+  desc: Increases stun resistance and movement speed, giving you hand cramps. Overdose deals toxin damage and inhibits breathing
+  physicalDesc: Bone white
+  color: "#D2FFFA"
+  boilingPoint: 255.0
+  meltingPoint: 36.0
+
 - type: reagent
   id: Oil
   name: oil
   desc: Used by chefs to cook.
   physicalDesc: oily
   color: "#b67823"
-  boilingPoint: 300.0 
+  boilingPoint: 300.0
   meltingPoint: -16.0
   tileReactions:
     - !type:FlammableTileReaction {}
diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml
index 16dba85352..c49cc13300 100644
--- a/Resources/Prototypes/Reagents/medicine.yml
+++ b/Resources/Prototypes/Reagents/medicine.yml
@@ -18,10 +18,6 @@
   desc: A broad-spectrum anti-toxin, which treats toxin damage in the blood stream. Overdosing will cause vomiting, dizzyness and pain.
   physicalDesc: translucent
   color: "#3a1d8a"
-  metabolism:
-    - !type:HealthChangeMetabolism 
-      healthChange: -1
-      damageClass: Toxin
   plantMetabolism:
     - !type:AdjustToxins
       amount: -10
@@ -34,13 +30,6 @@
   desc: A slightly unstable medication used for the most extreme any serious case of radiation poisoning. Lowers radiation level at over twice the rate Hyronalin does and will heal toxin damage at the same time. Deals very minor brute damage to the patient over time, but the patient's body will typically out-regenerate it easily.
   physicalDesc: cloudy
   color: "#bd5902"
-  metabolism:
-    - !type:HealthChangeMetabolism 
-      healthChange: -1
-      damageClass: Toxin #I think you need multiple of these components for different types of damage so I'll maybe change it to work better in the future 
-    - !type:HealthChangeMetabolism 
-      healthChange: 0.5
-      damageClass: Brute
 
 - type: reagent
   id: Bicaridine
@@ -48,10 +37,6 @@
   desc: An analgesic which is highly effective at treating brute damage. It is useful for stabilizing people who have been severely beaten, as well as treating less life-threatening injuries. In the case of bleeding (internal or external), bicaridine will slow down the bleeding heavily. If the dosage exceeds the overdose limit, it'll stop it outright.
   physicalDesc: opaque
   color: "#ffaa00"
-  metabolism:
-    - !type:HealthChangeMetabolism 
-      healthChange: -2
-      damageClass: Brute
 
 - type: reagent
   id: Cryoxadone
@@ -90,10 +75,6 @@
   desc: An advanced chemical that is more effective at treating burn damage than Kelotane.
   physicalDesc: translucent
   color: "#215263"
-  metabolism:
-    - !type:HealthChangeMetabolism 
-      healthChange: -3
-      damageClass: Burn
 
 - type: reagent
   id: Dexalin
@@ -101,21 +82,13 @@
   desc: Used for treating oxygen deprivation. In most cases where it is likely to be needed, the strength of Dexalin Plus will probably be more useful (Results in 1 unit instead of 2).
   physicalDesc: opaque
   color: "#0041a8"
-  metabolism:
-    - !type:HealthChangeMetabolism 
-      healthChange: -1
-      damageClass: Airloss #this may be asphyxiation
-      
+
 - type: reagent
   id: DexalinPlus
   name: dexalin plus
   desc: Used in treatment of extreme cases of oxygen deprivation. Even a single unit immediately counters all oxygen loss, which is hugely useful in many circumstances. Any dose beyond this will continue to counter oxygen loss until it is metabolized, essentially removing the need to breathe.
   physicalDesc: cloudy
   color: "#4da0bd"
-  metabolism:
-    - !type:HealthChangeMetabolism 
-      healthChange: -3
-      damageClass: Airloss
 
 - type: reagent
   id: Ethylredoxrazine
@@ -165,10 +138,6 @@
   desc: Treats burn damage and prevents infection.
   physicalDesc: strong-smelling
   color: "#bf3d19"
-  metabolism:
-    - !type:HealthChangeMetabolism 
-      healthChange: -1
-      damageClass: Burn
 
 - type: reagent
   id: Leporazine
@@ -201,7 +170,7 @@
 - type: reagent
   id: Paroxetine
   name: paroxetine
-  desc: Prevents hallucination, but has a 10% chance of causing intense hallucinations.  
+  desc: Prevents hallucination, but has a 10% chance of causing intense hallucinations.
   physicalDesc: acrid
   color: "#fffbad"
 
@@ -225,11 +194,6 @@
   desc: Toxic, but treats hallucinations, drowsiness & halves the duration of paralysis, stuns and knockdowns. It is metabolized very slowly. One unit is enough to treat hallucinations; two units is deadly.
   physicalDesc: pungent
   color: "#d49a2f"
-  metabolism:
-    - !type:HealthChangeMetabolism 
-      healthChange: 0.67
-      damageClass: Toxin
-      rate: 0.2 
 
 - type: reagent
   id: Tramadol
@@ -289,10 +253,6 @@
   plantMetabolism:
     - !type:AdjustToxins
       amount: 10
-  metabolism:
-    - !type:HealthChangeMetabolism 
-      healthChange: 1
-      damageClass: Airloss
 
 - type: reagent
   id: Impedrezene
@@ -307,10 +267,6 @@
   desc: Temporarily stops respiration and causes tissue damage. Large doses are fatal, and will cause people to pass out very quickly. Dexalin and Dexalin Plus will both remove it, however.
   physicalDesc: pungent
   color: "#6b0007"
-  metabolism:
-    - !type:HealthChangeMetabolism 
-      healthChange: 7
-      damageClass: Airloss
 
 - type: reagent
   id: Lipozine
@@ -356,24 +312,10 @@
   desc: Pure THC oil, extracted from the leaves of the cannabis plant. Much stronger than in it's natural form and can be used to numb chronic pain in patients.
   physicalDesc: skunky
   color: "#DAA520"
-  
+
 - type: reagent
   id: Omnizine
   name: Omnizine
   desc: A soothing milky liquid with an iridescent gleam. A well known conspiracy theory says that it's origins remain a mystery because knowing the secrets of its production would render most commercial pharmaceuticals obsolete.
   physicalDesc: soothing
   color: "#fcf7f9"
-  metabolism:
-    - !type:HealthChangeMetabolism 
-      healthChange: -2
-      damageClass: Burn
-    - !type:HealthChangeMetabolism 
-      healthChange: -2
-      damageClass: Toxin
-    - !type:HealthChangeMetabolism 
-      healthChange: -2
-      damageClass: Airloss
-    - !type:HealthChangeMetabolism 
-      healthChange: -2
-      damageClass: Brute
-
diff --git a/Resources/Prototypes/Recipes/Reactions/chemicals.yml b/Resources/Prototypes/Recipes/Reactions/chemicals.yml
index e719e598fe..511edf22e3 100644
--- a/Resources/Prototypes/Recipes/Reactions/chemicals.yml
+++ b/Resources/Prototypes/Recipes/Reactions/chemicals.yml
@@ -226,3 +226,31 @@
       amount: 1
   products:
     Fluorosurfactant: 5
+    
+- type: reaction
+  id: Meth
+  reactants:
+    Ephedrine:
+      amount: 1
+    Carbon:
+      amount: 1
+    Iodine:
+      amount: 1
+    Phosphorus:
+     amount: 1
+  products:
+    Meth: 4 #I kinda remember having to heat this up, and if you heated it up too much, it went boom, I can't remember the specific values tho.
+    
+- type: reaction
+  id: Ephedrine
+  reactants:
+    Oil:
+      amount: 1
+    Hydrogen:
+      amount: 1
+    Sugar:
+      amount: 1
+    Diethylamine:
+     amount: 1
+  products:
+    Ephedrine: 4
diff --git a/Resources/Textures/Clothing/Head/Hats/truckershat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/truckershat.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..8e0362d8dd
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/truckershat.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/truckershat.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/truckershat.rsi/icon.png
new file mode 100644
index 0000000000..95a2ca01f5
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/truckershat.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/truckershat.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/truckershat.rsi/inhand-left.png
new file mode 100644
index 0000000000..7e2ef801dc
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/truckershat.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/truckershat.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/truckershat.rsi/inhand-right.png
new file mode 100644
index 0000000000..db26e66334
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/truckershat.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/truckershat.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/truckershat.rsi/meta.json
new file mode 100644
index 0000000000..48deea96a8
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hats/truckershat.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from baystation12 and modified by Swept at commit https://github.com/Baystation12/Baystation12/commit/80b2ded014aa871e6bceb6913b2961a23109aa23",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000..42ea220dba
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/icon.png
new file mode 100644
index 0000000000..6f2f21e14b
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/inhand-left.png
new file mode 100644
index 0000000000..ef474f95ad
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/inhand-right.png
new file mode 100644
index 0000000000..79468f3b60
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/meta.json
new file mode 100644
index 0000000000..c35ec06fb5
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation and modified by Swept at commit https://github.com/tgstation/tgstation/commit/ac792e3226d48e5b3aaccff165ce100f7636a040",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/gasfilter.rsi/gasFilterOn.png b/Resources/Textures/Structures/Piping/Atmospherics/gasfilter.rsi/gasFilterOn.png
index 891eface87..06cdacf03e 100644
Binary files a/Resources/Textures/Structures/Piping/Atmospherics/gasfilter.rsi/gasFilterOn.png and b/Resources/Textures/Structures/Piping/Atmospherics/gasfilter.rsi/gasFilterOn.png differ
diff --git a/RobustToolbox b/RobustToolbox
index 3a86c827ea..04d94f87fc 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 3a86c827ea02f46b213f473f6479fbfaed35095e
+Subproject commit 04d94f87fc7205443aa8d9ea2b6fa178d4ba825d
diff --git a/SpaceStation14.sln.DotSettings b/SpaceStation14.sln.DotSettings
index 5ff7f8d1e5..692912bc33 100644
--- a/SpaceStation14.sln.DotSettings
+++ b/SpaceStation14.sln.DotSettings
@@ -264,6 +264,7 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Spirate/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Strippable/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=stunnable/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=subfloor/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Superconduct/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=superconduction/@EntryIndexedValue">True</s:Boolean>
     <s:Boolean x:Key="/Default/UserDictionary/Words/=swsl/@EntryIndexedValue">True</s:Boolean>
@@ -284,6 +285,7 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=unequip/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=unexcite/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Unequip/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=unhiding/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=unlockable/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=unobtanium/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Unoccluded/@EntryIndexedValue">True</s:Boolean>