diff --git a/Content.Benchmarks/ComponentManagerGetAllComponents.cs b/Content.Benchmarks/ComponentManagerGetAllComponents.cs
index 0507b58b5e..80cba3ca02 100644
--- a/Content.Benchmarks/ComponentManagerGetAllComponents.cs
+++ b/Content.Benchmarks/ComponentManagerGetAllComponents.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using BenchmarkDotNet.Attributes;
 using Moq;
 using Robust.Shared.Exceptions;
@@ -45,8 +45,7 @@ namespace Content.Benchmarks
             var dummyReg = new Mock<IComponentRegistration>();
             dummyReg.SetupGet(p => p.Name).Returns("Dummy");
             dummyReg.SetupGet(p => p.Type).Returns(typeof(DummyComponent));
-            dummyReg.SetupGet(p => p.NetID).Returns((uint?) null);
-            dummyReg.SetupGet(p => p.NetworkSynchronizeExistence).Returns(false);
+            dummyReg.SetupGet(p => p.NetID).Returns((ushort?) null);
             dummyReg.SetupGet(p => p.References).Returns(new [] {typeof(DummyComponent)});
 
             var componentFactory = new Mock<IComponentFactory>();
diff --git a/Content.Client/AI/ClientAiDebugSystem.cs b/Content.Client/AI/ClientAiDebugSystem.cs
index e60014f48f..fb3a657c4b 100644
--- a/Content.Client/AI/ClientAiDebugSystem.cs
+++ b/Content.Client/AI/ClientAiDebugSystem.cs
@@ -8,6 +8,7 @@ using Robust.Client.UserInterface.Controls;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Maths;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.AI
 {
@@ -169,8 +170,9 @@ namespace Content.Client.AI
                     MouseFilter = Control.MouseFilterMode.Ignore,
                 };
 
-                var vBox = new VBoxContainer()
+                var vBox = new BoxContainer()
                 {
+                    Orientation = LayoutOrientation.Vertical,
                     SeparationOverride = 15,
                     Children = {actionLabel, pathfindingLabel},
                 };
diff --git a/Content.Client/AME/UI/AMEWindow.cs b/Content.Client/AME/UI/AMEWindow.cs
index 108806eb55..e9104e6f67 100644
--- a/Content.Client/AME/UI/AMEWindow.cs
+++ b/Content.Client/AME/UI/AMEWindow.cs
@@ -6,6 +6,7 @@ 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
 {
@@ -30,61 +31,69 @@ namespace Content.Client.AME.UI
 
             MinSize = SetSize = (250, 250);
 
-            Contents.AddChild(new VBoxContainer
+            Contents.AddChild(new BoxContainer
             {
+	            Orientation = LayoutOrientation.Vertical,
                 Children =
                     {
-                        new HBoxContainer
+                        new BoxContainer
                         {
+                            Orientation = LayoutOrientation.Horizontal,
                             Children =
                             {
-                                new Label {Text = Loc.GetString("ame-window-engine-status-label")},
+                                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 HBoxContainer
+                        new BoxContainer
                         {
+                            Orientation = LayoutOrientation.Horizontal,
                             Children =
                             {
                                 (ToggleInjection = new Button {Text = Loc.GetString("ame-window-toggle-injection-button"), StyleClasses = {StyleBase.ButtonOpenBoth}, Disabled = true}),
                             }
                         },
-                        new HBoxContainer
+                        new BoxContainer
                         {
+                            Orientation = LayoutOrientation.Horizontal,
                             Children =
                             {
-                                new Label {Text = Loc.GetString("ame-window-fuel-status-label")},
+                                new Label {Text = Loc.GetString("ame-window-fuel-status-label") + " "},
                                 (FuelAmount = new Label {Text = Loc.GetString("ame-window-fuel-not-inserted-text")})
                             }
                         },
-                        new HBoxContainer
+                        new BoxContainer
                         {
+                            Orientation = LayoutOrientation.Horizontal,
                             Children =
                             {
                                 (EjectButton = new Button {Text = Loc.GetString("ame-window-eject-button"), StyleClasses = {StyleBase.ButtonOpenBoth}, Disabled = true}),
                             }
                         },
-                        new HBoxContainer
+                        new BoxContainer
                         {
+                            Orientation = LayoutOrientation.Horizontal,
                             Children =
                             {
-                                new Label {Text = Loc.GetString("ame-window-injection-amount-label")},
+                                new Label {Text = Loc.GetString("ame-window-injection-amount-label") + " "},
                                 (InjectionAmount = new Label {Text = "0"})
                             }
                         },
-                        new HBoxContainer
+                        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 HBoxContainer
+                        new BoxContainer
                         {
+                            Orientation = LayoutOrientation.Horizontal,
                             Children =
                             {
-                                 new Label { Text = Loc.GetString("ame-window-core-count-label")},
+                                 new Label { Text = Loc.GetString("ame-window-core-count-label") + " "},
                                 (CoreCount = new Label { Text = "0"}),
                             }
                         }
@@ -130,7 +139,7 @@ namespace Content.Client.AME.UI
                 EjectButton.Disabled = false;
             }
 
-            if(!castState.HasFuelJar)
+            if (!castState.HasFuelJar)
             {
                 EjectButton.Disabled = true;
                 ToggleInjection.Disabled = true;
@@ -143,18 +152,18 @@ namespace Content.Client.AME.UI
                 FuelAmount.Text = $"{castState.FuelAmount}";
             }
 
-            if(!castState.IsMaster)
+            if (!castState.IsMaster)
             {
                 ToggleInjection.Disabled = true;
             }
 
             if (!castState.Injecting)
             {
-                InjectionStatus.Text = Loc.GetString("ame-window-engine-injection-status-not-injecting-label");
+                InjectionStatus.Text = Loc.GetString("ame-window-engine-injection-status-not-injecting-label") + " ";
             }
             else
             {
-                InjectionStatus.Text = Loc.GetString("ame-window-engine-injection-status-injecting-label");
+                InjectionStatus.Text = Loc.GetString("ame-window-engine-injection-status-injecting-label") + " ";
             }
 
             CoreCount.Text = $"{castState.CoreCount}";
diff --git a/Content.Client/Access/UI/IdCardConsoleWindow.cs b/Content.Client/Access/UI/IdCardConsoleWindow.cs
index 450aa0ebdd..4c3093baa2 100644
--- a/Content.Client/Access/UI/IdCardConsoleWindow.cs
+++ b/Content.Client/Access/UI/IdCardConsoleWindow.cs
@@ -8,6 +8,7 @@ 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
 {
@@ -38,7 +39,10 @@ namespace Content.Client.Access.UI
         {
             MinSize = SetSize = (650, 290);
             _owner = owner;
-            var vBox = new VBoxContainer();
+            var vBox = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Vertical
+            };
 
             vBox.AddChild(new GridContainer
             {
diff --git a/Content.Client/Actions/UI/ActionAlertTooltip.cs b/Content.Client/Actions/UI/ActionAlertTooltip.cs
index 8ebb9c8642..b64faa56b1 100644
--- a/Content.Client/Actions/UI/ActionAlertTooltip.cs
+++ b/Content.Client/Actions/UI/ActionAlertTooltip.cs
@@ -4,6 +4,7 @@ using Robust.Client.UserInterface.Controls;
 using Robust.Shared.IoC;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Actions.UI
 {
@@ -28,8 +29,12 @@ namespace Content.Client.Actions.UI
 
             SetOnlyStyleClass(StyleNano.StyleClassTooltipPanel);
 
-            VBoxContainer vbox;
-            AddChild(vbox = new VBoxContainer {RectClipContent = true});
+            BoxContainer vbox;
+            AddChild(vbox = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Vertical,
+                RectClipContent = true
+            });
             var nameLabel = new RichTextLabel
             {
                 MaxWidth = TooltipTextMaxWidth,
diff --git a/Content.Client/Actions/UI/ActionMenu.cs b/Content.Client/Actions/UI/ActionMenu.cs
index a2cc63c26d..bb7f996ad0 100644
--- a/Content.Client/Actions/UI/ActionMenu.cs
+++ b/Content.Client/Actions/UI/ActionMenu.cs
@@ -19,6 +19,7 @@ using Robust.Shared.Localization;
 using Robust.Shared.Log;
 using Robust.Shared.Timing;
 using static Robust.Client.UserInterface.Controls.BaseButton;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Actions.UI
 {
@@ -71,12 +72,14 @@ namespace Content.Client.Actions.UI
             Title = Loc.GetString("ui-actionmenu-title");
             MinSize = (300, 300);
 
-            Contents.AddChild(new VBoxContainer
+            Contents.AddChild(new BoxContainer
             {
+	            Orientation = LayoutOrientation.Vertical,
                 Children =
                 {
-                    new HBoxContainer
+                    new BoxContainer
                     {
+                        Orientation = LayoutOrientation.Horizontal,
                         Children =
                         {
                             (_searchBar = new LineEdit
@@ -87,7 +90,7 @@ namespace Content.Client.Actions.UI
                             }),
                             (_filterButton = new MultiselectOptionButton<string>()
                             {
-                                Label = Loc.GetString("ui-actionmenu-filter-buttonr")
+                                Label = Loc.GetString("ui-actionmenu-filter-button")
                             })
                         }
                     },
diff --git a/Content.Client/Actions/UI/ActionSlot.cs b/Content.Client/Actions/UI/ActionSlot.cs
index 29b4b48b82..36702eddd9 100644
--- a/Content.Client/Actions/UI/ActionSlot.cs
+++ b/Content.Client/Actions/UI/ActionSlot.cs
@@ -16,6 +16,7 @@ using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Actions.UI
 {
@@ -174,8 +175,9 @@ namespace Content.Client.Actions.UI
             _cooldownGraphic = new CooldownGraphic {Progress = 0, Visible = false};
 
             // padding to the left of the number to shift it right
-            var paddingBox = new HBoxContainer()
+            var paddingBox = new BoxContainer
             {
+                Orientation = LayoutOrientation.Horizontal,
                 HorizontalExpand = true,
                 VerticalExpand = true,
                 MinSize = (64, 64)
@@ -187,8 +189,9 @@ namespace Content.Client.Actions.UI
             paddingBox.AddChild(_number);
 
             // padding to the left of the small icon
-            var paddingBoxItemIcon = new HBoxContainer()
+            var paddingBoxItemIcon = new BoxContainer
             {
+                Orientation = LayoutOrientation.Horizontal,
                 HorizontalExpand = true,
                 VerticalExpand = true,
                 MinSize = (64, 64)
diff --git a/Content.Client/Actions/UI/ActionsUI.cs b/Content.Client/Actions/UI/ActionsUI.cs
index 7c9b5ca86b..7544bece52 100644
--- a/Content.Client/Actions/UI/ActionsUI.cs
+++ b/Content.Client/Actions/UI/ActionsUI.cs
@@ -18,6 +18,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Log;
 using Robust.Shared.Timing;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Actions.UI
 {
@@ -42,7 +43,7 @@ namespace Content.Client.Actions.UI
         private readonly Label _loadoutNumber;
         private readonly Texture _lockTexture;
         private readonly Texture _unlockTexture;
-        private readonly HBoxContainer _loadoutContainer;
+        private readonly BoxContainer _loadoutContainer;
 
         private readonly TextureRect _dragShadow;
 
@@ -108,15 +109,17 @@ namespace Content.Client.Actions.UI
             };
             AddChild(panelContainer);
 
-            var hotbarContainer = new VBoxContainer
+            var hotbarContainer = new BoxContainer
             {
+	            Orientation = LayoutOrientation.Vertical,
                 SeparationOverride = 3,
                 HorizontalAlignment = HAlignment.Left
             };
             panelContainer.AddChild(hotbarContainer);
 
-            var settingsContainer = new HBoxContainer
+            var settingsContainer = new BoxContainer
             {
+                Orientation = LayoutOrientation.Horizontal,
                 HorizontalExpand = true
             };
             hotbarContainer.AddChild(settingsContainer);
@@ -156,8 +159,9 @@ namespace Content.Client.Actions.UI
             };
             hotbarContainer.AddChild(_slotContainer);
 
-            _loadoutContainer = new HBoxContainer
+            _loadoutContainer = new BoxContainer
             {
+                Orientation = LayoutOrientation.Horizontal,
                 HorizontalExpand = true,
                 MouseFilter = MouseFilterMode.Stop
             };
diff --git a/Content.Client/Administration/UI/AdminAddReagentUI.cs b/Content.Client/Administration/UI/AdminAddReagentUI.cs
index 397b899369..425fb16746 100644
--- a/Content.Client/Administration/UI/AdminAddReagentUI.cs
+++ b/Content.Client/Administration/UI/AdminAddReagentUI.cs
@@ -8,6 +8,7 @@ using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Prototypes;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Administration.UI
 {
@@ -65,8 +66,9 @@ namespace Content.Client.Administration.UI
 
                 Title = Loc.GetString("admin-add-reagent-eui-title");
 
-                Contents.AddChild(new VBoxContainer
+                Contents.AddChild(new BoxContainer
                 {
+	                Orientation = LayoutOrientation.Vertical,
                     Children =
                     {
                         new GridContainer
@@ -88,8 +90,9 @@ namespace Content.Client.Administration.UI
                             HorizontalExpand = true,
                             VerticalExpand = true
                         },
-                        new HBoxContainer
+                        new BoxContainer
                         {
+                            Orientation = LayoutOrientation.Horizontal,
                             Children =
                             {
                                 (_errorLabel = new Label
diff --git a/Content.Client/Administration/UI/AdminMenuWindow.xaml.cs b/Content.Client/Administration/UI/AdminMenuWindow.xaml.cs
index f527a28c8d..bb431027b0 100644
--- a/Content.Client/Administration/UI/AdminMenuWindow.xaml.cs
+++ b/Content.Client/Administration/UI/AdminMenuWindow.xaml.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Collections.Generic;
 using Content.Client.Administration.UI.Tabs;
 using Content.Client.HUD;
diff --git a/Content.Client/Administration/UI/CustomControls/CommandButton.cs b/Content.Client/Administration/UI/CustomControls/CommandButton.cs
index f728b8b6e2..9986eac3c1 100644
--- a/Content.Client/Administration/UI/CustomControls/CommandButton.cs
+++ b/Content.Client/Administration/UI/CustomControls/CommandButton.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Robust.Client.Console;
+using Robust.Client.Console;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.IoC;
 
@@ -9,7 +8,7 @@ namespace Content.Client.Administration.UI.CustomControls
     {
         public string? Command { get; set; }
 
-        public CommandButton() : base()
+        public CommandButton()
         {
             OnPressed += Execute;
         }
diff --git a/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml b/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml
index 33d5d6d535..4f64435d42 100644
--- a/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml
+++ b/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml
@@ -1,13 +1,13 @@
-<VBoxContainer
+<BoxContainer Orientation="Vertical"
     xmlns="https://spacestation14.io">
     <Control CustomMinimumSize="0 5" />
-    <HBoxContainer>
+    <BoxContainer Orientation="Horizontal">
         <!-- <Label Text="{Loc Search}" CustomMinimumSize="100 0" /> -->
         <!-- <Control CustomMinimumSize="50 0" /> -->
         <LineEdit Name="FilterLineEdit" CustomMinimumSize="100 0" SizeFlagsHorizontal="FillExpand" PlaceHolder="{Loc Filter}"/>
-    </HBoxContainer>
+    </BoxContainer>
     <!-- <Control CustomMinimumSize="0 5" /> -->
     <ItemList
         Name="PlayerItemList" SelectMode="Single" SizeFlagsVertical="FillExpand" SizeFlagsHorizontal="FillExpand"
         CustomMinimumSize="100 100" />
-</VBoxContainer>
+</BoxContainer>
diff --git a/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs b/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs
index c582b234c0..fa1dfeb613 100644
--- a/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs
+++ b/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Robust.Client.AutoGenerated;
diff --git a/Content.Client/Administration/UI/CustomControls/UICommandButton.cs b/Content.Client/Administration/UI/CustomControls/UICommandButton.cs
index dd38f32479..eeeb214397 100644
--- a/Content.Client/Administration/UI/CustomControls/UICommandButton.cs
+++ b/Content.Client/Administration/UI/CustomControls/UICommandButton.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.IoC;
 
diff --git a/Content.Client/Administration/UI/PermissionsEui.cs b/Content.Client/Administration/UI/PermissionsEui.cs
index feaa2b751d..8aa8b32a6f 100644
--- a/Content.Client/Administration/UI/PermissionsEui.cs
+++ b/Content.Client/Administration/UI/PermissionsEui.cs
@@ -14,6 +14,7 @@ using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using Robust.Shared.Utility;
 using static Content.Shared.Administration.PermissionsEuiMsg;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Administration.UI
 {
@@ -316,15 +317,17 @@ namespace Content.Client.Administration.UI
                 };
 
                 AdminsList = new GridContainer {Columns = 5, VerticalExpand = true};
-                var adminVBox = new VBoxContainer
+                var adminVBox = new BoxContainer
                 {
+                    Orientation = LayoutOrientation.Vertical,
                     Children = {AdminsList, AddAdminButton},
                 };
                 TabContainer.SetTabTitle(adminVBox, Loc.GetString("permissions-eui-menu-admins-tab-title"));
 
                 AdminRanksList = new GridContainer {Columns = 3};
-                var rankVBox = new VBoxContainer
+                var rankVBox = new BoxContainer
                 {
+                    Orientation = LayoutOrientation.Vertical,
                     Children = { AdminRanksList, AddAdminRankButton}
                 };
                 TabContainer.SetTabTitle(rankVBox, Loc.GetString("permissions-eui-menu-admin-ranks-tab-title"));
@@ -451,7 +454,10 @@ namespace Content.Client.Administration.UI
                     FlagButtons.Add(flag, (inherit, sub, plus));
                 }
 
-                var bottomButtons = new HBoxContainer();
+                var bottomButtons = new BoxContainer
+                {
+                    Orientation = LayoutOrientation.Horizontal
+                };
                 if (data != null)
                 {
                     // show remove button.
@@ -461,17 +467,20 @@ namespace Content.Client.Administration.UI
 
                 bottomButtons.AddChild(SaveButton);
 
-                Contents.AddChild(new VBoxContainer
+                Contents.AddChild(new BoxContainer
                 {
+                    Orientation = LayoutOrientation.Vertical,
                     Children =
                     {
-                        new HBoxContainer
+                        new BoxContainer
                         {
+                            Orientation = LayoutOrientation.Horizontal,
                             SeparationOverride = 2,
                             Children =
                             {
-                                new VBoxContainer
+                                new BoxContainer
                                 {
+                                    Orientation = LayoutOrientation.Vertical,
                                     HorizontalExpand = true,
                                     Children =
                                     {
@@ -541,7 +550,10 @@ namespace Content.Client.Administration.UI
                     HorizontalAlignment = HAlignment.Right,
                     HorizontalExpand = true
                 };
-                var flagsBox = new VBoxContainer();
+                var flagsBox = new BoxContainer
+                {
+                    Orientation = LayoutOrientation.Vertical
+                };
 
                 foreach (var flag in AdminFlagsHelper.AllFlags)
                 {
@@ -565,7 +577,10 @@ namespace Content.Client.Administration.UI
                     flagsBox.AddChild(checkBox);
                 }
 
-                var bottomButtons = new HBoxContainer();
+                var bottomButtons = new BoxContainer
+                {
+                    Orientation = LayoutOrientation.Horizontal
+                };
                 if (data != null)
                 {
                     // show remove button.
@@ -575,8 +590,9 @@ namespace Content.Client.Administration.UI
 
                 bottomButtons.AddChild(SaveButton);
 
-                Contents.AddChild(new VBoxContainer
+                Contents.AddChild(new BoxContainer
                 {
+                    Orientation = LayoutOrientation.Vertical,
                     Children =
                     {
                         NameEdit,
diff --git a/Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml b/Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml
index 6cdafeb1c8..efb831cd1b 100644
--- a/Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml
+++ b/Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml
@@ -1,15 +1,15 @@
 <SS14Window
     xmlns="https://spacestation14.io">
-    <HBoxContainer HorizontalExpand="True">
-        <VBoxContainer HorizontalExpand="True" SizeFlagsStretchRatio="0.45">
-            <HBoxContainer HorizontalExpand="True" VerticalExpand="True"
+    <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
+        <BoxContainer Orientation="Vertical" HorizontalExpand="True" SizeFlagsStretchRatio="0.45">
+            <BoxContainer Orientation="Horizontal" HorizontalExpand="True" VerticalExpand="True"
                                     SizeFlagsStretchRatio="0.1">
                 <LineEdit Name="SearchBar" PlaceHolder="Search" HorizontalExpand="True"
                                    SizeFlagsStretchRatio="0.6" />
-            </HBoxContainer>
+            </BoxContainer>
             <ItemList Name="OutfitList" SelectMode="Single" VerticalExpand="True"
                                SizeFlagsStretchRatio="0.9" />
             <Button Name="ConfirmButton" HorizontalExpand="True" />
-        </VBoxContainer>
-    </HBoxContainer>
+        </BoxContainer>
+    </BoxContainer>
 </SS14Window>
diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml b/Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml
index 30a1cb64bf..98167d55c8 100644
--- a/Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml
+++ b/Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml
@@ -5,7 +5,7 @@
     xmlns:at="clr-namespace:Content.Client.Administration.UI.Tabs.AdminTab"
     Margin="4"
     MinSize="50 50">
-    <VBoxContainer>
+    <BoxContainer Orientation="Vertical">
         <GridContainer Columns="4">
             <cc:UICommandButton Command="kick" Text="{Loc Kick}" WindowType="{x:Type at:KickWindow}" />
             <cc:UICommandButton Command="ban" Text="{Loc Ban}" WindowType="{x:Type at:BanWindow}" />
@@ -13,5 +13,5 @@
             <cc:UICommandButton Command="tpto" Text="{Loc Teleport}" WindowType="{x:Type at:TeleportWindow}" />
             <cc:CommandButton Command="permissions" Text="{Loc Permissions Panel}" />
         </GridContainer>
-    </VBoxContainer>
+    </BoxContainer>
 </Control>
diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml.cs b/Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml.cs
index aa9fc7307c..02dad6cbd2 100644
--- a/Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Robust.Client.AutoGenerated;
+using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
 
 namespace Content.Client.Administration.UI.Tabs.AdminTab
diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/BanWindow.xaml b/Content.Client/Administration/UI/Tabs/AdminTab/BanWindow.xaml
index 18b82ca927..d81942655a 100644
--- a/Content.Client/Administration/UI/Tabs/AdminTab/BanWindow.xaml
+++ b/Content.Client/Administration/UI/Tabs/AdminTab/BanWindow.xaml
@@ -1,23 +1,23 @@
 <SS14Window
     xmlns="https://spacestation14.io"
     Title="{Loc Ban}" MinSize="425 162">
-    <VBoxContainer>
-        <HBoxContainer>
+    <BoxContainer Orientation="Vertical">
+        <BoxContainer Orientation="Horizontal">
             <Label Text="{Loc Player}" MinWidth="100" />
             <Control MinWidth="50" />
             <LineEdit Name="PlayerNameLine" MinWidth="100" HorizontalExpand="True" />
-        </HBoxContainer>
-        <HBoxContainer>
+        </BoxContainer>
+        <BoxContainer Orientation="Horizontal">
             <Label Text="{Loc Reason}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <LineEdit Name="ReasonLine" MinSize="100 0" HorizontalExpand="True" />
-        </HBoxContainer>
-        <HBoxContainer>
+        </BoxContainer>
+        <BoxContainer Orientation="Horizontal">
             <Label Text="{Loc Minutes}" MinWidth="100" />
             <Control MinWidth="50" />
             <LineEdit Name="MinutesLine" MinWidth="100" HorizontalExpand="True" PlaceHolder="{Loc 0 minutes for a permanent ban}" />
-        </HBoxContainer>
+        </BoxContainer>
         <Control MinWidth="50" />
         <Button Name="SubmitButton" Text="{Loc Ban}" />
-    </VBoxContainer>
+    </BoxContainer>
 </SS14Window>
diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/BanWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AdminTab/BanWindow.xaml.cs
index f45c3c3250..834348c66e 100644
--- a/Content.Client/Administration/UI/Tabs/AdminTab/BanWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/AdminTab/BanWindow.xaml.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Console;
 using Robust.Client.UserInterface.Controls;
diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/KickWindow.xaml b/Content.Client/Administration/UI/Tabs/AdminTab/KickWindow.xaml
index 72d79c8a53..c1ee96cfe6 100644
--- a/Content.Client/Administration/UI/Tabs/AdminTab/KickWindow.xaml
+++ b/Content.Client/Administration/UI/Tabs/AdminTab/KickWindow.xaml
@@ -2,13 +2,13 @@
     xmlns="https://spacestation14.io"
     xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
     Title="{Loc Kick}" MinSize="425 272">
-    <VBoxContainer>
-        <HBoxContainer>
+    <BoxContainer Orientation="Vertical">
+        <BoxContainer Orientation="Horizontal">
             <Label Text="{Loc Reason}" MinWidth="100" />
             <Control MinWidth="50" />
             <LineEdit Name="ReasonLine" MinWidth="100" HorizontalExpand="True" />
-        </HBoxContainer>
+        </BoxContainer>
         <cc:PlayerListControl Name="PlayerList" />
         <Button Name="SubmitButton" Text="{Loc Kick}" />
-    </VBoxContainer>
+    </BoxContainer>
 </SS14Window>
diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/KickWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AdminTab/KickWindow.xaml.cs
index 761be3d836..786123fab2 100644
--- a/Content.Client/Administration/UI/Tabs/AdminTab/KickWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/AdminTab/KickWindow.xaml.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Console;
 using Robust.Client.UserInterface.Controls;
diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml b/Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml
index ef7635c599..380ee75ed4 100644
--- a/Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml
+++ b/Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml
@@ -2,8 +2,8 @@
     xmlns="https://spacestation14.io"
     xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
     Title="{Loc Teleport}" MinSize="425 230">
-    <VBoxContainer>
+    <BoxContainer Orientation="Vertical">
         <cc:PlayerListControl Name="PlayerList" />
         <Button Name="SubmitButton" Text="{Loc Teleport}" />
-    </VBoxContainer>
+    </BoxContainer>
 </SS14Window>
diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml.cs
index 5c8c5fc43b..f0b044c500 100644
--- a/Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Console;
 using Robust.Client.UserInterface.Controls;
diff --git a/Content.Client/Administration/UI/Tabs/AdminbusTab/AdminbusTab.xaml.cs b/Content.Client/Administration/UI/Tabs/AdminbusTab/AdminbusTab.xaml.cs
index 20d22ceb0e..698880b754 100644
--- a/Content.Client/Administration/UI/Tabs/AdminbusTab/AdminbusTab.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/AdminbusTab/AdminbusTab.xaml.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Client.Administration.Managers;
+using Content.Client.Administration.Managers;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Placement;
 using Robust.Client.ResourceManagement;
@@ -15,6 +14,9 @@ namespace Content.Client.Administration.UI.Tabs.AdminbusTab
     [GenerateTypedNameReferences]
     public partial class AdminbusTab : Control
     {
+        private EntitySpawnWindow? _entitySpawnWindow;
+        private TileSpawnWindow? _tileSpawnWindow;
+
         protected override void EnteredTree()
         {
             // For the SpawnEntitiesButton and SpawnTilesButton we need to do the press manually
@@ -23,22 +25,22 @@ namespace Content.Client.Administration.UI.Tabs.AdminbusTab
             SpawnTilesButton.OnPressed += SpawnTilesButtonOnOnPressed;
         }
 
-        private static void SpawnEntitiesButtonOnOnPressed(BaseButton.ButtonEventArgs obj)
+        private void SpawnEntitiesButtonOnOnPressed(BaseButton.ButtonEventArgs obj)
         {
             var manager = IoCManager.Resolve<IAdminMenuManager>();
-            var window = new EntitySpawnWindow(IoCManager.Resolve<IPlacementManager>(),
+            _entitySpawnWindow ??= new EntitySpawnWindow(IoCManager.Resolve<IPlacementManager>(),
                 IoCManager.Resolve<IPrototypeManager>(),
                 IoCManager.Resolve<IResourceCache>());
-            manager.OpenCommand(window);
+            manager.OpenCommand(_entitySpawnWindow);
         }
 
-        private static void SpawnTilesButtonOnOnPressed(BaseButton.ButtonEventArgs obj)
+        private void SpawnTilesButtonOnOnPressed(BaseButton.ButtonEventArgs obj)
         {
             var manager = IoCManager.Resolve<IAdminMenuManager>();
-            var window = new TileSpawnWindow(IoCManager.Resolve<ITileDefinitionManager>(),
+            _tileSpawnWindow ??= new TileSpawnWindow(IoCManager.Resolve<ITileDefinitionManager>(),
                 IoCManager.Resolve<IPlacementManager>(),
                 IoCManager.Resolve<IResourceCache>());
-            manager.OpenCommand(window);
+            manager.OpenCommand(_tileSpawnWindow);
         }
     }
 }
diff --git a/Content.Client/Administration/UI/Tabs/AdminbusTab/StationEventsWindow.xaml b/Content.Client/Administration/UI/Tabs/AdminbusTab/StationEventsWindow.xaml
index 097eb0f150..709d665fb6 100644
--- a/Content.Client/Administration/UI/Tabs/AdminbusTab/StationEventsWindow.xaml
+++ b/Content.Client/Administration/UI/Tabs/AdminbusTab/StationEventsWindow.xaml
@@ -1,13 +1,13 @@
 <SS14Window
     xmlns="https://spacestation14.io" Title="Kick">
-    <VBoxContainer>
-        <HBoxContainer>
+    <BoxContainer Orientation="Vertical">
+        <BoxContainer Orientation="Horizontal">
             <Label Text="{Loc Event}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <OptionButton Name="EventsOptions" MinSize="100 0" HorizontalExpand="True" />
-        </HBoxContainer>
+        </BoxContainer>
         <Button Name="PauseButton" Text="{Loc Pause}" />
         <Button Name="ResumeButton" Text="{Loc Resume}" />
         <Button Name="SubmitButton" Text="{Loc Run}" />
-    </VBoxContainer>
+    </BoxContainer>
 </SS14Window>
diff --git a/Content.Client/Administration/UI/Tabs/AdminbusTab/StationEventsWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AdminbusTab/StationEventsWindow.xaml.cs
index f500ece192..a26d41934c 100644
--- a/Content.Client/Administration/UI/Tabs/AdminbusTab/StationEventsWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/AdminbusTab/StationEventsWindow.xaml.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Collections.Generic;
 using System.Linq;
 using Content.Client.StationEvents.Managers;
diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml b/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml
index bdc9528ba8..c2857cc733 100644
--- a/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml
+++ b/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml
@@ -1,11 +1,11 @@
 <SS14Window
     xmlns="https://spacestation14.io" Title="{Loc Add Atmos}">
-    <VBoxContainer>
-        <HBoxContainer>
+    <BoxContainer Orientation="Vertical">
+        <BoxContainer Orientation="Horizontal">
             <Label Text="{Loc Grid}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <OptionButton Name="GridOptions" MinSize="100 0" HorizontalExpand="True" />
-        </HBoxContainer>
+        </BoxContainer>
         <Button Name="SubmitButton" Text="{Loc Add Atmos}" />
-    </VBoxContainer>
+    </BoxContainer>
 </SS14Window>
diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml.cs
index 6867a1bc8f..11390ea3b8 100644
--- a/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
 using Robust.Client.AutoGenerated;
diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml b/Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml
index d31d48dd8c..4b5f9d46e0 100644
--- a/Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml
+++ b/Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml
@@ -1,31 +1,31 @@
 <SS14Window
     xmlns="https://spacestation14.io" Title="{Loc Add Gas}">
-    <VBoxContainer>
-        <HBoxContainer>
+    <BoxContainer Orientation="Vertical">
+        <BoxContainer Orientation="Horizontal">
             <Label Text="{Loc Grid}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <OptionButton Name="GridOptions" MinSize="100 0" HorizontalExpand="True" />
-        </HBoxContainer>
-        <HBoxContainer>
+        </BoxContainer>
+        <BoxContainer Orientation="Horizontal">
             <Label Text="{Loc TileX}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <SpinBox Name="TileXSpin" MinSize="100 0" HorizontalExpand="True" />
-        </HBoxContainer>
-        <HBoxContainer>
+        </BoxContainer>
+        <BoxContainer Orientation="Horizontal">
             <Label Text="{Loc TileY}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <SpinBox Name="TileYSpin" MinSize="100 0" HorizontalExpand="True" />
-        </HBoxContainer>
-        <HBoxContainer>
+        </BoxContainer>
+        <BoxContainer Orientation="Horizontal">
             <Label Text="{Loc Gas}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <OptionButton Name="GasOptions" MinSize="100 0" HorizontalExpand="True" />
-        </HBoxContainer>
-        <HBoxContainer>
+        </BoxContainer>
+        <BoxContainer Orientation="Horizontal">
             <Label Text="{Loc Amount}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <SpinBox Name="AmountSpin" MinSize="100 0" HorizontalExpand="True" />
-        </HBoxContainer>
+        </BoxContainer>
         <Button Name="SubmitButton" Text="{Loc Add Gas}" />
-    </VBoxContainer>
+    </BoxContainer>
 </SS14Window>
diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml.cs
index 273d194196..1d43aeeb23 100644
--- a/Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using Content.Client.Atmos.EntitySystems;
 using Content.Shared.Atmos;
diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/AtmosTab.xaml.cs b/Content.Client/Administration/UI/Tabs/AtmosTab/AtmosTab.xaml.cs
index a27a42c07e..b7d682e12a 100644
--- a/Content.Client/Administration/UI/Tabs/AtmosTab/AtmosTab.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/AtmosTab/AtmosTab.xaml.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Robust.Client.AutoGenerated;
+using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
 
 namespace Content.Client.Administration.UI.Tabs.AtmosTab
diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml b/Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml
index e06e390ba8..715653236d 100644
--- a/Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml
+++ b/Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml
@@ -1,21 +1,21 @@
 <SS14Window
     xmlns="https://spacestation14.io" Title="{Loc Fill Gas}">
-    <VBoxContainer>
-        <HBoxContainer>
+    <BoxContainer Orientation="Vertical">
+        <BoxContainer Orientation="Horizontal">
             <Label Text="{Loc Grid}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <OptionButton Name="GridOptions" MinSize="100 0" HorizontalExpand="True" />
-        </HBoxContainer>
-        <HBoxContainer>
+        </BoxContainer>
+        <BoxContainer Orientation="Horizontal">
             <Label Text="{Loc Gas}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <OptionButton Name="GasOptions" MinSize="100 0" HorizontalExpand="True" />
-        </HBoxContainer>
-        <HBoxContainer>
+        </BoxContainer>
+        <BoxContainer Orientation="Horizontal">
             <Label Text="{Loc Amount}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <SpinBox Name="AmountSpin" MinSize="100 0" HorizontalExpand="True" />
-        </HBoxContainer>
+        </BoxContainer>
         <Button Name="SubmitButton" Text="{Loc Fill Gas}" />
-    </VBoxContainer>
+    </BoxContainer>
 </SS14Window>
diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml.cs
index 2465d8c61d..6c51f34357 100644
--- a/Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using Content.Client.Atmos.EntitySystems;
 using Content.Shared.Atmos;
diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/SetTemperatureWindow.xaml b/Content.Client/Administration/UI/Tabs/AtmosTab/SetTemperatureWindow.xaml
index 97abb3ecb7..da471f500e 100644
--- a/Content.Client/Administration/UI/Tabs/AtmosTab/SetTemperatureWindow.xaml
+++ b/Content.Client/Administration/UI/Tabs/AtmosTab/SetTemperatureWindow.xaml
@@ -1,26 +1,26 @@
 <SS14Window
     xmlns="https://spacestation14.io" Title="{Loc Set Temperature}">
-    <VBoxContainer>
-        <HBoxContainer>
+    <BoxContainer Orientation="Vertical">
+        <BoxContainer Orientation="Horizontal">
             <Label Text="{Loc Grid}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <OptionButton Name="GridOptions" MinSize="100 0" HorizontalExpand="True" />
-        </HBoxContainer>
-        <HBoxContainer>
+        </BoxContainer>
+        <BoxContainer Orientation="Horizontal">
             <Label Text="{Loc TileX}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <SpinBox Name="TileXSpin" MinSize="100 0" HorizontalExpand="True" />
-        </HBoxContainer>
-        <HBoxContainer>
+        </BoxContainer>
+        <BoxContainer Orientation="Horizontal">
             <Label Text="{Loc TileY}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <SpinBox Name="TileYSpin" MinSize="100 0" HorizontalExpand="True" />
-        </HBoxContainer>
-        <HBoxContainer>
+        </BoxContainer>
+        <BoxContainer Orientation="Horizontal">
             <Label Text="{Loc Temperature}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <SpinBox Name="TemperatureSpin" MinSize="100 0" HorizontalExpand="True" />
-        </HBoxContainer>
+        </BoxContainer>
         <Button Name="SubmitButton" Text="{Loc Set Temperature}" />
-    </VBoxContainer>
+    </BoxContainer>
 </SS14Window>
diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/SetTemperatureWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AtmosTab/SetTemperatureWindow.xaml.cs
index 234dde6a84..a5be641a21 100644
--- a/Content.Client/Administration/UI/Tabs/AtmosTab/SetTemperatureWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/AtmosTab/SetTemperatureWindow.xaml.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
 using Robust.Client.AutoGenerated;
diff --git a/Content.Client/Administration/UI/Tabs/PlayerTab.xaml b/Content.Client/Administration/UI/Tabs/PlayerTab.xaml
index 4cca89fb11..6c17639df7 100644
--- a/Content.Client/Administration/UI/Tabs/PlayerTab.xaml
+++ b/Content.Client/Administration/UI/Tabs/PlayerTab.xaml
@@ -1,14 +1,14 @@
 <Control xmlns="https://spacestation14.io">
-    <VBoxContainer>
-        <HBoxContainer>
+    <BoxContainer Orientation="Vertical">
+        <BoxContainer Orientation="Horizontal">
             <Label Name="PlayerCount" HorizontalExpand="True" SizeFlagsStretchRatio="0.7"
                    Text="{Loc Player Count}" />
             <Button Name="RefreshButton" HorizontalExpand="True" SizeFlagsStretchRatio="0.3"
                     Text="{Loc Refresh}" />
-        </HBoxContainer>
+        </BoxContainer>
         <Control MinSize="0 5" />
         <ScrollContainer HorizontalExpand="True" VerticalExpand="True">
-            <VBoxContainer Name="PlayerList" />
+            <BoxContainer Orientation="Vertical" Name="PlayerList" />
         </ScrollContainer>
-    </VBoxContainer>
+    </BoxContainer>
 </Control>
diff --git a/Content.Client/Administration/UI/Tabs/PlayerTab.xaml.cs b/Content.Client/Administration/UI/Tabs/PlayerTab.xaml.cs
index 020f64ade0..a128c9ad1b 100644
--- a/Content.Client/Administration/UI/Tabs/PlayerTab.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/PlayerTab.xaml.cs
@@ -1,5 +1,4 @@
-#nullable enable
-
+
 using System.Collections.Generic;
 using Content.Shared.Administration.Menu;
 using Robust.Client.AutoGenerated;
@@ -10,6 +9,7 @@ using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.IoC;
 using Robust.Shared.Maths;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Administration.UI.Tabs
 {
@@ -41,8 +41,9 @@ namespace Content.Client.Administration.UI.Tabs
             var altColor = Color.FromHex("#292B38");
             var defaultColor = Color.FromHex("#2F2F3B");
 
-            var header = new HBoxContainer
+            var header = new BoxContainer
             {
+                Orientation = LayoutOrientation.Horizontal,
                 HorizontalExpand = true,
                 SeparationOverride = 4,
                 Children =
@@ -85,8 +86,9 @@ namespace Content.Client.Administration.UI.Tabs
             var useAltColor = false;
             foreach (var player in players)
             {
-                var hBox = new HBoxContainer
+                var hBox = new BoxContainer
                 {
+                    Orientation = LayoutOrientation.Horizontal,
                     HorizontalExpand = true,
                     SeparationOverride = 4,
                     Children =
diff --git a/Content.Client/Administration/UI/Tabs/RoundTab.xaml.cs b/Content.Client/Administration/UI/Tabs/RoundTab.xaml.cs
index bfe1dfe3af..0e897bd376 100644
--- a/Content.Client/Administration/UI/Tabs/RoundTab.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/RoundTab.xaml.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Robust.Client.AutoGenerated;
+using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
 
 namespace Content.Client.Administration.UI.Tabs
diff --git a/Content.Client/Administration/UI/Tabs/ServerTab.xaml.cs b/Content.Client/Administration/UI/Tabs/ServerTab.xaml.cs
index fbb52bf7b0..9f7d6a0e40 100644
--- a/Content.Client/Administration/UI/Tabs/ServerTab.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/ServerTab.xaml.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Robust.Client.AutoGenerated;
+using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
 
 namespace Content.Client.Administration.UI.Tabs
diff --git a/Content.Client/Alerts/UI/AlertsUI.cs b/Content.Client/Alerts/UI/AlertsUI.cs
index f5064438ee..46e6721acd 100644
--- a/Content.Client/Alerts/UI/AlertsUI.cs
+++ b/Content.Client/Alerts/UI/AlertsUI.cs
@@ -48,7 +48,7 @@ namespace Content.Client.Alerts.UI
             base.EnteredTree();
             var _chatManager = IoCManager.Resolve<IChatManager>();
             _chatManager.OnChatBoxResized += OnChatResized;
-            OnChatResized(new ChatResizedEventArgs(ChatBox.InitialChatBottom));
+            OnChatResized(new ChatResizedEventArgs(HudChatBox.InitialChatBottom));
         }
 
         protected override void ExitedTree()
diff --git a/Content.Client/Arcade/BlockGameMenu.cs b/Content.Client/Arcade/BlockGameMenu.cs
index 0ac7329a71..ce11b1a6e4 100644
--- a/Content.Client/Arcade/BlockGameMenu.cs
+++ b/Content.Client/Arcade/BlockGameMenu.cs
@@ -14,6 +14,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using Robust.Shared.Utility;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Arcade
 {
@@ -28,7 +29,7 @@ namespace Content.Client.Arcade
 
         private readonly PanelContainer _mainPanel;
 
-        private VBoxContainer _gameRootContainer;
+        private BoxContainer _gameRootContainer;
         private GridContainer _gameGrid = default!;
         private GridContainer _nextBlockGrid = default!;
         private GridContainer _holdBlockGrid = default!;
@@ -68,7 +69,10 @@ namespace Content.Client.Arcade
 
             #region Game Menu
             // building the game container
-            _gameRootContainer = new VBoxContainer();
+            _gameRootContainer = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Vertical
+            };
 
             _levelLabel = new Label
             {
@@ -92,7 +96,10 @@ namespace Content.Client.Arcade
                 MinSize = new Vector2(1,10)
             });
 
-            var gameBox = new HBoxContainer();
+            var gameBox = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Horizontal
+            };
             gameBox.AddChild(SetupHoldBox(backgroundTexture));
             gameBox.AddChild(new Control
             {
@@ -152,8 +159,9 @@ namespace Content.Client.Arcade
 
             _menuRootContainer.AddChild(pauseMenuInnerPanel);
 
-            var pauseMenuContainer = new VBoxContainer
+            var pauseMenuContainer = new BoxContainer
             {
+                Orientation = LayoutOrientation.Vertical,
                 HorizontalAlignment = HAlignment.Center,
                 VerticalAlignment = VAlignment.Center
             };
@@ -224,8 +232,9 @@ namespace Content.Client.Arcade
 
             _gameOverRootContainer.AddChild(gameOverMenuInnerPanel);
 
-            var gameOverMenuContainer = new VBoxContainer
+            var gameOverMenuContainer = new BoxContainer
             {
+                Orientation = LayoutOrientation.Vertical,
                 HorizontalAlignment = HAlignment.Center,
                 VerticalAlignment = VAlignment.Center
             };
@@ -282,8 +291,9 @@ namespace Content.Client.Arcade
 
             _highscoresRootContainer.AddChild(menuInnerPanel);
 
-            var menuContainer = new VBoxContainer()
+            var menuContainer = new BoxContainer
             {
+                Orientation = LayoutOrientation.Vertical,
                 HorizontalAlignment = HAlignment.Center,
                 VerticalAlignment = VAlignment.Center
             };
@@ -291,7 +301,10 @@ namespace Content.Client.Arcade
             menuContainer.AddChild(new Label{Text = Loc.GetString("blockgame-menu-label-highscores")});
             menuContainer.AddChild(new Control{MinSize = new Vector2(1,10)});
 
-            var highScoreBox = new HBoxContainer();
+            var highScoreBox = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Horizontal
+            };
 
             _localHighscoresLabel = new Label
             {
diff --git a/Content.Client/Atmos/EntitySystems/AtmosDebugOverlaySystem.cs b/Content.Client/Atmos/EntitySystems/AtmosDebugOverlaySystem.cs
index d714789aa0..72fa97c32a 100644
--- a/Content.Client/Atmos/EntitySystems/AtmosDebugOverlaySystem.cs
+++ b/Content.Client/Atmos/EntitySystems/AtmosDebugOverlaySystem.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Collections.Generic;
 using Content.Client.Atmos.Overlays;
 using Content.Shared.Atmos;
diff --git a/Content.Client/Atmos/EntitySystems/GasTileOverlaySystem.cs b/Content.Client/Atmos/EntitySystems/GasTileOverlaySystem.cs
index 470c4cae0c..9beb61a3c9 100644
--- a/Content.Client/Atmos/EntitySystems/GasTileOverlaySystem.cs
+++ b/Content.Client/Atmos/EntitySystems/GasTileOverlaySystem.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using Content.Client.Atmos.Overlays;
diff --git a/Content.Client/Atmos/UI/GasAnalyzerMenu.cs b/Content.Client/Atmos/UI/GasAnalyzerMenu.cs
index 3c114f7d7c..86122932a4 100644
--- a/Content.Client/Atmos/UI/GasAnalyzerMenu.cs
+++ b/Content.Client/Atmos/UI/GasAnalyzerMenu.cs
@@ -10,6 +10,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using static Content.Shared.Atmos.Components.SharedGasAnalyzerComponent;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Atmos.UI
 {
@@ -61,11 +62,15 @@ namespace Content.Client.Atmos.UI
             LayoutContainer.SetAnchorPreset(bottomWrap, LayoutContainer.LayoutPreset.VerticalCenterWide);
             LayoutContainer.SetGrowHorizontal(bottomWrap, LayoutContainer.GrowDirection.Both);
 
-            var topContainerWrap = new VBoxContainer
+            var topContainerWrap = new BoxContainer
             {
+                Orientation = LayoutOrientation.Vertical,
                 Children =
                 {
-                    (_topContainer = new VBoxContainer()),
+                    (_topContainer = new BoxContainer
+                    {
+                        Orientation = LayoutOrientation.Vertical
+                    }),
                     new Control {MinSize = (0, 110)}
                 }
             };
@@ -78,8 +83,9 @@ namespace Content.Client.Atmos.UI
             var fontSmall = resourceCache.GetFont("/Fonts/Boxfont-round/Boxfont Round.ttf", 10);
 
             Button refreshButton;
-            var topRow = new HBoxContainer
+            var topRow = new BoxContainer
             {
+                Orientation = LayoutOrientation.Horizontal,
                 Margin = new Thickness(4, 4, 12, 2),
                 Children =
                 {
@@ -118,8 +124,9 @@ namespace Content.Client.Atmos.UI
                 PanelOverride = new StyleBoxFlat { BackgroundColor = Color.FromHex("#202025") },
                 Children =
                 {
-                    (_statusContainer = new VBoxContainer
+                    (_statusContainer = new BoxContainer
                     {
+                        Orientation = LayoutOrientation.Vertical,
                         Margin = new Thickness(8, 8, 4, 4)
                     })
                 }
@@ -178,10 +185,17 @@ namespace Content.Client.Atmos.UI
             });
 
             // Add a table with all the gases
-            var tableKey = new VBoxContainer();
-            var tableVal = new VBoxContainer();
-            _statusContainer.AddChild(new HBoxContainer
+            var tableKey = new BoxContainer
             {
+                Orientation = LayoutOrientation.Vertical
+            };
+            var tableVal = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Vertical
+            };
+            _statusContainer.AddChild(new BoxContainer
+            {
+                Orientation = LayoutOrientation.Horizontal,
                 Children =
                 {
                     tableKey,
@@ -195,8 +209,9 @@ namespace Content.Client.Atmos.UI
             // This is the gas bar thingy
             var height = 30;
             var minSize = 24; // This basically allows gases which are too small, to be shown properly
-            var gasBar = new HBoxContainer
+            var gasBar = new BoxContainer
             {
+                Orientation = LayoutOrientation.Horizontal,
                 HorizontalExpand = true,
                 MinSize = new Vector2(0, height)
             };
diff --git a/Content.Client/Atmos/UI/GasCanisterWindow.xaml b/Content.Client/Atmos/UI/GasCanisterWindow.xaml
index 6bddc2ced3..69e2599523 100644
--- a/Content.Client/Atmos/UI/GasCanisterWindow.xaml
+++ b/Content.Client/Atmos/UI/GasCanisterWindow.xaml
@@ -2,51 +2,51 @@
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:s="clr-namespace:Content.Client.Stylesheets"
             MinSize="480 400" Title="Canister">
-    <VBoxContainer Margin="5 5 5 5" SeparationOverride="10">
-        <VBoxContainer VerticalExpand="True">
+    <BoxContainer Orientation="Vertical" Margin="5 5 5 5" SeparationOverride="10">
+        <BoxContainer Orientation="Vertical" VerticalExpand="True">
             <Label Text="{Loc comp-gas-canister-ui-canister-status}" FontColorOverride="{x:Static s:StyleNano.NanoGold}" StyleClasses="LabelBig"/>
-            <HBoxContainer>
+            <BoxContainer Orientation="Horizontal">
                 <Label Text="{Loc comp-gas-canister-ui-canister-pressure}"/>
                 <Label Name="CanisterPressureLabel" Align="Center" HorizontalExpand="True"/>
-            </HBoxContainer>
-            <HBoxContainer>
+            </BoxContainer>
+            <BoxContainer Orientation="Horizontal">
                 <Label Text="{Loc comp-gas-canister-ui-port-status}"/>
                 <Label Name="PortStatusLabel" Align="Center" HorizontalExpand="True"/>
-            </HBoxContainer>
-        </VBoxContainer>
+            </BoxContainer>
+        </BoxContainer>
 
-        <VBoxContainer VerticalExpand="True">
+        <BoxContainer Orientation="Vertical" VerticalExpand="True">
             <Label Text="{Loc comp-gas-canister-ui-holding-tank-status}" FontColorOverride="{x:Static s:StyleNano.NanoGold}" StyleClasses="LabelBig"/>
-            <HBoxContainer>
+            <BoxContainer Orientation="Horizontal">
                 <Label Text="{Loc comp-gas-canister-ui-holding-tank-label}"/>
                 <Label Name="TankLabelLabel" Text="{Loc comp-gas-canister-ui-holding-tank-label-empty}" Align="Center" HorizontalExpand="True"/>
                 <Button Name="TankEjectButton" Text="{Loc comp-gas-canister-ui-holding-tank-eject}"/>
-            </HBoxContainer>
-            <HBoxContainer>
+            </BoxContainer>
+            <BoxContainer Orientation="Horizontal">
                 <Label Text="{Loc comp-gas-canister-ui-holding-tank-pressure}"/>
                 <Label Name="TankPressureLabel" Align="Center" HorizontalExpand="True"/>
-            </HBoxContainer>
-        </VBoxContainer>
+            </BoxContainer>
+        </BoxContainer>
 
-        <VBoxContainer VerticalExpand="True">
+        <BoxContainer Orientation="Vertical" VerticalExpand="True">
             <Label Text="{Loc comp-gas-canister-ui-release-valve-status}" FontColorOverride="{x:Static s:StyleNano.NanoGold}" StyleClasses="LabelBig"/>
-            <HBoxContainer>
-                <VBoxContainer>
+            <BoxContainer Orientation="Horizontal">
+                <BoxContainer Orientation="Vertical">
                     <Label Text="{Loc comp-gas-canister-ui-release-pressure}"/>
                     <Control VerticalExpand="True"/>
-                </VBoxContainer>
-                <VBoxContainer HorizontalExpand="True" Margin="15 0 0 15" SeparationOverride="5">
+                </BoxContainer>
+                <BoxContainer Orientation="Vertical" HorizontalExpand="True" Margin="15 0 0 15" SeparationOverride="5">
                     <Slider Name="ReleasePressureSlider" HorizontalExpand="True"/>
                     <Label Name="ReleasePressureLabel" Align="Center" HorizontalExpand="True"/>
-                </VBoxContainer>
-            </HBoxContainer>
-            <HBoxContainer>
+                </BoxContainer>
+            </BoxContainer>
+            <BoxContainer Orientation="Horizontal">
                 <Label Text="{Loc comp-gas-canister-ui-release-valve}"/>
                 <Control HorizontalExpand="True"/>
                 <Button Name="ReleaseValveOpenButton" Text="{Loc comp-gas-canister-ui-release-valve-open}" ToggleMode="True"/>
                 <Button Name="ReleaseValveCloseButton" Text="{Loc comp-gas-canister-ui-release-valve-close}" ToggleMode="True"/>
                 <Control HorizontalExpand="True"/>
-            </HBoxContainer>
-        </VBoxContainer>
-    </VBoxContainer>
+            </BoxContainer>
+        </BoxContainer>
+    </BoxContainer>
 </SS14Window>
diff --git a/Content.Client/Atmos/Piping/EnabledAtmosDeviceVisualizer.cs b/Content.Client/Atmos/Visualizers/EnabledAtmosDeviceVisualizer.cs
similarity index 96%
rename from Content.Client/Atmos/Piping/EnabledAtmosDeviceVisualizer.cs
rename to Content.Client/Atmos/Visualizers/EnabledAtmosDeviceVisualizer.cs
index 93b2913567..b39fb9eed8 100644
--- a/Content.Client/Atmos/Piping/EnabledAtmosDeviceVisualizer.cs
+++ b/Content.Client/Atmos/Visualizers/EnabledAtmosDeviceVisualizer.cs
@@ -4,7 +4,7 @@ using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Client.Atmos.Piping
+namespace Content.Client.Atmos.Visualizers
 {
     [UsedImplicitly]
     public abstract class EnabledAtmosDeviceVisualizer : AppearanceVisualizer
diff --git a/Content.Client/Atmos/Piping/OutletInjectorVisualizer.cs b/Content.Client/Atmos/Visualizers/OutletInjectorVisualizer.cs
similarity index 90%
rename from Content.Client/Atmos/Piping/OutletInjectorVisualizer.cs
rename to Content.Client/Atmos/Visualizers/OutletInjectorVisualizer.cs
index 2d4cad5cf6..dc1681c226 100644
--- a/Content.Client/Atmos/Piping/OutletInjectorVisualizer.cs
+++ b/Content.Client/Atmos/Visualizers/OutletInjectorVisualizer.cs
@@ -2,7 +2,7 @@ using System;
 using Content.Shared.Atmos.Piping;
 using JetBrains.Annotations;
 
-namespace Content.Client.Atmos.Piping
+namespace Content.Client.Atmos.Visualizers
 {
     [UsedImplicitly]
     public class OutletInjectorVisualizer : EnabledAtmosDeviceVisualizer
diff --git a/Content.Client/Atmos/Piping/PassiveVentVisualizer.cs b/Content.Client/Atmos/Visualizers/PassiveVentVisualizer.cs
similarity index 89%
rename from Content.Client/Atmos/Piping/PassiveVentVisualizer.cs
rename to Content.Client/Atmos/Visualizers/PassiveVentVisualizer.cs
index a932eb055a..01991d837b 100644
--- a/Content.Client/Atmos/Piping/PassiveVentVisualizer.cs
+++ b/Content.Client/Atmos/Visualizers/PassiveVentVisualizer.cs
@@ -2,7 +2,7 @@ using System;
 using Content.Shared.Atmos.Piping;
 using JetBrains.Annotations;
 
-namespace Content.Client.Atmos.Piping
+namespace Content.Client.Atmos.Visualizers
 {
     [UsedImplicitly]
     public class PassiveVentVisualizer : EnabledAtmosDeviceVisualizer
diff --git a/Content.Client/Atmos/Visualizers/PipeColorVisualizer.cs b/Content.Client/Atmos/Visualizers/PipeColorVisualizer.cs
new file mode 100644
index 0000000000..7994a2b7de
--- /dev/null
+++ b/Content.Client/Atmos/Visualizers/PipeColorVisualizer.cs
@@ -0,0 +1,30 @@
+using Content.Shared.Atmos.Piping;
+using JetBrains.Annotations;
+using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Maths;
+
+namespace Content.Client.Atmos.Visualizers
+{
+    [UsedImplicitly]
+    public class PipeColorVisualizer : AppearanceVisualizer
+    {
+        public override void OnChangeData(AppearanceComponent component)
+        {
+            base.OnChangeData(component);
+
+            if (!component.Owner.TryGetComponent(out SpriteComponent? sprite))
+                return;
+
+            if (component.TryGetData(PipeColorVisuals.Color, out Color color))
+            {
+                sprite.LayerSetColor(Layers.Pipe, color);
+            }
+        }
+
+        public enum Layers : byte
+        {
+            Pipe,
+        }
+    }
+}
diff --git a/Content.Client/Atmos/Piping/PipeConnectorVisualizer.cs b/Content.Client/Atmos/Visualizers/PipeConnectorVisualizer.cs
similarity index 88%
rename from Content.Client/Atmos/Piping/PipeConnectorVisualizer.cs
rename to Content.Client/Atmos/Visualizers/PipeConnectorVisualizer.cs
index 93e70bf8d3..9f7e58d31b 100644
--- a/Content.Client/Atmos/Piping/PipeConnectorVisualizer.cs
+++ b/Content.Client/Atmos/Visualizers/PipeConnectorVisualizer.cs
@@ -1,6 +1,6 @@
-#nullable enable
 using System;
 using Content.Shared.Atmos;
+using Content.Shared.Atmos.Piping;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
@@ -8,16 +8,17 @@ using Robust.Client.ResourceManagement;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
+using Robust.Shared.Maths;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Client.Atmos.Piping
+namespace Content.Client.Atmos.Visualizers
 {
     [UsedImplicitly]
     public class PipeConnectorVisualizer : AppearanceVisualizer, ISerializationHooks
     {
         [DataField("rsi")]
-        private string _rsi = "Constructible/Atmos/pipe.rsi";
+        private string _rsi = "Structures/Piping/Atmospherics/pipe.rsi";
 
         [DataField("baseState")]
         private string _baseState = "pipeConnector";
@@ -62,6 +63,9 @@ namespace Content.Client.Atmos.Piping
             if (!component.Owner.TryGetComponent<ISpriteComponent>(out var sprite))
                 return;
 
+            if (!component.TryGetData(PipeColorVisuals.Color, out Color color))
+                color = Color.White;
+
             if (!component.TryGetData(PipeVisuals.VisualState, out PipeVisualState state))
                 return;
 
@@ -72,6 +76,7 @@ namespace Content.Client.Atmos.Piping
 
                 var layer = sprite.LayerMapGet(layerKey);
                 sprite.LayerSetVisible(layer, layerVisible);
+                sprite.LayerSetColor(layer, color);
             }
         }
 
diff --git a/Content.Client/Atmos/Piping/PressurePumpVisualizer.cs b/Content.Client/Atmos/Visualizers/PressurePumpVisualizer.cs
similarity index 89%
rename from Content.Client/Atmos/Piping/PressurePumpVisualizer.cs
rename to Content.Client/Atmos/Visualizers/PressurePumpVisualizer.cs
index acdf4350d0..c1441da37b 100644
--- a/Content.Client/Atmos/Piping/PressurePumpVisualizer.cs
+++ b/Content.Client/Atmos/Visualizers/PressurePumpVisualizer.cs
@@ -2,7 +2,7 @@ using System;
 using Content.Shared.Atmos.Piping;
 using JetBrains.Annotations;
 
-namespace Content.Client.Atmos.Piping
+namespace Content.Client.Atmos.Visualizers
 {
     [UsedImplicitly]
     public class PressurePumpVisualizer : EnabledAtmosDeviceVisualizer
diff --git a/Content.Client/Atmos/Piping/ScrubberVisualizer.cs b/Content.Client/Atmos/Visualizers/ScrubberVisualizer.cs
similarity index 95%
rename from Content.Client/Atmos/Piping/ScrubberVisualizer.cs
rename to Content.Client/Atmos/Visualizers/ScrubberVisualizer.cs
index b4add93bcd..6568fab771 100644
--- a/Content.Client/Atmos/Piping/ScrubberVisualizer.cs
+++ b/Content.Client/Atmos/Visualizers/ScrubberVisualizer.cs
@@ -1,9 +1,8 @@
 using Content.Shared.Atmos.Piping.Unary.Visuals;
-using Content.Shared.Atmos.Visuals;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 
-namespace Content.Client.Atmos.Piping
+namespace Content.Client.Atmos.Visualizers
 {
     [UsedImplicitly]
     public class ScrubberVisualizer : AppearanceVisualizer
diff --git a/Content.Client/Atmos/Piping/ThermoMachineVisualizer.cs b/Content.Client/Atmos/Visualizers/ThermoMachineVisualizer.cs
similarity index 89%
rename from Content.Client/Atmos/Piping/ThermoMachineVisualizer.cs
rename to Content.Client/Atmos/Visualizers/ThermoMachineVisualizer.cs
index 2a1136a951..e9d77226cc 100644
--- a/Content.Client/Atmos/Piping/ThermoMachineVisualizer.cs
+++ b/Content.Client/Atmos/Visualizers/ThermoMachineVisualizer.cs
@@ -2,7 +2,7 @@ using System;
 using Content.Shared.Atmos.Piping;
 using JetBrains.Annotations;
 
-namespace Content.Client.Atmos.Piping
+namespace Content.Client.Atmos.Visualizers
 {
     [UsedImplicitly]
     public class ThermoMachineVisualizer : EnabledAtmosDeviceVisualizer
diff --git a/Content.Client/Atmos/Piping/VentPumpVisualizer.cs b/Content.Client/Atmos/Visualizers/VentPumpVisualizer.cs
similarity index 97%
rename from Content.Client/Atmos/Piping/VentPumpVisualizer.cs
rename to Content.Client/Atmos/Visualizers/VentPumpVisualizer.cs
index d31dad27a8..7db4bc7d5f 100644
--- a/Content.Client/Atmos/Piping/VentPumpVisualizer.cs
+++ b/Content.Client/Atmos/Visualizers/VentPumpVisualizer.cs
@@ -2,7 +2,7 @@ using Content.Shared.Atmos.Visuals;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 
-namespace Content.Client.Atmos.Piping
+namespace Content.Client.Atmos.Visualizers
 {
     [UsedImplicitly]
     public class VentPumpVisualizer : AppearanceVisualizer
diff --git a/Content.Client/Audio/BackgroundAudioSystem.cs b/Content.Client/Audio/BackgroundAudioSystem.cs
index 9aa00712cd..4d79891649 100644
--- a/Content.Client/Audio/BackgroundAudioSystem.cs
+++ b/Content.Client/Audio/BackgroundAudioSystem.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Client.GameTicking.Managers;
 using Content.Client.Lobby;
 using Content.Client.Viewport;
diff --git a/Content.Client/Body/UI/BodyScannerDisplay.cs b/Content.Client/Body/UI/BodyScannerDisplay.cs
index 90b3436582..428a2b4516 100644
--- a/Content.Client/Body/UI/BodyScannerDisplay.cs
+++ b/Content.Client/Body/UI/BodyScannerDisplay.cs
@@ -8,6 +8,7 @@ using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 using static Robust.Client.UserInterface.Controls.ItemList;
 
 namespace Content.Client.Body.UI
@@ -25,8 +26,9 @@ namespace Content.Client.Body.UI
             Owner = owner;
             Title = Loc.GetString("body-scanner-display-title");
 
-            var hSplit = new HBoxContainer
+            var hSplit = new BoxContainer
             {
+                Orientation = LayoutOrientation.Horizontal,
                 Children =
                 {
                     // Left half
@@ -39,20 +41,23 @@ namespace Content.Client.Body.UI
                         }
                     },
                     // Right half
-                    new VBoxContainer
+                    new BoxContainer
                     {
+                        Orientation = LayoutOrientation.Vertical,
                         HorizontalExpand = true,
                         Children =
                         {
                             // Top half of the right half
-                            new VBoxContainer
+                            new BoxContainer
                             {
+                                Orientation = LayoutOrientation.Vertical,
                                 VerticalExpand = true,
                                 Children =
                                 {
                                     (BodyPartLabel = new Label()),
-                                    new HBoxContainer
+                                    new BoxContainer
                                     {
+                                        Orientation = LayoutOrientation.Horizontal,
                                         Children =
                                         {
                                             new Label
diff --git a/Content.Client/Body/UI/SurgeryWindow.cs b/Content.Client/Body/UI/SurgeryWindow.cs
index ef771bab1e..9f8b18c5e0 100644
--- a/Content.Client/Body/UI/SurgeryWindow.cs
+++ b/Content.Client/Body/UI/SurgeryWindow.cs
@@ -5,6 +5,7 @@ using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Body.UI
 {
@@ -12,7 +13,7 @@ namespace Content.Client.Body.UI
     {
         public delegate void OptionSelectedCallback(int selectedOptionData);
 
-        private readonly VBoxContainer _optionsBox;
+        private readonly BoxContainer _optionsBox;
         private OptionSelectedCallback? _optionSelectedCallback;
 
         public SurgeryWindow()
@@ -21,8 +22,9 @@ namespace Content.Client.Body.UI
             Title = Loc.GetString("surgery-window-title");
             RectClipContent = true;
 
-            var vSplitContainer = new VBoxContainer
+            var vSplitContainer = new BoxContainer
             {
+                Orientation = LayoutOrientation.Vertical,
                 Children =
                 {
                     new ScrollContainer
@@ -33,8 +35,9 @@ namespace Content.Client.Body.UI
                         VScrollEnabled = true,
                         Children =
                         {
-                            (_optionsBox = new VBoxContainer
+                            (_optionsBox = new BoxContainer
                             {
+                                Orientation = LayoutOrientation.Vertical,
                                 HorizontalExpand = true
                             })
                         }
@@ -94,8 +97,9 @@ namespace Content.Client.Body.UI
 
             AddChild(Button);
 
-            AddChild(new HBoxContainer
+            AddChild(new BoxContainer
             {
+                Orientation = LayoutOrientation.Horizontal,
                 Children =
                 {
                     (SpriteView = new SpriteView
diff --git a/Content.Client/Botany/PlantHolderVisualizer.cs b/Content.Client/Botany/PlantHolderVisualizer.cs
index 485d225ed2..2cd216d7d2 100644
--- a/Content.Client/Botany/PlantHolderVisualizer.cs
+++ b/Content.Client/Botany/PlantHolderVisualizer.cs
@@ -22,7 +22,7 @@ namespace Content.Client.Botany
             sprite.LayerMapReserveBlank(PlantHolderLayers.AlertLight);
             sprite.LayerMapReserveBlank(PlantHolderLayers.HarvestLight);
 
-            var hydroTools = new ResourcePath("Constructible/Hydroponics/overlays.rsi");
+            var hydroTools = new ResourcePath("Structures/Hydroponics/overlays.rsi");
 
             sprite.LayerSetSprite(PlantHolderLayers.HealthLight,
                 new SpriteSpecifier.Rsi(hydroTools, "lowhealth3"));
diff --git a/Content.Client/Buckle/BuckleComponent.cs b/Content.Client/Buckle/BuckleComponent.cs
index 542fb4e3ef..2e342aa203 100644
--- a/Content.Client/Buckle/BuckleComponent.cs
+++ b/Content.Client/Buckle/BuckleComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Shared.Buckle.Components;
+using Content.Shared.Buckle.Components;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 
diff --git a/Content.Client/Cargo/UI/CargoConsoleMenu.cs b/Content.Client/Cargo/UI/CargoConsoleMenu.cs
index 36eb189c4b..69a3e1a03b 100644
--- a/Content.Client/Cargo/UI/CargoConsoleMenu.cs
+++ b/Content.Client/Cargo/UI/CargoConsoleMenu.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using Content.Client.Stylesheets;
@@ -11,6 +10,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using static Robust.Client.UserInterface.Controls.BaseButton;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Cargo.UI
 {
@@ -28,12 +28,12 @@ namespace Content.Client.Cargo.UI
         private Label _pointsLabel { get; set; }
         private Label _shuttleStatusLabel { get; set; }
         private Label _shuttleCapacityLabel { get; set; }
-        private VBoxContainer _requests { get; set; }
-        private VBoxContainer _orders { get; set; }
+        private BoxContainer _requests { get; set; }
+        private BoxContainer _orders { get; set; }
         private OptionButton _categories { get; set; }
         private LineEdit _searchBar { get; set; }
 
-        public VBoxContainer Products { get; set; }
+        public BoxContainer Products { get; set; }
         public Button CallShuttleButton { get; set; }
         public Button PermissionsButton { get; set; }
 
@@ -50,9 +50,15 @@ namespace Content.Client.Cargo.UI
             else
                 Title = Loc.GetString("cargo-console-menu-title");
 
-            var rows = new VBoxContainer();
+            var rows = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Vertical
+            };
 
-            var accountName = new HBoxContainer();
+            var accountName = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Horizontal
+            };
             var accountNameLabel = new Label {
                 Text = Loc.GetString("cargo-console-menu-account-name-label") + " ",
                 StyleClasses = { StyleNano.StyleClassLabelKeyText }
@@ -64,7 +70,10 @@ namespace Content.Client.Cargo.UI
             accountName.AddChild(_accountNameLabel);
             rows.AddChild(accountName);
 
-            var points = new HBoxContainer();
+            var points = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Horizontal
+            };
             var pointsLabel = new Label
             {
                 Text = Loc.GetString("cargo-console-menu-points-label") + " ",
@@ -78,7 +87,10 @@ namespace Content.Client.Cargo.UI
             points.AddChild(_pointsLabel);
             rows.AddChild(points);
 
-            var shuttleStatus = new HBoxContainer();
+            var shuttleStatus = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Horizontal
+            };
             var shuttleStatusLabel = new Label
             {
                 Text = Loc.GetString("cargo-console-menu-shuttle-status-label") + " ",
@@ -92,7 +104,10 @@ namespace Content.Client.Cargo.UI
             shuttleStatus.AddChild(_shuttleStatusLabel);
             rows.AddChild(shuttleStatus);
 
-            var shuttleCapacity = new HBoxContainer();
+            var shuttleCapacity = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Horizontal
+            };
             var shuttleCapacityLabel = new Label
             {
                 Text = Loc.GetString("cargo-console-menu-order-capacity-label") + " ",
@@ -106,7 +121,10 @@ namespace Content.Client.Cargo.UI
             shuttleCapacity.AddChild(_shuttleCapacityLabel);
             rows.AddChild(shuttleCapacity);
 
-            var buttons = new HBoxContainer();
+            var buttons = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Horizontal
+            };
             CallShuttleButton = new Button()
             {
                 //Text = Loc.GetString("Call Shuttle"),
@@ -123,7 +141,10 @@ namespace Content.Client.Cargo.UI
             buttons.AddChild(PermissionsButton);
             rows.AddChild(buttons);
 
-            var category = new HBoxContainer();
+            var category = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Horizontal
+            };
             _categories = new OptionButton
             {
                 Prefix = Loc.GetString("cargo-console-menu-categories-label") + " ",
@@ -146,8 +167,9 @@ namespace Content.Client.Cargo.UI
                 VerticalExpand = true,
                 SizeFlagsStretchRatio = 6
             };
-            Products = new VBoxContainer()
+            Products = new BoxContainer
             {
+                Orientation = LayoutOrientation.Vertical,
                 HorizontalExpand = true,
                 VerticalExpand = true
             };
@@ -164,17 +186,22 @@ namespace Content.Client.Cargo.UI
             {
                 VerticalExpand = true
             };
-            var rAndOVBox = new VBoxContainer();
-            var requestsLabel = new Label { Text = Loc.GetString("cargo-console-menu-requests-label") };
-            _requests = new VBoxContainer // replace with scroll box so that approval buttons can be added
+            var rAndOVBox = new BoxContainer
             {
+                Orientation = LayoutOrientation.Vertical
+            };
+            var requestsLabel = new Label { Text = Loc.GetString("cargo-console-menu-requests-label") };
+            _requests = new BoxContainer // replace with scroll box so that approval buttons can be added
+            {
+                Orientation = LayoutOrientation.Vertical,
                 StyleClasses = { "transparentItemList" },
                 VerticalExpand = true,
                 SizeFlagsStretchRatio = 1,
             };
             var ordersLabel = new Label { Text = Loc.GetString("cargo-console-menu-orders-label") };
-            _orders = new VBoxContainer
+            _orders = new BoxContainer
             {
+                Orientation = LayoutOrientation.Vertical,
                 StyleClasses = { "transparentItemList" },
                 VerticalExpand = true,
                 SizeFlagsStretchRatio = 1,
@@ -386,8 +413,9 @@ namespace Content.Client.Cargo.UI
             };
             AddChild(MainButton);
 
-            var hBox = new HBoxContainer
+            var hBox = new BoxContainer
             {
+                Orientation = LayoutOrientation.Horizontal,
                 HorizontalExpand = true
             };
 
@@ -433,8 +461,9 @@ namespace Content.Client.Cargo.UI
         {
             HorizontalExpand = true;
 
-            var hBox = new HBoxContainer
+            var hBox = new BoxContainer
             {
+                Orientation = LayoutOrientation.Horizontal,
                 HorizontalExpand = true,
             };
 
@@ -445,8 +474,9 @@ namespace Content.Client.Cargo.UI
             };
             hBox.AddChild(Icon);
 
-            var vBox = new VBoxContainer
+            var vBox = new BoxContainer
             {
+                Orientation = LayoutOrientation.Vertical,
                 HorizontalExpand = true,
                 VerticalExpand = true
             };
diff --git a/Content.Client/Cargo/UI/CargoConsoleOrderMenu.cs b/Content.Client/Cargo/UI/CargoConsoleOrderMenu.cs
index 524a03468e..f5daf8d4f1 100644
--- a/Content.Client/Cargo/UI/CargoConsoleOrderMenu.cs
+++ b/Content.Client/Cargo/UI/CargoConsoleOrderMenu.cs
@@ -3,6 +3,7 @@ using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Cargo.UI
 {
@@ -19,7 +20,10 @@ namespace Content.Client.Cargo.UI
 
             Title = Loc.GetString("cargo-console-order-menu-title");
 
-            var vBox = new VBoxContainer();
+            var vBox = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Vertical
+            };
             var gridContainer = new GridContainer { Columns = 2 };
 
             var requesterLabel = new Label { Text = Loc.GetString("cargo-console-order-menu-requester-label") };
@@ -27,12 +31,12 @@ namespace Content.Client.Cargo.UI
             gridContainer.AddChild(requesterLabel);
             gridContainer.AddChild(Requester);
 
-            var reasonLabel = new Label { Text = Loc.GetString("cargo-console-order-menu-reason-label:") };
+            var reasonLabel = new Label { Text = Loc.GetString("cargo-console-order-menu-reason-label") };
             Reason = new LineEdit();
             gridContainer.AddChild(reasonLabel);
             gridContainer.AddChild(Reason);
 
-            var amountLabel = new Label { Text = Loc.GetString("cargo-console-order-menu-amount-label:") };
+            var amountLabel = new Label { Text = Loc.GetString("cargo-console-order-menu-amount-label") };
             Amount = new SpinBox
             {
                 HorizontalExpand = true,
diff --git a/Content.Client/Changelog/ChangelogManager.cs b/Content.Client/Changelog/ChangelogManager.cs
index d0a34a5e23..48854ba45b 100644
--- a/Content.Client/Changelog/ChangelogManager.cs
+++ b/Content.Client/Changelog/ChangelogManager.cs
@@ -13,7 +13,6 @@ using Robust.Shared.Serialization.Markdown;
 using Robust.Shared.Serialization.Markdown.Mapping;
 using Robust.Shared.Utility;
 
-#nullable enable
 
 namespace Content.Client.Changelog
 {
diff --git a/Content.Client/Changelog/ChangelogWindow.xaml b/Content.Client/Changelog/ChangelogWindow.xaml
index c763c4ad2e..41ac1c70ee 100644
--- a/Content.Client/Changelog/ChangelogWindow.xaml
+++ b/Content.Client/Changelog/ChangelogWindow.xaml
@@ -3,20 +3,20 @@
                            xmlns:ui="clr-namespace:Content.Client.HUD.UI"
                            MinSize="500 400" MouseFilter="Stop">
     <PanelContainer StyleClasses="AngleRect" />
-    <VBoxContainer>
-        <HBoxContainer>
+    <BoxContainer Orientation="Vertical">
+        <BoxContainer Orientation="Horizontal">
             <Label Margin="6 0 0 0" HorizontalExpand="True" Text="{Loc 'changelog-window-title'}" VAlign="Center"
                    StyleClasses="LabelHeading" />
             <TextureButton Margin="0 0 8 0" Name="CloseButton" StyleClasses="windowCloseButton"
                            VerticalAlignment="Center" />
-        </HBoxContainer>
+        </BoxContainer>
         <ui:HighDivider />
 
         <ScrollContainer VerticalExpand="True" HScrollEnabled="False">
-            <VBoxContainer Name="ChangelogBody" />
+            <BoxContainer Orientation="Vertical" Name="ChangelogBody" />
         </ScrollContainer>
 
         <PanelContainer StyleClasses="LowDivider" />
         <Label Name="VersionLabel" HorizontalAlignment="Right" StyleClasses="LabelSubText" Margin="4 0" />
-    </VBoxContainer>
+    </BoxContainer>
 </changelog:ChangelogWindow>
diff --git a/Content.Client/Changelog/ChangelogWindow.xaml.cs b/Content.Client/Changelog/ChangelogWindow.xaml.cs
index f5e4360f1c..c6117128f9 100644
--- a/Content.Client/Changelog/ChangelogWindow.xaml.cs
+++ b/Content.Client/Changelog/ChangelogWindow.xaml.cs
@@ -15,6 +15,7 @@ using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using Robust.Shared.Utility;
 using static Content.Client.Changelog.ChangelogManager;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Changelog
 {
@@ -94,10 +95,14 @@ namespace Content.Client.Changelog
                         var upArrow =
                             _resourceCache.GetTexture("/Textures/Interface/Changelog/up_arrow.svg.192dpi.png");
 
-                        var readDivider = new VBoxContainer();
-
-                        var hBox = new HBoxContainer
+                        var readDivider = new BoxContainer
                         {
+                            Orientation = LayoutOrientation.Vertical
+                        };
+
+                        var hBox = new BoxContainer
+                        {
+                            Orientation = LayoutOrientation.Horizontal,
                             HorizontalAlignment = HAlignment.Center,
                             Children =
                             {
@@ -148,8 +153,9 @@ namespace Content.Client.Changelog
                     {
                         var text = new RichTextLabel();
                         text.SetMessage(FormattedMessage.FromMarkup(change.Message));
-                        ChangelogBody.AddChild(new HBoxContainer
+                        ChangelogBody.AddChild(new BoxContainer
                         {
+                            Orientation = LayoutOrientation.Horizontal,
                             Margin = new Thickness(14, 1, 10, 2),
                             Children =
                             {
diff --git a/Content.Client/CharacterAppearance/MagicMirrorBoundUserInterface.cs b/Content.Client/CharacterAppearance/MagicMirrorBoundUserInterface.cs
index 34ef6f1900..1749ec46b8 100644
--- a/Content.Client/CharacterAppearance/MagicMirrorBoundUserInterface.cs
+++ b/Content.Client/CharacterAppearance/MagicMirrorBoundUserInterface.cs
@@ -13,6 +13,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using static Content.Shared.CharacterAppearance.Components.SharedMagicMirrorComponent;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.CharacterAppearance
 {
@@ -107,8 +108,9 @@ namespace Content.Client.CharacterAppearance
                 MinSize = (50, 0)
             };
 
-            AddChild(new HBoxContainer
+            AddChild(new BoxContainer
             {
+                Orientation = LayoutOrientation.Horizontal,
                 Children =
                 {
                     _slider,
@@ -204,10 +206,16 @@ namespace Content.Client.CharacterAppearance
         {
             IoCManager.InjectDependencies(this);
 
-            var vBox = new VBoxContainer();
+            var vBox = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Vertical
+            };
             AddChild(vBox);
 
-            _colorContainer = new VBoxContainer();
+            _colorContainer = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Vertical
+            };
             vBox.AddChild(_colorContainer);
             _colorContainer.AddChild(_colorSliderR = new ColorSlider(StyleNano.StyleClassSliderRed));
             _colorContainer.AddChild(_colorSliderG = new ColorSlider(StyleNano.StyleClassSliderGreen));
@@ -289,7 +297,10 @@ namespace Content.Client.CharacterAppearance
 
         public EyeColorPicker()
         {
-            var vBox = new VBoxContainer();
+            var vBox = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Vertical
+            };
             AddChild(vBox);
 
             vBox.AddChild(_colorSliderR = new ColorSlider(StyleNano.StyleClassSliderRed));
@@ -340,8 +351,9 @@ namespace Content.Client.CharacterAppearance
             _eyeColorPicker = new EyeColorPicker {SizeFlagsHorizontal = SizeFlags.FillExpand};
             _eyeColorPicker.OnEyeColorPicked += newColor => owner.EyeColorSelected(newColor);
 
-            Contents.AddChild(new HBoxContainer
+            Contents.AddChild(new BoxContainer
             {
+                Orientation = LayoutOrientation.Horizontal,
                 SeparationOverride = 8,
                 Children = {_hairStylePicker, _facialHairStylePicker, _eyeColorPicker}
             });
diff --git a/Content.Client/CharacterInfo/Components/CharacterInfoComponent.cs b/Content.Client/CharacterInfo/Components/CharacterInfoComponent.cs
index 7161808649..ce4f536335 100644
--- a/Content.Client/CharacterInfo/Components/CharacterInfoComponent.cs
+++ b/Content.Client/CharacterInfo/Components/CharacterInfoComponent.cs
@@ -62,19 +62,21 @@ namespace Content.Client.CharacterInfo.Components
             public Label NameLabel { get; }
             public Label SubText { get; }
 
-            public VBoxContainer ObjectivesContainer { get; }
+            public BoxContainer ObjectivesContainer { get; }
 
             public CharacterInfoControl(IResourceCache resourceCache)
             {
                 IoCManager.InjectDependencies(this);
 
-                AddChild(new HBoxContainer
+                AddChild(new BoxContainer
                 {
+                    Orientation = LayoutOrientation.Horizontal,
                     Children =
                     {
                         (SpriteView = new SpriteView { Scale = (2, 2)}),
-                        new VBoxContainer
+                        new BoxContainer
                         {
+                            Orientation = LayoutOrientation.Vertical,
                             VerticalAlignment = VAlignment.Top,
                             Children =
                             {
@@ -100,7 +102,10 @@ namespace Content.Client.CharacterInfo.Components
                     Text = Loc.GetString("character-info-objectives-label"),
                     HorizontalAlignment = HAlignment.Center
                 });
-                ObjectivesContainer = new VBoxContainer();
+                ObjectivesContainer = new BoxContainer
+                {
+                    Orientation = LayoutOrientation.Vertical
+                };
                 AddChild(ObjectivesContainer);
 
                 AddChild(new Placeholder()
@@ -116,8 +121,9 @@ namespace Content.Client.CharacterInfo.Components
                 ObjectivesContainer.RemoveAllChildren();
                 foreach (var (groupId, objectiveConditions) in characterInfoMessage.Objectives)
                 {
-                    var vbox = new VBoxContainer
+                    var vbox = new BoxContainer
                     {
+                        Orientation = LayoutOrientation.Vertical,
                         Modulate = Color.Gray
                     };
 
@@ -129,7 +135,10 @@ namespace Content.Client.CharacterInfo.Components
 
                     foreach (var objectiveCondition in objectiveConditions)
                     {
-                        var hbox = new HBoxContainer();
+                        var hbox = new BoxContainer
+                        {
+                            Orientation = LayoutOrientation.Horizontal
+                        };
                         hbox.AddChild(new ProgressTextureRect
                         {
                             Texture = objectiveCondition.SpriteSpecifier.Frame0(),
@@ -140,8 +149,9 @@ namespace Content.Client.CharacterInfo.Components
                         {
                             MinSize = (10,0)
                         });
-                        hbox.AddChild(new VBoxContainer
+                        hbox.AddChild(new BoxContainer
                             {
+                                Orientation = LayoutOrientation.Vertical,
                                 Children =
                                 {
                                     new Label{Text = objectiveCondition.Title},
diff --git a/Content.Client/CharacterInterface/CharacterInterfaceComponent.cs b/Content.Client/CharacterInterface/CharacterInterfaceComponent.cs
index 95f769e126..f071c03269 100644
--- a/Content.Client/CharacterInterface/CharacterInterfaceComponent.cs
+++ b/Content.Client/CharacterInterface/CharacterInterfaceComponent.cs
@@ -9,6 +9,7 @@ using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.CharacterInterface
 {
@@ -110,14 +111,17 @@ namespace Content.Client.CharacterInterface
         /// </summary>
         public class CharacterWindow : SS14Window
         {
-            private readonly VBoxContainer _contentsVBox;
+            private readonly BoxContainer _contentsVBox;
             private readonly List<ICharacterUI> _windowComponents;
 
             public CharacterWindow(List<ICharacterUI> windowComponents)
             {
                 Title = "Character";
 
-                _contentsVBox = new VBoxContainer();
+                _contentsVBox = new BoxContainer
+                {
+                    Orientation = LayoutOrientation.Vertical
+                };
                 Contents.AddChild(_contentsVBox);
 
                 windowComponents.Sort((a, b) => ((int) a.Priority).CompareTo((int) b.Priority));
diff --git a/Content.Client/Chat/ChatHelper.cs b/Content.Client/Chat/ChatHelper.cs
index 076a6995cf..350ab6aa1c 100644
--- a/Content.Client/Chat/ChatHelper.cs
+++ b/Content.Client/Chat/ChatHelper.cs
@@ -12,7 +12,7 @@ namespace Content.Client.Chat
                 ChatChannel.Radio => Color.Green,
                 ChatChannel.OOC => Color.LightSkyBlue,
                 ChatChannel.Dead => Color.MediumPurple,
-                ChatChannel.AdminChat => Color.Red,
+                ChatChannel.Admin => Color.Red,
                 _ => Color.DarkGray
             };
     }
diff --git a/Content.Client/Chat/ChatInput.cs b/Content.Client/Chat/ChatInput.cs
new file mode 100644
index 0000000000..541cd8dc9f
--- /dev/null
+++ b/Content.Client/Chat/ChatInput.cs
@@ -0,0 +1,42 @@
+using Content.Client.Chat.UI;
+using Content.Client.Viewport;
+using Content.Shared.Chat;
+using Content.Shared.Input;
+using Robust.Client.Input;
+using Robust.Shared.Input.Binding;
+
+namespace Content.Client.Chat
+{
+    public static class ChatInput
+    {
+        public static void SetupChatInputHandlers(IInputManager inputManager, ChatBox chatBox)
+        {
+            inputManager.SetInputCommand(ContentKeyFunctions.FocusChat,
+                InputCmdHandler.FromDelegate(_ => GameScreen.FocusChat(chatBox)));
+
+            inputManager.SetInputCommand(ContentKeyFunctions.FocusLocalChat,
+                InputCmdHandler.FromDelegate(_ => GameScreen.FocusChannel(chatBox, ChatSelectChannel.Local)));
+
+            inputManager.SetInputCommand(ContentKeyFunctions.FocusOOC,
+                InputCmdHandler.FromDelegate(_ => GameScreen.FocusChannel(chatBox, ChatSelectChannel.OOC)));
+
+            inputManager.SetInputCommand(ContentKeyFunctions.FocusAdminChat,
+                InputCmdHandler.FromDelegate(_ => GameScreen.FocusChannel(chatBox, ChatSelectChannel.Admin)));
+
+            inputManager.SetInputCommand(ContentKeyFunctions.FocusRadio,
+                InputCmdHandler.FromDelegate(_ => GameScreen.FocusChannel(chatBox, ChatSelectChannel.Radio)));
+
+            inputManager.SetInputCommand(ContentKeyFunctions.FocusDeadChat,
+                InputCmdHandler.FromDelegate(_ => GameScreen.FocusChannel(chatBox, ChatSelectChannel.Dead)));
+
+            inputManager.SetInputCommand(ContentKeyFunctions.FocusConsoleChat,
+                InputCmdHandler.FromDelegate(_ => GameScreen.FocusChannel(chatBox, ChatSelectChannel.Console)));
+
+            inputManager.SetInputCommand(ContentKeyFunctions.CycleChatChannelForward,
+                InputCmdHandler.FromDelegate(_ => chatBox.CycleChatChannel(true)));
+
+            inputManager.SetInputCommand(ContentKeyFunctions.CycleChatChannelBackward,
+                InputCmdHandler.FromDelegate(_ => chatBox.CycleChatChannel(false)));
+        }
+    }
+}
diff --git a/Content.Client/Chat/Managers/ChatManager.cs b/Content.Client/Chat/Managers/ChatManager.cs
index 4af4b111e4..78f3fd9269 100644
--- a/Content.Client/Chat/Managers/ChatManager.cs
+++ b/Content.Client/Chat/Managers/ChatManager.cs
@@ -1,20 +1,21 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Content.Client.Administration.Managers;
 using Content.Client.Chat.UI;
 using Content.Client.Ghost;
 using Content.Shared.Administration;
+using Content.Shared.CCVar;
 using Content.Shared.Chat;
 using Robust.Client.Console;
 using Robust.Client.Graphics;
 using Robust.Client.Player;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
+using Robust.Shared.Configuration;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
-using Robust.Shared.Localization;
 using Robust.Shared.Log;
-using Robust.Shared.Maths;
 using Robust.Shared.Network;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
@@ -52,23 +53,17 @@ namespace Content.Client.Chat.Managers
         /// <summary>
         ///     The max amount of characters an entity can send in one message
         /// </summary>
-        private int _maxMessageLength = 1000;
+        public int MaxMessageLength => _cfg.GetCVar(CCVars.ChatMaxMessageLength);
 
-        public const char ConCmdSlash = '/';
-        public const char OOCAlias = '[';
-        public const char MeAlias = '@';
-        public const char AdminChatAlias = ']';
-        public const char RadioAlias = ';';
+        private readonly List<StoredChatMessage> _history = new();
+        public IReadOnlyList<StoredChatMessage> History => _history;
 
-        private readonly List<StoredChatMessage> _filteredHistory = new();
-
-        // currently enabled channel filters set by the user. If an entry is not in this
-        // list it has not been explicitly set yet, thus will default to enabled when it first
-        // becomes filterable (added to _filterableChannels)
+        // currently enabled channel filters set by the user.
+        // All values default to on, even if they aren't a filterable chat channel currently.
         // Note that these are persisted here, at the manager,
         // rather than the chatbox so that these settings persist between instances of different
         // chatboxes.
-        public readonly Dictionary<ChatChannel, bool> _channelFilters = new();
+        public ChatChannel ChannelFilters { get; private set; } = (ChatChannel) ushort.MaxValue;
 
         // Maintains which channels a client should be able to filter (for showing in the chatbox)
         // and select (for attempting to send on).
@@ -80,18 +75,16 @@ namespace Content.Client.Chat.Managers
         //
         // Note that Command is an available selection in the chatbox channel selector,
         // which is not actually a chat channel but is always available.
-        private readonly HashSet<ChatChannel> _filterableChannels = new();
-        private readonly List<ChatChannel> _selectableChannels = new();
-
-        // Flag Enums for holding filtered channels
-        private ChatChannel _filteredChannels;
+        public ChatSelectChannel SelectableChannels { get; private set; }
+        public ChatChannel FilterableChannels { get; private set; }
 
         /// <summary>
         /// For currently disabled chat filters,
-        /// unread messages (messages received since the channel has been filtered
-        /// out). Never goes above 10 (9+ should be shown when at 10)
+        /// unread messages (messages received since the channel has been filtered out).
         /// </summary>
-        private readonly Dictionary<ChatChannel, byte> _unreadMessages = new();
+        private readonly Dictionary<ChatChannel, int> _unreadMessages = new();
+
+        public IReadOnlyDictionary<ChatChannel, int> UnreadMessages => _unreadMessages;
 
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IClientNetManager _netManager = default!;
@@ -100,16 +93,23 @@ namespace Content.Client.Chat.Managers
         [Dependency] private readonly IEyeManager _eyeManager = default!;
         [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
         [Dependency] private readonly IClientAdminManager _adminMgr = default!;
+        [Dependency] private readonly IConfigurationManager _cfg = default!;
 
         /// <summary>
         /// Current chat box control. This can be modified, so do not depend on saving a reference to this.
         /// </summary>
         public ChatBox? CurrentChatBox { get; private set; }
+
         /// <summary>
         /// Invoked when CurrentChatBox is resized (including after setting initial default size)
         /// </summary>
         public event Action<ChatResizedEventArgs>? OnChatBoxResized;
 
+        public event Action<ChatPermissionsUpdatedEventArgs>? ChatPermissionsUpdated;
+        public event Action? UnreadMessageCountsUpdated;
+        public event Action<StoredChatMessage>? MessageAdded;
+        public event Action? FiltersUpdated;
+
         private Control _speechBubbleRoot = null!;
 
         /// <summary>
@@ -128,15 +128,11 @@ namespace Content.Client.Chat.Managers
         public void Initialize()
         {
             _netManager.RegisterNetMessage<MsgChatMessage>(OnChatMessage);
-            _netManager.RegisterNetMessage<ChatMaxMsgLengthMessage>(OnMaxLengthReceived);
 
             _speechBubbleRoot = new LayoutContainer();
             LayoutContainer.SetAnchorPreset(_speechBubbleRoot, LayoutContainer.LayoutPreset.Wide);
             _userInterfaceManager.StateRoot.AddChild(_speechBubbleRoot);
             _speechBubbleRoot.SetPositionFirst();
-
-            // When connexion is achieved, request the max chat message length
-            _netManager.Connected += RequestMaxLength;
         }
 
         public void PostInject()
@@ -178,83 +174,58 @@ namespace Content.Client.Chat.Managers
         // for any newly-granted channels
         private void UpdateChannelPermissions()
         {
+            var oldSelectable = SelectableChannels;
+            SelectableChannels = default;
+            FilterableChannels = default;
+
+            // Can always send console stuff.
+            SelectableChannels |= ChatSelectChannel.Console;
+
             // can always send/recieve OOC
-            if (!_selectableChannels.Contains(ChatChannel.OOC))
-            {
-                _selectableChannels.Add(ChatChannel.OOC);
-            }
-            AddFilterableChannel(ChatChannel.OOC);
+            SelectableChannels |= ChatSelectChannel.OOC;
+            FilterableChannels |= ChatChannel.OOC;
 
             // can always hear server (nobody can actually send server messages).
-            AddFilterableChannel(ChatChannel.Server);
+            FilterableChannels |= ChatChannel.Server;
 
             // can always hear local / radio / emote
-            AddFilterableChannel(ChatChannel.Local);
-            AddFilterableChannel(ChatChannel.Radio);
-            AddFilterableChannel(ChatChannel.Emotes);
+            // todo: this makes no sense the lobby exists fix this.
+            FilterableChannels |= ChatChannel.Local;
+            FilterableChannels |= ChatChannel.Radio;
+            FilterableChannels |= ChatChannel.Emotes;
 
             // Can only send local / radio / emote when attached to a non-ghost entity.
             // TODO: this logic is iffy (checking if controlling something that's NOT a ghost), is there a better way to check this?
-            if (!_playerManager.LocalPlayer?.ControlledEntity?.HasComponent<GhostComponent>() ?? false)
+            if (!IsGhost)
             {
-                _selectableChannels.Add(ChatChannel.Local);
-                _selectableChannels.Add(ChatChannel.Radio);
-                _selectableChannels.Add(ChatChannel.Emotes);
-            }
-            else
-            {
-                _selectableChannels.Remove(ChatChannel.Local);
-                _selectableChannels.Remove(ChatChannel.Radio);
-                _selectableChannels.Remove(ChatChannel.Emotes);
+                SelectableChannels |= ChatSelectChannel.Local;
+                SelectableChannels |= ChatSelectChannel.Radio;
+                SelectableChannels |= ChatSelectChannel.Emotes;
             }
 
             // Only ghosts and admins can send / see deadchat.
-            // TODO: Should spectators also be able to see deadchat?
-            if (_adminMgr.HasFlag(AdminFlags.Admin) ||
-                (_playerManager?.LocalPlayer?.ControlledEntity?.HasComponent<GhostComponent>() ?? false))
+            if (_adminMgr.HasFlag(AdminFlags.Admin) || IsGhost)
             {
-                AddFilterableChannel(ChatChannel.Dead);
-                if (!_selectableChannels.Contains(ChatChannel.Dead))
-                {
-                    _selectableChannels.Add(ChatChannel.Dead);
-                }
-            }
-            else
-            {
-                _filterableChannels.Remove(ChatChannel.Dead);
-                _selectableChannels.Remove(ChatChannel.Dead);
+                FilterableChannels |= ChatChannel.Dead;
+                SelectableChannels |= ChatSelectChannel.Dead;
             }
 
             // only admins can see / filter asay
             if (_adminMgr.HasFlag(AdminFlags.Admin))
             {
-                AddFilterableChannel(ChatChannel.AdminChat);
-                if (!_selectableChannels.Contains(ChatChannel.AdminChat))
-                {
-                    _selectableChannels.Add(ChatChannel.AdminChat);
-                }
-            }
-            else
-            {
-                _selectableChannels.Remove(ChatChannel.AdminChat);
-                _filterableChannels.Remove(ChatChannel.AdminChat);
+                FilterableChannels |= ChatChannel.Admin;
+                SelectableChannels |= ChatSelectChannel.Admin;
             }
 
+            // Necessary so that we always have a channel to fall back to.
+            DebugTools.Assert((SelectableChannels & ChatSelectChannel.OOC) != 0, "OOC must always be available");
+            DebugTools.Assert((FilterableChannels & ChatChannel.OOC) != 0, "OOC must always be available");
+
             // let our chatbox know all the new settings
-            CurrentChatBox?.SetChannelPermissions(_selectableChannels, _filterableChannels, _channelFilters, _unreadMessages, true);
-        }
-
-        /// <summary>
-        /// Adds the channel to the set of filterable channels, defaulting it as enabled
-        /// if it doesn't currently have an explicit enable/disable setting
-        /// </summary>
-        private void AddFilterableChannel(ChatChannel channel)
-        {
-            if (!_channelFilters.ContainsKey(channel))
-                _channelFilters[channel] = true;
-            _filterableChannels.Add(channel);
+            ChatPermissionsUpdated?.Invoke(new ChatPermissionsUpdatedEventArgs {OldSelectableChannels = oldSelectable});
         }
 
+        public bool IsGhost => _playerManager.LocalPlayer?.ControlledEntity?.HasComponent<GhostComponent>() ?? false;
 
         public void FrameUpdate(FrameEventArgs delta)
         {
@@ -296,27 +267,19 @@ namespace Content.Client.Chat.Managers
 
         public void SetChatBox(ChatBox chatBox)
         {
-            if (CurrentChatBox != null)
-            {
-                CurrentChatBox.TextSubmitted -= OnChatBoxTextSubmitted;
-                CurrentChatBox.FilterToggled -= OnFilterButtonToggled;
-                CurrentChatBox.OnResized -= ChatBoxOnResized;
-            }
-
             CurrentChatBox = chatBox;
-            if (CurrentChatBox != null)
-            {
-                CurrentChatBox.TextSubmitted += OnChatBoxTextSubmitted;
-                CurrentChatBox.FilterToggled += OnFilterButtonToggled;
-                CurrentChatBox.OnResized += ChatBoxOnResized;
-
-                CurrentChatBox.SetChannelPermissions(_selectableChannels, _filterableChannels, _channelFilters, _unreadMessages, false);
-            }
-
-            RepopulateChat(_filteredHistory);
         }
 
-        private void ChatBoxOnResized(ChatResizedEventArgs chatResizedEventArgs)
+        public void ClearUnfilteredUnreads()
+        {
+            foreach (var channel in _unreadMessages.Keys.ToArray())
+            {
+                if ((ChannelFilters & channel) != 0)
+                    _unreadMessages.Remove(channel);
+            }
+        }
+
+        public void ChatBoxOnResized(ChatResizedEventArgs chatResizedEventArgs)
         {
             OnChatBoxResized?.Invoke(chatResizedEventArgs);
         }
@@ -334,158 +297,86 @@ namespace Content.Client.Chat.Managers
             }
         }
 
-        private void WriteChatMessage(StoredChatMessage message)
-        {
-            Logger.Debug($"{message.Channel}: {message.Message}");
-
-            if (IsFiltered(message.Channel))
-            {
-                Logger.Debug($"Message filtered: {message.Channel}: {message.Message}");
-                // accumulate unread
-                if (message.Read) return;
-                if (!_unreadMessages.TryGetValue(message.Channel, out var count))
-                {
-                    count = 0;
-                }
-                count = (byte) Math.Min(count + 1, 10);
-                _unreadMessages[message.Channel] = count;
-                CurrentChatBox?.UpdateUnreadMessageCounts(_unreadMessages);
-                return;
-            }
-
-            var color = Color.DarkGray;
-            var messageText = FormattedMessage.EscapeText(message.Message);
-            if (!string.IsNullOrEmpty(message.MessageWrap))
-            {
-               messageText = string.Format(message.MessageWrap, messageText);
-            }
-
-            if (message.MessageColorOverride != Color.Transparent)
-            {
-                color = message.MessageColorOverride;
-            }
-            else
-            {
-                color = ChatHelper.ChatColor(message.Channel);
-            }
-
-            if (CurrentChatBox == null) return;
-            CurrentChatBox.AddLine(messageText, message.Channel, color);
-            // TODO: Can make this "smarter" later by only setting it false when the message has been scrolled to
-            message.Read = true;
-        }
-
-        private void OnChatBoxTextSubmitted(ChatBox chatBox, string text)
+        public void OnChatBoxTextSubmitted(ChatBox chatBox, ReadOnlyMemory<char> text, ChatSelectChannel channel)
         {
             DebugTools.Assert(chatBox == CurrentChatBox);
 
-            if (string.IsNullOrWhiteSpace(text))
-                return;
+            var str = text.ToString();
 
-            // Check if message is longer than the character limit
-            if (text.Length > _maxMessageLength)
+            switch (channel)
             {
-                if (CurrentChatBox != null)
-                {
-                    string locWarning = Loc.GetString("chat-manager-max-message-length",
-                                            ("maxMessageLength", _maxMessageLength));
-                    CurrentChatBox.AddLine(locWarning, ChatChannel.Server, Color.Orange);
-                    CurrentChatBox.ClearOnEnter = false; // The text shouldn't be cleared if it hasn't been sent
-                }
-                return;
-            }
-
-            switch (text[0])
-            {
-                case ConCmdSlash:
-                {
+                case ChatSelectChannel.Console:
                     // run locally
-                    var conInput = text.Substring(1);
-                    _consoleHost.ExecuteCommand(conInput);
+                    _consoleHost.ExecuteCommand(text.ToString());
                     break;
-                }
-                case OOCAlias:
-                {
-                    var conInput = text.Substring(1);
-                    if (string.IsNullOrWhiteSpace(conInput))
-                        return;
-                    _consoleHost.ExecuteCommand($"ooc \"{CommandParsing.Escape(conInput)}\"");
-                    break;
-                }
-                case AdminChatAlias:
-                {
-                    var conInput = text.Substring(1);
-                    if (string.IsNullOrWhiteSpace(conInput))
-                        return;
-                    if (_adminMgr.HasFlag(AdminFlags.Admin))
-                    {
-                        _consoleHost.ExecuteCommand($"asay \"{CommandParsing.Escape(conInput)}\"");
-                    }
-                    else
-                    {
-                        _consoleHost.ExecuteCommand($"ooc \"{CommandParsing.Escape(conInput)}\"");
-                    }
 
+                case ChatSelectChannel.OOC:
+                    _consoleHost.ExecuteCommand($"ooc \"{CommandParsing.Escape(str)}\"");
                     break;
-                }
-                case MeAlias:
-                {
-                    var conInput = text.Substring(1);
-                    if (string.IsNullOrWhiteSpace(conInput))
-                        return;
-                    _consoleHost.ExecuteCommand($"me \"{CommandParsing.Escape(conInput)}\"");
+
+                case ChatSelectChannel.Admin:
+                    _consoleHost.ExecuteCommand($"asay \"{CommandParsing.Escape(str)}\"");
                     break;
-                }
+
+                case ChatSelectChannel.Emotes:
+                    _consoleHost.ExecuteCommand($"me \"{CommandParsing.Escape(str)}\"");
+                    break;
+
+                case ChatSelectChannel.Dead:
+                    if (IsGhost)
+                        goto case ChatSelectChannel.Local;
+                    else if (_adminMgr.HasFlag(AdminFlags.Admin))
+                        _consoleHost.ExecuteCommand($"dsay \"{CommandParsing.Escape(str)}\"");
+                    else
+                        Logger.WarningS("chat", "Tried to speak on deadchat without being ghost or admin.");
+                    break;
+
+                case ChatSelectChannel.Radio:
+                    _consoleHost.ExecuteCommand($"say \";{CommandParsing.Escape(str)}\"");
+                    break;
+
+                case ChatSelectChannel.Local:
+                    _consoleHost.ExecuteCommand($"say \"{CommandParsing.Escape(str)}\"");
+                    break;
+
                 default:
-                {
-                    var conInput = CurrentChatBox?.DefaultChatFormat != null
-                        ? string.Format(CurrentChatBox.DefaultChatFormat, CommandParsing.Escape(text))
-                        : text;
-                    _consoleHost.ExecuteCommand(conInput);
-                    break;
-                }
+                    throw new ArgumentOutOfRangeException(nameof(channel), channel, null);
             }
         }
 
-        private void OnFilterButtonToggled(ChatChannel channel, bool enabled)
+        public void OnFilterButtonToggled(ChatChannel channel, bool enabled)
         {
             if (enabled)
             {
-                _channelFilters[channel] = true;
-                _filteredChannels &= ~channel;
+                ChannelFilters |= channel;
                 _unreadMessages.Remove(channel);
-                CurrentChatBox?.UpdateUnreadMessageCounts(_unreadMessages);
+                UnreadMessageCountsUpdated?.Invoke();
             }
             else
             {
-                _channelFilters[channel] = false;
-                _filteredChannels |= channel;
+                ChannelFilters &= ~channel;
             }
 
-            RepopulateChat(_filteredHistory);
-        }
-
-        private void RepopulateChat(IEnumerable<StoredChatMessage> filteredMessages)
-        {
-            if (CurrentChatBox == null)
-            {
-                return;
-            }
-
-            CurrentChatBox.Contents.Clear();
-
-            foreach (var msg in filteredMessages)
-            {
-                WriteChatMessage(msg);
-            }
+            FiltersUpdated?.Invoke();
         }
 
         private void OnChatMessage(MsgChatMessage msg)
         {
             // Log all incoming chat to repopulate when filter is un-toggled
             var storedMessage = new StoredChatMessage(msg);
-            _filteredHistory.Add(storedMessage);
-            WriteChatMessage(storedMessage);
+            _history.Add(storedMessage);
+            MessageAdded?.Invoke(storedMessage);
+
+            if (!storedMessage.Read)
+            {
+                Logger.Debug($"Message filtered: {storedMessage.Channel}: {storedMessage.Message}");
+                if (!_unreadMessages.TryGetValue(msg.Channel, out var count))
+                    count = 0;
+
+                count += 1;
+                _unreadMessages[msg.Channel] = count;
+                UnreadMessageCountsUpdated?.Invoke();
+            }
 
             // Local messages that have an entity attached get a speech bubble.
             if (msg.SenderEntity == default)
@@ -498,7 +389,7 @@ namespace Content.Client.Chat.Managers
                     break;
 
                 case ChatChannel.Dead:
-                    if (!_playerManager.LocalPlayer?.ControlledEntity?.HasComponent<GhostComponent>() ?? true)
+                    if (!IsGhost)
                         break;
 
                     AddSpeechBubble(msg, SpeechBubble.SpeechType.Say);
@@ -510,17 +401,6 @@ namespace Content.Client.Chat.Managers
             }
         }
 
-        private void OnMaxLengthReceived(ChatMaxMsgLengthMessage msg)
-        {
-            _maxMessageLength = msg.MaxMessageLength;
-        }
-
-        private void RequestMaxLength(object? sender, NetChannelArgs args)
-        {
-            ChatMaxMsgLengthMessage msg = _netManager.CreateNetMessage<ChatMaxMsgLengthMessage>();
-            _netManager.ClientSendMessage(msg);
-        }
-
         private void AddSpeechBubble(MsgChatMessage msg, SpeechBubble.SpeechType speechType)
         {
             if (!_entityManager.TryGetEntity(msg.SenderEntity, out var entity))
@@ -604,7 +484,8 @@ namespace Content.Client.Chat.Managers
 
         private void CreateSpeechBubble(IEntity entity, SpeechBubbleData speechData)
         {
-            var bubble = SpeechBubble.CreateSpeechBubble(speechData.Type, speechData.Message, entity, _eyeManager, this);
+            var bubble =
+                SpeechBubble.CreateSpeechBubble(speechData.Type, speechData.Message, entity, _eyeManager, this);
 
             if (_activeSpeechBubbles.TryGetValue(entity.Uid, out var existing))
             {
@@ -631,11 +512,6 @@ namespace Content.Client.Chat.Managers
             }
         }
 
-        private bool IsFiltered(ChatChannel channel)
-        {
-            return _filteredChannels.HasFlag(channel);
-        }
-
         private sealed class SpeechBubbleQueueData
         {
             /// <summary>
diff --git a/Content.Client/Chat/Managers/IChatManager.cs b/Content.Client/Chat/Managers/IChatManager.cs
index 64367365f2..2c25b1b7ee 100644
--- a/Content.Client/Chat/Managers/IChatManager.cs
+++ b/Content.Client/Chat/Managers/IChatManager.cs
@@ -1,5 +1,7 @@
 using System;
+using System.Collections.Generic;
 using Content.Client.Chat.UI;
+using Content.Shared.Chat;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Timing;
 
@@ -7,6 +9,10 @@ namespace Content.Client.Chat.Managers
 {
     public interface IChatManager
     {
+        ChatChannel ChannelFilters { get; }
+        ChatSelectChannel SelectableChannels { get; }
+        ChatChannel FilterableChannels { get; }
+
         void Initialize();
 
         void FrameUpdate(FrameEventArgs delta);
@@ -20,9 +26,29 @@ namespace Content.Client.Chat.Managers
         /// </summary>
         ChatBox? CurrentChatBox { get; }
 
+        IReadOnlyDictionary<ChatChannel, int> UnreadMessages { get; }
+        IReadOnlyList<StoredChatMessage> History { get; }
+        int MaxMessageLength { get; }
+        bool IsGhost { get; }
+
         /// <summary>
         /// Invoked when CurrentChatBox is resized (including after setting initial default size)
         /// </summary>
         event Action<ChatResizedEventArgs>? OnChatBoxResized;
+
+        event Action<ChatPermissionsUpdatedEventArgs>? ChatPermissionsUpdated;
+        event Action? UnreadMessageCountsUpdated;
+        event Action<StoredChatMessage>? MessageAdded;
+        event Action? FiltersUpdated;
+
+        void ClearUnfilteredUnreads();
+        void ChatBoxOnResized(ChatResizedEventArgs chatResizedEventArgs);
+        void OnChatBoxTextSubmitted(ChatBox chatBox, ReadOnlyMemory<char> text, ChatSelectChannel channel);
+        void OnFilterButtonToggled(ChatChannel channel, bool enabled);
+    }
+
+    public struct ChatPermissionsUpdatedEventArgs
+    {
+        public ChatSelectChannel OldSelectableChannels;
     }
 }
diff --git a/Content.Client/Chat/UI/ChatBox.cs b/Content.Client/Chat/UI/ChatBox.cs
deleted file mode 100644
index 1052f499c2..0000000000
--- a/Content.Client/Chat/UI/ChatBox.cs
+++ /dev/null
@@ -1,973 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Content.Client.Alerts.UI;
-using Content.Client.Chat.Managers;
-using Content.Client.Lobby;
-using Content.Client.Resources;
-using Content.Client.Stylesheets;
-using Content.Shared.Chat;
-using Content.Shared.Input;
-using Robust.Client.Graphics;
-using Robust.Client.ResourceManagement;
-using Robust.Client.State;
-using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.Controls;
-using Robust.Shared.Input;
-using Robust.Shared.IoC;
-using Robust.Shared.Localization;
-using Robust.Shared.Maths;
-using Robust.Shared.Timing;
-using Robust.Shared.Utility;
-
-namespace Content.Client.Chat.UI
-{
-    public class ChatBox : Control
-    {
-        public const float InitialChatBottom = 235;
-
-        public delegate void TextSubmitHandler(ChatBox chatBox, string text);
-
-        public delegate void FilterToggledHandler(ChatChannel toggled, bool enabled);
-
-        public event TextSubmitHandler? TextSubmitted;
-
-        public event FilterToggledHandler? FilterToggled;
-
-        public HistoryLineEdit Input { get; private set; }
-        public OutputPanel Contents { get; }
-
-        public event Action<ChatResizedEventArgs>? OnResized;
-
-        // order in which the available channel filters show up when available
-        public static readonly IReadOnlyList<ChatChannel> ChannelFilterOrder = new List<ChatChannel>
-        {
-            ChatChannel.Local, ChatChannel.Emotes, ChatChannel.Radio, ChatChannel.OOC, ChatChannel.Dead, ChatChannel.AdminChat,
-            ChatChannel.Server
-        };
-
-        // order in which the channels show up in the channel selector
-        private static readonly IReadOnlyList<ChatChannel> ChannelSelectorOrder = new List<ChatChannel>
-        {
-            ChatChannel.Local, ChatChannel.Emotes, ChatChannel.Radio, ChatChannel.OOC, ChatChannel.Dead, ChatChannel.AdminChat
-        };
-
-        private const float FilterPopupWidth = 110;
-        private const int DragMarginSize = 7;
-        private const int MinDistanceFromBottom = 255;
-        private const int MinLeft = 500;
-
-        /// <summary>
-        /// Will be Unspecified if set to Console
-        /// </summary>
-        public ChatChannel SelectedChannel = ChatChannel.Unspecified;
-
-        /// <summary>
-        ///     Default formatting string for the ClientChatConsole.
-        /// </summary>
-        public string DefaultChatFormat { get; set; } = string.Empty;
-
-        public bool ReleaseFocusOnEnter { get; set; } = true;
-
-        public bool ClearOnEnter { get; set; } = true;
-
-        // when channel is changed temporarily due to typing an alias
-        // prefix, we save the current channel selection here to restore it when
-        // the message is sent
-        private ChatChannel? _savedSelectedChannel;
-
-        private readonly Popup _channelSelectorPopup;
-        private readonly Button _channelSelector;
-        private readonly HBoxContainer _channelSelectorHBox;
-        private readonly FilterButton _filterButton;
-        private readonly Popup _filterPopup;
-        private readonly PanelContainer _filterPopupPanel;
-        private readonly VBoxContainer _filterVBox;
-        private DragMode _currentDrag = DragMode.None;
-        private Vector2 _dragOffsetTopLeft;
-        private Vector2 _dragOffsetBottomRight;
-        private readonly IClyde _clyde;
-        private readonly bool _lobbyMode;
-        private byte _clampIn;
-        // currently known selectable channels as provided by ChatManager,
-        // never contains Unspecified (which corresponds to Console which is always available)
-        public List<ChatChannel> SelectableChannels = new();
-
-        /// <summary>
-        /// When lobbyMode is false, will position / add to correct location in StateRoot and
-        /// be resizable.
-        /// wWen true, will leave layout up to parent and not be resizable.
-        /// </summary>
-        public ChatBox()
-        {
-            //TODO Paul needs to fix xaml ctor args so we can pass this instead of resolving it.
-            var stateManager = IoCManager.Resolve<IStateManager>();
-            _lobbyMode = stateManager.CurrentState is LobbyState;
-
-            // TODO: Revisit the resizing stuff after https://github.com/space-wizards/RobustToolbox/issues/1392 is done,
-            // Probably not "supposed" to inject IClyde, but I give up.
-            // I can't find any other way to allow this control to properly resize when the
-            // window is resized. Resized() isn't reliably called when resizing the window,
-            // and layoutcontainer anchor / margin don't seem to adjust how we need
-            // them to when the window is resized. We need it to be able to resize
-            // within some bounds so that it doesn't overlap other UI elements, while still
-            // being freely resizable within those bounds.
-            _clyde = IoCManager.Resolve<IClyde>();
-            MouseFilter = MouseFilterMode.Stop;
-            LayoutContainer.SetMarginLeft(this, 4);
-            LayoutContainer.SetMarginRight(this, 4);
-            MinHeight = 128;
-            MinWidth = 200;
-
-            AddChild(new PanelContainer
-            {
-                PanelOverride = new StyleBoxFlat {BackgroundColor = Color.FromHex("#25252aaa")},
-                VerticalExpand = true,
-                HorizontalExpand = true,
-                Children =
-                {
-                    new VBoxContainer
-                    {
-                        Children =
-                        {
-                            (Contents = new OutputPanel
-                            {
-                                VerticalExpand = true,
-                            }),
-                            new PanelContainer
-                            {
-                                StyleClasses = { StyleNano.StyleClassChatSubPanel },
-                                HorizontalExpand = true,
-                                Children =
-                                {
-                                    new HBoxContainer
-                                    {
-                                        HorizontalExpand = true,
-                                        SeparationOverride = 4,
-                                        Children =
-                                        {
-                                            (_channelSelector = new ChannelSelectorButton
-                                            {
-                                                StyleClasses = { StyleNano.StyleClassChatChannelSelectorButton },
-                                                MinWidth = 75,
-                                                Text = Loc.GetString("hud-chatbox-ooc"),
-                                                ToggleMode = true
-                                            }),
-                                            (Input = new HistoryLineEdit
-                                            {
-                                                PlaceHolder = Loc.GetString("hud-chatbox-info"),
-                                                HorizontalExpand = true,
-                                                StyleClasses = { StyleNano.StyleClassChatLineEdit }
-                                            }),
-                                            (_filterButton = new FilterButton
-                                            {
-                                                StyleClasses = { StyleNano.StyleClassChatFilterOptionButton }
-                                            })
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            });
-
-            _filterPopup = new Popup
-            {
-                Children =
-                {
-                    (_filterPopupPanel = new PanelContainer
-                    {
-                        StyleClasses = {StyleNano.StyleClassBorderedWindowPanel},
-                        Children =
-                        {
-                            new HBoxContainer
-                            {
-                                Children =
-                                {
-                                    new Control{MinSize = (4,0)},
-                                    (_filterVBox = new VBoxContainer
-                                    {
-                                        SeparationOverride = 4
-                                    })
-                                }
-                            }
-                        }
-                    })
-                }
-            };
-
-            _channelSelectorPopup = new Popup
-            {
-                Children =
-                {
-                    (_channelSelectorHBox = new HBoxContainer
-                    {
-                        SeparationOverride = 1
-                    })
-                }
-            };
-
-            if (!_lobbyMode)
-            {
-                UserInterfaceManager.StateRoot.AddChild(this);
-                LayoutContainer.SetAnchorAndMarginPreset(this, LayoutContainer.LayoutPreset.TopRight, margin: 10);
-                LayoutContainer.SetAnchorAndMarginPreset(this, LayoutContainer.LayoutPreset.TopRight, margin: 10);
-                LayoutContainer.SetMarginLeft(this, -475);
-                LayoutContainer.SetMarginBottom(this, InitialChatBottom);
-                OnResized?.Invoke(new ChatResizedEventArgs(InitialChatBottom));
-            }
-        }
-
-        protected override void EnteredTree()
-        {
-            base.EnteredTree();
-            _channelSelector.OnToggled += OnChannelSelectorToggled;
-            _filterButton.OnToggled += OnFilterButtonToggled;
-            Input.OnKeyBindDown += InputKeyBindDown;
-            Input.OnTextEntered += Input_OnTextEntered;
-            Input.OnTextChanged += InputOnTextChanged;
-            Input.OnFocusExit += InputOnFocusExit;
-            _channelSelectorPopup.OnPopupHide += OnChannelSelectorPopupHide;
-            _filterPopup.OnPopupHide += OnFilterPopupHide;
-            _clyde.OnWindowResized += ClydeOnOnWindowResized;
-        }
-
-        protected override void ExitedTree()
-        {
-            base.ExitedTree();
-            _channelSelector.OnToggled -= OnChannelSelectorToggled;
-            _filterButton.OnToggled -= OnFilterButtonToggled;
-            Input.OnKeyBindDown -= InputKeyBindDown;
-            Input.OnTextEntered -= Input_OnTextEntered;
-            Input.OnTextChanged -= InputOnTextChanged;
-            Input.OnFocusExit -= InputOnFocusExit;
-            _channelSelectorPopup.OnPopupHide -= OnChannelSelectorPopupHide;
-            _filterPopup.OnPopupHide -= OnFilterPopupHide;
-            _clyde.OnWindowResized -= ClydeOnOnWindowResized;
-            UnsubFilterItems();
-            UnsubChannelItems();
-
-        }
-
-        private void UnsubFilterItems()
-        {
-            foreach (var child in _filterVBox.Children)
-            {
-                if (child is not ChannelFilterCheckbox checkbox) continue;
-                checkbox.OnToggled -= OnFilterCheckboxToggled;
-            }
-        }
-
-        private void UnsubChannelItems()
-        {
-            foreach (var child in _channelSelectorHBox.Children)
-            {
-                if (child is not ChannelItemButton button) continue;
-                button.OnPressed -= OnChannelSelectorItemPressed;
-            }
-        }
-
-
-        /// <summary>
-        /// Update the available filters / selectable channels and the current filter settings using the provided
-        /// data.
-        /// </summary>
-        /// <param name="selectableChannels">channels currently selectable to send on</param>
-        /// <param name="filterableChannels">channels currently able ot filter on</param>
-        /// <param name="channelFilters">current settings for the channel filters, this SHOULD always have an entry if
-        /// there is a corresponding entry in filterableChannels, but it may also have additional
-        /// entries (which should not be presented to the user)</param>
-        /// <param name="unreadMessages">unread message counts for each disabled channel, values 10 or higher will show as 9+</param>
-        public void SetChannelPermissions(List<ChatChannel> selectableChannels, IReadOnlySet<ChatChannel> filterableChannels,
-            IReadOnlyDictionary<ChatChannel, bool> channelFilters, IReadOnlyDictionary<ChatChannel, byte> unreadMessages, bool switchIfConsole)
-        {
-            SelectableChannels = selectableChannels;
-            // update the channel selector
-            UnsubChannelItems();
-            _channelSelectorHBox.RemoveAllChildren();
-            foreach (var selectableChannel in ChannelSelectorOrder)
-            {
-                if (!selectableChannels.Contains(selectableChannel)) continue;
-                var newButton = new ChannelItemButton(selectableChannel);
-                newButton.OnPressed += OnChannelSelectorItemPressed;
-                _channelSelectorHBox.AddChild(newButton);
-            }
-            // console channel is always selectable and represented via Unspecified
-            var consoleButton = new ChannelItemButton(ChatChannel.Unspecified);
-            consoleButton.OnPressed += OnChannelSelectorItemPressed;
-            _channelSelectorHBox.AddChild(consoleButton);
-
-
-            if (_savedSelectedChannel.HasValue && _savedSelectedChannel.Value != ChatChannel.Unspecified &&
-                !selectableChannels.Contains(_savedSelectedChannel.Value))
-            {
-                // we just lost our saved selected channel, the current one will become permanent
-                _savedSelectedChannel = null;
-            }
-
-            if (!selectableChannels.Contains(SelectedChannel) && (switchIfConsole || SelectedChannel != ChatChannel.Unspecified))
-            {
-                // our previously selected channel no longer exists or we are still on console channel because we just joined
-                if ((SelectedChannel & ChatChannel.IC) != 0 || SelectedChannel == ChatChannel.Unspecified)
-                {
-                    if (!SafelySelectChannel(ChatChannel.Local))
-                        SafelySelectChannel(ChatChannel.Dead);
-                }
-                else if (selectableChannels.Contains(ChatChannel.OOC))
-                {
-                    SafelySelectChannel(ChatChannel.OOC);
-                }
-                else //This shouldn't happen but better to be safe than sorry
-                {
-                    SafelySelectChannel(selectableChannels.First());
-                }
-            }
-            else
-            {
-                SafelySelectChannel(SelectedChannel);
-            }
-
-            // update the channel filters
-            UnsubFilterItems();
-            _filterVBox.Children.Clear();
-            _filterVBox.AddChild(new Control {CustomMinimumSize = (10, 0)});
-            foreach (var channelFilter in ChannelFilterOrder)
-            {
-                if (!filterableChannels.Contains(channelFilter)) continue;
-                byte? unreadCount = null;
-                if (unreadMessages.TryGetValue(channelFilter, out var unread))
-                {
-                    unreadCount = unread;
-                }
-                var newCheckBox = new ChannelFilterCheckbox(channelFilter, unreadCount)
-                {
-                    // shouldn't happen, but if there's no explicit enable setting provided, default to enabled
-                    Pressed = !channelFilters.TryGetValue(channelFilter, out var enabled) || enabled
-                };
-                newCheckBox.OnToggled += OnFilterCheckboxToggled;
-                _filterVBox.AddChild(newCheckBox);
-            }
-            _filterVBox.AddChild(new Control {CustomMinimumSize = (10, 0)});
-        }
-
-        /// <summary>
-        /// Update the unread message counts in the filters based on the provided data.
-        /// </summary>
-        /// <param name="unreadMessages">counts for each channel, any values above 9 will show as 9+</param>
-        public void UpdateUnreadMessageCounts(IReadOnlyDictionary<ChatChannel, byte> unreadMessages)
-        {
-            foreach (var channelFilter in _filterVBox.Children)
-            {
-                if (channelFilter is not ChannelFilterCheckbox filterCheckbox) continue;
-                if (unreadMessages.TryGetValue(filterCheckbox.Channel, out var unread))
-                {
-                    filterCheckbox.UpdateUnreadCount(unread);
-                }
-                else
-                {
-                    filterCheckbox.UpdateUnreadCount(null);
-                }
-            }
-        }
-
-        private void OnFilterCheckboxToggled(BaseButton.ButtonToggledEventArgs args)
-        {
-            if (args.Button is not ChannelFilterCheckbox checkbox) return;
-            FilterToggled?.Invoke(checkbox.Channel, checkbox.Pressed);
-        }
-
-
-        private void OnFilterButtonToggled(BaseButton.ButtonToggledEventArgs args)
-        {
-            if (args.Pressed)
-            {
-                var globalPos = _filterButton.GlobalPosition;
-                var (minX, minY) = _filterPopupPanel.CombinedMinimumSize;
-                var box = UIBox2.FromDimensions(globalPos - (FilterPopupWidth, 0), (Math.Max(minX, FilterPopupWidth), minY));
-                UserInterfaceManager.ModalRoot.AddChild(_filterPopup);
-                _filterPopup.Open(box);
-            }
-            else
-            {
-                _filterPopup.Close();
-            }
-        }
-
-        private void OnChannelSelectorToggled(BaseButton.ButtonToggledEventArgs args)
-        {
-            if (args.Pressed)
-            {
-                var globalLeft = GlobalPosition.X;
-                var globalBot = GlobalPosition.Y + Height;
-                var box = UIBox2.FromDimensions((globalLeft, globalBot), (SizeBox.Width, AlertsUI.ChatSeparation));
-                UserInterfaceManager.ModalRoot.AddChild(_channelSelectorPopup);
-                _channelSelectorPopup.Open(box);
-            }
-            else
-            {
-                _channelSelectorPopup.Close();
-            }
-        }
-
-        private void OnFilterPopupHide()
-        {
-            OnPopupHide(_filterPopup, _filterButton);
-        }
-
-        private void OnChannelSelectorPopupHide()
-        {
-            OnPopupHide(_channelSelectorPopup, _channelSelector);
-        }
-
-        private void OnPopupHide(Control popup, BaseButton button)
-        {
-            UserInterfaceManager.ModalRoot.RemoveChild(popup);
-            // this weird check here is because the hiding of the popup happens prior to the button
-            // receiving the keydown, which would cause it to then become unpressed
-            // and reopen immediately. To avoid this, if the popup was hidden due to clicking on the button,
-            // we will not auto-unpress the button, instead leaving it up to the button toggle logic
-            // (and this requires the button to be set to EnableAllKeybinds = true)
-            if (UserInterfaceManager.CurrentlyHovered != button)
-            {
-                button.Pressed = false;
-            }
-        }
-
-        private void OnChannelSelectorItemPressed(BaseButton.ButtonEventArgs obj)
-        {
-            if (obj.Button is not ChannelItemButton button) return;
-            SafelySelectChannel(button.Channel);
-            _channelSelectorPopup.Close();
-        }
-
-
-        /// <summary>
-        /// Selects the indicated channel, clearing out any temporarily-selected channel
-        /// (any currently entered text is preserved). If the specified channel is not selectable,
-        /// will just maintain current selection.
-        /// </summary>
-        public void SelectChannel(ChatChannel toSelect)
-        {
-            _savedSelectedChannel = null;
-            SafelySelectChannel(toSelect);
-        }
-
-        private bool SafelySelectChannel(ChatChannel toSelect)
-        {
-            if (toSelect == ChatChannel.Unspecified ||
-                SelectableChannels.Contains(toSelect))
-            {
-                SelectedChannel = toSelect;
-                _channelSelector.Text = ChannelSelectorName(toSelect);
-                _channelSelector.Modulate = ChatHelper.ChatColor(toSelect);
-                return true;
-            }
-            // keep current setting
-            return false;
-        }
-
-        protected override void KeyBindDown(GUIBoundKeyEventArgs args)
-        {
-            base.KeyBindDown(args);
-
-            if (args.Function == EngineKeyFunctions.UIClick && !_lobbyMode)
-            {
-                _currentDrag = GetDragModeFor(args.RelativePosition);
-
-                if (_currentDrag != DragMode.None)
-                {
-                    _dragOffsetTopLeft = args.PointerLocation.Position / UIScale - Position;
-                    _dragOffsetBottomRight = Position + Size - args.PointerLocation.Position / UIScale;
-                }
-            }
-
-            if (args.CanFocus)
-            {
-                Input.GrabKeyboardFocus();
-            }
-        }
-
-        protected override void KeyBindUp(GUIBoundKeyEventArgs args)
-        {
-            base.KeyBindUp(args);
-
-            if (args.Function != EngineKeyFunctions.UIClick || _lobbyMode)
-            {
-                return;
-            }
-
-            _dragOffsetTopLeft = _dragOffsetBottomRight = Vector2.Zero;
-            _currentDrag = DragMode.None;
-
-            // If this is done in MouseDown, Godot won't fire MouseUp as you need focus to receive MouseUps.
-            UserInterfaceManager.KeyboardFocused?.ReleaseKeyboardFocus();
-        }
-
-        public void CycleChatChannel(bool forward)
-        {
-            Input.IgnoreNext = true;
-            var channels = SelectableChannels;
-            var idx = channels.IndexOf(SelectedChannel);
-            if (forward)
-            {
-                idx++;
-            }
-            else
-            {
-                idx--;
-            }
-            idx = MathHelper.Mod(idx, channels.Count);
-
-            SelectChannel(channels[idx]);
-        }
-
-        private void InputKeyBindDown(GUIBoundKeyEventArgs args)
-        {
-            if (args.Function == EngineKeyFunctions.TextReleaseFocus)
-            {
-                Input.ReleaseKeyboardFocus();
-                args.Handle();
-                return;
-            }
-
-            if (args.Function == ContentKeyFunctions.CycleChatChannelForward)
-            {
-                CycleChatChannel(true);
-                args.Handle();
-                return;
-            }
-
-            if (args.Function == ContentKeyFunctions.CycleChatChannelBackward)
-            {
-                CycleChatChannel(false);
-                args.Handle();
-                return;
-            }
-
-            // if we temporarily selected another channel via a prefx, undo that when we backspace on an empty input
-            if (args.Function == EngineKeyFunctions.TextBackspace && Input.Text.Length == 0 && _savedSelectedChannel.HasValue)
-            {
-                SafelySelectChannel(_savedSelectedChannel.Value);
-                _savedSelectedChannel = null;
-            }
-        }
-
-        // TODO: this drag and drop stuff is somewhat duplicated from Robust BaseWindow but also modified
-        [Flags]
-        private enum DragMode : byte
-        {
-            None = 0,
-            Bottom = 1 << 1,
-            Left = 1 << 2
-        }
-
-        private DragMode GetDragModeFor(Vector2 relativeMousePos)
-        {
-            var mode = DragMode.None;
-
-            if (relativeMousePos.Y > Size.Y - DragMarginSize)
-            {
-                mode = DragMode.Bottom;
-            }
-
-            if (relativeMousePos.X < DragMarginSize)
-            {
-                mode |= DragMode.Left;
-            }
-
-            return mode;
-        }
-
-        protected override void MouseMove(GUIMouseMoveEventArgs args)
-        {
-            base.MouseMove(args);
-
-            if (Parent == null || _lobbyMode)
-            {
-                return;
-            }
-
-            if (_currentDrag == DragMode.None)
-            {
-                var cursor = CursorShape.Arrow;
-                var previewDragMode = GetDragModeFor(args.RelativePosition);
-                switch (previewDragMode)
-                {
-                    case DragMode.Bottom:
-                        cursor = CursorShape.VResize;
-                        break;
-
-                    case DragMode.Left:
-                        cursor = CursorShape.HResize;
-                        break;
-
-                    case DragMode.Bottom | DragMode.Left:
-                        cursor = CursorShape.Crosshair;
-                        break;
-                }
-
-                DefaultCursorShape = cursor;
-            }
-            else
-            {
-                var top = Rect.Top;
-                var bottom = Rect.Bottom;
-                var left = Rect.Left;
-                var right = Rect.Right;
-                var (minSizeX, minSizeY) = CombinedMinimumSize;
-                if ((_currentDrag & DragMode.Bottom) == DragMode.Bottom)
-                {
-                    bottom = Math.Max(args.GlobalPosition.Y + _dragOffsetBottomRight.Y, top + minSizeY);
-                }
-
-                if ((_currentDrag & DragMode.Left) == DragMode.Left)
-                {
-                    var maxX = right - minSizeX;
-                    left = Math.Min(args.GlobalPosition.X - _dragOffsetTopLeft.X, maxX);
-                }
-
-                ClampSize(left, bottom);
-            }
-        }
-
-        protected override void UIScaleChanged()
-        {
-            base.UIScaleChanged();
-            ClampAfterDelay();
-        }
-
-        private void ClydeOnOnWindowResized(WindowResizedEventArgs obj)
-        {
-            ClampAfterDelay();
-        }
-
-        private void ClampAfterDelay()
-        {
-            if (!_lobbyMode)
-                _clampIn = 2;
-        }
-
-        protected override void FrameUpdate(FrameEventArgs args)
-        {
-            base.FrameUpdate(args);
-            if (_lobbyMode) return;
-            // we do the clamping after a delay (after UI scale / window resize)
-            // because we need to wait for our parent container to properly resize
-            // first, so we can calculate where we should go. If we do it right away,
-            // we won't have the correct values from the parent to know how to adjust our margins.
-            if (_clampIn <= 0) return;
-            _clampIn -= 1;
-            if (_clampIn == 0) ClampSize();
-        }
-
-        private void ClampSize(float? desiredLeft = null, float? desiredBottom = null)
-        {
-            if (Parent == null || _lobbyMode) return;
-            var top = Rect.Top;
-            var right = Rect.Right;
-            var left = desiredLeft ?? Rect.Left;
-            var bottom = desiredBottom ?? Rect.Bottom;
-
-            // clamp so it doesn't go too high or low (leave space for alerts UI)
-            var maxBottom = Parent.Size.Y - MinDistanceFromBottom;
-            if (maxBottom <= MinHeight)
-            {
-                // we can't fit in our given space (window made awkwardly small), so give up
-                // and overlap at our min height
-                bottom = MinHeight;
-            }
-            else
-            {
-                bottom = Math.Clamp(bottom, MinHeight, maxBottom);
-            }
-
-            var maxLeft = Parent.Size.X - MinWidth;
-            if (maxLeft <= MinLeft)
-            {
-                // window too narrow, give up and overlap at our max left
-                left = maxLeft;
-            }
-            else
-            {
-                left = Math.Clamp(left, MinLeft, maxLeft);
-            }
-
-            LayoutContainer.SetMarginLeft(this, -((right + 10) - left));
-            LayoutContainer.SetMarginBottom(this, bottom);
-            OnResized?.Invoke(new ChatResizedEventArgs(bottom));
-        }
-
-        protected override void MouseExited()
-        {
-            base.MouseExited();
-
-            if (_currentDrag == DragMode.None && !_lobbyMode)
-            {
-                DefaultCursorShape = CursorShape.Arrow;
-            }
-        }
-
-
-        private void InputOnTextChanged(LineEdit.LineEditEventArgs obj)
-        {
-            // switch temporarily to a different channel if an alias prefix has been entered.
-
-            // are we already temporarily switching to a channel?
-            if (_savedSelectedChannel.HasValue) return;
-
-            var trimmed = obj.Text.Trim();
-            if (trimmed.Length == 0 || trimmed.Length > 1) return;
-
-            var channel = GetChannelFromPrefix(trimmed[0]);
-            var prevChannel = SelectedChannel;
-            if (channel == null || !SafelySelectChannel(channel.Value)) return;
-            // we ate the prefix and auto-switched (temporarily) to the channel with that prefix
-            _savedSelectedChannel = prevChannel;
-            Input.Text = "";
-        }
-
-        private static ChatChannel? GetChannelFromPrefix(char prefix)
-        {
-            return prefix switch
-            {
-                ChatManager.MeAlias => ChatChannel.Emotes,
-                ChatManager.RadioAlias => ChatChannel.Radio,
-                ChatManager.AdminChatAlias => ChatChannel.AdminChat,
-                ChatManager.OOCAlias => ChatChannel.OOC,
-                ChatManager.ConCmdSlash => ChatChannel.Unspecified,
-                _ => null
-            };
-        }
-
-        private static string GetPrefixFromChannel(ChatChannel channel)
-        {
-            char? prefixChar = channel switch
-            {
-                ChatChannel.Emotes => ChatManager.MeAlias,
-                ChatChannel.Radio => ChatManager.RadioAlias,
-                ChatChannel.AdminChat => ChatManager.AdminChatAlias,
-                ChatChannel.OOC => ChatManager.OOCAlias,
-                ChatChannel.Unspecified => ChatManager.ConCmdSlash,
-                _ => null
-            };
-
-            return prefixChar.ToString() ?? string.Empty;
-        }
-
-        public static string ChannelSelectorName(ChatChannel channel)
-        {
-            return channel switch
-            {
-                ChatChannel.AdminChat => Loc.GetString("hud-chatbox-admin"),
-                ChatChannel.Unspecified => Loc.GetString("hud-chatbox-console"),
-                _ => Loc.GetString(channel.ToString())
-            };
-        }
-
-        public void AddLine(string message, ChatChannel channel, Color color)
-        {
-            if (Disposed)
-            {
-                return;
-            }
-
-            var formatted = new FormattedMessage(3);
-            formatted.PushColor(color);
-            formatted.AddMarkup(message);
-            formatted.Pop();
-            Contents.AddMessage(formatted);
-        }
-
-        private void InputOnFocusExit(LineEdit.LineEditEventArgs obj)
-        {
-            // undo the temporary selection, otherwise it will be odd if user
-            // comes back to it later only to have their selection cleared upon sending
-            if (!_savedSelectedChannel.HasValue) return;
-            SafelySelectChannel(_savedSelectedChannel.Value);
-            _savedSelectedChannel = null;
-        }
-
-        private void Input_OnTextEntered(LineEdit.LineEditEventArgs args)
-        {
-            // We set it there to true so it's set to false by TextSubmitted.Invoke if necessary
-            ClearOnEnter = true;
-
-            if (!string.IsNullOrWhiteSpace(args.Text))
-            {
-                TextSubmitted?.Invoke(this, GetPrefixFromChannel(SelectedChannel)
-                                            + args.Text);
-            }
-
-            if (ClearOnEnter)
-            {
-                Input.Clear();
-                if (_savedSelectedChannel.HasValue)
-                {
-                    SafelySelectChannel(_savedSelectedChannel.Value);
-                    _savedSelectedChannel = null;
-                }
-            }
-
-            if (ReleaseFocusOnEnter)
-            {
-                Input.ReleaseKeyboardFocus();
-            }
-        }
-    }
-
-    /// <summary>
-    /// Only needed to avoid the issue where right click on the button closes the popup
-    /// but leaves the button highlighted.
-    /// </summary>
-    public sealed class ChannelSelectorButton : Button
-    {
-        public ChannelSelectorButton()
-        {
-            // needed so the popup is untoggled regardless of which key is pressed when hovering this button.
-            // If we don't have this, then right clicking the button while it's toggled on will hide
-            // the popup but keep the button toggled on
-            Mode = ActionMode.Press;
-            EnableAllKeybinds = true;
-        }
-
-        protected override void KeyBindDown(GUIBoundKeyEventArgs args)
-        {
-            // needed since we need EnableAllKeybinds - don't double-send both UI click and Use
-            if (args.Function == EngineKeyFunctions.Use) return;
-            base.KeyBindDown(args);
-        }
-    }
-
-    public sealed class FilterButton : ContainerButton
-    {
-        private static readonly Color ColorNormal = Color.FromHex("#7b7e9e");
-        private static readonly Color ColorHovered = Color.FromHex("#9699bb");
-        private static readonly Color ColorPressed = Color.FromHex("#789B8C");
-
-        private readonly TextureRect _textureRect;
-
-        public FilterButton()
-        {
-            var filterTexture = IoCManager.Resolve<IResourceCache>()
-                .GetTexture("/Textures/Interface/Nano/filter.svg.96dpi.png");
-
-            // needed for same reason as ChannelSelectorButton
-            Mode = ActionMode.Press;
-            EnableAllKeybinds = true;
-
-            AddChild(
-                (_textureRect = new TextureRect
-                {
-                    Texture = filterTexture,
-                    SizeFlagsVertical = SizeFlags.ShrinkCenter,
-                    SizeFlagsHorizontal = SizeFlags.ShrinkCenter
-                })
-            );
-            ToggleMode = true;
-        }
-
-        protected override void KeyBindDown(GUIBoundKeyEventArgs args)
-        {
-            // needed since we need EnableAllKeybinds - don't double-send both UI click and Use
-            if (args.Function == EngineKeyFunctions.Use) return;
-            base.KeyBindDown(args);
-        }
-
-        private void UpdateChildColors()
-        {
-            if (_textureRect == null) return;
-            switch (DrawMode)
-            {
-                case DrawModeEnum.Normal:
-                    _textureRect.ModulateSelfOverride = ColorNormal;
-                    break;
-
-                case DrawModeEnum.Pressed:
-                    _textureRect.ModulateSelfOverride = ColorPressed;
-                    break;
-
-                case DrawModeEnum.Hover:
-                    _textureRect.ModulateSelfOverride = ColorHovered;
-                    break;
-
-                case DrawModeEnum.Disabled:
-                    break;
-            }
-        }
-
-        protected override void DrawModeChanged()
-        {
-            base.DrawModeChanged();
-            UpdateChildColors();
-        }
-
-        protected override void StylePropertiesChanged()
-        {
-            base.StylePropertiesChanged();
-            UpdateChildColors();
-        }
-
-    }
-
-    public sealed class ChannelItemButton : Button
-    {
-        public readonly ChatChannel Channel;
-
-        public ChannelItemButton(ChatChannel channel)
-        {
-            Channel = channel;
-            AddStyleClass(StyleNano.StyleClassChatChannelSelectorButton);
-            Text = ChatBox.ChannelSelectorName(channel);
-        }
-    }
-
-    public sealed class ChannelFilterCheckbox : CheckBox
-    {
-        public readonly ChatChannel Channel;
-
-        public ChannelFilterCheckbox(ChatChannel channel, byte? unreadCount)
-        {
-            Channel = channel;
-
-            UpdateText(unreadCount);
-        }
-
-        private void UpdateText(byte? unread)
-        {
-            var name = Channel switch
-            {
-                ChatChannel.AdminChat => Loc.GetString("hud-chatbox-admin"),
-                ChatChannel.Unspecified => throw new InvalidOperationException(
-                    "cannot create chat filter for Unspecified"),
-                _ => Loc.GetString(Channel.ToString())
-            };
-
-            if (unread > 0)
-            {
-                Text = name + " (" + (unread > 9 ? "9+" : unread) + ")";
-            }
-            else
-            {
-                Text = name;
-            }
-        }
-
-        public void UpdateUnreadCount(byte? unread)
-        {
-            UpdateText(unread);
-        }
-    }
-
-    public readonly struct ChatResizedEventArgs
-    {
-        /// new bottom that the chat rect is going to have in virtual pixels
-        /// after the imminent relayout
-        public readonly float NewBottom;
-
-        public ChatResizedEventArgs(float newBottom)
-        {
-            NewBottom = newBottom;
-        }
-    }
-}
diff --git a/Content.Client/Chat/UI/ChatBox.xaml b/Content.Client/Chat/UI/ChatBox.xaml
new file mode 100644
index 0000000000..3f66665d95
--- /dev/null
+++ b/Content.Client/Chat/UI/ChatBox.xaml
@@ -0,0 +1,24 @@
+<Control xmlns="https://spacestation14.io"
+         xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
+         xmlns:chatUI="clr-namespace:Content.Client.Chat.UI"
+         MouseFilter="Stop"
+         MinSize="200 128">
+    <PanelContainer>
+        <PanelContainer.PanelOverride>
+            <gfx:StyleBoxFlat BackgroundColor="#25252AAA" />
+        </PanelContainer.PanelOverride>
+
+        <BoxContainer Orientation="Vertical">
+            <OutputPanel Name="Contents" VerticalExpand="True" />
+            <PanelContainer StyleClasses="ChatSubPanel">
+                <BoxContainer Orientation="Horizontal" SeparationOverride="4">
+                    <chatUI:ChannelSelectorButton Name="ChannelSelector" ToggleMode="True"
+                                                  StyleClasses="chatSelectorOptionButton" MinWidth="75" />
+                    <HistoryLineEdit Name="Input" PlaceHolder="{Loc 'hud-chatbox-info'}" HorizontalExpand="True"
+                                     StyleClasses="chatLineEdit" />
+                    <chatUI:FilterButton Name="FilterButton" StyleClasses="chatFilterOptionButton" />
+                </BoxContainer>
+            </PanelContainer>
+        </BoxContainer>
+    </PanelContainer>
+</Control>
diff --git a/Content.Client/Chat/UI/ChatBox.xaml.cs b/Content.Client/Chat/UI/ChatBox.xaml.cs
new file mode 100644
index 0000000000..ee3ff56d9f
--- /dev/null
+++ b/Content.Client/Chat/UI/ChatBox.xaml.cs
@@ -0,0 +1,740 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Content.Client.Alerts.UI;
+using Content.Client.Chat.Managers;
+using Content.Client.Resources;
+using Content.Client.Stylesheets;
+using Content.Shared.Chat;
+using Content.Shared.Input;
+using Robust.Client.AutoGenerated;
+using Robust.Client.ResourceManagement;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Input;
+using Robust.Shared.IoC;
+using Robust.Shared.Localization;
+using Robust.Shared.Log;
+using Robust.Shared.Maths;
+using Robust.Shared.Utility;
+
+namespace Content.Client.Chat.UI
+{
+    [GenerateTypedNameReferences]
+    public partial class ChatBox : Control
+    {
+        [Dependency] protected readonly IChatManager ChatMgr = default!;
+
+        // order in which the available channel filters show up when available
+        private static readonly ChatChannel[] ChannelFilterOrder =
+        {
+            ChatChannel.Local,
+            ChatChannel.Emotes,
+            ChatChannel.Radio,
+            ChatChannel.OOC,
+            ChatChannel.Dead,
+            ChatChannel.Admin,
+            ChatChannel.Server
+        };
+
+        // order in which the channels show up in the channel selector
+        private static readonly ChatSelectChannel[] ChannelSelectorOrder =
+        {
+            ChatSelectChannel.Local,
+            ChatSelectChannel.Emotes,
+            ChatSelectChannel.Radio,
+            ChatSelectChannel.OOC,
+            ChatSelectChannel.Dead,
+            ChatSelectChannel.Admin
+            // NOTE: Console is not in there and it can never be permanently selected.
+            // You can, however, still submit commands as console by prefixing with /.
+        };
+
+        public const char AliasLocal = '.';
+        public const char AliasConsole = '/';
+        public const char AliasDead = '\\';
+        public const char AliasOOC = '[';
+        public const char AliasEmotes = '@';
+        public const char AliasAdmin = ']';
+        public const char AliasRadio = ';';
+
+        private static readonly Dictionary<char, ChatSelectChannel> PrefixToChannel = new()
+        {
+            {AliasLocal, ChatSelectChannel.Local},
+            {AliasConsole, ChatSelectChannel.Console},
+            {AliasOOC, ChatSelectChannel.OOC},
+            {AliasEmotes, ChatSelectChannel.Emotes},
+            {AliasAdmin, ChatSelectChannel.Admin},
+            {AliasRadio, ChatSelectChannel.Radio},
+            {AliasDead, ChatSelectChannel.Dead}
+        };
+
+        private static readonly Dictionary<ChatSelectChannel, char> ChannelPrefixes =
+            PrefixToChannel.ToDictionary(kv => kv.Value, kv => kv.Key);
+
+        private const float FilterPopupWidth = 110;
+
+        /// <summary>
+        /// The currently default channel that will be used if no prefix is specified.
+        /// </summary>
+        public ChatSelectChannel SelectedChannel { get; private set; } = ChatSelectChannel.OOC;
+
+        /// <summary>
+        /// The "preferred" channel. Will be switched to if permissions change and the channel becomes available,
+        /// such as by re-entering body. Gets changed if the user manually selects a channel with the buttons.
+        /// </summary>
+        public ChatSelectChannel PreferredChannel { get; set; } = ChatSelectChannel.OOC;
+
+        public bool ReleaseFocusOnEnter { get; set; } = true;
+
+        private readonly Popup _channelSelectorPopup;
+        private readonly BoxContainer _channelSelectorHBox;
+        private readonly Popup _filterPopup;
+        private readonly PanelContainer _filterPopupPanel;
+        private readonly BoxContainer _filterVBox;
+
+        /// <summary>
+        /// When lobbyMode is false, will position / add to correct location in StateRoot and
+        /// be resizable.
+        /// wWen true, will leave layout up to parent and not be resizable.
+        /// </summary>
+        public ChatBox()
+        {
+            IoCManager.InjectDependencies(this);
+            RobustXamlLoader.Load(this);
+
+            LayoutContainer.SetMarginLeft(this, 4);
+            LayoutContainer.SetMarginRight(this, 4);
+
+            _filterPopup = new Popup
+            {
+                Children =
+                {
+                    (_filterPopupPanel = new PanelContainer
+                    {
+                        StyleClasses = {StyleNano.StyleClassBorderedWindowPanel},
+                        Children =
+                        {
+                            new BoxContainer
+                            {
+                                Orientation = BoxContainer.LayoutOrientation.Horizontal,
+                                Children =
+                                {
+                                    new Control {MinSize = (4, 0)},
+                                    (_filterVBox = new BoxContainer
+                                    {
+                                        Margin = new Thickness(0, 10),
+                                        Orientation = BoxContainer.LayoutOrientation.Vertical,
+                                        SeparationOverride = 4
+                                    })
+                                }
+                            }
+                        }
+                    })
+                }
+            };
+
+            _channelSelectorPopup = new Popup
+            {
+                Children =
+                {
+                    (_channelSelectorHBox = new BoxContainer
+                    {
+                        Orientation = BoxContainer.LayoutOrientation.Horizontal,
+                        SeparationOverride = 1
+                    })
+                }
+            };
+
+            ChannelSelector.OnToggled += OnChannelSelectorToggled;
+            FilterButton.OnToggled += OnFilterButtonToggled;
+            Input.OnKeyBindDown += InputKeyBindDown;
+            Input.OnTextEntered += Input_OnTextEntered;
+            Input.OnTextChanged += InputOnTextChanged;
+            _channelSelectorPopup.OnPopupHide += OnChannelSelectorPopupHide;
+            _filterPopup.OnPopupHide += OnFilterPopupHide;
+        }
+
+        protected override void EnteredTree()
+        {
+            base.EnteredTree();
+
+            ChatMgr.MessageAdded += WriteChatMessage;
+            ChatMgr.ChatPermissionsUpdated += OnChatPermissionsUpdated;
+            ChatMgr.UnreadMessageCountsUpdated += UpdateUnreadMessageCounts;
+            ChatMgr.FiltersUpdated += Repopulate;
+
+            // The chat manager may have messages logged from before there was a chat box.
+            // In this case, these messages will be marked as unread despite the filters allowing them through.
+            // Tell chat manager to clear these.
+            ChatMgr.ClearUnfilteredUnreads();
+
+            ChatPermissionsUpdated(0);
+            UpdateChannelSelectButton();
+            Repopulate();
+        }
+
+        protected override void ExitedTree()
+        {
+            base.ExitedTree();
+
+            ChatMgr.MessageAdded -= WriteChatMessage;
+            ChatMgr.ChatPermissionsUpdated -= OnChatPermissionsUpdated;
+            ChatMgr.UnreadMessageCountsUpdated -= UpdateUnreadMessageCounts;
+            ChatMgr.FiltersUpdated -= Repopulate;
+        }
+
+        private void OnChatPermissionsUpdated(ChatPermissionsUpdatedEventArgs eventArgs)
+        {
+            ChatPermissionsUpdated(eventArgs.OldSelectableChannels);
+        }
+
+        private void ChatPermissionsUpdated(ChatSelectChannel oldSelectable)
+        {
+            // update the channel selector
+            _channelSelectorHBox.Children.Clear();
+            foreach (var selectableChannel in ChannelSelectorOrder)
+            {
+                if ((ChatMgr.SelectableChannels & selectableChannel) == 0)
+                    continue;
+
+                var newButton = new ChannelItemButton(selectableChannel);
+                newButton.OnPressed += OnChannelSelectorItemPressed;
+                _channelSelectorHBox.AddChild(newButton);
+            }
+
+            // Selected channel no longer available, switch to OOC?
+            if ((ChatMgr.SelectableChannels & SelectedChannel) == 0)
+            {
+                // Handle local -> dead mapping when you e.g. ghost.
+                // Only necessary for admins because they always have deadchat
+                // so the normal preferred check won't see it as newly available and do nothing.
+                var mappedSelect = MapLocalIfGhost(SelectedChannel);
+                if ((ChatMgr.SelectableChannels & mappedSelect) != 0)
+                    SafelySelectChannel(mappedSelect);
+                else
+                    SafelySelectChannel(ChatSelectChannel.OOC);
+            }
+
+            // If the preferred channel just became available, switch to it.
+            var pref = MapLocalIfGhost(PreferredChannel);
+            if ((oldSelectable & pref) == 0 && (ChatMgr.SelectableChannels & pref) != 0)
+                SafelySelectChannel(pref);
+
+            // update the channel filters
+            _filterVBox.Children.Clear();
+            foreach (var channelFilter in ChannelFilterOrder)
+            {
+                if ((ChatMgr.FilterableChannels & channelFilter) == 0)
+                    continue;
+
+                int? unreadCount = null;
+                if (ChatMgr.UnreadMessages.TryGetValue(channelFilter, out var unread))
+                    unreadCount = unread;
+
+                var newCheckBox = new ChannelFilterCheckbox(channelFilter, unreadCount)
+                {
+                    Pressed = (ChatMgr.ChannelFilters & channelFilter) != 0
+                };
+
+                newCheckBox.OnToggled += OnFilterCheckboxToggled;
+                _filterVBox.AddChild(newCheckBox);
+            }
+
+            UpdateChannelSelectButton();
+        }
+
+        private void UpdateUnreadMessageCounts()
+        {
+            foreach (var channelFilter in _filterVBox.Children)
+            {
+                if (channelFilter is not ChannelFilterCheckbox filterCheckbox) continue;
+                if (ChatMgr.UnreadMessages.TryGetValue(filterCheckbox.Channel, out var unread))
+                {
+                    filterCheckbox.UpdateUnreadCount(unread);
+                }
+                else
+                {
+                    filterCheckbox.UpdateUnreadCount(null);
+                }
+            }
+        }
+
+        private void OnFilterCheckboxToggled(BaseButton.ButtonToggledEventArgs args)
+        {
+            if (args.Button is not ChannelFilterCheckbox checkbox)
+                return;
+
+            ChatMgr.OnFilterButtonToggled(checkbox.Channel, checkbox.Pressed);
+        }
+
+        private void OnFilterButtonToggled(BaseButton.ButtonToggledEventArgs args)
+        {
+            if (args.Pressed)
+            {
+                var globalPos = FilterButton.GlobalPosition;
+                var (minX, minY) = _filterPopupPanel.MinSize;
+                var box = UIBox2.FromDimensions(globalPos - (FilterPopupWidth, 0),
+                    (Math.Max(minX, FilterPopupWidth), minY));
+                UserInterfaceManager.ModalRoot.AddChild(_filterPopup);
+                _filterPopup.Open(box);
+            }
+            else
+            {
+                _filterPopup.Close();
+            }
+        }
+
+        private void OnChannelSelectorToggled(BaseButton.ButtonToggledEventArgs args)
+        {
+            if (args.Pressed)
+            {
+                var globalLeft = GlobalPosition.X;
+                var globalBot = GlobalPosition.Y + Height;
+                var box = UIBox2.FromDimensions((globalLeft, globalBot), (SizeBox.Width, AlertsUI.ChatSeparation));
+                UserInterfaceManager.ModalRoot.AddChild(_channelSelectorPopup);
+                _channelSelectorPopup.Open(box);
+            }
+            else
+            {
+                _channelSelectorPopup.Close();
+            }
+        }
+
+        private void OnFilterPopupHide()
+        {
+            OnPopupHide(_filterPopup, FilterButton);
+        }
+
+        private void OnChannelSelectorPopupHide()
+        {
+            OnPopupHide(_channelSelectorPopup, ChannelSelector);
+        }
+
+        private void OnPopupHide(Control popup, BaseButton button)
+        {
+            UserInterfaceManager.ModalRoot.RemoveChild(popup);
+
+            // this weird check here is because the hiding of the popup happens prior to the button
+            // receiving the keydown, which would cause it to then become unpressed
+            // and reopen immediately. To avoid this, if the popup was hidden due to clicking on the button,
+            // we will not auto-unpress the button, instead leaving it up to the button toggle logic
+            // (and this requires the button to be set to EnableAllKeybinds = true)
+            if (UserInterfaceManager.CurrentlyHovered != button)
+            {
+                button.Pressed = false;
+            }
+        }
+
+        private void OnChannelSelectorItemPressed(BaseButton.ButtonEventArgs obj)
+        {
+            if (obj.Button is not ChannelItemButton button)
+                return;
+
+            PreferredChannel = button.Channel;
+            SafelySelectChannel(button.Channel);
+            _channelSelectorPopup.Close();
+        }
+
+        public bool SafelySelectChannel(ChatSelectChannel toSelect)
+        {
+            toSelect = MapLocalIfGhost(toSelect);
+            if ((ChatMgr.SelectableChannels & toSelect) == 0)
+                return false;
+
+            SelectedChannel = toSelect;
+            UpdateChannelSelectButton();
+            return true;
+        }
+
+        private void UpdateChannelSelectButton()
+        {
+            var (prefixChannel, _) = SplitInputContents();
+
+            var channel = prefixChannel == 0 ? SelectedChannel : prefixChannel;
+
+            ChannelSelector.Text = ChannelSelectorName(channel);
+            ChannelSelector.Modulate = ChannelSelectColor(channel);
+        }
+
+        protected override void KeyBindDown(GUIBoundKeyEventArgs args)
+        {
+            base.KeyBindDown(args);
+
+            if (args.CanFocus)
+            {
+                Input.GrabKeyboardFocus();
+            }
+        }
+
+        public void CycleChatChannel(bool forward)
+        {
+            Input.IgnoreNext = true;
+
+            var idx = Array.IndexOf(ChannelSelectorOrder, SelectedChannel);
+            do
+            {
+                // go over every channel until we find one we can actually select.
+                idx += forward ? 1 : -1;
+                idx = MathHelper.Mod(idx, ChannelSelectorOrder.Length);
+            } while ((ChatMgr.SelectableChannels & ChannelSelectorOrder[idx]) == 0);
+
+            SafelySelectChannel(ChannelSelectorOrder[idx]);
+        }
+
+        private void Repopulate()
+        {
+            Contents.Clear();
+
+            foreach (var msg in ChatMgr.History)
+            {
+                WriteChatMessage(msg);
+            }
+        }
+
+        private void WriteChatMessage(StoredChatMessage message)
+        {
+            Logger.DebugS("chat", $"{message.Channel}: {message.Message}");
+
+            if (IsFilteredOut(message.Channel))
+                return;
+
+            // TODO: Can make this "smarter" later by only setting it false when the message has been scrolled to
+            message.Read = true;
+
+            var messageText = FormattedMessage.EscapeText(message.Message);
+            if (!string.IsNullOrEmpty(message.MessageWrap))
+            {
+                messageText = string.Format(message.MessageWrap, messageText);
+            }
+
+            var color = message.MessageColorOverride != Color.Transparent
+                ? message.MessageColorOverride
+                : ChatHelper.ChatColor(message.Channel);
+
+            AddLine(messageText, message.Channel, color);
+        }
+
+        private bool IsFilteredOut(ChatChannel channel)
+        {
+            return (ChatMgr.ChannelFilters & channel) == 0;
+        }
+
+        private void InputKeyBindDown(GUIBoundKeyEventArgs args)
+        {
+            if (args.Function == EngineKeyFunctions.TextReleaseFocus)
+            {
+                Input.ReleaseKeyboardFocus();
+                args.Handle();
+                return;
+            }
+
+            if (args.Function == ContentKeyFunctions.CycleChatChannelForward)
+            {
+                CycleChatChannel(true);
+                args.Handle();
+                return;
+            }
+
+            if (args.Function == ContentKeyFunctions.CycleChatChannelBackward)
+            {
+                CycleChatChannel(false);
+                args.Handle();
+            }
+        }
+
+        private (ChatSelectChannel selChannel, ReadOnlyMemory<char> text) SplitInputContents()
+        {
+            var text = Input.Text.AsMemory().Trim();
+            if (text.Length == 0)
+                return default;
+
+            var prefixChar = text.Span[0];
+            var channel = GetChannelFromPrefix(prefixChar);
+
+            if ((ChatMgr.SelectableChannels & channel) != 0)
+                // Cut off prefix if it's valid and we can use the channel in question.
+                text = text[1..];
+            else
+                channel = 0;
+
+            channel = MapLocalIfGhost(channel);
+
+            // Trim from start again to cut out any whitespace between the prefix and message, if any.
+            return (channel, text.TrimStart());
+        }
+
+        private void InputOnTextChanged(LineEdit.LineEditEventArgs obj)
+        {
+            // Update channel select button to correct channel if we have a prefix.
+            UpdateChannelSelectButton();
+        }
+
+        private static ChatSelectChannel GetChannelFromPrefix(char prefix)
+        {
+            return PrefixToChannel.GetValueOrDefault(prefix);
+        }
+
+        public static char GetPrefixFromChannel(ChatSelectChannel channel)
+        {
+            return ChannelPrefixes.GetValueOrDefault(channel);
+        }
+
+        public static string ChannelSelectorName(ChatSelectChannel channel)
+        {
+            return Loc.GetString($"hud-chatbox-select-channel-{channel}");
+        }
+
+        public static Color ChannelSelectColor(ChatSelectChannel channel)
+        {
+            return channel switch
+            {
+                ChatSelectChannel.Radio => Color.Green,
+                ChatSelectChannel.OOC => Color.LightSkyBlue,
+                ChatSelectChannel.Dead => Color.MediumPurple,
+                ChatSelectChannel.Admin => Color.Red,
+                _ => Color.DarkGray
+            };
+        }
+
+        public void AddLine(string message, ChatChannel channel, Color color)
+        {
+            DebugTools.Assert(!Disposed);
+
+            var formatted = new FormattedMessage(3);
+            formatted.PushColor(color);
+            formatted.AddMarkup(message);
+            formatted.Pop();
+            Contents.AddMessage(formatted);
+        }
+
+        private void Input_OnTextEntered(LineEdit.LineEditEventArgs args)
+        {
+            if (!string.IsNullOrWhiteSpace(args.Text))
+            {
+                var (prefixChannel, text) = SplitInputContents();
+
+                // Check if message is longer than the character limit
+                if (text.Length > ChatMgr.MaxMessageLength)
+                {
+                    string locWarning = Loc.GetString(
+                        "chat-manager-max-message-length",
+                        ("maxMessageLength", ChatMgr.MaxMessageLength));
+
+                    AddLine(locWarning, ChatChannel.Server, Color.Orange);
+                    return;
+                }
+
+                ChatMgr.OnChatBoxTextSubmitted(this, text, prefixChannel == 0 ? SelectedChannel : prefixChannel);
+            }
+
+            Input.Clear();
+            UpdateChannelSelectButton();
+
+            if (ReleaseFocusOnEnter)
+                Input.ReleaseKeyboardFocus();
+        }
+
+        public void Focus(ChatSelectChannel? channel = null)
+        {
+            var selectStart = Index.End;
+            if (channel != null)
+            {
+                channel = MapLocalIfGhost(channel.Value);
+
+                // Channel not selectable, just do NOTHING (not even focus).
+                if (!((ChatMgr.SelectableChannels & channel.Value) != 0))
+                    return;
+
+                var (_, text) = SplitInputContents();
+
+                var newPrefix = GetPrefixFromChannel(channel.Value);
+                DebugTools.Assert(newPrefix != default, "Focus channel must have prefix!");
+
+                if (channel == SelectedChannel)
+                {
+                    // New selected channel is just the selected channel,
+                    // just remove prefix (if any) and leave text unchanged.
+
+                    Input.Text = text.ToString();
+                    selectStart = Index.Start;
+                }
+                else
+                {
+                    // Change prefix to new focused channel prefix and leave text unchanged.
+                    Input.Text = string.Concat(newPrefix.ToString(), " ", text.Span);
+                    selectStart = Index.FromStart(2);
+                }
+
+                UpdateChannelSelectButton();
+            }
+
+            Input.IgnoreNext = true;
+            Input.GrabKeyboardFocus();
+
+            Input.CursorPosition = Input.Text.Length;
+            Input.SelectionStart = selectStart.GetOffset(Input.Text.Length);
+        }
+
+        private ChatSelectChannel MapLocalIfGhost(ChatSelectChannel channel)
+        {
+            if (channel == ChatSelectChannel.Local && ChatMgr.IsGhost)
+                return ChatSelectChannel.Dead;
+
+            return channel;
+        }
+    }
+
+    /// <summary>
+    /// Only needed to avoid the issue where right click on the button closes the popup
+    /// but leaves the button highlighted.
+    /// </summary>
+    public sealed class ChannelSelectorButton : Button
+    {
+        public ChannelSelectorButton()
+        {
+            // needed so the popup is untoggled regardless of which key is pressed when hovering this button.
+            // If we don't have this, then right clicking the button while it's toggled on will hide
+            // the popup but keep the button toggled on
+            Mode = ActionMode.Press;
+            EnableAllKeybinds = true;
+        }
+
+        protected override void KeyBindDown(GUIBoundKeyEventArgs args)
+        {
+            // needed since we need EnableAllKeybinds - don't double-send both UI click and Use
+            if (args.Function == EngineKeyFunctions.Use)
+                return;
+
+            base.KeyBindDown(args);
+        }
+    }
+
+    public sealed class FilterButton : ContainerButton
+    {
+        private static readonly Color ColorNormal = Color.FromHex("#7b7e9e");
+        private static readonly Color ColorHovered = Color.FromHex("#9699bb");
+        private static readonly Color ColorPressed = Color.FromHex("#789B8C");
+
+        private readonly TextureRect _textureRect;
+
+        public FilterButton()
+        {
+            var filterTexture = IoCManager.Resolve<IResourceCache>()
+                .GetTexture("/Textures/Interface/Nano/filter.svg.96dpi.png");
+
+            // needed for same reason as ChannelSelectorButton
+            Mode = ActionMode.Press;
+            EnableAllKeybinds = true;
+
+            AddChild(
+                (_textureRect = new TextureRect
+                {
+                    Texture = filterTexture,
+                    HorizontalAlignment = HAlignment.Center,
+                    VerticalAlignment = VAlignment.Center
+                })
+            );
+
+            ToggleMode = true;
+        }
+
+        protected override void KeyBindDown(GUIBoundKeyEventArgs args)
+        {
+            // needed since we need EnableAllKeybinds - don't double-send both UI click and Use
+            if (args.Function == EngineKeyFunctions.Use) return;
+            base.KeyBindDown(args);
+        }
+
+        private void UpdateChildColors()
+        {
+            if (_textureRect == null) return;
+            switch (DrawMode)
+            {
+                case DrawModeEnum.Normal:
+                    _textureRect.ModulateSelfOverride = ColorNormal;
+                    break;
+
+                case DrawModeEnum.Pressed:
+                    _textureRect.ModulateSelfOverride = ColorPressed;
+                    break;
+
+                case DrawModeEnum.Hover:
+                    _textureRect.ModulateSelfOverride = ColorHovered;
+                    break;
+
+                case DrawModeEnum.Disabled:
+                    break;
+            }
+        }
+
+        protected override void DrawModeChanged()
+        {
+            base.DrawModeChanged();
+            UpdateChildColors();
+        }
+
+        protected override void StylePropertiesChanged()
+        {
+            base.StylePropertiesChanged();
+            UpdateChildColors();
+        }
+    }
+
+    public sealed class ChannelItemButton : Button
+    {
+        public readonly ChatSelectChannel Channel;
+
+        public ChannelItemButton(ChatSelectChannel channel)
+        {
+            Channel = channel;
+            AddStyleClass(StyleNano.StyleClassChatChannelSelectorButton);
+            Text = ChatBox.ChannelSelectorName(channel);
+
+            var prefix = ChatBox.GetPrefixFromChannel(channel);
+            if (prefix != default)
+                Text = Loc.GetString("hud-chatbox-select-name-prefixed", ("name", Text), ("prefix", prefix));
+        }
+    }
+
+    public sealed class ChannelFilterCheckbox : CheckBox
+    {
+        public readonly ChatChannel Channel;
+
+        public ChannelFilterCheckbox(ChatChannel channel, int? unreadCount)
+        {
+            Channel = channel;
+
+            UpdateText(unreadCount);
+        }
+
+        private void UpdateText(int? unread)
+        {
+            var name = Loc.GetString($"hud-chatbox-channel-{Channel}");
+
+            if (unread > 0)
+                // todo: proper fluent stuff here.
+                name += " (" + (unread > 9 ? "9+" : unread) + ")";
+
+            Text = name;
+        }
+
+        public void UpdateUnreadCount(int? unread)
+        {
+            UpdateText(unread);
+        }
+    }
+
+    public readonly struct ChatResizedEventArgs
+    {
+        /// new bottom that the chat rect is going to have in virtual pixels
+        /// after the imminent relayout
+        public readonly float NewBottom;
+
+        public ChatResizedEventArgs(float newBottom)
+        {
+            NewBottom = newBottom;
+        }
+    }
+}
diff --git a/Content.Client/Chat/UI/HudChatBox.cs b/Content.Client/Chat/UI/HudChatBox.cs
new file mode 100644
index 0000000000..824a906d01
--- /dev/null
+++ b/Content.Client/Chat/UI/HudChatBox.cs
@@ -0,0 +1,235 @@
+using System;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Shared.Input;
+using Robust.Shared.IoC;
+using Robust.Shared.Maths;
+using Robust.Shared.Timing;
+
+namespace Content.Client.Chat.UI
+{
+    public class HudChatBox : ChatBox
+    {
+        // TODO: Revisit the resizing stuff after https://github.com/space-wizards/RobustToolbox/issues/1392 is done,
+        // Probably not "supposed" to inject IClyde, but I give up.
+        // I can't find any other way to allow this control to properly resize when the
+        // window is resized. Resized() isn't reliably called when resizing the window,
+        // and layoutcontainer anchor / margin don't seem to adjust how we need
+        // them to when the window is resized. We need it to be able to resize
+        // within some bounds so that it doesn't overlap other UI elements, while still
+        // being freely resizable within those bounds.
+        [Dependency] private readonly IClyde _clyde = default!;
+
+        public const float InitialChatBottom = 235;
+        private const int DragMarginSize = 7;
+        private const int MinDistanceFromBottom = 255;
+        private const int MinLeft = 500;
+        private DragMode _currentDrag = DragMode.None;
+        private Vector2 _dragOffsetTopLeft;
+        private Vector2 _dragOffsetBottomRight;
+
+        private byte _clampIn;
+
+        protected override void EnteredTree()
+        {
+            base.EnteredTree();
+
+            _clyde.OnWindowResized += ClydeOnOnWindowResized;
+        }
+
+        protected override void ExitedTree()
+        {
+            base.ExitedTree();
+
+            _clyde.OnWindowResized -= ClydeOnOnWindowResized;
+        }
+
+        protected override void KeyBindDown(GUIBoundKeyEventArgs args)
+        {
+            if (args.Function == EngineKeyFunctions.UIClick)
+            {
+                _currentDrag = GetDragModeFor(args.RelativePosition);
+
+                if (_currentDrag != DragMode.None)
+                {
+                    _dragOffsetTopLeft = args.PointerLocation.Position / UIScale - Position;
+                    _dragOffsetBottomRight = Position + Size - args.PointerLocation.Position / UIScale;
+                }
+            }
+
+            base.KeyBindDown(args);
+        }
+
+        protected override void KeyBindUp(GUIBoundKeyEventArgs args)
+        {
+            base.KeyBindUp(args);
+
+            if (args.Function != EngineKeyFunctions.UIClick)
+                return;
+
+            _dragOffsetTopLeft = _dragOffsetBottomRight = Vector2.Zero;
+            _currentDrag = DragMode.None;
+
+            // If this is done in MouseDown, Godot won't fire MouseUp as you need focus to receive MouseUps.
+            UserInterfaceManager.KeyboardFocused?.ReleaseKeyboardFocus();
+        }
+
+
+        // TODO: this drag and drop stuff is somewhat duplicated from Robust BaseWindow but also modified
+        [Flags]
+        private enum DragMode : byte
+        {
+            None = 0,
+            Bottom = 1 << 1,
+            Left = 1 << 2
+        }
+
+        private DragMode GetDragModeFor(Vector2 relativeMousePos)
+        {
+            var mode = DragMode.None;
+
+            if (relativeMousePos.Y > Size.Y - DragMarginSize)
+            {
+                mode = DragMode.Bottom;
+            }
+
+            if (relativeMousePos.X < DragMarginSize)
+            {
+                mode |= DragMode.Left;
+            }
+
+            return mode;
+        }
+
+        protected override void MouseMove(GUIMouseMoveEventArgs args)
+        {
+            base.MouseMove(args);
+
+            if (Parent == null)
+                return;
+
+            if (_currentDrag == DragMode.None)
+            {
+                var cursor = CursorShape.Arrow;
+                var previewDragMode = GetDragModeFor(args.RelativePosition);
+                switch (previewDragMode)
+                {
+                    case DragMode.Bottom:
+                        cursor = CursorShape.VResize;
+                        break;
+
+                    case DragMode.Left:
+                        cursor = CursorShape.HResize;
+                        break;
+
+                    case DragMode.Bottom | DragMode.Left:
+                        cursor = CursorShape.Crosshair;
+                        break;
+                }
+
+                DefaultCursorShape = cursor;
+            }
+            else
+            {
+                var top = Rect.Top;
+                var bottom = Rect.Bottom;
+                var left = Rect.Left;
+                var right = Rect.Right;
+                var (minSizeX, minSizeY) = MinSize;
+                if ((_currentDrag & DragMode.Bottom) == DragMode.Bottom)
+                {
+                    bottom = Math.Max(args.GlobalPosition.Y + _dragOffsetBottomRight.Y, top + minSizeY);
+                }
+
+                if ((_currentDrag & DragMode.Left) == DragMode.Left)
+                {
+                    var maxX = right - minSizeX;
+                    left = Math.Min(args.GlobalPosition.X - _dragOffsetTopLeft.X, maxX);
+                }
+
+                ClampSize(left, bottom);
+            }
+        }
+
+        protected override void UIScaleChanged()
+        {
+            base.UIScaleChanged();
+            ClampAfterDelay();
+        }
+
+        private void ClydeOnOnWindowResized(WindowResizedEventArgs obj)
+        {
+            ClampAfterDelay();
+        }
+
+        private void ClampAfterDelay()
+        {
+            _clampIn = 2;
+        }
+
+        protected override void FrameUpdate(FrameEventArgs args)
+        {
+            base.FrameUpdate(args);
+
+            // we do the clamping after a delay (after UI scale / window resize)
+            // because we need to wait for our parent container to properly resize
+            // first, so we can calculate where we should go. If we do it right away,
+            // we won't have the correct values from the parent to know how to adjust our margins.
+            if (_clampIn <= 0)
+                return;
+
+            _clampIn -= 1;
+            if (_clampIn == 0)
+                ClampSize();
+        }
+
+        private void ClampSize(float? desiredLeft = null, float? desiredBottom = null)
+        {
+            if (Parent == null)
+                return;
+
+            // var top = Rect.Top;
+            var right = Rect.Right;
+            var left = desiredLeft ?? Rect.Left;
+            var bottom = desiredBottom ?? Rect.Bottom;
+
+            // clamp so it doesn't go too high or low (leave space for alerts UI)
+            var maxBottom = Parent.Size.Y - MinDistanceFromBottom;
+            if (maxBottom <= MinHeight)
+            {
+                // we can't fit in our given space (window made awkwardly small), so give up
+                // and overlap at our min height
+                bottom = MinHeight;
+            }
+            else
+            {
+                bottom = Math.Clamp(bottom, MinHeight, maxBottom);
+            }
+
+            var maxLeft = Parent.Size.X - MinWidth;
+            if (maxLeft <= MinLeft)
+            {
+                // window too narrow, give up and overlap at our max left
+                left = maxLeft;
+            }
+            else
+            {
+                left = Math.Clamp(left, MinLeft, maxLeft);
+            }
+
+            LayoutContainer.SetMarginLeft(this, -((right + 10) - left));
+            LayoutContainer.SetMarginBottom(this, bottom);
+
+            ChatMgr.ChatBoxOnResized(new ChatResizedEventArgs(bottom));
+        }
+
+        protected override void MouseExited()
+        {
+            base.MouseExited();
+
+            if (_currentDrag == DragMode.None)
+                DefaultCursorShape = CursorShape.Arrow;
+        }
+    }
+}
diff --git a/Content.Client/Chemistry/UI/ChemMasterWindow.cs b/Content.Client/Chemistry/UI/ChemMasterWindow.cs
index f46fc8fd0e..c627470286 100644
--- a/Content.Client/Chemistry/UI/ChemMasterWindow.cs
+++ b/Content.Client/Chemistry/UI/ChemMasterWindow.cs
@@ -14,6 +14,7 @@ using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
 using static Content.Shared.Chemistry.Components.SharedChemMasterComponent;
 using static Robust.Client.UserInterface.Controls.BaseButton;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Chemistry.UI
 {
@@ -25,11 +26,11 @@ namespace Content.Client.Chemistry.UI
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
         /// <summary>Contains info about the reagent container such as it's contents, if one is loaded into the dispenser.</summary>
-        private readonly VBoxContainer ContainerInfo;
+        private readonly BoxContainer ContainerInfo;
 
-        private readonly VBoxContainer BufferInfo;
+        private readonly BoxContainer BufferInfo;
 
-        private readonly VBoxContainer PackagingInfo;
+        private readonly BoxContainer PackagingInfo;
 
         /// <summary>Ejects the reagent container from the dispenser.</summary>
         public Button EjectButton { get; }
@@ -41,8 +42,8 @@ namespace Content.Client.Chemistry.UI
 
         public event Action<ButtonEventArgs, ChemButton>? OnChemButtonPressed;
 
-        public HBoxContainer PillInfo { get; set; }
-        public HBoxContainer BottleInfo { get; set; }
+        public BoxContainer PillInfo { get; set; }
+        public BoxContainer BottleInfo { get; set; }
         public SpinBox PillAmount { get; set; }
         public SpinBox BottleAmount { get; set; }
         public Button CreatePills { get; }
@@ -57,13 +58,15 @@ namespace Content.Client.Chemistry.UI
             MinSize = SetSize = (400, 525);
             IoCManager.InjectDependencies(this);
 
-            Contents.AddChild(new VBoxContainer
+            Contents.AddChild(new BoxContainer
             {
+                Orientation = LayoutOrientation.Vertical,
                 Children =
                 {
                     //Container
-                    new HBoxContainer
+                    new BoxContainer
                     {
+                        Orientation = LayoutOrientation.Horizontal,
                         Children =
                         {
                             new Label {Text = Loc.GetString("chem-master-window-container-label")},
@@ -84,8 +87,9 @@ namespace Content.Client.Chemistry.UI
                         Children =
                         {
                             //Currently empty, when server sends state data this will have container contents and fill volume.
-                            (ContainerInfo = new VBoxContainer
+                            (ContainerInfo = new BoxContainer
                             {
+                                Orientation = LayoutOrientation.Vertical,
                                 HorizontalExpand = true,
                                 Children =
                                 {
@@ -102,8 +106,9 @@ namespace Content.Client.Chemistry.UI
                     new Control {MinSize = (0.0f, 10.0f)},
 
                     //Buffer
-                    new HBoxContainer
+                    new BoxContainer
                     {
+                        Orientation = LayoutOrientation.Horizontal,
                         Children =
                         {
                             new Label {Text = Loc.GetString("chem-master-window-buffer-text")},
@@ -126,8 +131,9 @@ namespace Content.Client.Chemistry.UI
                         Children =
                         {
                             //Buffer reagent list
-                            (BufferInfo = new VBoxContainer
+                            (BufferInfo = new BoxContainer
                             {
+                                Orientation = LayoutOrientation.Vertical,
                                 HorizontalExpand = true,
                                 Children =
                                 {
@@ -144,8 +150,9 @@ namespace Content.Client.Chemistry.UI
                     new Control {MinSize = (0.0f, 10.0f)},
 
                     //Packaging
-                    new HBoxContainer
+                    new BoxContainer
                     {
+                        Orientation = LayoutOrientation.Horizontal,
                         Children =
                         {
                             new Label {Text = $"{Loc.GetString("chem-master-window-packaging-text")} "},
@@ -165,8 +172,9 @@ namespace Content.Client.Chemistry.UI
                         Children =
                         {
                             //Packaging options
-                            (PackagingInfo = new VBoxContainer
+                            (PackagingInfo = new BoxContainer
                             {
+                                Orientation = LayoutOrientation.Vertical,
                                 HorizontalExpand = true,
                             }),
 
@@ -176,8 +184,9 @@ namespace Content.Client.Chemistry.UI
             });
 
             //Pills
-            PillInfo = new HBoxContainer
+            PillInfo = new BoxContainer
             {
+                Orientation = LayoutOrientation.Horizontal,
                 Children =
                 {
                     new Label
@@ -213,8 +222,9 @@ namespace Content.Client.Chemistry.UI
             PillInfo.AddChild(CreatePills);
 
             //Bottles
-            BottleInfo = new HBoxContainer
+            BottleInfo = new BoxContainer
             {
+                Orientation = LayoutOrientation.Horizontal,
                 Children =
                 {
                     new Label
@@ -315,8 +325,9 @@ namespace Content.Client.Chemistry.UI
                 return;
             }
 
-            ContainerInfo.Children.Add(new HBoxContainer // Name of the container and its fill status (Ex: 44/100u)
+            ContainerInfo.Children.Add(new BoxContainer // Name of the container and its fill status (Ex: 44/100u)
             {
+                Orientation = LayoutOrientation.Horizontal,
                 Children =
                 {
                     new Label {Text = $"{state.ContainerName}: "},
@@ -339,8 +350,9 @@ namespace Content.Client.Chemistry.UI
 
                 if (proto != null)
                 {
-                    ContainerInfo.Children.Add(new HBoxContainer
+                    ContainerInfo.Children.Add(new BoxContainer
                     {
+                        Orientation = LayoutOrientation.Horizontal,
                         Children =
                         {
                             new Label {Text = $"{name}: "},
@@ -371,7 +383,10 @@ namespace Content.Client.Chemistry.UI
                 return;
             }
 
-            var bufferHBox = new HBoxContainer();
+            var bufferHBox = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Horizontal
+            };
             BufferInfo.AddChild(bufferHBox);
 
             var bufferLabel = new Label { Text = $"{Loc.GetString("chem-master-window-buffer-label")} " };
@@ -394,8 +409,9 @@ namespace Content.Client.Chemistry.UI
 
                 if (proto != null)
                 {
-                    BufferInfo.Children.Add(new HBoxContainer
+                    BufferInfo.Children.Add(new BoxContainer
                     {
+                        Orientation = LayoutOrientation.Horizontal,
                         //SizeFlagsHorizontal = SizeFlags.ShrinkEnd,
                         Children =
                         {
diff --git a/Content.Client/Chemistry/UI/ReagentDispenserWindow.cs b/Content.Client/Chemistry/UI/ReagentDispenserWindow.cs
index acf11ca5fc..e5b3571027 100644
--- a/Content.Client/Chemistry/UI/ReagentDispenserWindow.cs
+++ b/Content.Client/Chemistry/UI/ReagentDispenserWindow.cs
@@ -12,6 +12,7 @@ using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
 using static Content.Shared.Chemistry.Dispenser.SharedReagentDispenserComponent;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Chemistry.UI
 {
@@ -23,7 +24,7 @@ namespace Content.Client.Chemistry.UI
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
         /// <summary>Contains info about the reagent container such as it's contents, if one is loaded into the dispenser.</summary>
-        private readonly VBoxContainer ContainerInfo;
+        private readonly BoxContainer ContainerInfo;
 
         /// <summary>Sets the dispense amount to 1 when pressed.</summary>
         public Button DispenseButton1 { get; }
@@ -72,13 +73,15 @@ namespace Content.Client.Chemistry.UI
 
             var dispenseAmountGroup = new ButtonGroup();
 
-            Contents.AddChild(new VBoxContainer
+            Contents.AddChild(new BoxContainer
             {
+                Orientation = LayoutOrientation.Vertical,
                 Children =
                 {
                     //First, our dispense amount buttons
-                    new HBoxContainer
+                    new BoxContainer
                     {
+                        Orientation = LayoutOrientation.Horizontal,
                         Children =
                         {
                             new Label {Text = Loc.GetString("reagent-dispenser-window-amount-to-dispense-label")},
@@ -104,8 +107,9 @@ namespace Content.Client.Chemistry.UI
                     }),
                     //Padding
                     new Control {MinSize = (0.0f, 10.0f)},
-                    new HBoxContainer
+                    new BoxContainer
                     {
+                        Orientation = LayoutOrientation.Horizontal,
                         Children =
                         {
                             new Label {Text = Loc.GetString("reagent-dispenser-window-container-label") + " "},
@@ -126,8 +130,9 @@ namespace Content.Client.Chemistry.UI
                         Children =
                         {
                             //Currently empty, when server sends state data this will have container contents and fill volume.
-                            (ContainerInfo = new VBoxContainer
+                            (ContainerInfo = new BoxContainer
                             {
+                                Orientation = LayoutOrientation.Vertical,
                                 HorizontalExpand = true,
                                 Children =
                                 {
@@ -263,8 +268,9 @@ namespace Content.Client.Chemistry.UI
                 return;
             }
 
-            ContainerInfo.Children.Add(new HBoxContainer // Name of the container and its fill status (Ex: 44/100u)
+            ContainerInfo.Children.Add(new BoxContainer // Name of the container and its fill status (Ex: 44/100u)
             {
+                Orientation = LayoutOrientation.Horizontal,
                 Children =
                 {
                     new Label {Text = $"{state.ContainerName}: "},
@@ -293,8 +299,9 @@ namespace Content.Client.Chemistry.UI
                 //Check if the reagent is being moused over. If so, color it green.
                 if (proto != null && proto.ID == highlightedReagentId)
                 {
-                    ContainerInfo.Children.Add(new HBoxContainer
+                    ContainerInfo.Children.Add(new BoxContainer
                     {
+                        Orientation = LayoutOrientation.Horizontal,
                         Children =
                         {
                             new Label
@@ -312,8 +319,9 @@ namespace Content.Client.Chemistry.UI
                 }
                 else //Otherwise, color it the normal colors.
                 {
-                    ContainerInfo.Children.Add(new HBoxContainer
+                    ContainerInfo.Children.Add(new BoxContainer
                     {
+                        Orientation = LayoutOrientation.Horizontal,
                         Children =
                         {
                             new Label {Text = $"{name}: "},
diff --git a/Content.Client/Chemistry/UI/TransferAmountBoundUserInterface.cs b/Content.Client/Chemistry/UI/TransferAmountBoundUserInterface.cs
new file mode 100644
index 0000000000..03eb454372
--- /dev/null
+++ b/Content.Client/Chemistry/UI/TransferAmountBoundUserInterface.cs
@@ -0,0 +1,35 @@
+using Content.Shared.Chemistry;
+using Content.Shared.Chemistry.Reagent;
+using JetBrains.Annotations;
+using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
+
+namespace Content.Client.Chemistry.UI
+{
+    [UsedImplicitly]
+    public class TransferAmountBoundUserInterface : BoundUserInterface
+    {
+        private TransferAmountWindow? _window;
+
+        protected override void Open()
+        {
+            base.Open();
+            _window = new TransferAmountWindow();
+
+            _window.applyButton.OnPressed += _ =>
+            {
+                if (int.TryParse(_window.amountLineEdit.Text, out var i))
+                {
+                    SendMessage(new TransferAmountSetValueMessage(ReagentUnit.New(i)));
+                    _window.Close();
+                }
+            };
+
+            _window.OpenCentered();
+        }
+
+        public TransferAmountBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey)
+        {
+        }
+    }
+}
diff --git a/Content.Client/Chemistry/UI/TransferAmountWindow.xaml b/Content.Client/Chemistry/UI/TransferAmountWindow.xaml
new file mode 100644
index 0000000000..50716c563c
--- /dev/null
+++ b/Content.Client/Chemistry/UI/TransferAmountWindow.xaml
@@ -0,0 +1,11 @@
+<SS14Window xmlns="https://spacestation14.io"
+            Title="{Loc 'ui-transfer-amount-title'}"
+            Resizable="False">
+
+    <VBoxContainer SeparationOverride="4" CustomMinimumSize="240 80">
+        <HBoxContainer>
+            <LineEdit Name="AmountLineEdit" HorizontalExpand="True" PlaceHolder="{Loc 'ui-transfer-amount-line-edit-placeholder'}"/>
+        </HBoxContainer>
+        <Button Name="ApplyButton" Text="{Loc 'ui-transfer-amount-apply'}"/>
+    </VBoxContainer>
+</SS14Window>
diff --git a/Content.Client/Chemistry/UI/TransferAmountWindow.xaml.cs b/Content.Client/Chemistry/UI/TransferAmountWindow.xaml.cs
new file mode 100644
index 0000000000..1c94789444
--- /dev/null
+++ b/Content.Client/Chemistry/UI/TransferAmountWindow.xaml.cs
@@ -0,0 +1,19 @@
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.Chemistry.UI
+{
+    [GenerateTypedNameReferences]
+    public partial class TransferAmountWindow : SS14Window
+    {
+        public Button applyButton => ApplyButton;
+        public LineEdit amountLineEdit => AmountLineEdit;
+
+        public TransferAmountWindow()
+        {
+            RobustXamlLoader.Load(this);
+        }
+    }
+}
diff --git a/Content.Client/Chemistry/Visualizers/SolutionContainerVisualizer.cs b/Content.Client/Chemistry/Visualizers/SolutionContainerVisualizer.cs
index dfb9d4cfb3..47b39c4c96 100644
--- a/Content.Client/Chemistry/Visualizers/SolutionContainerVisualizer.cs
+++ b/Content.Client/Chemistry/Visualizers/SolutionContainerVisualizer.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Content.Shared.Chemistry.Solution.Components;
 using JetBrains.Annotations;
diff --git a/Content.Client/Cloning/UI/AcceptCloningWindow.cs b/Content.Client/Cloning/UI/AcceptCloningWindow.cs
index c26d95a30f..b37e693679 100644
--- a/Content.Client/Cloning/UI/AcceptCloningWindow.cs
+++ b/Content.Client/Cloning/UI/AcceptCloningWindow.cs
@@ -2,6 +2,7 @@ using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.Localization;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Cloning.UI
 {
@@ -15,21 +16,24 @@ namespace Content.Client.Cloning.UI
 
             Title = Loc.GetString("accept-cloning-window-title");
 
-            Contents.AddChild(new VBoxContainer
+            Contents.AddChild(new BoxContainer
             {
+                Orientation = LayoutOrientation.Vertical,
                 Children =
                 {
-                    new VBoxContainer
+                    new BoxContainer
                     {
+                        Orientation = LayoutOrientation.Vertical,
                         Children =
                         {
                             (new Label()
                             {
                                 Text = Loc.GetString("accept-cloning-window-prompt-text-part")
                             }),
-                            new HBoxContainer
+                            new BoxContainer
                             {
-                                Align  = BoxContainer.AlignMode.Center,
+                                Orientation = LayoutOrientation.Horizontal,
+                                Align = AlignMode.Center,
                                 Children =
                                 {
                                     (AcceptButton = new Button
diff --git a/Content.Client/Cloning/UI/CloningPodWindow.cs b/Content.Client/Cloning/UI/CloningPodWindow.cs
index b085c5294d..a52ef93ebd 100644
--- a/Content.Client/Cloning/UI/CloningPodWindow.cs
+++ b/Content.Client/Cloning/UI/CloningPodWindow.cs
@@ -9,6 +9,7 @@ using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using Robust.Shared.Timing;
 using static Content.Shared.Cloning.SharedCloningPodComponent;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Cloning.UI
 {
@@ -16,7 +17,7 @@ namespace Content.Client.Cloning.UI
     {
         private Dictionary<int, string?> _scanManager;
 
-        private readonly VBoxContainer _scanList;
+        private readonly BoxContainer _scanList;
         public readonly Button CloneButton;
         public readonly Button EjectButton;
         private CloningScanButton? _selectedButton;
@@ -35,8 +36,9 @@ namespace Content.Client.Cloning.UI
 
             Title = Loc.GetString("cloning-pod-window-title");
 
-            Contents.AddChild(new VBoxContainer
+            Contents.AddChild(new BoxContainer
             {
+                Orientation = LayoutOrientation.Vertical,
                 Children =
                 {
                     new ScrollContainer
@@ -45,11 +47,15 @@ namespace Content.Client.Cloning.UI
                         VerticalExpand = true,
                         Children =
                         {
-                            (_scanList = new VBoxContainer())
+                            (_scanList = new BoxContainer
+                            {
+                                Orientation = LayoutOrientation.Vertical
+                            })
                         }
                     },
-                    new VBoxContainer
+                    new BoxContainer
                     {
+                        Orientation = LayoutOrientation.Vertical,
                         Children =
                         {
                             (CloneButton = new Button
@@ -74,8 +80,9 @@ namespace Content.Client.Cloning.UI
                     {
                         Text = Loc.GetString("cloning-pod-eject-body-button")
                     }),
-                    new HBoxContainer
+                    new BoxContainer
                     {
+                        Orientation = LayoutOrientation.Horizontal,
                         Children =
                         {
                             new Label()
@@ -219,8 +226,9 @@ namespace Content.Client.Cloning.UI
                     ToggleMode = true,
                 });
 
-                AddChild(new HBoxContainer
+                AddChild(new BoxContainer
                 {
+                    Orientation = LayoutOrientation.Horizontal,
                     Children =
                     {
                         (EntityTextureRect = new TextureRect
diff --git a/Content.Client/Clothing/ClothingComponent.cs b/Content.Client/Clothing/ClothingComponent.cs
index bceed9f7fe..4cd1d1ee46 100644
--- a/Content.Client/Clothing/ClothingComponent.cs
+++ b/Content.Client/Clothing/ClothingComponent.cs
@@ -1,14 +1,13 @@
-#nullable enable
 using Content.Client.Inventory;
 using Content.Client.Items.Components;
 using Content.Shared.Clothing;
 using Content.Shared.Inventory;
 using Content.Shared.Item;
-using Content.Shared.NetIDs;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.IoC;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
@@ -18,12 +17,12 @@ namespace Content.Client.Clothing
     [RegisterComponent]
     [ComponentReference(typeof(SharedItemComponent))]
     [ComponentReference(typeof(ItemComponent))]
+    [NetworkedComponent()]
     public class ClothingComponent : ItemComponent
     {
         [DataField("femaleMask")]
         private FemaleClothingMask _femaleMask = FemaleClothingMask.UniformFull;
         public override string Name => "Clothing";
-        public override uint? NetID => ContentNetIDs.CLOTHING;
 
         private string? _clothingEquippedPrefix;
 
diff --git a/Content.Client/CombatMode/ColoredScreenBorderOverlay.cs b/Content.Client/CombatMode/ColoredScreenBorderOverlay.cs
index 4fc1d7a908..9b02e7ce21 100644
--- a/Content.Client/CombatMode/ColoredScreenBorderOverlay.cs
+++ b/Content.Client/CombatMode/ColoredScreenBorderOverlay.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Robust.Client.Graphics;
 using Robust.Shared.Enums;
 using Robust.Shared.IoC;
diff --git a/Content.Client/Commands/GroupingContextMenuCommand.cs b/Content.Client/Commands/GroupingContextMenuCommand.cs
index e306c7da11..1b640b0907 100644
--- a/Content.Client/Commands/GroupingContextMenuCommand.cs
+++ b/Content.Client/Commands/GroupingContextMenuCommand.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Shared;
+using Content.Shared;
 using Content.Shared.CCVar;
 using Robust.Shared.Configuration;
 using Robust.Shared.Console;
diff --git a/Content.Client/Communications/UI/CommunicationsConsoleMenu.cs b/Content.Client/Communications/UI/CommunicationsConsoleMenu.cs
index 56d8497104..af12b76965 100644
--- a/Content.Client/Communications/UI/CommunicationsConsoleMenu.cs
+++ b/Content.Client/Communications/UI/CommunicationsConsoleMenu.cs
@@ -5,6 +5,7 @@ using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 using Timer = Robust.Shared.Timing.Timer;
 
 namespace Content.Client.Communications.UI
@@ -42,7 +43,12 @@ namespace Content.Client.Communications.UI
             EmergencyShuttleButton.OnPressed += (_) => Owner.EmergencyShuttleButtonPressed();
             EmergencyShuttleButton.Disabled = !owner.CanCall;
 
-            var vbox = new VBoxContainer() {HorizontalExpand = true, VerticalExpand = true};
+            var vbox = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Vertical,
+                HorizontalExpand = true,
+                VerticalExpand = true
+            };
             vbox.AddChild(_messageInput);
             vbox.AddChild(new Control(){MinSize = new Vector2(0,10), HorizontalExpand = true});
             vbox.AddChild(AnnounceButton);
@@ -50,7 +56,12 @@ namespace Content.Client.Communications.UI
             vbox.AddChild(_countdownLabel);
             vbox.AddChild(EmergencyShuttleButton);
 
-            var hbox = new HBoxContainer() {HorizontalExpand = true, VerticalExpand = true};
+            var hbox = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Horizontal,
+                HorizontalExpand = true,
+                VerticalExpand = true
+            };
             hbox.AddChild(new Control(){MinSize = new Vector2(100,0), HorizontalExpand = true});
             hbox.AddChild(vbox);
             hbox.AddChild(new Control(){MinSize = new Vector2(100,0), HorizontalExpand = true});
diff --git a/Content.Client/Configurable/UI/ConfigurationMenu.cs b/Content.Client/Configurable/UI/ConfigurationMenu.cs
index ea0c717b3d..07ad8ecf99 100644
--- a/Content.Client/Configurable/UI/ConfigurationMenu.cs
+++ b/Content.Client/Configurable/UI/ConfigurationMenu.cs
@@ -6,6 +6,7 @@ using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using static Content.Shared.Configurable.SharedConfigurationComponent;
 using static Robust.Client.UserInterface.Controls.BaseButton;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Configurable.UI
 {
@@ -13,9 +14,8 @@ namespace Content.Client.Configurable.UI
     {
         public ConfigurationBoundUserInterface Owner { get; }
 
-        private readonly VBoxContainer _baseContainer;
-        private readonly VBoxContainer _column;
-        private readonly HBoxContainer _row;
+        private readonly BoxContainer _column;
+        private readonly BoxContainer _row;
 
         private readonly List<(string  name, LineEdit input)> _inputs;
 
@@ -28,20 +28,23 @@ namespace Content.Client.Configurable.UI
 
             Title = Loc.GetString("configuration-menu-device-title");
 
-            _baseContainer = new VBoxContainer
+            BoxContainer baseContainer = new BoxContainer
             {
+                Orientation = LayoutOrientation.Vertical,
                 VerticalExpand = true,
                 HorizontalExpand = true
             };
 
-            _column = new VBoxContainer
+            _column = new BoxContainer
             {
+                Orientation = LayoutOrientation.Vertical,
                 Margin = new Thickness(8),
                 SeparationOverride = 16,
             };
 
-            _row = new HBoxContainer
+            _row = new BoxContainer
             {
+                Orientation = LayoutOrientation.Horizontal,
                 SeparationOverride = 16,
                 HorizontalExpand = true
             };
@@ -63,9 +66,9 @@ namespace Content.Client.Configurable.UI
             };
 
             outerColumn.AddChild(_column);
-            _baseContainer.AddChild(outerColumn);
-            _baseContainer.AddChild(confirmButton);
-            Contents.AddChild(_baseContainer);
+            baseContainer.AddChild(outerColumn);
+            baseContainer.AddChild(confirmButton);
+            Contents.AddChild(baseContainer);
         }
 
         public void Populate(ConfigurationBoundUserInterfaceState state)
@@ -97,7 +100,10 @@ namespace Content.Client.Configurable.UI
 
                 _inputs.Add((field.Key, input));
 
-                var row = new HBoxContainer();
+                var row = new BoxContainer
+                {
+                    Orientation = LayoutOrientation.Horizontal
+                };
                 CopyProperties(_row, row);
 
                 row.AddChild(label);
diff --git a/Content.Client/Construction/ConstructionSystem.cs b/Content.Client/Construction/ConstructionSystem.cs
index 7ffc1fbf81..e3524212dc 100644
--- a/Content.Client/Construction/ConstructionSystem.cs
+++ b/Content.Client/Construction/ConstructionSystem.cs
@@ -14,7 +14,6 @@ using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
 
-#nullable enable
 
 namespace Content.Client.Construction
 {
diff --git a/Content.Client/Construction/UI/ConstructionMenu.xaml b/Content.Client/Construction/UI/ConstructionMenu.xaml
index b95c4d4f58..2c943206bb 100644
--- a/Content.Client/Construction/UI/ConstructionMenu.xaml
+++ b/Content.Client/Construction/UI/ConstructionMenu.xaml
@@ -1,32 +1,32 @@
 <SS14Window xmlns="https://spacestation14.io">
-    <HBoxContainer HorizontalExpand="True">
-        <VBoxContainer HorizontalExpand="True" SizeFlagsStretchRatio="0.4">
-            <HBoxContainer HorizontalExpand="True">
+    <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
+        <BoxContainer Orientation="Vertical" HorizontalExpand="True" SizeFlagsStretchRatio="0.4">
+            <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
                 <LineEdit Name="SearchBar" PlaceHolder="Search" HorizontalExpand="True"/>
                 <OptionButton Name="Category" MinSize="130 0"/>
-            </HBoxContainer>
+            </BoxContainer>
             <ItemList Name="RecipesList" SelectMode="Single" VerticalExpand="True"/>
-        </VBoxContainer>
+        </BoxContainer>
         <Control MinSize="10 0"/>
-        <VBoxContainer HorizontalExpand="True" SizeFlagsStretchRatio="0.6">
+        <BoxContainer Orientation="Vertical" HorizontalExpand="True" SizeFlagsStretchRatio="0.6">
             <Control>
-                <HBoxContainer Align="Center">
+                <BoxContainer Orientation="Horizontal" Align="Center">
                     <TextureRect Name="TargetTexture" HorizontalAlignment="Right" Stretch="Keep"/>
                     <Control MinSize="10 0"/>
-                    <VBoxContainer>
+                    <BoxContainer Orientation="Vertical">
                         <RichTextLabel Name="TargetName"/>
                         <RichTextLabel Name="TargetDesc"/>
-                    </VBoxContainer>
-                </HBoxContainer>
+                    </BoxContainer>
+                </BoxContainer>
             </Control>
             <ItemList Name="StepList" VerticalExpand="True"/>
-            <VBoxContainer>
+            <BoxContainer Orientation="Vertical">
                 <Button Name="BuildButton" Disabled="True" ToggleMode="True" VerticalExpand="True" SizeFlagsStretchRatio="0.5"/>
-                <HBoxContainer VerticalExpand="True" SizeFlagsStretchRatio="0.5">
+                <BoxContainer Orientation="Horizontal" VerticalExpand="True" SizeFlagsStretchRatio="0.5">
                     <Button Name="EraseButton" ToggleMode="True" HorizontalExpand="True" SizeFlagsStretchRatio="0.7"/>
                     <Button Name="ClearButton" HorizontalExpand="True" SizeFlagsStretchRatio="0.3"/>
-                </HBoxContainer>
-            </VBoxContainer>
-        </VBoxContainer>
-    </HBoxContainer>
+                </BoxContainer>
+            </BoxContainer>
+        </BoxContainer>
+    </BoxContainer>
 </SS14Window>
diff --git a/Content.Client/Construction/UI/ConstructionMenu.xaml.cs b/Content.Client/Construction/UI/ConstructionMenu.xaml.cs
index b1182c005c..7ad635d6b7 100644
--- a/Content.Client/Construction/UI/ConstructionMenu.xaml.cs
+++ b/Content.Client/Construction/UI/ConstructionMenu.xaml.cs
@@ -7,7 +7,6 @@ using Robust.Client.UserInterface.XAML;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 
-#nullable enable
 
 namespace Content.Client.Construction.UI
 {
diff --git a/Content.Client/Construction/UI/ConstructionMenuPresenter.cs b/Content.Client/Construction/UI/ConstructionMenuPresenter.cs
index 53a174f9e7..78b93f5544 100644
--- a/Content.Client/Construction/UI/ConstructionMenuPresenter.cs
+++ b/Content.Client/Construction/UI/ConstructionMenuPresenter.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/Content.Client/ContextMenu/UI/ContextMenuElement.cs b/Content.Client/ContextMenu/UI/ContextMenuElement.cs
index 540aa07679..9f9c049763 100644
--- a/Content.Client/ContextMenu/UI/ContextMenuElement.cs
+++ b/Content.Client/ContextMenu/UI/ContextMenuElement.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Content.Client.Interactable.Components;
@@ -14,6 +13,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 using Vector2 = Robust.Shared.Maths.Vector2;
 
 namespace Content.Client.ContextMenu.UI
@@ -64,8 +64,9 @@ namespace Content.Client.ContextMenu.UI
             OutlineComponent = ContextEntity.GetComponentOrNull<InteractionOutlineComponent>();
 
             AddChild(
-                new HBoxContainer
+                new BoxContainer
                 {
+                    Orientation = LayoutOrientation.Horizontal,
                     Children =
                     {
                         new LayoutContainer
@@ -130,14 +131,16 @@ namespace Content.Client.ContextMenu.UI
              LayoutContainer.SetGrowVertical(_label, LayoutContainer.GrowDirection.Begin);
 
              AddChild(
-                 new HBoxContainer()
+                 new BoxContainer
                  {
+                     Orientation = LayoutOrientation.Horizontal,
                      SeparationOverride = 6,
                      Children =
                      {
                          new LayoutContainer { Children = { _spriteView, _label } },
-                         new HBoxContainer()
+                         new BoxContainer
                          {
+                             Orientation = LayoutOrientation.Horizontal,
                              SeparationOverride = 6,
                              Children =
                              {
@@ -180,7 +183,7 @@ namespace Content.Client.ContextMenu.UI
         private const int MaxItemsBeforeScroll = 10;
         private const int MarginSizeBetweenElements = 2;
 
-        public VBoxContainer List { get; }
+        public BoxContainer List { get; }
         public int Depth { get; }
 
         public ContextMenuPopup(int depth = 0)
@@ -191,7 +194,10 @@ namespace Content.Client.ContextMenu.UI
                 HScrollEnabled = false,
                 Children = { new PanelContainer
                 {
-                    Children = { (List = new VBoxContainer()) },
+                    Children = { (List = new BoxContainer
+                    {
+                        Orientation = LayoutOrientation.Vertical
+                    }) },
                     PanelOverride = new StyleBoxFlat {  BackgroundColor = MarginColor }
                 }}
             });
diff --git a/Content.Client/ContextMenu/UI/ContextMenuPresenter.cs b/Content.Client/ContextMenu/UI/ContextMenuPresenter.cs
index 21ca65f75a..d85eda0ce8 100644
--- a/Content.Client/ContextMenu/UI/ContextMenuPresenter.cs
+++ b/Content.Client/ContextMenu/UI/ContextMenuPresenter.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using System.Linq;
 using System.Threading;
 using Content.Client.Examine;
diff --git a/Content.Client/ContextMenu/UI/ContextMenuView.cs b/Content.Client/ContextMenu/UI/ContextMenuView.cs
index cef321f5b1..ed41f6314a 100644
--- a/Content.Client/ContextMenu/UI/ContextMenuView.cs
+++ b/Content.Client/ContextMenu/UI/ContextMenuView.cs
@@ -1,5 +1,4 @@
-#nullable enable
-
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/Content.Client/ContextMenu/UI/ContextMenuViewGrouping.cs b/Content.Client/ContextMenu/UI/ContextMenuViewGrouping.cs
index 84797f8467..67556dbdc4 100644
--- a/Content.Client/ContextMenu/UI/ContextMenuViewGrouping.cs
+++ b/Content.Client/ContextMenu/UI/ContextMenuViewGrouping.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Robust.Client.GameObjects;
diff --git a/Content.Client/Crayon/UI/CrayonWindow.cs b/Content.Client/Crayon/UI/CrayonWindow.cs
index a1b1fc33d1..6c6de15a10 100644
--- a/Content.Client/Crayon/UI/CrayonWindow.cs
+++ b/Content.Client/Crayon/UI/CrayonWindow.cs
@@ -9,6 +9,7 @@ using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using Robust.Shared.Utility;
 using static Robust.Client.UserInterface.Controls.BaseButton;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Crayon.UI
 {
@@ -27,7 +28,10 @@ namespace Content.Client.Crayon.UI
             Title = Loc.GetString("crayon-window-title");
             Owner = owner;
 
-            var vbox = new VBoxContainer();
+            var vbox = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Vertical
+            };
             Contents.AddChild(vbox);
 
             _search = new LineEdit();
diff --git a/Content.Client/Credits/CreditsWindow.cs b/Content.Client/Credits/CreditsWindow.cs
index a755979ee5..b617f25fb1 100644
--- a/Content.Client/Credits/CreditsWindow.cs
+++ b/Content.Client/Credits/CreditsWindow.cs
@@ -16,6 +16,7 @@ using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using Robust.Shared.Utility;
 using YamlDotNet.RepresentationModel;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Credits
 {
@@ -71,8 +72,9 @@ namespace Content.Client.Credits
 
         private void PopulateLicenses(ScrollContainer licensesList)
         {
-            var vBox = new VBoxContainer
+            var vBox = new BoxContainer
             {
+                Orientation = LayoutOrientation.Vertical,
                 Margin = new Thickness(2, 2, 0, 0)
             };
 
@@ -93,8 +95,9 @@ namespace Content.Client.Credits
 
         private void PopulatePatronsList(Control patronsList)
         {
-            var vBox = new VBoxContainer
+            var vBox = new BoxContainer
             {
+                Orientation = LayoutOrientation.Vertical,
                 Margin = new Thickness(2, 2, 0, 0)
             };
             var patrons = LoadPatrons();
@@ -152,13 +155,15 @@ namespace Content.Client.Credits
         {
             Button contributeButton;
 
-            var vBox = new VBoxContainer
+            var vBox = new BoxContainer
             {
+                Orientation = LayoutOrientation.Vertical,
                 Margin = new Thickness(2, 2, 0, 0)
             };
 
-            vBox.AddChild(new HBoxContainer
+            vBox.AddChild(new BoxContainer
             {
+                Orientation = LayoutOrientation.Horizontal,
                 HorizontalAlignment = HAlignment.Center,
                 SeparationOverride = 20,
                 Children =
diff --git a/Content.Client/Disposal/UI/DisposalMailingUnitWindow.cs b/Content.Client/Disposal/UI/DisposalMailingUnitWindow.cs
index 13e49516ad..db6b24044d 100644
--- a/Content.Client/Disposal/UI/DisposalMailingUnitWindow.cs
+++ b/Content.Client/Disposal/UI/DisposalMailingUnitWindow.cs
@@ -7,6 +7,7 @@ using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using static Content.Shared.Disposal.Components.SharedDisposalMailingUnitComponent;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Disposal.UI
 {
@@ -30,18 +31,21 @@ namespace Content.Client.Disposal.UI
         {
             MinSize = SetSize = (460, 230);
             TargetList = new List<string>();
-            Contents.AddChild(new HBoxContainer
+            Contents.AddChild(new BoxContainer
             {
+                Orientation = LayoutOrientation.Horizontal,
                 Children =
                 {
-                    new VBoxContainer
+                    new BoxContainer
                     {
+                        Orientation = LayoutOrientation.Vertical,
                         HorizontalExpand = true,
                         Margin = new Thickness(8, 0),
                         Children =
                         {
-                            new HBoxContainer
+                            new BoxContainer
                             {
+                                Orientation = LayoutOrientation.Horizontal,
                                 Children =
                                 {
                                     new Label {Text = $"{Loc.GetString("disposal-mailing-unit-window-state-label")} "},
@@ -50,8 +54,9 @@ namespace Content.Client.Disposal.UI
                                 }
                             },
                             new Control {MinSize = (0, 10)},
-                            new HBoxContainer
+                            new BoxContainer
                             {
+                                Orientation = LayoutOrientation.Horizontal,
                                 HorizontalExpand = true,
                                 Children =
                                 {
@@ -73,8 +78,9 @@ namespace Content.Client.Disposal.UI
                                 }
                             },
                             new Control {MinSize = (0, 10)},
-                            new HBoxContainer
+                            new BoxContainer
                             {
+                                Orientation = LayoutOrientation.Horizontal,
                                 HorizontalExpand = true,
                                 Children =
                                 {
@@ -94,8 +100,9 @@ namespace Content.Client.Disposal.UI
                                 }
                             },
                             new Control {MinSize = (0, 10)},
-                            new HBoxContainer
+                            new BoxContainer
                             {
+                                Orientation = LayoutOrientation.Horizontal,
                                 HorizontalExpand = true,
                                 Children =
                                 {
@@ -114,8 +121,9 @@ namespace Content.Client.Disposal.UI
                                 }
                             },
                             new Control {MinSize = (0, 10)},
-                            new HBoxContainer
+                            new BoxContainer
                             {
+                                Orientation = LayoutOrientation.Horizontal,
                                 Children =
                                 {
                                     (Power = new CheckButton {Text = Loc.GetString("disposal-mailing-unit-power-button")}),
@@ -123,13 +131,15 @@ namespace Content.Client.Disposal.UI
                             }
                         }
                     },
-                    new VBoxContainer
+                    new BoxContainer
                     {
+                        Orientation = LayoutOrientation.Vertical,
                         Margin = new Thickness(12, 0, 8, 0),
                         Children =
                         {
-                            new HBoxContainer
+                            new BoxContainer
                             {
+                                Orientation = LayoutOrientation.Horizontal,
                                 Children =
                                 {
                                     new Label
@@ -139,8 +149,9 @@ namespace Content.Client.Disposal.UI
                                 }
                             },
                             new Control {MinSize = new Vector2(0, 8)},
-                            new HBoxContainer
+                            new BoxContainer
                             {
+                                Orientation = LayoutOrientation.Horizontal,
                                 VerticalExpand = true,
                                 Children =
                                 {
@@ -161,16 +172,19 @@ namespace Content.Client.Disposal.UI
                                 HorizontalExpand = true,
                                 MinSize = new Vector2(0, 1),
                             },
-                            new HBoxContainer
+                            new BoxContainer
                             {
+                                Orientation = LayoutOrientation.Horizontal,
                                 Children =
                                 {
-                                    new VBoxContainer
+                                    new BoxContainer
                                     {
+                                        Orientation = LayoutOrientation.Vertical,
                                         Children =
                                         {
-                                            new HBoxContainer
+                                            new BoxContainer
                                             {
+                                                Orientation = LayoutOrientation.Horizontal,
                                                 Margin = new Thickness(4, 0, 0, 0),
                                                 Children =
                                                 {
diff --git a/Content.Client/Disposal/UI/DisposalRouterWindow.cs b/Content.Client/Disposal/UI/DisposalRouterWindow.cs
index aed47c39bf..b81e9cb5ae 100644
--- a/Content.Client/Disposal/UI/DisposalRouterWindow.cs
+++ b/Content.Client/Disposal/UI/DisposalRouterWindow.cs
@@ -4,6 +4,7 @@ using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.Localization;
 using static Content.Shared.Disposal.Components.SharedDisposalRouterComponent;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Disposal.UI
 {
@@ -20,14 +21,16 @@ namespace Content.Client.Disposal.UI
             MinSize = SetSize = (500, 110);
             Title = Loc.GetString("disposal-router-window-title");
 
-            Contents.AddChild(new VBoxContainer
+            Contents.AddChild(new BoxContainer
             {
+                Orientation = LayoutOrientation.Vertical,
                 Children =
                 {
                     new Label {Text = Loc.GetString("disposal-router-window-tags-label")},
                     new Control {MinSize = (0, 10)},
-                    new HBoxContainer
+                    new BoxContainer
                     {
+                        Orientation = LayoutOrientation.Horizontal,
                         Children =
                         {
                             (TagInput = new LineEdit
diff --git a/Content.Client/Disposal/UI/DisposalTaggerWindow.cs b/Content.Client/Disposal/UI/DisposalTaggerWindow.cs
index d548a7da30..3ff60c676b 100644
--- a/Content.Client/Disposal/UI/DisposalTaggerWindow.cs
+++ b/Content.Client/Disposal/UI/DisposalTaggerWindow.cs
@@ -4,6 +4,7 @@ using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.Localization;
 using static Content.Shared.Disposal.Components.SharedDisposalTaggerComponent;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Disposal.UI
 {
@@ -20,14 +21,16 @@ namespace Content.Client.Disposal.UI
             MinSize = SetSize = (500, 110);
             Title = Loc.GetString("disposal-tagger-window-title");
 
-            Contents.AddChild(new VBoxContainer
+            Contents.AddChild(new BoxContainer
             {
+                Orientation = LayoutOrientation.Vertical,
                 Children =
                 {
                     new Label {Text = Loc.GetString("disposal-tagger-window-tag-input-label")},
                     new Control {MinSize = (0, 10)},
-                    new HBoxContainer
+                    new BoxContainer
                     {
+                        Orientation = LayoutOrientation.Horizontal,
                         Children =
                         {
                             (TagInput = new LineEdit
diff --git a/Content.Client/Disposal/UI/DisposalUnitWindow.cs b/Content.Client/Disposal/UI/DisposalUnitWindow.cs
index a1bdd0d211..627cad95b4 100644
--- a/Content.Client/Disposal/UI/DisposalUnitWindow.cs
+++ b/Content.Client/Disposal/UI/DisposalUnitWindow.cs
@@ -8,6 +8,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using static Content.Shared.Disposal.Components.SharedDisposalUnitComponent;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Disposal.UI
 {
@@ -27,12 +28,14 @@ namespace Content.Client.Disposal.UI
             IoCManager.InjectDependencies(this);
             MinSize = SetSize = (300, 140);
             Resizable = false;
-            Contents.AddChild(new VBoxContainer
+            Contents.AddChild(new BoxContainer
             {
+                Orientation = LayoutOrientation.Vertical,
                 Children =
                 {
-                    new HBoxContainer
+                    new BoxContainer
                     {
+                        Orientation = LayoutOrientation.Horizontal,
                         SeparationOverride = 4,
                         Children =
                         {
@@ -41,8 +44,9 @@ namespace Content.Client.Disposal.UI
                         }
                     },
                     new Control {MinSize = (0, 5)},
-                    new HBoxContainer
+                    new BoxContainer
                     {
+                        Orientation = LayoutOrientation.Horizontal,
                         SeparationOverride = 4,
                         Children =
                         {
@@ -59,8 +63,9 @@ namespace Content.Client.Disposal.UI
                         }
                     },
                     new Control {MinSize = (0, 10)},
-                    new HBoxContainer
+                    new BoxContainer
                     {
+                        Orientation = LayoutOrientation.Horizontal,
                         Children =
                         {
                             (Engage = new Button
diff --git a/Content.Client/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs
index 2bc5e3f265..b975c28673 100644
--- a/Content.Client/Entry/EntryPoint.cs
+++ b/Content.Client/Entry/EntryPoint.cs
@@ -105,6 +105,7 @@ namespace Content.Client.Entry
             }
 
             IoCManager.BuildGraph();
+            factory.GenerateNetIds();
 
             IoCManager.Resolve<IClientAdminManager>().Initialize();
             IoCManager.Resolve<IParallaxManager>().LoadParallax();
diff --git a/Content.Client/Entry/IgnoredComponents.cs b/Content.Client/Entry/IgnoredComponents.cs
index b3a76fb612..c8c591b40c 100644
--- a/Content.Client/Entry/IgnoredComponents.cs
+++ b/Content.Client/Entry/IgnoredComponents.cs
@@ -21,7 +21,6 @@ namespace Content.Client.Entry
             "EmitSoundOnActivate",
             "FootstepModifier",
             "HeatResistance",
-            "ItemTeleporter",
             "EntityStorage",
             "Wirecutter",
             "Screwdriver",
@@ -78,8 +77,7 @@ namespace Content.Client.Entry
             "CanSpill",
             "SpeedLoader",
             "Hitscan",
-            "ExplosiveProjectile",
-            "StunnableProjectile",
+            "StunOnCollide",
             "RandomPottedPlant",
             "CommunicationsConsole",
             "BarSign",
@@ -97,8 +95,11 @@ namespace Content.Client.Entry
             "SecureEntityStorage",
             "PresetIdCard",
             "SolarControlConsole",
-            "FlashExplosive",
-            "FlashProjectile",
+            "FlashOnTrigger",
+            "SoundOnTrigger",
+            "TriggerOnCollide",
+            "DeleteOnTrigger",
+            "ExplodeOnTrigger",
             "Utensil",
             "UnarmedCombat",
             "TimedSpawner",
@@ -191,6 +192,7 @@ namespace Content.Client.Entry
             "GasCanisterPort",
             "GasPort",
             "GasPortable",
+            "AtmosPipeColor",
             "AtmosUnsafeUnanchor",
             "GasMixer",
             "Cleanable",
@@ -232,7 +234,7 @@ namespace Content.Client.Entry
             "ConveyorAssembly",
             "TwoWayLever",
             "FirelockElectronics",
-            "ChemicalInjectionProjectile",
+            "SolutionInjectOnCollide",
             "Machine",
             "MachinePart",
             "MachineFrame",
diff --git a/Content.Client/EscapeMenu/UI/EscapeMenu.xaml b/Content.Client/EscapeMenu/UI/EscapeMenu.xaml
index aa892e473b..baed55524a 100644
--- a/Content.Client/EscapeMenu/UI/EscapeMenu.xaml
+++ b/Content.Client/EscapeMenu/UI/EscapeMenu.xaml
@@ -4,11 +4,11 @@
             Title="{Loc 'ui-escape-title'}"
             Resizable="False">
 
-    <VBoxContainer SeparationOverride="4" CustomMinimumSize="150 160">
+    <BoxContainer Orientation="Vertical" SeparationOverride="4" CustomMinimumSize="150 160">
         <changelog:ChangelogButton />
         <ui:VoteCallMenuButton />
         <Button Name="OptionsButton" Text="{Loc 'ui-escape-options'}" />
         <Button Name="DisconnectButton" Text="{Loc 'ui-escape-disconnect'}" />
         <Button Name="QuitButton" Text="{Loc 'ui-escape-quit'}" />
-    </VBoxContainer>
+    </BoxContainer>
 </SS14Window>
diff --git a/Content.Client/EscapeMenu/UI/OptionsMenu.Audio.cs b/Content.Client/EscapeMenu/UI/OptionsMenu.Audio.cs
deleted file mode 100644
index 40815acde2..0000000000
--- a/Content.Client/EscapeMenu/UI/OptionsMenu.Audio.cs
+++ /dev/null
@@ -1,198 +0,0 @@
-using Content.Client.HUD.UI;
-using Content.Client.Stylesheets;
-using Content.Shared;
-using Content.Shared.CCVar;
-using Robust.Client.Graphics;
-using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.Controls;
-using Robust.Shared;
-using Robust.Shared.Configuration;
-using Robust.Shared.Localization;
-using Robust.Shared.Maths;
-
-namespace Content.Client.EscapeMenu.UI
-{
-    public sealed partial class OptionsMenu
-    {
-        private sealed class AudioControl : Control
-        {
-            private readonly IConfigurationManager _cfg;
-            private readonly IClydeAudio _clydeAudio;
-
-            private readonly Button ApplyButton;
-            private readonly Label MasterVolumeLabel;
-            private readonly Slider MasterVolumeSlider;
-            private readonly CheckBox AmbienceCheckBox;
-            private readonly CheckBox LobbyMusicCheckBox;
-            private readonly Button ResetButton;
-
-            public AudioControl(IConfigurationManager cfg, IClydeAudio clydeAudio)
-            {
-                _cfg = cfg;
-                _clydeAudio = clydeAudio;
-
-                var vBox = new VBoxContainer();
-
-                var contents = new VBoxContainer
-                {
-                    Margin = new Thickness(2, 2, 2, 0),
-                    VerticalExpand = true,
-                };
-
-                MasterVolumeSlider = new Slider
-                {
-                    MinValue = 0.0f,
-                    MaxValue = 100.0f,
-                    HorizontalExpand = true,
-                    MinSize = (80, 8),
-                    Rounded = true
-                };
-
-                MasterVolumeLabel = new Label
-                {
-                    MinSize = (48, 0),
-                    Align = Label.AlignMode.Right
-                };
-
-                contents.AddChild(new HBoxContainer
-                {
-                    Children =
-                    {
-                        new Control {MinSize = (4, 0)},
-                        new Label {Text = Loc.GetString("ui-options-master-volume")},
-                        new Control {MinSize = (8, 0)},
-                        MasterVolumeSlider,
-                        new Control {MinSize = (8, 0)},
-                        MasterVolumeLabel,
-                        new Control {MinSize = (4, 0)},
-                    }
-                });
-
-                // sets up ambience checkbox. i am sorry for not fixing the rest of this code.
-                AmbienceCheckBox = new CheckBox {Text = Loc.GetString("ui-options-ambient-hum")};
-                contents.AddChild(AmbienceCheckBox);
-                AmbienceCheckBox.Pressed = _cfg.GetCVar(CCVars.AmbienceBasicEnabled);
-
-                LobbyMusicCheckBox = new CheckBox {Text = Loc.GetString("ui-options-lobby-music")};
-                contents.AddChild(LobbyMusicCheckBox);
-                LobbyMusicCheckBox.Pressed = _cfg.GetCVar(CCVars.LobbyMusicEnabled);
-
-                ApplyButton = new Button
-                {
-                    Text = Loc.GetString("ui-options-apply"), TextAlign = Label.AlignMode.Center,
-                    HorizontalAlignment = HAlignment.Right
-                };
-
-                vBox.AddChild(new Label
-                {
-                    Text = Loc.GetString("ui-options-volume-sliders"),
-                    FontColorOverride = StyleNano.NanoGold,
-                    StyleClasses = {StyleNano.StyleClassLabelKeyText}
-                });
-
-                vBox.AddChild(contents);
-
-                ResetButton = new Button
-                {
-                    Text = Loc.GetString("ui-options-reset-all"),
-                    StyleClasses = {StyleBase.ButtonCaution},
-                    HorizontalExpand = true,
-                    HorizontalAlignment = HAlignment.Right
-                };
-
-                vBox.AddChild(new StripeBack
-                {
-                    HasBottomEdge = false,
-                    HasMargins = false,
-                    Children =
-                    {
-                        new HBoxContainer
-                        {
-                            Align = BoxContainer.AlignMode.End,
-                            HorizontalExpand = true,
-                            VerticalExpand = true,
-                            Children =
-                            {
-                                ResetButton,
-                                new Control {MinSize = (2, 0)},
-                                ApplyButton
-                            }
-                        }
-                    }
-                });
-
-                ApplyButton.OnPressed += OnApplyButtonPressed;
-                ResetButton.OnPressed += OnResetButtonPressed;
-                MasterVolumeSlider.OnValueChanged += OnMasterVolumeSliderChanged;
-                AmbienceCheckBox.OnToggled += OnAmbienceCheckToggled;
-                LobbyMusicCheckBox.OnToggled += OnLobbyMusicCheckToggled;
-
-                AddChild(vBox);
-
-                Reset();
-            }
-
-            protected override void Dispose(bool disposing)
-            {
-                ApplyButton.OnPressed -= OnApplyButtonPressed;
-                ResetButton.OnPressed -= OnResetButtonPressed;
-                MasterVolumeSlider.OnValueChanged -= OnMasterVolumeSliderChanged;
-                AmbienceCheckBox.OnToggled -= OnAmbienceCheckToggled;
-                base.Dispose(disposing);
-            }
-
-            private void OnMasterVolumeSliderChanged(Range range)
-            {
-                MasterVolumeLabel.Text =
-                    Loc.GetString("ui-options-volume-percent", ("volume", MasterVolumeSlider.Value / 100));
-                _clydeAudio.SetMasterVolume(MasterVolumeSlider.Value / 100);
-                UpdateChanges();
-            }
-
-            private void OnAmbienceCheckToggled(BaseButton.ButtonEventArgs args)
-            {
-                UpdateChanges();
-            }
-
-            private void OnLobbyMusicCheckToggled(BaseButton.ButtonEventArgs args)
-            {
-                UpdateChanges();
-            }
-
-            private void OnApplyButtonPressed(BaseButton.ButtonEventArgs args)
-            {
-                _cfg.SetCVar(CVars.AudioMasterVolume, MasterVolumeSlider.Value / 100);
-                _cfg.SetCVar(CCVars.AmbienceBasicEnabled, AmbienceCheckBox.Pressed);
-                _cfg.SetCVar(CCVars.LobbyMusicEnabled, LobbyMusicCheckBox.Pressed);
-                _cfg.SaveToFile();
-                UpdateChanges();
-            }
-
-            private void OnResetButtonPressed(BaseButton.ButtonEventArgs args)
-            {
-                Reset();
-            }
-
-            private void Reset()
-            {
-                MasterVolumeSlider.Value = _cfg.GetCVar(CVars.AudioMasterVolume) * 100;
-                MasterVolumeLabel.Text =
-                    Loc.GetString("ui-options-volume-percent", ("volume", MasterVolumeSlider.Value / 100));
-                AmbienceCheckBox.Pressed = _cfg.GetCVar(CCVars.AmbienceBasicEnabled);
-                LobbyMusicCheckBox.Pressed = _cfg.GetCVar(CCVars.LobbyMusicEnabled);
-                UpdateChanges();
-            }
-
-            private void UpdateChanges()
-            {
-                var isMasterVolumeSame =
-                    System.Math.Abs(MasterVolumeSlider.Value - _cfg.GetCVar(CVars.AudioMasterVolume) * 100) < 0.01f;
-                var isAmbienceSame = AmbienceCheckBox.Pressed == _cfg.GetCVar(CCVars.AmbienceBasicEnabled);
-                var isLobbySame = LobbyMusicCheckBox.Pressed == _cfg.GetCVar(CCVars.LobbyMusicEnabled);
-                var isEverythingSame = isMasterVolumeSame && isAmbienceSame && isLobbySame;
-                ApplyButton.Disabled = isEverythingSame;
-                ResetButton.Disabled = isEverythingSame;
-            }
-        }
-    }
-}
diff --git a/Content.Client/EscapeMenu/UI/OptionsMenu.Graphics.cs b/Content.Client/EscapeMenu/UI/OptionsMenu.Graphics.cs
deleted file mode 100644
index 88e67f702c..0000000000
--- a/Content.Client/EscapeMenu/UI/OptionsMenu.Graphics.cs
+++ /dev/null
@@ -1,337 +0,0 @@
-using Content.Client.HUD.UI;
-using Content.Shared;
-using Content.Shared.CCVar;
-using Content.Shared.HUD;
-using Robust.Client.Graphics;
-using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.Controls;
-using Robust.Shared;
-using Robust.Shared.Configuration;
-using Robust.Shared.Localization;
-using Robust.Shared.Maths;
-using Robust.Shared.Prototypes;
-
-namespace Content.Client.EscapeMenu.UI
-{
-    public sealed partial class OptionsMenu
-    {
-        private sealed class GraphicsControl : Control
-        {
-            private static readonly float[] UIScaleOptions =
-            {
-                0f,
-                0.75f,
-                1f,
-                1.25f,
-                1.50f,
-                1.75f,
-                2f
-            };
-
-            private readonly IConfigurationManager _cfg;
-            private readonly IPrototypeManager _prototypeManager;
-
-            private readonly Button ApplyButton;
-            private readonly CheckBox VSyncCheckBox;
-            private readonly CheckBox FullscreenCheckBox;
-            private readonly OptionButton LightingPresetOption;
-            private readonly OptionButton _uiScaleOption;
-            private readonly OptionButton _hudThemeOption;
-            private readonly CheckBox _viewportStretchCheckBox;
-            private readonly CheckBox _viewportLowResCheckBox;
-            private readonly Slider _viewportScaleSlider;
-            private readonly Control _viewportScaleBox;
-            private readonly Label _viewportScaleText;
-
-            public GraphicsControl(IConfigurationManager cfg, IPrototypeManager proMan)
-            {
-                _cfg = cfg;
-                _prototypeManager = proMan;
-                var vBox = new VBoxContainer();
-
-                var contents = new VBoxContainer
-                {
-                    Margin = new Thickness(2, 2, 2, 0),
-                    VerticalExpand = true,
-                };
-
-                VSyncCheckBox = new CheckBox {Text = Loc.GetString("ui-options-vsync")};
-                contents.AddChild(VSyncCheckBox);
-                VSyncCheckBox.OnToggled += OnCheckBoxToggled;
-
-                FullscreenCheckBox = new CheckBox {Text = Loc.GetString("ui-options-fullscreen")};
-                contents.AddChild(FullscreenCheckBox);
-                FullscreenCheckBox.OnToggled += OnCheckBoxToggled;
-
-                LightingPresetOption = new OptionButton {MinSize = (100, 0)};
-                LightingPresetOption.AddItem(Loc.GetString("ui-options-lighting-very-low"));
-                LightingPresetOption.AddItem(Loc.GetString("ui-options-lighting-low"));
-                LightingPresetOption.AddItem(Loc.GetString("ui-options-lighting-medium"));
-                LightingPresetOption.AddItem(Loc.GetString("ui-options-lighting-high"));
-                LightingPresetOption.OnItemSelected += OnLightingQualityChanged;
-
-                contents.AddChild(new HBoxContainer
-                {
-                    Children =
-                    {
-                        new Label {Text = Loc.GetString("ui-options-lighting-label")},
-                        new Control {MinSize = (4, 0)},
-                        LightingPresetOption
-                    }
-                });
-
-                ApplyButton = new Button
-                {
-                    Text = Loc.GetString("ui-options-apply"), TextAlign = Label.AlignMode.Center,
-                    HorizontalAlignment = HAlignment.Right
-                };
-
-                _uiScaleOption = new OptionButton();
-                _uiScaleOption.AddItem(Loc.GetString("ui-options-scale-auto",
-                    ("scale", UserInterfaceManager.DefaultUIScale)));
-                _uiScaleOption.AddItem(Loc.GetString("ui-options-scale-75"));
-                _uiScaleOption.AddItem(Loc.GetString("ui-options-scale-100"));
-                _uiScaleOption.AddItem(Loc.GetString("ui-options-scale-125"));
-                _uiScaleOption.AddItem(Loc.GetString("ui-options-scale-150"));
-                _uiScaleOption.AddItem(Loc.GetString("ui-options-scale-175"));
-                _uiScaleOption.AddItem(Loc.GetString("ui-options-scale-200"));
-                _uiScaleOption.OnItemSelected += OnUIScaleChanged;
-
-                contents.AddChild(new HBoxContainer
-                {
-                    Children =
-                    {
-                        new Label {Text = Loc.GetString("ui-options-scale-label")},
-                        new Control {MinSize = (4, 0)},
-                        _uiScaleOption
-                    }
-                });
-
-                _hudThemeOption = new OptionButton();
-                foreach (var gear in _prototypeManager.EnumeratePrototypes<HudThemePrototype>())
-                {
-                   _hudThemeOption.AddItem(Loc.GetString(gear.Name));
-                }
-                _hudThemeOption.OnItemSelected += OnHudThemeChanged;
-
-                contents.AddChild(new HBoxContainer
-                {
-                    Children =
-                    {
-                        new Label {Text = Loc.GetString("ui-options-hud-theme")},
-                        new Control {MinSize = (4, 0)},
-                        _hudThemeOption
-                    }
-                });
-
-                _viewportStretchCheckBox = new CheckBox
-                {
-                    Text = Loc.GetString("ui-options-vp-stretch")
-                };
-
-                _viewportStretchCheckBox.OnToggled += _ =>
-                {
-                    UpdateViewportScale();
-                    UpdateApplyButton();
-                };
-
-                _viewportScaleSlider = new Slider
-                {
-                    MinValue = 1,
-                    MaxValue = 5,
-                    Rounded = true,
-                    MinWidth = 200
-                };
-
-                _viewportScaleSlider.OnValueChanged += _ =>
-                {
-                    UpdateApplyButton();
-                    UpdateViewportScale();
-                };
-
-                _viewportLowResCheckBox = new CheckBox { Text = Loc.GetString("ui-options-vp-low-res")};
-                _viewportLowResCheckBox.OnToggled += OnCheckBoxToggled;
-
-                contents.AddChild(new HBoxContainer
-                {
-                    Children =
-                    {
-                        _viewportStretchCheckBox,
-                        (_viewportScaleBox = new HBoxContainer
-                        {
-                            Children =
-                            {
-                                (_viewportScaleText = new Label
-                                {
-                                    Margin = new Thickness(8, 0)
-                                }),
-                                _viewportScaleSlider,
-                            }
-                        })
-                    }
-                });
-
-                contents.AddChild(_viewportLowResCheckBox);
-
-                vBox.AddChild(contents);
-
-                vBox.AddChild(new StripeBack
-                {
-                    HasBottomEdge = false,
-                    HasMargins = false,
-                    Children =
-                    {
-                        ApplyButton
-                    }
-                });
-                ApplyButton.OnPressed += OnApplyButtonPressed;
-
-                VSyncCheckBox.Pressed = _cfg.GetCVar(CVars.DisplayVSync);
-                FullscreenCheckBox.Pressed = ConfigIsFullscreen;
-                LightingPresetOption.SelectId(GetConfigLightingQuality());
-                _uiScaleOption.SelectId(GetConfigUIScalePreset(ConfigUIScale));
-                _hudThemeOption.SelectId(_cfg.GetCVar(CCVars.HudTheme));
-                _viewportScaleSlider.Value = _cfg.GetCVar(CCVars.ViewportFixedScaleFactor);
-                _viewportStretchCheckBox.Pressed = _cfg.GetCVar(CCVars.ViewportStretch);
-                _viewportLowResCheckBox.Pressed = !_cfg.GetCVar(CCVars.ViewportScaleRender);
-
-                UpdateViewportScale();
-                UpdateApplyButton();
-
-                AddChild(vBox);
-            }
-
-            private void OnUIScaleChanged(OptionButton.ItemSelectedEventArgs args)
-            {
-                _uiScaleOption.SelectId(args.Id);
-                UpdateApplyButton();
-            }
-
-            private void OnHudThemeChanged(OptionButton.ItemSelectedEventArgs args)
-            {
-                _hudThemeOption.SelectId(args.Id);
-                UpdateApplyButton();
-            }
-
-            private void OnApplyButtonPressed(BaseButton.ButtonEventArgs args)
-            {
-                _cfg.SetCVar(CVars.DisplayVSync, VSyncCheckBox.Pressed);
-                SetConfigLightingQuality(LightingPresetOption.SelectedId);
-                if (_hudThemeOption.SelectedId != _cfg.GetCVar(CCVars.HudTheme)) // Don't unnecessarily redraw the HUD
-                {
-                    _cfg.SetCVar(CCVars.HudTheme, _hudThemeOption.SelectedId);
-                }
-
-                _cfg.SetCVar(CVars.DisplayWindowMode,
-                    (int) (FullscreenCheckBox.Pressed ? WindowMode.Fullscreen : WindowMode.Windowed));
-                _cfg.SetCVar(CVars.DisplayUIScale, UIScaleOptions[_uiScaleOption.SelectedId]);
-                _cfg.SetCVar(CCVars.ViewportStretch, _viewportStretchCheckBox.Pressed);
-                _cfg.SetCVar(CCVars.ViewportFixedScaleFactor, (int) _viewportScaleSlider.Value);
-                _cfg.SetCVar(CCVars.ViewportScaleRender, !_viewportLowResCheckBox.Pressed);
-                _cfg.SaveToFile();
-                UpdateApplyButton();
-            }
-
-            private void OnCheckBoxToggled(BaseButton.ButtonToggledEventArgs args)
-            {
-                UpdateApplyButton();
-            }
-
-            private void OnLightingQualityChanged(OptionButton.ItemSelectedEventArgs args)
-            {
-                LightingPresetOption.SelectId(args.Id);
-                UpdateApplyButton();
-            }
-
-            private void UpdateApplyButton()
-            {
-                var isVSyncSame = VSyncCheckBox.Pressed == _cfg.GetCVar(CVars.DisplayVSync);
-                var isFullscreenSame = FullscreenCheckBox.Pressed == ConfigIsFullscreen;
-                var isLightingQualitySame = LightingPresetOption.SelectedId == GetConfigLightingQuality();
-                var isHudThemeSame = _hudThemeOption.SelectedId == _cfg.GetCVar(CCVars.HudTheme);
-                var isUIScaleSame = MathHelper.CloseTo(UIScaleOptions[_uiScaleOption.SelectedId], ConfigUIScale);
-                var isVPStretchSame = _viewportStretchCheckBox.Pressed == _cfg.GetCVar(CCVars.ViewportStretch);
-                var isVPScaleSame = (int) _viewportScaleSlider.Value == _cfg.GetCVar(CCVars.ViewportFixedScaleFactor);
-                var isVPResSame = _viewportLowResCheckBox.Pressed == !_cfg.GetCVar(CCVars.ViewportScaleRender);
-
-                ApplyButton.Disabled = isVSyncSame &&
-                                       isFullscreenSame &&
-                                       isLightingQualitySame &&
-                                       isUIScaleSame &&
-                                       isVPStretchSame &&
-                                       isVPScaleSame &&
-                                       isVPResSame &&
-                                       isHudThemeSame;
-            }
-
-            private bool ConfigIsFullscreen =>
-                _cfg.GetCVar(CVars.DisplayWindowMode) == (int) WindowMode.Fullscreen;
-
-            private float ConfigUIScale => _cfg.GetCVar(CVars.DisplayUIScale);
-
-            private int GetConfigLightingQuality()
-            {
-                var val = _cfg.GetCVar(CVars.DisplayLightMapDivider);
-                var soft = _cfg.GetCVar(CVars.DisplaySoftShadows);
-                if (val >= 8)
-                {
-                    return 0;
-                }
-                else if ((val >= 2) && !soft)
-                {
-                    return 1;
-                }
-                else if (val >= 2)
-                {
-                    return 2;
-                }
-                else
-                {
-                    return 3;
-                }
-            }
-
-            private void SetConfigLightingQuality(int value)
-            {
-                switch (value)
-                {
-                    case 0:
-                        _cfg.SetCVar(CVars.DisplayLightMapDivider, 8);
-                        _cfg.SetCVar(CVars.DisplaySoftShadows, false);
-                        break;
-                    case 1:
-                        _cfg.SetCVar(CVars.DisplayLightMapDivider, 2);
-                        _cfg.SetCVar(CVars.DisplaySoftShadows, false);
-                        break;
-                    case 2:
-                        _cfg.SetCVar(CVars.DisplayLightMapDivider, 2);
-                        _cfg.SetCVar(CVars.DisplaySoftShadows, true);
-                        break;
-                    case 3:
-                        _cfg.SetCVar(CVars.DisplayLightMapDivider, 1);
-                        _cfg.SetCVar(CVars.DisplaySoftShadows, true);
-                        break;
-                }
-            }
-
-            private static int GetConfigUIScalePreset(float value)
-            {
-                for (var i = 0; i < UIScaleOptions.Length; i++)
-                {
-                    if (MathHelper.CloseTo(UIScaleOptions[i], value))
-                    {
-                        return i;
-                    }
-                }
-
-                return 0;
-            }
-
-            private void UpdateViewportScale()
-            {
-                _viewportScaleBox.Visible = !_viewportStretchCheckBox.Pressed;
-                _viewportScaleText.Text = Loc.GetString("ui-options-vp-scale", ("scale", _viewportScaleSlider.Value));
-            }
-        }
-    }
-}
diff --git a/Content.Client/EscapeMenu/UI/OptionsMenu.KeyRebind.cs b/Content.Client/EscapeMenu/UI/OptionsMenu.KeyRebind.cs
deleted file mode 100644
index ffde940423..0000000000
--- a/Content.Client/EscapeMenu/UI/OptionsMenu.KeyRebind.cs
+++ /dev/null
@@ -1,491 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Content.Client.HUD.UI;
-using Content.Client.Stylesheets;
-using Content.Shared.Input;
-using Robust.Client.Input;
-using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.Controls;
-using Robust.Shared.Input;
-using Robust.Shared.IoC;
-using Robust.Shared.Localization;
-using Robust.Shared.Maths;
-using Robust.Shared.Timing;
-using Robust.Shared.Utility;
-
-namespace Content.Client.EscapeMenu.UI
-{
-    public sealed partial class OptionsMenu
-    {
-        private sealed class KeyRebindControl : Control
-        {
-            // List of key functions that must be registered as toggle instead.
-            private static readonly HashSet<BoundKeyFunction> ToggleFunctions = new()
-            {
-                EngineKeyFunctions.ShowDebugMonitors,
-                EngineKeyFunctions.HideUI,
-            };
-
-            [Dependency] private readonly IInputManager _inputManager = default!;
-
-            private BindButton? _currentlyRebinding;
-
-            private readonly Dictionary<BoundKeyFunction, KeyControl> _keyControls =
-                new();
-
-            private readonly List<Action> _deferCommands = new();
-
-            public KeyRebindControl()
-            {
-                IoCManager.InjectDependencies(this);
-
-                Button resetAllButton;
-                var vBox = new VBoxContainer {Margin = new Thickness(2, 0, 0, 0)};
-                AddChild(new VBoxContainer
-                {
-                    Children =
-                    {
-                        new ScrollContainer
-                        {
-                            VerticalExpand = true,
-                            Children = {vBox}
-                        },
-
-                        new StripeBack
-                        {
-                            HasBottomEdge = false,
-                            HasMargins = false,
-                            Children =
-                            {
-                                new HBoxContainer
-                                {
-                                    Children =
-                                    {
-                                        new Control {MinSize = (2, 0)},
-                                        new Label
-                                        {
-                                            StyleClasses = {StyleBase.StyleClassLabelSubText},
-                                            Text = Loc.GetString("ui-options-binds-explanation")
-                                        },
-                                        (resetAllButton = new Button
-                                        {
-                                            Text = Loc.GetString("ui-options-binds-reset-all"),
-                                            StyleClasses = {StyleBase.ButtonCaution},
-                                            HorizontalExpand = true,
-                                            HorizontalAlignment = HAlignment.Right
-                                        })
-                                    }
-                                }
-                            }
-                        }
-                    }
-                });
-
-                resetAllButton.OnPressed += _ =>
-                {
-                    _deferCommands.Add(() =>
-                    {
-                        _inputManager.ResetAllBindings();
-                        _inputManager.SaveToUserData();
-                    });
-                };
-
-                var first = true;
-
-                void AddHeader(string headerContents)
-                {
-                    if (!first)
-                    {
-                        vBox.AddChild(new Control {MinSize = (0, 8)});
-                    }
-
-                    first = false;
-                    vBox.AddChild(new Label
-                    {
-                        Text = Loc.GetString(headerContents),
-                        FontColorOverride = StyleNano.NanoGold,
-                        StyleClasses = {StyleNano.StyleClassLabelKeyText}
-                    });
-                }
-
-                void AddButton(BoundKeyFunction function)
-                {
-                    var control = new KeyControl(this, function);
-                    vBox.AddChild(control);
-                    _keyControls.Add(function, control);
-                }
-
-                AddHeader("ui-options-header-movement");
-                AddButton(EngineKeyFunctions.MoveUp);
-                AddButton(EngineKeyFunctions.MoveLeft);
-                AddButton(EngineKeyFunctions.MoveDown);
-                AddButton(EngineKeyFunctions.MoveRight);
-                AddButton(EngineKeyFunctions.Walk);
-
-                AddHeader("ui-options-header-interaction-basic");
-                AddButton(EngineKeyFunctions.Use);
-                AddButton(ContentKeyFunctions.WideAttack);
-                AddButton(ContentKeyFunctions.ActivateItemInHand);
-                AddButton(ContentKeyFunctions.ActivateItemInWorld);
-                AddButton(ContentKeyFunctions.Drop);
-                AddButton(ContentKeyFunctions.ExamineEntity);
-                AddButton(ContentKeyFunctions.SwapHands);
-
-                AddHeader("ui-options-header-interaction-adv");
-                AddButton(ContentKeyFunctions.SmartEquipBackpack);
-                AddButton(ContentKeyFunctions.SmartEquipBelt);
-                AddButton(ContentKeyFunctions.ThrowItemInHand);
-                AddButton(ContentKeyFunctions.TryPullObject);
-                AddButton(ContentKeyFunctions.MovePulledObject);
-                AddButton(ContentKeyFunctions.ReleasePulledObject);
-                AddButton(ContentKeyFunctions.Point);
-
-                AddHeader("ui-options-header-ui");
-                AddButton(ContentKeyFunctions.FocusChat);
-                AddButton(ContentKeyFunctions.FocusLocalChat);
-                AddButton(ContentKeyFunctions.FocusRadio);
-                AddButton(ContentKeyFunctions.FocusOOC);
-                AddButton(ContentKeyFunctions.FocusAdminChat);
-                AddButton(ContentKeyFunctions.CycleChatChannelForward);
-                AddButton(ContentKeyFunctions.CycleChatChannelBackward);
-                AddButton(ContentKeyFunctions.OpenCharacterMenu);
-                AddButton(ContentKeyFunctions.OpenContextMenu);
-                AddButton(ContentKeyFunctions.OpenCraftingMenu);
-                AddButton(ContentKeyFunctions.OpenInventoryMenu);
-                AddButton(ContentKeyFunctions.OpenInfo);
-                AddButton(ContentKeyFunctions.OpenActionsMenu);
-                AddButton(ContentKeyFunctions.OpenEntitySpawnWindow);
-                AddButton(ContentKeyFunctions.OpenSandboxWindow);
-                AddButton(ContentKeyFunctions.OpenTileSpawnWindow);
-                AddButton(ContentKeyFunctions.OpenAdminMenu);
-
-                AddHeader("ui-options-header-misc");
-                AddButton(ContentKeyFunctions.TakeScreenshot);
-                AddButton(ContentKeyFunctions.TakeScreenshotNoUI);
-
-                AddHeader("ui-options-header-hotbar");
-                AddButton(ContentKeyFunctions.Hotbar1);
-                AddButton(ContentKeyFunctions.Hotbar2);
-                AddButton(ContentKeyFunctions.Hotbar3);
-                AddButton(ContentKeyFunctions.Hotbar4);
-                AddButton(ContentKeyFunctions.Hotbar5);
-                AddButton(ContentKeyFunctions.Hotbar6);
-                AddButton(ContentKeyFunctions.Hotbar7);
-                AddButton(ContentKeyFunctions.Hotbar8);
-                AddButton(ContentKeyFunctions.Hotbar9);
-                AddButton(ContentKeyFunctions.Hotbar0);
-                AddButton(ContentKeyFunctions.Loadout1);
-                AddButton(ContentKeyFunctions.Loadout2);
-                AddButton(ContentKeyFunctions.Loadout3);
-                AddButton(ContentKeyFunctions.Loadout4);
-                AddButton(ContentKeyFunctions.Loadout5);
-                AddButton(ContentKeyFunctions.Loadout6);
-                AddButton(ContentKeyFunctions.Loadout7);
-                AddButton(ContentKeyFunctions.Loadout8);
-                AddButton(ContentKeyFunctions.Loadout9);
-
-                AddHeader("ui-options-header-map-editor");
-                AddButton(EngineKeyFunctions.EditorPlaceObject);
-                AddButton(EngineKeyFunctions.EditorCancelPlace);
-                AddButton(EngineKeyFunctions.EditorGridPlace);
-                AddButton(EngineKeyFunctions.EditorLinePlace);
-                AddButton(EngineKeyFunctions.EditorRotateObject);
-
-                AddHeader("ui-options-header-dev");
-                AddButton(EngineKeyFunctions.ShowDebugConsole);
-                AddButton(EngineKeyFunctions.ShowDebugMonitors);
-                AddButton(EngineKeyFunctions.HideUI);
-
-                foreach (var control in _keyControls.Values)
-                {
-                    UpdateKeyControl(control);
-                }
-            }
-
-            private void UpdateKeyControl(KeyControl control)
-            {
-                var activeBinds = _inputManager.GetKeyBindings(control.Function);
-
-                IKeyBinding? bind1 = null;
-                IKeyBinding? bind2 = null;
-
-                if (activeBinds.Count > 0)
-                {
-                    bind1 = activeBinds[0];
-
-                    if (activeBinds.Count > 1)
-                    {
-                        bind2 = activeBinds[1];
-                    }
-                }
-
-                control.BindButton1.Binding = bind1;
-                control.BindButton1.UpdateText();
-
-                control.BindButton2.Binding = bind2;
-                control.BindButton2.UpdateText();
-
-                control.BindButton2.Button.Disabled = activeBinds.Count == 0;
-                control.ResetButton.Disabled = !_inputManager.IsKeyFunctionModified(control.Function);
-            }
-
-            protected override void EnteredTree()
-            {
-                base.EnteredTree();
-
-                _inputManager.FirstChanceOnKeyEvent += InputManagerOnFirstChanceOnKeyEvent;
-                _inputManager.OnKeyBindingAdded += OnKeyBindAdded;
-                _inputManager.OnKeyBindingRemoved += OnKeyBindRemoved;
-            }
-
-            protected override void ExitedTree()
-            {
-                base.ExitedTree();
-
-                _inputManager.FirstChanceOnKeyEvent -= InputManagerOnFirstChanceOnKeyEvent;
-                _inputManager.OnKeyBindingAdded -= OnKeyBindAdded;
-                _inputManager.OnKeyBindingRemoved -= OnKeyBindRemoved;
-            }
-
-            private void OnKeyBindRemoved(IKeyBinding obj)
-            {
-                OnKeyBindModified(obj, true);
-            }
-
-            private void OnKeyBindAdded(IKeyBinding obj)
-            {
-                OnKeyBindModified(obj, false);
-            }
-
-            private void OnKeyBindModified(IKeyBinding bind, bool removal)
-            {
-                if (!_keyControls.TryGetValue(bind.Function, out var keyControl))
-                {
-                    return;
-                }
-
-                if (removal && _currentlyRebinding?.KeyControl == keyControl)
-                {
-                    // Don't do update if the removal was from initiating a rebind.
-                    return;
-                }
-
-                UpdateKeyControl(keyControl);
-
-                if (_currentlyRebinding == keyControl.BindButton1 || _currentlyRebinding == keyControl.BindButton2)
-                {
-                    _currentlyRebinding = null;
-                }
-            }
-
-            private void InputManagerOnFirstChanceOnKeyEvent(KeyEventArgs keyEvent, KeyEventType type)
-            {
-                DebugTools.Assert(IsInsideTree);
-
-                if (_currentlyRebinding == null)
-                {
-                    return;
-                }
-
-                keyEvent.Handle();
-
-                if (type != KeyEventType.Up)
-                {
-                    return;
-                }
-
-                var key = keyEvent.Key;
-
-                // Figure out modifiers based on key event.
-                // TODO: this won't allow for combinations with keys other than the standard modifier keys,
-                // even though the input system totally supports it.
-                var mods = new Keyboard.Key[3];
-                var i = 0;
-                if (keyEvent.Control && key != Keyboard.Key.Control)
-                {
-                    mods[i] = Keyboard.Key.Control;
-                    i += 1;
-                }
-
-                if (keyEvent.Shift && key != Keyboard.Key.Shift)
-                {
-                    mods[i] = Keyboard.Key.Shift;
-                    i += 1;
-                }
-
-                if (keyEvent.Alt && key != Keyboard.Key.Alt)
-                {
-                    mods[i] = Keyboard.Key.Alt;
-                    i += 1;
-                }
-
-                // The input system can only handle 3 modifier keys so if you hold all 4 of the modifier keys
-                // then system gets the shaft, I guess.
-                if (keyEvent.System && i != 3 && key != Keyboard.Key.LSystem && key != Keyboard.Key.RSystem)
-                {
-                    mods[i] = Keyboard.Key.LSystem;
-                }
-
-                var function = _currentlyRebinding.KeyControl.Function;
-                var bindType = KeyBindingType.State;
-                if (ToggleFunctions.Contains(function))
-                {
-                    bindType = KeyBindingType.Toggle;
-                }
-
-                var registration = new KeyBindingRegistration
-                {
-                    Function = function,
-                    BaseKey = key,
-                    Mod1 = mods[0],
-                    Mod2 = mods[1],
-                    Mod3 = mods[2],
-                    Priority = 0,
-                    Type = bindType,
-                    CanFocus = key == Keyboard.Key.MouseLeft
-                               || key == Keyboard.Key.MouseRight
-                               || key == Keyboard.Key.MouseMiddle,
-                    CanRepeat = false
-                };
-
-                _inputManager.RegisterBinding(registration);
-                // OnKeyBindModified will cause _currentlyRebinding to be reset and the UI to update.
-                _inputManager.SaveToUserData();
-            }
-
-            private void RebindButtonPressed(BindButton button)
-            {
-                if (_currentlyRebinding != null)
-                {
-                    return;
-                }
-
-                _currentlyRebinding = button;
-                _currentlyRebinding.Button.Text = Loc.GetString("ui-options-key-prompt");
-
-                if (button.Binding != null)
-                {
-                    _deferCommands.Add(() =>
-                    {
-                        // Have to do defer this or else there will be an exception in InputManager.
-                        // Because this IS fired from an input event.
-                        _inputManager.RemoveBinding(button.Binding);
-                    });
-                }
-            }
-
-            protected override void FrameUpdate(FrameEventArgs args)
-            {
-                base.FrameUpdate(args);
-
-                if (_deferCommands.Count == 0)
-                {
-                    return;
-                }
-
-                foreach (var command in _deferCommands)
-                {
-                    command();
-                }
-
-                _deferCommands.Clear();
-            }
-
-            private sealed class KeyControl : Control
-            {
-                public readonly BoundKeyFunction Function;
-                public readonly BindButton BindButton1;
-                public readonly BindButton BindButton2;
-                public readonly Button ResetButton;
-
-                public KeyControl(KeyRebindControl parent, BoundKeyFunction function)
-                {
-                    Function = function;
-                    var name = new Label
-                    {
-                        Text = Loc.GetString(
-                            $"ui-options-function-{CaseConversion.PascalToKebab(function.FunctionName)}"),
-                        HorizontalExpand = true,
-                        HorizontalAlignment = HAlignment.Left
-                    };
-
-                    BindButton1 = new BindButton(parent, this, StyleBase.ButtonOpenRight);
-                    BindButton2 = new BindButton(parent, this, StyleBase.ButtonOpenLeft);
-                    ResetButton = new Button {Text = Loc.GetString("ui-options-bind-reset"), StyleClasses = {StyleBase.ButtonCaution}};
-
-                    var hBox = new HBoxContainer
-                    {
-                        Children =
-                        {
-                            new Control {MinSize = (5, 0)},
-                            name,
-                            BindButton1,
-                            BindButton2,
-                            new Control {MinSize = (10, 0)},
-                            ResetButton
-                        }
-                    };
-
-                    ResetButton.OnPressed += args =>
-                    {
-                        parent._deferCommands.Add(() =>
-                        {
-                            parent._inputManager.ResetBindingsFor(function);
-                            parent._inputManager.SaveToUserData();
-                        });
-                    };
-
-                    AddChild(hBox);
-                }
-            }
-
-            private sealed class BindButton : Control
-            {
-                private readonly KeyRebindControl _control;
-                public readonly KeyControl KeyControl;
-                public readonly Button Button;
-                public IKeyBinding? Binding;
-
-                public BindButton(KeyRebindControl control, KeyControl keyControl, string styleClass)
-                {
-                    _control = control;
-                    KeyControl = keyControl;
-                    Button = new Button {StyleClasses = {styleClass}};
-                    UpdateText();
-                    AddChild(Button);
-
-                    Button.OnPressed += args =>
-                    {
-                        control.RebindButtonPressed(this);
-                    };
-
-                    Button.OnKeyBindDown += ButtonOnOnKeyBindDown;
-
-                    MinSize = (200, 0);
-                }
-
-                private void ButtonOnOnKeyBindDown(GUIBoundKeyEventArgs args)
-                {
-                    if (args.Function == EngineKeyFunctions.UIRightClick)
-                    {
-                        if (Binding != null)
-                        {
-                            _control._deferCommands.Add(() =>
-                            {
-                                _control._inputManager.RemoveBinding(Binding);
-                                _control._inputManager.SaveToUserData();
-                            });
-                        }
-
-                        args.Handle();
-                    }
-                }
-
-                public void UpdateText()
-                {
-                    Button.Text = Binding?.GetKeyString() ?? Loc.GetString("ui-options-unbound");
-                }
-            }
-        }
-    }
-}
diff --git a/Content.Client/EscapeMenu/UI/OptionsMenu.cs b/Content.Client/EscapeMenu/UI/OptionsMenu.cs
deleted file mode 100644
index 5203494fc2..0000000000
--- a/Content.Client/EscapeMenu/UI/OptionsMenu.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using Robust.Client.Graphics;
-using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.CustomControls;
-using Robust.Shared.Configuration;
-using Robust.Shared.IoC;
-using Robust.Shared.Localization;
-using Robust.Shared.Prototypes;
-
-namespace Content.Client.EscapeMenu.UI
-{
-    public sealed partial class OptionsMenu : SS14Window
-    {
-        [Dependency] private readonly IConfigurationManager _configManager = default!;
-        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-        [Dependency] private readonly IClydeAudio _clydeAudio = default!;
-
-        public OptionsMenu()
-        {
-            SetSize = MinSize = (800, 450);
-            IoCManager.InjectDependencies(this);
-
-            Title = Loc.GetString("ui-options-title");
-
-            GraphicsControl graphicsControl;
-            KeyRebindControl rebindControl;
-            AudioControl audioControl;
-
-            var tabs = new TabContainer
-            {
-                Children =
-                {
-                    (graphicsControl = new GraphicsControl(_configManager, _prototypeManager)),
-                    (rebindControl = new KeyRebindControl()),
-                    (audioControl = new AudioControl(_configManager, _clydeAudio)),
-                }
-            };
-
-            TabContainer.SetTabTitle(graphicsControl, Loc.GetString("ui-options-tab-graphics"));
-            TabContainer.SetTabTitle(rebindControl, Loc.GetString("ui-options-tab-controls"));
-            TabContainer.SetTabTitle(audioControl, Loc.GetString("ui-options-tab-audio"));
-
-            Contents.AddChild(tabs);
-        }
-    }
-}
diff --git a/Content.Client/EscapeMenu/UI/OptionsMenu.xaml b/Content.Client/EscapeMenu/UI/OptionsMenu.xaml
new file mode 100644
index 0000000000..84da16e1a1
--- /dev/null
+++ b/Content.Client/EscapeMenu/UI/OptionsMenu.xaml
@@ -0,0 +1,10 @@
+<SS14Window xmlns="https://spacestation14.io"
+            xmlns:tabs="clr-namespace:Content.Client.EscapeMenu.UI.Tabs"
+            Title="{Loc 'ui-options-title'}"
+            MinSize="800 450">
+    <TabContainer Name="Tabs">
+        <tabs:GraphicsTab />
+        <tabs:KeyRebindTab />
+        <tabs:AudioTab />
+    </TabContainer>
+</SS14Window>
diff --git a/Content.Client/EscapeMenu/UI/OptionsMenu.xaml.cs b/Content.Client/EscapeMenu/UI/OptionsMenu.xaml.cs
new file mode 100644
index 0000000000..2e408d445f
--- /dev/null
+++ b/Content.Client/EscapeMenu/UI/OptionsMenu.xaml.cs
@@ -0,0 +1,22 @@
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.IoC;
+using Robust.Shared.Localization;
+
+namespace Content.Client.EscapeMenu.UI
+{
+    [GenerateTypedNameReferences]
+    public partial class OptionsMenu : SS14Window
+    {
+        public OptionsMenu()
+        {
+            RobustXamlLoader.Load(this);
+            IoCManager.InjectDependencies(this);
+
+            Tabs.SetTabTitle(0, Loc.GetString("ui-options-tab-graphics"));
+            Tabs.SetTabTitle(1, Loc.GetString("ui-options-tab-controls"));
+            Tabs.SetTabTitle(2, Loc.GetString("ui-options-tab-audio"));
+        }
+    }
+}
diff --git a/Content.Client/EscapeMenu/UI/Tabs/AudioTab.xaml b/Content.Client/EscapeMenu/UI/Tabs/AudioTab.xaml
new file mode 100644
index 0000000000..19c24ec270
--- /dev/null
+++ b/Content.Client/EscapeMenu/UI/Tabs/AudioTab.xaml
@@ -0,0 +1,47 @@
+<Control xmlns="https://spacestation14.io"
+         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+         xmlns:s="clr-namespace:Content.Client.Stylesheets"
+         xmlns:hudUi="clr-namespace:Content.Client.HUD.UI">
+    <BoxContainer Orientation="Vertical">
+        <BoxContainer Orientation="Vertical" Margin="8 8 8 8" VerticalExpand="True">
+            <Label Text="{Loc 'ui-options-volume-label'}"
+                   FontColorOverride="{x:Static s:StyleNano.NanoGold}"
+                   StyleClasses="LabelKeyText"/>
+            <BoxContainer Orientation="Vertical" Margin="0 3 0 0">
+                <BoxContainer Orientation="Horizontal" Margin="5 0 0 0">
+                    <Label Text="{Loc 'ui-options-master-volume'}" />
+                    <Control MinSize="8 0" />
+                    <Slider Name="MasterVolumeSlider"
+                            MinValue="0"
+                            MaxValue="100"
+                            HorizontalExpand="True"
+                            MinSize="80 0"
+                            Rounded="True" />
+                    <Control MinSize="8 0" />
+                    <Label Name="MasterVolumeLabel" MinSize="48 0" Align="Right" />
+                    <Control MinSize="4 0"/>
+                </BoxContainer>
+                <Control MinSize="0 8" />
+                <CheckBox Name="AmbienceCheckBox" Text="{Loc 'ui-options-ambient-hum'}" />
+                <CheckBox Name="LobbyMusicCheckBox" Text="{Loc 'ui-options-lobby-music'}" />
+            </BoxContainer>
+        </BoxContainer>
+        <hudUi:StripeBack HasBottomEdge="False" HasMargins="False">
+            <BoxContainer Orientation="Horizontal"
+                          Align="End"
+                          HorizontalExpand="True"
+                          VerticalExpand="True">
+                <Button Name="ResetButton"
+                        Text="{Loc 'ui-options-reset-all'}"
+                        StyleClasses="Caution"
+                        HorizontalExpand="True"
+                        HorizontalAlignment="Right" />
+                <Control MinSize="2 0" />
+                <Button Name="ApplyButton"
+                        Text="{Loc 'ui-options-apply'}"
+                        TextAlign="Center"
+                        HorizontalAlignment="Right" />
+            </BoxContainer>
+        </hudUi:StripeBack>
+    </BoxContainer>
+</Control>
diff --git a/Content.Client/EscapeMenu/UI/Tabs/AudioTab.xaml.cs b/Content.Client/EscapeMenu/UI/Tabs/AudioTab.xaml.cs
new file mode 100644
index 0000000000..22e905b032
--- /dev/null
+++ b/Content.Client/EscapeMenu/UI/Tabs/AudioTab.xaml.cs
@@ -0,0 +1,99 @@
+using Content.Shared.CCVar;
+using Robust.Client.AutoGenerated;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared;
+using Robust.Shared.Configuration;
+using Robust.Shared.IoC;
+using Robust.Shared.Localization;
+
+namespace Content.Client.EscapeMenu.UI.Tabs
+{
+    [GenerateTypedNameReferences]
+    public partial class AudioTab : Control
+    {
+        [Dependency] private readonly IConfigurationManager _cfg = default!;
+        [Dependency] private readonly IClydeAudio _clydeAudio = default!;
+
+        public AudioTab()
+        {
+            RobustXamlLoader.Load(this);
+            IoCManager.InjectDependencies(this);
+
+            AmbienceCheckBox.Pressed = _cfg.GetCVar(CCVars.AmbienceBasicEnabled);
+            LobbyMusicCheckBox.Pressed = _cfg.GetCVar(CCVars.LobbyMusicEnabled);
+
+            ApplyButton.OnPressed += OnApplyButtonPressed;
+            ResetButton.OnPressed += OnResetButtonPressed;
+            MasterVolumeSlider.OnValueChanged += OnMasterVolumeSliderChanged;
+            AmbienceCheckBox.OnToggled += OnAmbienceCheckToggled;
+            LobbyMusicCheckBox.OnToggled += OnLobbyMusicCheckToggled;
+
+            Reset();
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            ApplyButton.OnPressed -= OnApplyButtonPressed;
+            ResetButton.OnPressed -= OnResetButtonPressed;
+            MasterVolumeSlider.OnValueChanged -= OnMasterVolumeSliderChanged;
+            AmbienceCheckBox.OnToggled -= OnAmbienceCheckToggled;
+            base.Dispose(disposing);
+        }
+
+        private void OnMasterVolumeSliderChanged(Range range)
+        {
+            MasterVolumeLabel.Text =
+                Loc.GetString("ui-options-volume-percent", ("volume", MasterVolumeSlider.Value / 100));
+            _clydeAudio.SetMasterVolume(MasterVolumeSlider.Value / 100);
+            UpdateChanges();
+        }
+
+        private void OnAmbienceCheckToggled(BaseButton.ButtonEventArgs args)
+        {
+            UpdateChanges();
+        }
+
+        private void OnLobbyMusicCheckToggled(BaseButton.ButtonEventArgs args)
+        {
+            UpdateChanges();
+        }
+
+        private void OnApplyButtonPressed(BaseButton.ButtonEventArgs args)
+        {
+            _cfg.SetCVar(CVars.AudioMasterVolume, MasterVolumeSlider.Value / 100);
+            _cfg.SetCVar(CCVars.AmbienceBasicEnabled, AmbienceCheckBox.Pressed);
+            _cfg.SetCVar(CCVars.LobbyMusicEnabled, LobbyMusicCheckBox.Pressed);
+            _cfg.SaveToFile();
+            UpdateChanges();
+        }
+
+        private void OnResetButtonPressed(BaseButton.ButtonEventArgs args)
+        {
+            Reset();
+        }
+
+        private void Reset()
+        {
+            MasterVolumeSlider.Value = _cfg.GetCVar(CVars.AudioMasterVolume) * 100;
+            MasterVolumeLabel.Text =
+                Loc.GetString("ui-options-volume-percent", ("volume", MasterVolumeSlider.Value / 100));
+            AmbienceCheckBox.Pressed = _cfg.GetCVar(CCVars.AmbienceBasicEnabled);
+            LobbyMusicCheckBox.Pressed = _cfg.GetCVar(CCVars.LobbyMusicEnabled);
+            UpdateChanges();
+        }
+
+        private void UpdateChanges()
+        {
+            var isMasterVolumeSame =
+                System.Math.Abs(MasterVolumeSlider.Value - _cfg.GetCVar(CVars.AudioMasterVolume) * 100) < 0.01f;
+            var isAmbienceSame = AmbienceCheckBox.Pressed == _cfg.GetCVar(CCVars.AmbienceBasicEnabled);
+            var isLobbySame = LobbyMusicCheckBox.Pressed == _cfg.GetCVar(CCVars.LobbyMusicEnabled);
+            var isEverythingSame = isMasterVolumeSame && isAmbienceSame && isLobbySame;
+            ApplyButton.Disabled = isEverythingSame;
+            ResetButton.Disabled = isEverythingSame;
+        }
+    }
+}
diff --git a/Content.Client/EscapeMenu/UI/Tabs/GraphicsTab.xaml b/Content.Client/EscapeMenu/UI/Tabs/GraphicsTab.xaml
new file mode 100644
index 0000000000..f8ae37134a
--- /dev/null
+++ b/Content.Client/EscapeMenu/UI/Tabs/GraphicsTab.xaml
@@ -0,0 +1,45 @@
+<Control xmlns="https://spacestation14.io"
+         xmlns:hudUi="clr-namespace:Content.Client.HUD.UI">
+    <BoxContainer Orientation="Vertical">
+        <BoxContainer Orientation="Vertical" Margin="8 8 8 8" VerticalExpand="True">
+            <CheckBox Name="VSyncCheckBox" Text="{Loc 'ui-options-vsync'}" />
+            <CheckBox Name="FullscreenCheckBox" Text="{Loc 'ui-options-fullscreen'}" />
+            <BoxContainer Orientation="Horizontal">
+                <Label Text="{Loc 'ui-options-lighting-label'}" />
+                <Control MinSize="4 0" />
+                <OptionButton Name="LightingPresetOption" MinSize="100 0" />
+            </BoxContainer>
+            <BoxContainer Orientation="Horizontal">
+                <Label Text="{Loc 'ui-options-scale-label'}" />
+                <Control MinSize="4 0" />
+                <OptionButton Name="UIScaleOption" />
+            </BoxContainer>
+            <BoxContainer Orientation="Horizontal">
+                <Label Text="{Loc 'ui-options-hud-theme'}" />
+                <Control MinSize="4 0" />
+                <OptionButton Name="HudThemeOption" />
+            </BoxContainer>
+            <BoxContainer Orientation="Horizontal">
+                <CheckBox Name="ViewportStretchCheckBox" Text="{Loc 'ui-options-vp-stretch'}" />
+                <BoxContainer Name="ViewportScaleBox" Orientation="Horizontal">
+                    <Label Name="ViewportScaleText" Margin="8 0" />
+                    <Slider Name="ViewportScaleSlider"
+                            MinValue="1"
+                            MaxValue="5"
+                            Rounded="True"
+                            MinWidth="200" />
+                </BoxContainer>
+            </BoxContainer>
+            <CheckBox Name="IntegerScalingCheckBox"
+                      Text="{Loc 'ui-options-vp-integer-scaling'}"
+                      ToolTip="{Loc 'ui-options-vp-integer-scaling-tooltip'}" />
+            <CheckBox Name="ViewportLowResCheckBox" Text="{Loc 'ui-options-vp-low-res'}" />
+        </BoxContainer>
+        <hudUi:StripeBack HasBottomEdge="False" HasMargins="False">
+            <Button Name="ApplyButton"
+                    Text="{Loc 'ui-options-apply'}"
+                    TextAlign="Center"
+                    HorizontalAlignment="Right" />
+        </hudUi:StripeBack>
+    </BoxContainer>
+</Control>
diff --git a/Content.Client/EscapeMenu/UI/Tabs/GraphicsTab.xaml.cs b/Content.Client/EscapeMenu/UI/Tabs/GraphicsTab.xaml.cs
new file mode 100644
index 0000000000..db27898a79
--- /dev/null
+++ b/Content.Client/EscapeMenu/UI/Tabs/GraphicsTab.xaml.cs
@@ -0,0 +1,230 @@
+using Content.Shared.CCVar;
+using Content.Shared.HUD;
+using Robust.Client.AutoGenerated;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared;
+using Robust.Shared.Configuration;
+using Robust.Shared.IoC;
+using Robust.Shared.Localization;
+using Robust.Shared.Maths;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client.EscapeMenu.UI.Tabs
+{
+    [GenerateTypedNameReferences]
+    public partial class GraphicsTab : Control
+    {
+        private static readonly float[] UIScaleOptions =
+        {
+            0f,
+            0.75f,
+            1f,
+            1.25f,
+            1.50f,
+            1.75f,
+            2f
+        };
+
+        [Dependency] private readonly IConfigurationManager _cfg = default!;
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+
+        public GraphicsTab()
+        {
+            IoCManager.InjectDependencies(this);
+            RobustXamlLoader.Load(this);
+
+            VSyncCheckBox.OnToggled += OnCheckBoxToggled;
+            FullscreenCheckBox.OnToggled += OnCheckBoxToggled;
+
+            LightingPresetOption.AddItem(Loc.GetString("ui-options-lighting-very-low"));
+            LightingPresetOption.AddItem(Loc.GetString("ui-options-lighting-low"));
+            LightingPresetOption.AddItem(Loc.GetString("ui-options-lighting-medium"));
+            LightingPresetOption.AddItem(Loc.GetString("ui-options-lighting-high"));
+            LightingPresetOption.OnItemSelected += OnLightingQualityChanged;
+
+            UIScaleOption.AddItem(Loc.GetString("ui-options-scale-auto",
+                                                ("scale", UserInterfaceManager.DefaultUIScale)));
+            UIScaleOption.AddItem(Loc.GetString("ui-options-scale-75"));
+            UIScaleOption.AddItem(Loc.GetString("ui-options-scale-100"));
+            UIScaleOption.AddItem(Loc.GetString("ui-options-scale-125"));
+            UIScaleOption.AddItem(Loc.GetString("ui-options-scale-150"));
+            UIScaleOption.AddItem(Loc.GetString("ui-options-scale-175"));
+            UIScaleOption.AddItem(Loc.GetString("ui-options-scale-200"));
+            UIScaleOption.OnItemSelected += OnUIScaleChanged;
+
+            foreach (var gear in _prototypeManager.EnumeratePrototypes<HudThemePrototype>())
+            {
+                HudThemeOption.AddItem(Loc.GetString(gear.Name));
+            }
+            HudThemeOption.OnItemSelected += OnHudThemeChanged;
+
+            ViewportStretchCheckBox.OnToggled += _ =>
+            {
+                UpdateViewportScale();
+                UpdateApplyButton();
+            };
+
+            ViewportScaleSlider.OnValueChanged += _ =>
+            {
+                UpdateApplyButton();
+                UpdateViewportScale();
+            };
+
+            IntegerScalingCheckBox.OnToggled += OnCheckBoxToggled;
+            ViewportLowResCheckBox.OnToggled += OnCheckBoxToggled;
+            ApplyButton.OnPressed += OnApplyButtonPressed;
+            VSyncCheckBox.Pressed = _cfg.GetCVar(CVars.DisplayVSync);
+            FullscreenCheckBox.Pressed = ConfigIsFullscreen;
+            LightingPresetOption.SelectId(GetConfigLightingQuality());
+            UIScaleOption.SelectId(GetConfigUIScalePreset(ConfigUIScale));
+            HudThemeOption.SelectId(_cfg.GetCVar(CCVars.HudTheme));
+            ViewportScaleSlider.Value = _cfg.GetCVar(CCVars.ViewportFixedScaleFactor);
+            ViewportStretchCheckBox.Pressed = _cfg.GetCVar(CCVars.ViewportStretch);
+            IntegerScalingCheckBox.Pressed = _cfg.GetCVar(CCVars.ViewportSnapToleranceMargin) != 0;
+            ViewportLowResCheckBox.Pressed = !_cfg.GetCVar(CCVars.ViewportScaleRender);
+
+            UpdateViewportScale();
+            UpdateApplyButton();
+        }
+
+        private void OnUIScaleChanged(OptionButton.ItemSelectedEventArgs args)
+        {
+            UIScaleOption.SelectId(args.Id);
+            UpdateApplyButton();
+        }
+
+        private void OnHudThemeChanged(OptionButton.ItemSelectedEventArgs args)
+        {
+            HudThemeOption.SelectId(args.Id);
+            UpdateApplyButton();
+        }
+
+        private void OnApplyButtonPressed(BaseButton.ButtonEventArgs args)
+        {
+            _cfg.SetCVar(CVars.DisplayVSync, VSyncCheckBox.Pressed);
+            SetConfigLightingQuality(LightingPresetOption.SelectedId);
+            if (HudThemeOption.SelectedId != _cfg.GetCVar(CCVars.HudTheme)) // Don't unnecessarily redraw the HUD
+            {
+                _cfg.SetCVar(CCVars.HudTheme, HudThemeOption.SelectedId);
+            }
+
+            _cfg.SetCVar(CVars.DisplayWindowMode,
+                         (int) (FullscreenCheckBox.Pressed ? WindowMode.Fullscreen : WindowMode.Windowed));
+            _cfg.SetCVar(CVars.DisplayUIScale, UIScaleOptions[UIScaleOption.SelectedId]);
+            _cfg.SetCVar(CCVars.ViewportStretch, ViewportStretchCheckBox.Pressed);
+            _cfg.SetCVar(CCVars.ViewportFixedScaleFactor, (int) ViewportScaleSlider.Value);
+            _cfg.SetCVar(CCVars.ViewportSnapToleranceMargin,
+                         IntegerScalingCheckBox.Pressed ? CCVars.ViewportSnapToleranceMargin.DefaultValue : 0);
+            _cfg.SetCVar(CCVars.ViewportScaleRender, !ViewportLowResCheckBox.Pressed);
+            _cfg.SaveToFile();
+            UpdateApplyButton();
+        }
+
+        private void OnCheckBoxToggled(BaseButton.ButtonToggledEventArgs args)
+        {
+            UpdateApplyButton();
+        }
+
+        private void OnLightingQualityChanged(OptionButton.ItemSelectedEventArgs args)
+        {
+            LightingPresetOption.SelectId(args.Id);
+            UpdateApplyButton();
+        }
+
+        private void UpdateApplyButton()
+        {
+            var isVSyncSame = VSyncCheckBox.Pressed == _cfg.GetCVar(CVars.DisplayVSync);
+            var isFullscreenSame = FullscreenCheckBox.Pressed == ConfigIsFullscreen;
+            var isLightingQualitySame = LightingPresetOption.SelectedId == GetConfigLightingQuality();
+            var isHudThemeSame = HudThemeOption.SelectedId == _cfg.GetCVar(CCVars.HudTheme);
+            var isUIScaleSame = MathHelper.CloseTo(UIScaleOptions[UIScaleOption.SelectedId], ConfigUIScale);
+            var isVPStretchSame = ViewportStretchCheckBox.Pressed == _cfg.GetCVar(CCVars.ViewportStretch);
+            var isVPScaleSame = (int) ViewportScaleSlider.Value == _cfg.GetCVar(CCVars.ViewportFixedScaleFactor);
+            var isIntegerScalingSame = IntegerScalingCheckBox.Pressed == (_cfg.GetCVar(CCVars.ViewportSnapToleranceMargin) != 0);
+            var isVPResSame = ViewportLowResCheckBox.Pressed == !_cfg.GetCVar(CCVars.ViewportScaleRender);
+
+            ApplyButton.Disabled = isVSyncSame &&
+                                   isFullscreenSame &&
+                                   isLightingQualitySame &&
+                                   isUIScaleSame &&
+                                   isVPStretchSame &&
+                                   isVPScaleSame &&
+                                   isIntegerScalingSame &&
+                                   isVPResSame &&
+                                   isHudThemeSame;
+        }
+
+        private bool ConfigIsFullscreen =>
+            _cfg.GetCVar(CVars.DisplayWindowMode) == (int) WindowMode.Fullscreen;
+
+        private float ConfigUIScale => _cfg.GetCVar(CVars.DisplayUIScale);
+
+        private int GetConfigLightingQuality()
+        {
+            var val = _cfg.GetCVar(CVars.DisplayLightMapDivider);
+            var soft = _cfg.GetCVar(CVars.DisplaySoftShadows);
+            if (val >= 8)
+            {
+                return 0;
+            }
+            else if ((val >= 2) && !soft)
+            {
+                return 1;
+            }
+            else if (val >= 2)
+            {
+                return 2;
+            }
+            else
+            {
+                return 3;
+            }
+        }
+
+        private void SetConfigLightingQuality(int value)
+        {
+            switch (value)
+            {
+                case 0:
+                    _cfg.SetCVar(CVars.DisplayLightMapDivider, 8);
+                    _cfg.SetCVar(CVars.DisplaySoftShadows, false);
+                    break;
+                case 1:
+                    _cfg.SetCVar(CVars.DisplayLightMapDivider, 2);
+                    _cfg.SetCVar(CVars.DisplaySoftShadows, false);
+                    break;
+                case 2:
+                    _cfg.SetCVar(CVars.DisplayLightMapDivider, 2);
+                    _cfg.SetCVar(CVars.DisplaySoftShadows, true);
+                    break;
+                case 3:
+                    _cfg.SetCVar(CVars.DisplayLightMapDivider, 1);
+                    _cfg.SetCVar(CVars.DisplaySoftShadows, true);
+                    break;
+            }
+        }
+
+        private static int GetConfigUIScalePreset(float value)
+        {
+            for (var i = 0; i < UIScaleOptions.Length; i++)
+            {
+                if (MathHelper.CloseTo(UIScaleOptions[i], value))
+                {
+                    return i;
+                }
+            }
+
+            return 0;
+        }
+
+        private void UpdateViewportScale()
+        {
+            ViewportScaleBox.Visible = !ViewportStretchCheckBox.Pressed;
+            IntegerScalingCheckBox.Visible = ViewportStretchCheckBox.Pressed;
+            ViewportScaleText.Text = Loc.GetString("ui-options-vp-scale", ("scale", ViewportScaleSlider.Value));
+        }
+    }
+}
diff --git a/Content.Client/EscapeMenu/UI/Tabs/KeyRebindTab.xaml b/Content.Client/EscapeMenu/UI/Tabs/KeyRebindTab.xaml
new file mode 100644
index 0000000000..0769aa9c0c
--- /dev/null
+++ b/Content.Client/EscapeMenu/UI/Tabs/KeyRebindTab.xaml
@@ -0,0 +1,22 @@
+<Control xmlns="https://spacestation14.io"
+         xmlns:hudUi="clr-namespace:Content.Client.HUD.UI">
+    <BoxContainer Orientation="Vertical">
+        <ScrollContainer VerticalExpand="True">
+            <BoxContainer Name="KeybindsContainer" Orientation="Vertical" Margin="8 8 8 8">
+
+                <!-- Keybind buttons are added here in the C# code -->
+
+            </BoxContainer>
+        </ScrollContainer>
+        <hudUi:StripeBack HasBottomEdge="False" HasMargins="False">
+            <BoxContainer Orientation="Horizontal">
+                <Control MinSize="8 0" />
+                <Label Text="{Loc 'ui-options-binds-explanation'}" StyleClasses="LabelSubText" />
+                <Button Name="ResetAllButton"
+                        Text="{Loc 'ui-options-binds-reset-all'}"
+                        HorizontalExpand="True"
+                        HorizontalAlignment="Right" />
+            </BoxContainer>
+        </hudUi:StripeBack>
+    </BoxContainer>
+</Control>
diff --git a/Content.Client/EscapeMenu/UI/Tabs/KeyRebindTab.xaml.cs b/Content.Client/EscapeMenu/UI/Tabs/KeyRebindTab.xaml.cs
new file mode 100644
index 0000000000..bbd8fb0f6e
--- /dev/null
+++ b/Content.Client/EscapeMenu/UI/Tabs/KeyRebindTab.xaml.cs
@@ -0,0 +1,452 @@
+using System;
+using System.Collections.Generic;
+using Content.Client.Stylesheets;
+using Content.Shared.Input;
+using Robust.Client.AutoGenerated;
+using Robust.Client.Input;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Input;
+using Robust.Shared.IoC;
+using Robust.Shared.Localization;
+using Robust.Shared.Timing;
+using Robust.Shared.Utility;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
+
+namespace Content.Client.EscapeMenu.UI.Tabs
+{
+    [GenerateTypedNameReferences]
+    public partial class KeyRebindTab : Control
+    {
+        // List of key functions that must be registered as toggle instead.
+        private static readonly HashSet<BoundKeyFunction> ToggleFunctions = new()
+        {
+            EngineKeyFunctions.ShowDebugMonitors,
+            EngineKeyFunctions.HideUI,
+        };
+
+        [Dependency] private readonly IInputManager _inputManager = default!;
+
+        private BindButton? _currentlyRebinding;
+
+        private readonly Dictionary<BoundKeyFunction, KeyControl> _keyControls =
+            new();
+
+        private readonly List<Action> _deferCommands = new();
+
+        public KeyRebindTab()
+        {
+            IoCManager.InjectDependencies(this);
+            RobustXamlLoader.Load(this);
+
+            ResetAllButton.OnPressed += _ =>
+            {
+                _deferCommands.Add(() =>
+                {
+                    _inputManager.ResetAllBindings();
+                    _inputManager.SaveToUserData();
+                });
+            };
+
+            var first = true;
+
+            void AddHeader(string headerContents)
+            {
+                if (!first)
+                {
+                    KeybindsContainer.AddChild(new Control {MinSize = (0, 8)});
+                }
+
+                first = false;
+                KeybindsContainer.AddChild(new Label
+                {
+                    Text = Loc.GetString(headerContents),
+                    FontColorOverride = StyleNano.NanoGold,
+                    StyleClasses = {StyleNano.StyleClassLabelKeyText}
+                });
+            }
+
+            void AddButton(BoundKeyFunction function)
+            {
+                var control = new KeyControl(this, function);
+                KeybindsContainer.AddChild(control);
+                _keyControls.Add(function, control);
+            }
+
+            AddHeader("ui-options-header-movement");
+            AddButton(EngineKeyFunctions.MoveUp);
+            AddButton(EngineKeyFunctions.MoveLeft);
+            AddButton(EngineKeyFunctions.MoveDown);
+            AddButton(EngineKeyFunctions.MoveRight);
+            AddButton(EngineKeyFunctions.Walk);
+
+            AddHeader("ui-options-header-interaction-basic");
+            AddButton(EngineKeyFunctions.Use);
+            AddButton(ContentKeyFunctions.WideAttack);
+            AddButton(ContentKeyFunctions.ActivateItemInHand);
+            AddButton(ContentKeyFunctions.ActivateItemInWorld);
+            AddButton(ContentKeyFunctions.Drop);
+            AddButton(ContentKeyFunctions.ExamineEntity);
+            AddButton(ContentKeyFunctions.SwapHands);
+
+            AddHeader("ui-options-header-interaction-adv");
+            AddButton(ContentKeyFunctions.SmartEquipBackpack);
+            AddButton(ContentKeyFunctions.SmartEquipBelt);
+            AddButton(ContentKeyFunctions.ThrowItemInHand);
+            AddButton(ContentKeyFunctions.TryPullObject);
+            AddButton(ContentKeyFunctions.MovePulledObject);
+            AddButton(ContentKeyFunctions.ReleasePulledObject);
+            AddButton(ContentKeyFunctions.Point);
+
+            AddHeader("ui-options-header-ui");
+            AddButton(ContentKeyFunctions.FocusChat);
+            AddButton(ContentKeyFunctions.FocusLocalChat);
+            AddButton(ContentKeyFunctions.FocusRadio);
+            AddButton(ContentKeyFunctions.FocusOOC);
+            AddButton(ContentKeyFunctions.FocusAdminChat);
+            AddButton(ContentKeyFunctions.FocusDeadChat);
+            AddButton(ContentKeyFunctions.FocusConsoleChat);
+            AddButton(ContentKeyFunctions.CycleChatChannelForward);
+            AddButton(ContentKeyFunctions.CycleChatChannelBackward);
+            AddButton(ContentKeyFunctions.OpenCharacterMenu);
+            AddButton(ContentKeyFunctions.OpenContextMenu);
+            AddButton(ContentKeyFunctions.OpenCraftingMenu);
+            AddButton(ContentKeyFunctions.OpenInventoryMenu);
+            AddButton(ContentKeyFunctions.OpenInfo);
+            AddButton(ContentKeyFunctions.OpenActionsMenu);
+            AddButton(ContentKeyFunctions.OpenEntitySpawnWindow);
+            AddButton(ContentKeyFunctions.OpenSandboxWindow);
+            AddButton(ContentKeyFunctions.OpenTileSpawnWindow);
+            AddButton(ContentKeyFunctions.OpenAdminMenu);
+
+            AddHeader("ui-options-header-misc");
+            AddButton(ContentKeyFunctions.TakeScreenshot);
+            AddButton(ContentKeyFunctions.TakeScreenshotNoUI);
+
+            AddHeader("ui-options-header-hotbar");
+            AddButton(ContentKeyFunctions.Hotbar1);
+            AddButton(ContentKeyFunctions.Hotbar2);
+            AddButton(ContentKeyFunctions.Hotbar3);
+            AddButton(ContentKeyFunctions.Hotbar4);
+            AddButton(ContentKeyFunctions.Hotbar5);
+            AddButton(ContentKeyFunctions.Hotbar6);
+            AddButton(ContentKeyFunctions.Hotbar7);
+            AddButton(ContentKeyFunctions.Hotbar8);
+            AddButton(ContentKeyFunctions.Hotbar9);
+            AddButton(ContentKeyFunctions.Hotbar0);
+            AddButton(ContentKeyFunctions.Loadout1);
+            AddButton(ContentKeyFunctions.Loadout2);
+            AddButton(ContentKeyFunctions.Loadout3);
+            AddButton(ContentKeyFunctions.Loadout4);
+            AddButton(ContentKeyFunctions.Loadout5);
+            AddButton(ContentKeyFunctions.Loadout6);
+            AddButton(ContentKeyFunctions.Loadout7);
+            AddButton(ContentKeyFunctions.Loadout8);
+            AddButton(ContentKeyFunctions.Loadout9);
+
+            AddHeader("ui-options-header-map-editor");
+            AddButton(EngineKeyFunctions.EditorPlaceObject);
+            AddButton(EngineKeyFunctions.EditorCancelPlace);
+            AddButton(EngineKeyFunctions.EditorGridPlace);
+            AddButton(EngineKeyFunctions.EditorLinePlace);
+            AddButton(EngineKeyFunctions.EditorRotateObject);
+
+            AddHeader("ui-options-header-dev");
+            AddButton(EngineKeyFunctions.ShowDebugConsole);
+            AddButton(EngineKeyFunctions.ShowDebugMonitors);
+            AddButton(EngineKeyFunctions.HideUI);
+
+            foreach (var control in _keyControls.Values)
+            {
+                UpdateKeyControl(control);
+            }
+        }
+
+        private void UpdateKeyControl(KeyControl control)
+        {
+            var activeBinds = _inputManager.GetKeyBindings(control.Function);
+
+            IKeyBinding? bind1 = null;
+            IKeyBinding? bind2 = null;
+
+            if (activeBinds.Count > 0)
+            {
+                bind1 = activeBinds[0];
+
+                if (activeBinds.Count > 1)
+                {
+                    bind2 = activeBinds[1];
+                }
+            }
+
+            control.BindButton1.Binding = bind1;
+            control.BindButton1.UpdateText();
+
+            control.BindButton2.Binding = bind2;
+            control.BindButton2.UpdateText();
+
+            control.BindButton2.Button.Disabled = activeBinds.Count == 0;
+            control.ResetButton.Disabled = !_inputManager.IsKeyFunctionModified(control.Function);
+        }
+
+        protected override void EnteredTree()
+        {
+            base.EnteredTree();
+
+            _inputManager.FirstChanceOnKeyEvent += InputManagerOnFirstChanceOnKeyEvent;
+            _inputManager.OnKeyBindingAdded += OnKeyBindAdded;
+            _inputManager.OnKeyBindingRemoved += OnKeyBindRemoved;
+        }
+
+        protected override void ExitedTree()
+        {
+            base.ExitedTree();
+
+            _inputManager.FirstChanceOnKeyEvent -= InputManagerOnFirstChanceOnKeyEvent;
+            _inputManager.OnKeyBindingAdded -= OnKeyBindAdded;
+            _inputManager.OnKeyBindingRemoved -= OnKeyBindRemoved;
+        }
+
+        private void OnKeyBindRemoved(IKeyBinding obj)
+        {
+            OnKeyBindModified(obj, true);
+        }
+
+        private void OnKeyBindAdded(IKeyBinding obj)
+        {
+            OnKeyBindModified(obj, false);
+        }
+
+        private void OnKeyBindModified(IKeyBinding bind, bool removal)
+        {
+            if (!_keyControls.TryGetValue(bind.Function, out var keyControl))
+            {
+                return;
+            }
+
+            if (removal && _currentlyRebinding?.KeyControl == keyControl)
+            {
+                // Don't do update if the removal was from initiating a rebind.
+                return;
+            }
+
+            UpdateKeyControl(keyControl);
+
+            if (_currentlyRebinding == keyControl.BindButton1 || _currentlyRebinding == keyControl.BindButton2)
+            {
+                _currentlyRebinding = null;
+            }
+        }
+
+        private void InputManagerOnFirstChanceOnKeyEvent(KeyEventArgs keyEvent, KeyEventType type)
+        {
+            DebugTools.Assert(IsInsideTree);
+
+            if (_currentlyRebinding == null)
+            {
+                return;
+            }
+
+            keyEvent.Handle();
+
+            if (type != KeyEventType.Up)
+            {
+                return;
+            }
+
+            var key = keyEvent.Key;
+
+            // Figure out modifiers based on key event.
+            // TODO: this won't allow for combinations with keys other than the standard modifier keys,
+            // even though the input system totally supports it.
+            var mods = new Keyboard.Key[3];
+            var i = 0;
+            if (keyEvent.Control && key != Keyboard.Key.Control)
+            {
+                mods[i] = Keyboard.Key.Control;
+                i += 1;
+            }
+
+            if (keyEvent.Shift && key != Keyboard.Key.Shift)
+            {
+                mods[i] = Keyboard.Key.Shift;
+                i += 1;
+            }
+
+            if (keyEvent.Alt && key != Keyboard.Key.Alt)
+            {
+                mods[i] = Keyboard.Key.Alt;
+                i += 1;
+            }
+
+            // The input system can only handle 3 modifier keys so if you hold all 4 of the modifier keys
+            // then system gets the shaft, I guess.
+            if (keyEvent.System && i != 3 && key != Keyboard.Key.LSystem && key != Keyboard.Key.RSystem)
+            {
+                mods[i] = Keyboard.Key.LSystem;
+            }
+
+            var function = _currentlyRebinding.KeyControl.Function;
+            var bindType = KeyBindingType.State;
+            if (ToggleFunctions.Contains(function))
+            {
+                bindType = KeyBindingType.Toggle;
+            }
+
+            var registration = new KeyBindingRegistration
+            {
+                Function = function,
+                BaseKey = key,
+                Mod1 = mods[0],
+                Mod2 = mods[1],
+                Mod3 = mods[2],
+                Priority = 0,
+                Type = bindType,
+                CanFocus = key == Keyboard.Key.MouseLeft
+                           || key == Keyboard.Key.MouseRight
+                           || key == Keyboard.Key.MouseMiddle,
+                CanRepeat = false
+            };
+
+            _inputManager.RegisterBinding(registration);
+            // OnKeyBindModified will cause _currentlyRebinding to be reset and the UI to update.
+            _inputManager.SaveToUserData();
+        }
+
+        private void RebindButtonPressed(BindButton button)
+        {
+            if (_currentlyRebinding != null)
+            {
+                return;
+            }
+
+            _currentlyRebinding = button;
+            _currentlyRebinding.Button.Text = Loc.GetString("ui-options-key-prompt");
+
+            if (button.Binding != null)
+            {
+                _deferCommands.Add(() =>
+                {
+                    // Have to do defer this or else there will be an exception in InputManager.
+                    // Because this IS fired from an input event.
+                    _inputManager.RemoveBinding(button.Binding);
+                });
+            }
+        }
+
+        protected override void FrameUpdate(FrameEventArgs args)
+        {
+            base.FrameUpdate(args);
+
+            if (_deferCommands.Count == 0)
+            {
+                return;
+            }
+
+            foreach (var command in _deferCommands)
+            {
+                command();
+            }
+
+            _deferCommands.Clear();
+        }
+
+        private sealed class KeyControl : Control
+        {
+            public readonly BoundKeyFunction Function;
+            public readonly BindButton BindButton1;
+            public readonly BindButton BindButton2;
+            public readonly Button ResetButton;
+
+            public KeyControl(KeyRebindTab parent, BoundKeyFunction function)
+            {
+                Function = function;
+                var name = new Label
+                {
+                    Text = Loc.GetString(
+                        $"ui-options-function-{CaseConversion.PascalToKebab(function.FunctionName)}"),
+                    HorizontalExpand = true,
+                    HorizontalAlignment = HAlignment.Left
+                };
+
+                BindButton1 = new BindButton(parent, this, StyleBase.ButtonOpenRight);
+                BindButton2 = new BindButton(parent, this, StyleBase.ButtonOpenLeft);
+                ResetButton = new Button {Text = Loc.GetString("ui-options-bind-reset"), StyleClasses = {StyleBase.ButtonCaution}};
+
+                var hBox = new BoxContainer
+                {
+                    Orientation = LayoutOrientation.Horizontal,
+                    Children =
+                    {
+                        new Control {MinSize = (5, 0)},
+                        name,
+                        BindButton1,
+                        BindButton2,
+                        new Control {MinSize = (10, 0)},
+                        ResetButton
+                    }
+                };
+
+                ResetButton.OnPressed += args =>
+                {
+                    parent._deferCommands.Add(() =>
+                    {
+                        parent._inputManager.ResetBindingsFor(function);
+                        parent._inputManager.SaveToUserData();
+                    });
+                };
+
+                AddChild(hBox);
+            }
+        }
+
+        private sealed class BindButton : Control
+        {
+            private readonly KeyRebindTab _tab;
+            public readonly KeyControl KeyControl;
+            public readonly Button Button;
+            public IKeyBinding? Binding;
+
+            public BindButton(KeyRebindTab tab, KeyControl keyControl, string styleClass)
+            {
+                _tab = tab;
+                KeyControl = keyControl;
+                Button = new Button {StyleClasses = {styleClass}};
+                UpdateText();
+                AddChild(Button);
+
+                Button.OnPressed += args =>
+                {
+                    tab.RebindButtonPressed(this);
+                };
+
+                Button.OnKeyBindDown += ButtonOnOnKeyBindDown;
+
+                MinSize = (200, 0);
+            }
+
+            private void ButtonOnOnKeyBindDown(GUIBoundKeyEventArgs args)
+            {
+                if (args.Function == EngineKeyFunctions.UIRightClick)
+                {
+                    if (Binding != null)
+                    {
+                        _tab._deferCommands.Add(() =>
+                        {
+                            _tab._inputManager.RemoveBinding(Binding);
+                            _tab._inputManager.SaveToUserData();
+                        });
+                    }
+
+                    args.Handle();
+                }
+            }
+
+            public void UpdateText()
+            {
+                Button.Text = Binding?.GetKeyString() ?? Loc.GetString("ui-options-unbound");
+            }
+        }
+    }
+}
diff --git a/Content.Client/Examine/ExamineSystem.cs b/Content.Client/Examine/ExamineSystem.cs
index 5302afc651..5d58fc47fd 100644
--- a/Content.Client/Examine/ExamineSystem.cs
+++ b/Content.Client/Examine/ExamineSystem.cs
@@ -8,6 +8,7 @@ using Robust.Client.GameObjects;
 using Robust.Client.Player;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
+using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Input.Binding;
 using Robust.Shared.IoC;
@@ -15,6 +16,8 @@ using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Players;
 using Robust.Shared.Utility;
+using static Content.Shared.Interaction.SharedInteractionSystem;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Examine
 {
@@ -26,6 +29,8 @@ namespace Content.Client.Examine
 
         public const string StyleClassEntityTooltip = "entity-tooltip";
 
+        private IEntity? _examinedEntity;
+        private IEntity? _playerEntity;
         private Popup? _examineTooltipOpen;
         private CancellationTokenSource? _requestCancelTokenSource;
 
@@ -38,6 +43,24 @@ namespace Content.Client.Examine
                 .Register<ExamineSystem>();
         }
 
+        public override void Update(float frameTime)
+        {
+            if (_examineTooltipOpen == null || !_examineTooltipOpen.Visible) return;
+            if (_examinedEntity == null || _playerEntity == null) return;
+
+            Ignored predicate = entity => entity == _playerEntity || entity == _examinedEntity;
+
+            if (_playerEntity.TryGetContainer(out var container))
+            {
+                predicate += entity => entity == container.Owner;
+            }
+
+            if (!InRangeUnOccluded(_playerEntity, _examinedEntity, ExamineRange, predicate))
+            {
+                CloseTooltip();
+            }
+        }
+
         public override void Shutdown()
         {
             CommandBinds.Unregister<ExamineSystem>();
@@ -46,44 +69,54 @@ namespace Content.Client.Examine
 
         private bool HandleExamine(ICommonSession? session, EntityCoordinates coords, EntityUid uid)
         {
-            if (!uid.IsValid() || !EntityManager.TryGetEntity(uid, out var examined))
+            if (!uid.IsValid() || !EntityManager.TryGetEntity(uid, out _examinedEntity))
             {
                 return false;
             }
 
-            var playerEntity = _playerManager.LocalPlayer?.ControlledEntity;
+            _playerEntity = _playerManager.LocalPlayer?.ControlledEntity;
 
-            if (playerEntity == null || !CanExamine(playerEntity, examined))
+            if (_playerEntity == null || !CanExamine(_playerEntity, _examinedEntity))
             {
                 return false;
             }
 
-            DoExamine(examined);
+            DoExamine(_examinedEntity);
             return true;
         }
 
         public async void DoExamine(IEntity entity)
         {
-            const float minWidth = 300;
+            // Close any examine tooltip that might already be opened
             CloseTooltip();
 
+            const float minWidth = 300;
             var popupPos = _userInterfaceManager.MousePositionScaled;
 
             // Actually open the tooltip.
-            _examineTooltipOpen = new Popup { MaxWidth = 400};
+            _examineTooltipOpen = new Popup { MaxWidth = 400 };
             _userInterfaceManager.ModalRoot.AddChild(_examineTooltipOpen);
             var panel = new PanelContainer();
             panel.AddStyleClass(StyleClassEntityTooltip);
             panel.ModulateSelfOverride = Color.LightGray.WithAlpha(0.90f);
             _examineTooltipOpen.AddChild(panel);
-            //panel.SetAnchorAndMarginPreset(Control.LayoutPreset.Wide);
-            var vBox = new VBoxContainer();
+
+            var vBox = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Vertical
+            };
             panel.AddChild(vBox);
-            var hBox = new HBoxContainer {SeparationOverride = 5};
+
+            var hBox = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Horizontal,
+                SeparationOverride = 5
+            };
             vBox.AddChild(hBox);
+
             if (entity.TryGetComponent(out ISpriteComponent? sprite))
             {
-                hBox.AddChild(new SpriteView {Sprite = sprite, OverrideDirection = Direction.South});
+                hBox.AddChild(new SpriteView { Sprite = sprite, OverrideDirection = Direction.South });
             }
 
             hBox.AddChild(new Label
@@ -104,7 +137,6 @@ namespace Content.Client.Examine
             }
             else
             {
-
                 // Ask server for extra examine info.
                 RaiseNetworkEvent(new ExamineSystemMessages.RequestExamineInfoMessage(entity.Uid));
 
@@ -130,17 +162,16 @@ namespace Content.Client.Examine
 
             foreach (var msg in message.Tags.OfType<FormattedMessage.TagText>())
             {
-                if (!string.IsNullOrWhiteSpace(msg.Text))
-                {
-                    var richLabel = new RichTextLabel();
-                    richLabel.SetMessage(message);
-                    vBox.AddChild(richLabel);
-                    break;
-                }
+                if (string.IsNullOrWhiteSpace(msg.Text)) continue;
+
+                var richLabel = new RichTextLabel();
+                richLabel.SetMessage(message);
+                vBox.AddChild(richLabel);
+                break;
             }
         }
 
-        public void CloseTooltip()
+        private void CloseTooltip()
         {
             if (_examineTooltipOpen != null)
             {
diff --git a/Content.Client/Flash/FlashableComponent.cs b/Content.Client/Flash/FlashableComponent.cs
index 50b0d2a1e3..2c16df833a 100644
--- a/Content.Client/Flash/FlashableComponent.cs
+++ b/Content.Client/Flash/FlashableComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Content.Shared.Flash;
 using Robust.Client.Graphics;
diff --git a/Content.Client/Ghost/GhostGui.cs b/Content.Client/Ghost/GhostGui.cs
index 1f2d9c289c..6616e27e7f 100644
--- a/Content.Client/Ghost/GhostGui.cs
+++ b/Content.Client/Ghost/GhostGui.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Collections.Generic;
 using Content.Shared.Ghost;
 using Robust.Client.Console;
@@ -8,6 +7,7 @@ using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Ghost
 {
@@ -44,8 +44,9 @@ namespace Content.Client.Ghost
             _ghostRoles.OnPressed += _ => IoCManager.Resolve<IClientConsoleHost>()
                 .RemoteExecuteCommand(null, "ghostroles");
 
-            AddChild(new HBoxContainer
+            AddChild(new BoxContainer
             {
+                Orientation = LayoutOrientation.Horizontal,
                 Children =
                 {
                     _returnToBody,
@@ -77,7 +78,7 @@ namespace Content.Client.Ghost
         private readonly GhostComponent _owner;
         private readonly IEntityNetworkManager _netManager;
 
-        private readonly VBoxContainer _buttonContainer;
+        private readonly BoxContainer _buttonContainer;
 
         public List<string> Locations { get; set; } = new();
 
@@ -90,8 +91,9 @@ namespace Content.Client.Ghost
             _owner = owner;
             _netManager = netManager;
 
-            _buttonContainer = new VBoxContainer()
+            _buttonContainer = new BoxContainer
             {
+                Orientation = LayoutOrientation.Vertical,
                 VerticalExpand = true,
                 SeparationOverride = 5,
 
diff --git a/Content.Client/Ghost/Roles/UI/GhostRolesEntry.xaml b/Content.Client/Ghost/Roles/UI/GhostRolesEntry.xaml
index 60ac1dc697..04e50e46df 100644
--- a/Content.Client/Ghost/Roles/UI/GhostRolesEntry.xaml
+++ b/Content.Client/Ghost/Roles/UI/GhostRolesEntry.xaml
@@ -1,9 +1,9 @@
-<VBoxContainer
+<BoxContainer Orientation="Vertical"
     xmlns="https://spacestation14.io">
 
     <RichTextLabel Name="Title" />
-    <HBoxContainer SeparationOverride="10">
+    <BoxContainer Orientation="Horizontal" SeparationOverride="10">
         <RichTextLabel Name="Description" HorizontalExpand="True" />
         <Button Name="RequestButton" Text="Request" TextAlign="Center" SizeFlagsHorizontal="ShrinkEnd" />
-    </HBoxContainer>
-</VBoxContainer>
+    </BoxContainer>
+</BoxContainer>
diff --git a/Content.Client/Ghost/Roles/UI/GhostRolesWindow.xaml b/Content.Client/Ghost/Roles/UI/GhostRolesWindow.xaml
index 8f6de8f9c3..9af69fba4e 100644
--- a/Content.Client/Ghost/Roles/UI/GhostRolesWindow.xaml
+++ b/Content.Client/Ghost/Roles/UI/GhostRolesWindow.xaml
@@ -4,7 +4,7 @@
         <Label Text="There are currently no available ghost roles." />
     </CenterContainer>
     <ScrollContainer HorizontalExpand="True" VerticalExpand="True">
-        <VBoxContainer Name="EntryContainer" HorizontalExpand="True" VerticalExpand="True" />
+        <BoxContainer Orientation="Vertical" Name="EntryContainer" HorizontalExpand="True" VerticalExpand="True" />
     </ScrollContainer>
 
 </SS14Window>
diff --git a/Content.Client/Ghost/Roles/UI/MakeGhostRoleWindow.xaml b/Content.Client/Ghost/Roles/UI/MakeGhostRoleWindow.xaml
index 0a5dfa1850..0a51ef7bfb 100644
--- a/Content.Client/Ghost/Roles/UI/MakeGhostRoleWindow.xaml
+++ b/Content.Client/Ghost/Roles/UI/MakeGhostRoleWindow.xaml
@@ -1,26 +1,26 @@
 <SS14Window Title="Make Ghost Role"
             xmlns="https://spacestation14.io">
 
-    <VBoxContainer>
-        <HBoxContainer>
+    <BoxContainer Orientation="Vertical">
+        <BoxContainer Orientation="Horizontal">
             <Label Name="RoleEntityLabel" Text="Entity" />
             <Label Name="RoleEntity" Text="" />
-        </HBoxContainer>
-        <HBoxContainer>
+        </BoxContainer>
+        <BoxContainer Orientation="Horizontal">
             <Label Name="RoleNameLabel" Text="Role Name" />
             <LineEdit Name="RoleName" HorizontalExpand="True" />
-        </HBoxContainer>
-        <HBoxContainer>
+        </BoxContainer>
+        <BoxContainer Orientation="Horizontal">
             <Label Name="RoleDescriptionLabel" Text="Role Description" />
             <LineEdit Name="RoleDescription" HorizontalExpand="True" />
-        </HBoxContainer>
-        <HBoxContainer>
+        </BoxContainer>
+        <BoxContainer Orientation="Horizontal">
             <Label Name="MakeSentientLabel" Text="Make Sentient" />
             <CheckBox Name="MakeSentientCheckbox" />
-        </HBoxContainer>
-        <HBoxContainer>
+        </BoxContainer>
+        <BoxContainer Orientation="Horizontal">
             <Button Name="MakeButton" Text="Make" />
-        </HBoxContainer>
-    </VBoxContainer>
+        </BoxContainer>
+    </BoxContainer>
 
 </SS14Window>
diff --git a/Content.Client/Ghost/Roles/UI/MakeGhostRoleWindow.xaml.cs b/Content.Client/Ghost/Roles/UI/MakeGhostRoleWindow.xaml.cs
index f7ce045357..7ec189cb43 100644
--- a/Content.Client/Ghost/Roles/UI/MakeGhostRoleWindow.xaml.cs
+++ b/Content.Client/Ghost/Roles/UI/MakeGhostRoleWindow.xaml.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Robust.Client.AutoGenerated;
+using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.GameObjects;
diff --git a/Content.Client/Gravity/GravityGeneratorBoundUserInterface.cs b/Content.Client/Gravity/GravityGeneratorBoundUserInterface.cs
index 6dbbe28fb3..5d956ad632 100644
--- a/Content.Client/Gravity/GravityGeneratorBoundUserInterface.cs
+++ b/Content.Client/Gravity/GravityGeneratorBoundUserInterface.cs
@@ -7,6 +7,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Gravity
 {
@@ -73,8 +74,9 @@ namespace Content.Client.Gravity
 
             Title = Loc.GetString("gravity-generator-window-title");
 
-            var vBox = new VBoxContainer
+            var vBox = new BoxContainer
             {
+                Orientation = LayoutOrientation.Vertical,
                 MinSize = new Vector2(250, 100)
             };
             Status = new Label
diff --git a/Content.Client/Gravity/GravityGeneratorVisualizer.cs b/Content.Client/Gravity/GravityGeneratorVisualizer.cs
index ef43265d0c..2dffc2826b 100644
--- a/Content.Client/Gravity/GravityGeneratorVisualizer.cs
+++ b/Content.Client/Gravity/GravityGeneratorVisualizer.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using System.Collections.Generic;
 using Content.Shared.Gravity;
 using JetBrains.Annotations;
diff --git a/Content.Client/HUD/GameHud.cs b/Content.Client/HUD/GameHud.cs
index bda10542f3..1e780b4600 100644
--- a/Content.Client/HUD/GameHud.cs
+++ b/Content.Client/HUD/GameHud.cs
@@ -25,6 +25,7 @@ using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 using static Robust.Client.Input.Keyboard.Key;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 using Control = Robust.Client.UserInterface.Control;
 using LC = Robust.Client.UserInterface.Controls.LayoutContainer;
 
@@ -94,7 +95,7 @@ namespace Content.Client.HUD
 
     internal sealed class GameHud : IGameHud
     {
-        private HBoxContainer _topButtonsContainer = default!;
+        private BoxContainer _topButtonsContainer = default!;
         private TopButton _buttonEscapeMenu = default!;
         private TopButton _buttonInfo = default!;
         private TopButton _buttonCharacterMenu = default!;
@@ -105,8 +106,8 @@ namespace Content.Client.HUD
         private TopButton _buttonSandboxMenu = default!;
         private InfoWindow _infoWindow = default!;
         private TargetingDoll _targetingDoll = default!;
-        private VBoxContainer _combatPanelContainer = default!;
-        private VBoxContainer _topNotificationContainer = default!;
+        private BoxContainer _combatPanelContainer = default!;
+        private BoxContainer _topNotificationContainer = default!;
 
         [Dependency] private readonly IResourceCache _resourceCache = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
@@ -183,8 +184,9 @@ namespace Content.Client.HUD
             var infoTexture = _resourceCache.GetTexture("/Textures/Interface/info.svg.192dpi.png");
             var sandboxTexture = _resourceCache.GetTexture("/Textures/Interface/sandbox.svg.192dpi.png");
 
-            _topButtonsContainer = new HBoxContainer
+            _topButtonsContainer = new BoxContainer
             {
+                Orientation = LayoutOrientation.Horizontal,
                 SeparationOverride = 8
             };
 
@@ -307,8 +309,9 @@ namespace Content.Client.HUD
                 InputCmdHandler.FromDelegate(s => ButtonInfoOnOnToggled()));
 
 
-            _combatPanelContainer = new VBoxContainer
+            _combatPanelContainer = new BoxContainer
             {
+                Orientation = LayoutOrientation.Vertical,
                 HorizontalAlignment = Control.HAlignment.Left,
                 VerticalAlignment = Control.VAlignment.Bottom,
                 Children =
@@ -324,8 +327,9 @@ namespace Content.Client.HUD
 
             _targetingDoll.OnZoneChanged += args => OnTargetingZoneChanged?.Invoke(args);
 
-            var centerBottomContainer = new VBoxContainer
+            var centerBottomContainer = new BoxContainer
             {
+                Orientation = LayoutOrientation.Vertical,
                 SeparationOverride = 5,
                 HorizontalAlignment = Control.HAlignment.Center
             };
@@ -340,24 +344,28 @@ namespace Content.Client.HUD
                 VerticalAlignment = Control.VAlignment.Bottom,
                 HorizontalAlignment = Control.HAlignment.Center
             };
-            BottomRightInventoryQuickButtonContainer = new HBoxContainer()
+            BottomRightInventoryQuickButtonContainer = new BoxContainer
             {
+                Orientation = LayoutOrientation.Horizontal,
                 VerticalAlignment = Control.VAlignment.Bottom,
                 HorizontalAlignment = Control.HAlignment.Right
             };
-            BottomLeftInventoryQuickButtonContainer = new HBoxContainer()
+            BottomLeftInventoryQuickButtonContainer = new BoxContainer
             {
+                Orientation = LayoutOrientation.Horizontal,
                 VerticalAlignment = Control.VAlignment.Bottom,
                 HorizontalAlignment = Control.HAlignment.Left
             };
-            TopInventoryQuickButtonContainer = new HBoxContainer()
+            TopInventoryQuickButtonContainer = new BoxContainer
             {
+                Orientation = LayoutOrientation.Horizontal,
                 Visible = false,
                 VerticalAlignment = Control.VAlignment.Bottom,
                 HorizontalAlignment = Control.HAlignment.Center
             };
-            var bottomRow = new HBoxContainer()
+            var bottomRow = new BoxContainer
             {
+                Orientation = LayoutOrientation.Horizontal,
                 HorizontalAlignment = Control.HAlignment.Center
 
             };
@@ -376,8 +384,9 @@ namespace Content.Client.HUD
                 HorizontalAlignment = Control.HAlignment.Center
             };
 
-            var rightBottomContainer = new HBoxContainer
+            var rightBottomContainer = new BoxContainer
             {
+                Orientation = LayoutOrientation.Horizontal,
                 SeparationOverride = 5
             };
             LC.SetAnchorAndMarginPreset(rightBottomContainer, LC.LayoutPreset.BottomRight);
@@ -396,8 +405,9 @@ namespace Content.Client.HUD
             LC.SetGrowHorizontal(SuspicionContainer, LC.GrowDirection.End);
             LC.SetGrowVertical(SuspicionContainer, LC.GrowDirection.Begin);
 
-            _topNotificationContainer = new VBoxContainer
+            _topNotificationContainer = new BoxContainer
             {
+                Orientation = LayoutOrientation.Vertical,
                 MinSize = (600, 0)
             };
             RootControl.AddChild(_topNotificationContainer);
@@ -405,7 +415,10 @@ namespace Content.Client.HUD
             LC.SetGrowHorizontal(_topNotificationContainer, LC.GrowDirection.Both);
             LC.SetGrowVertical(_topNotificationContainer, LC.GrowDirection.End);
 
-            VoteContainer = new VBoxContainer();
+            VoteContainer = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Vertical
+            };
             RootControl.AddChild(VoteContainer);
             LC.SetAnchorPreset(VoteContainer, LC.LayoutPreset.TopLeft);
             LC.SetMarginLeft(VoteContainer, 180);
@@ -564,8 +577,9 @@ namespace Content.Client.HUD
                 TooltipDelay = CustomTooltipDelay;
 
                 AddChild(
-                    new VBoxContainer
+                    new BoxContainer
                     {
+                        Orientation = LayoutOrientation.Vertical,
                         Children =
                         {
                             (_textureRect = new TextureRect
diff --git a/Content.Client/Hands/HandsGui.cs b/Content.Client/Hands/HandsGui.cs
index 22a7e643e3..ff0fa47b23 100644
--- a/Content.Client/Hands/HandsGui.cs
+++ b/Content.Client/Hands/HandsGui.cs
@@ -21,6 +21,7 @@ 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
 {
@@ -36,7 +37,7 @@ namespace Content.Client.Hands
 
         private ItemStatusPanel StatusPanel { get; }
 
-        private HBoxContainer HandsContainer { get; }
+        private BoxContainer HandsContainer { get; }
 
         [ViewVariables]
         public IReadOnlyList<GuiHand> Hands => _hands;
@@ -53,18 +54,24 @@ namespace Content.Client.Hands
             IoCManager.InjectDependencies(this);
             _configManager.OnValueChanged(CCVars.HudTheme, UpdateHudTheme);
 
-            AddChild(new HBoxContainer
+            AddChild(new BoxContainer
             {
+                Orientation = LayoutOrientation.Horizontal,
                 SeparationOverride = 0,
                 HorizontalAlignment = HAlignment.Center,
                 Children =
                 {
-                    new VBoxContainer
+                    new BoxContainer
                     {
+                        Orientation = LayoutOrientation.Vertical,
                         Children =
                         {
                             (StatusPanel = ItemStatusPanel.FromSide(HandLocation.Middle)),
-                            (HandsContainer = new HBoxContainer() { HorizontalAlignment = HAlignment.Center } ),
+                            (HandsContainer = new BoxContainer
+                            {
+                                Orientation = LayoutOrientation.Horizontal,
+                                HorizontalAlignment = HAlignment.Center
+                            }),
                         }
                     },
                 }
diff --git a/Content.Client/Hands/HandsVisualizer.cs b/Content.Client/Hands/HandsVisualizer.cs
index 53a632fc2c..e8291d49ea 100644
--- a/Content.Client/Hands/HandsVisualizer.cs
+++ b/Content.Client/Hands/HandsVisualizer.cs
@@ -38,19 +38,21 @@ namespace Content.Client.Hands
             {
                 var rsi = resourceCache.GetResource<RSIResource>(SharedSpriteComponent.TextureRoot / hand.RsiPath).RSI;
 
-                var layerKey = LocationToLayerKey(hand.Location);
-                sprite.LayerMapReserveBlank(layerKey);
-
-                var layer = sprite.LayerMapGet(layerKey);
-                sprite.LayerSetVisible(layer, true);
-                sprite.LayerSetRSI(layer, rsi);
-                sprite.LayerSetColor(layer, hand.Color);
-
                 var state = $"inhand-{hand.Location.ToString().ToLowerInvariant()}";
                 if (hand.EquippedPrefix != null)
                     state = $"{hand.EquippedPrefix}-" + state;
 
-                sprite.LayerSetState(layer, state);
+                if (rsi.TryGetState(state, out var _))
+                {
+                    var layerKey = LocationToLayerKey(hand.Location);
+                    sprite.LayerMapReserveBlank(layerKey);
+
+                    var layer = sprite.LayerMapGet(layerKey);
+                    sprite.LayerSetVisible(layer, true);
+                    sprite.LayerSetRSI(layer, rsi);
+                    sprite.LayerSetColor(layer, hand.Color);
+                    sprite.LayerSetState(layer, state);
+                }
             }
         }
 
diff --git a/Content.Client/HealthOverlay/HealthOverlaySystem.cs b/Content.Client/HealthOverlay/HealthOverlaySystem.cs
index 2e92fb4245..f3c5a79266 100644
--- a/Content.Client/HealthOverlay/HealthOverlaySystem.cs
+++ b/Content.Client/HealthOverlay/HealthOverlaySystem.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Content.Client.HealthOverlay.UI;
 using Content.Shared.Damage.Components;
 using Content.Shared.GameTicking;
diff --git a/Content.Client/HealthOverlay/UI/HealthOverlayGui.cs b/Content.Client/HealthOverlay/UI/HealthOverlayGui.cs
index 8d1d546f48..c1d4eea275 100644
--- a/Content.Client/HealthOverlay/UI/HealthOverlayGui.cs
+++ b/Content.Client/HealthOverlay/UI/HealthOverlayGui.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Client.IoC;
 using Content.Client.Resources;
 using Content.Shared.Damage.Components;
diff --git a/Content.Client/Info/InfoWindow.cs b/Content.Client/Info/InfoWindow.cs
index 9dd8b48d90..517e39e636 100644
--- a/Content.Client/Info/InfoWindow.cs
+++ b/Content.Client/Info/InfoWindow.cs
@@ -1,4 +1,3 @@
-#nullable enable
 
 using System.Collections.Generic;
 using System.IO;
@@ -12,6 +11,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using Robust.Shared.Utility;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Info
 {
@@ -57,8 +57,9 @@ namespace Content.Client.Info
 
         private void PopulateRules(Control rulesList)
         {
-            var vBox = new VBoxContainer
+            var vBox = new BoxContainer
             {
+                Orientation = LayoutOrientation.Vertical,
                 Margin = new Thickness(2, 2, 0, 0)
             };
 
@@ -98,8 +99,9 @@ namespace Content.Client.Info
         {
             Button controlsButton;
 
-            var vBox = new VBoxContainer
+            var vBox = new BoxContainer
             {
+                Orientation = LayoutOrientation.Vertical,
                 Margin = new Thickness(2, 2, 0, 0)
             };
 
@@ -131,8 +133,9 @@ namespace Content.Client.Info
 
             AddSection(Loc.GetString("ui-info-header-intro"), "Intro.txt");
 
-            vBox.AddChild(new HBoxContainer
+            vBox.AddChild(new BoxContainer
             {
+                Orientation = LayoutOrientation.Horizontal,
                 MinSize = (0, 10),
                 Children =
                 {
@@ -140,8 +143,9 @@ namespace Content.Client.Info
                 }
             });
 
-            vBox.AddChild(new HBoxContainer
+            vBox.AddChild(new BoxContainer
             {
+                Orientation = LayoutOrientation.Horizontal,
                 SeparationOverride = 5,
                 Children =
                 {
diff --git a/Content.Client/Info/ServerInfo.cs b/Content.Client/Info/ServerInfo.cs
index 66f290a5a0..6cce59c2e8 100644
--- a/Content.Client/Info/ServerInfo.cs
+++ b/Content.Client/Info/ServerInfo.cs
@@ -21,7 +21,10 @@ namespace Content.Client.Info
             };
             AddChild(_richTextLabel);
 
-            var buttons = new HBoxContainer();
+            var buttons = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Horizontal
+            };
             AddChild(buttons);
 
             var uriOpener = IoCManager.Resolve<IUriOpener>();
diff --git a/Content.Client/Input/ContentContexts.cs b/Content.Client/Input/ContentContexts.cs
index 80e4cc96f4..494a85befd 100644
--- a/Content.Client/Input/ContentContexts.cs
+++ b/Content.Client/Input/ContentContexts.cs
@@ -17,6 +17,8 @@ namespace Content.Client.Input
             common.AddFunction(ContentKeyFunctions.FocusRadio);
             common.AddFunction(ContentKeyFunctions.FocusOOC);
             common.AddFunction(ContentKeyFunctions.FocusAdminChat);
+            common.AddFunction(ContentKeyFunctions.FocusConsoleChat);
+            common.AddFunction(ContentKeyFunctions.FocusDeadChat);
             common.AddFunction(ContentKeyFunctions.CycleChatChannelForward);
             common.AddFunction(ContentKeyFunctions.CycleChatChannelBackward);
             common.AddFunction(ContentKeyFunctions.ExamineEntity);
diff --git a/Content.Client/Instruments/InstrumentComponent.cs b/Content.Client/Instruments/InstrumentComponent.cs
index d864f5e8ea..66f5ddd458 100644
--- a/Content.Client/Instruments/InstrumentComponent.cs
+++ b/Content.Client/Instruments/InstrumentComponent.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Content.Shared.Instruments;
 using Content.Shared.Physics;
+using Robust.Client;
 using Robust.Client.Audio.Midi;
 using Robust.Shared.Audio.Midi;
 using Robust.Shared.GameObjects;
@@ -255,7 +256,7 @@ namespace Content.Client.Instruments
             _renderer = null;
             _midiEventBuffer.Clear();
 
-            if (!fromStateChange)
+            if (!fromStateChange && IoCManager.Resolve<INetManager>().IsConnected)
             {
                 SendNetworkMessage(new InstrumentStopMidiMessage());
             }
diff --git a/Content.Client/Instruments/UI/InstrumentMenu.xaml b/Content.Client/Instruments/UI/InstrumentMenu.xaml
index 6cd7f78b55..9eafb0a24b 100644
--- a/Content.Client/Instruments/UI/InstrumentMenu.xaml
+++ b/Content.Client/Instruments/UI/InstrumentMenu.xaml
@@ -1,26 +1,26 @@
 <SS14Window xmlns="https://spacestation14.io"
             xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client">
-    <VBoxContainer SeparationOverride="5">
-        <HBoxContainer VerticalExpand="True">
+    <BoxContainer Orientation="Vertical" SeparationOverride="5">
+        <BoxContainer Orientation="Horizontal" VerticalExpand="True">
             <Button Name="InputButton" ToggleMode="True" Text="MIDI Input" TextAlign="Center"
                     HorizontalExpand="True" SizeFlagsStretchRatio="1" />
             <Control HorizontalExpand="True" SizeFlagsStretchRatio="2" />
             <Button Name="FileButton" Text="Play MIDI File" TextAlign="Center" HorizontalExpand="True"
                     SizeFlagsStretchRatio="1" />
-        </HBoxContainer>
-        <HBoxContainer VerticalExpand="True">
+        </BoxContainer>
+        <BoxContainer Orientation="Horizontal" VerticalExpand="True">
             <Button Name="LoopButton" ToggleMode="True" Text="Loop" TextAlign="Center" HorizontalExpand="True"
                     SizeFlagsStretchRatio="1" />
             <Control HorizontalExpand="True" SizeFlagsStretchRatio="2" />
             <Button Name="StopButton" Text="Stop" TextAlign="Center" HorizontalExpand="True"
                     SizeFlagsStretchRatio="1" />
-        </HBoxContainer>
-        <HBoxContainer VerticalExpand="True">
+        </BoxContainer>
+        <BoxContainer Orientation="Horizontal" VerticalExpand="True">
             <Control HorizontalExpand="True" SizeFlagsStretchRatio="0.125" />
             <Slider Name="PlaybackSlider" HorizontalExpand="True" />
             <Control HorizontalExpand="True" SizeFlagsStretchRatio="0.125" />
-        </HBoxContainer>
-    </VBoxContainer>
+        </BoxContainer>
+    </BoxContainer>
     <PanelContainer Name="UnavailableOverlay" Visible="False" MouseFilter="Stop">
         <PanelContainer.PanelOverride>
             <gfx:StyleBoxFlat BackgroundColor="#000000E5" />
diff --git a/Content.Client/Inventory/HumanInventoryInterfaceController.cs b/Content.Client/Inventory/HumanInventoryInterfaceController.cs
index 0c5ed21557..fa52c89b71 100644
--- a/Content.Client/Inventory/HumanInventoryInterfaceController.cs
+++ b/Content.Client/Inventory/HumanInventoryInterfaceController.cs
@@ -17,6 +17,7 @@ using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
 using static Content.Shared.Inventory.EquipmentSlotDefines;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Inventory
 {
@@ -102,8 +103,9 @@ namespace Content.Client.Inventory
             AddButton(out _hudButtonEars, Slots.EARS, "ears");
             AddButton(out _hudButtonHead, Slots.HEAD, "head");
 
-            _topQuickButtonsContainer = new HBoxContainer
+            _topQuickButtonsContainer = new BoxContainer
             {
+                Orientation = LayoutOrientation.Horizontal,
                 Children =
                 {
                     _hudButtonShoes,
@@ -119,8 +121,9 @@ namespace Content.Client.Inventory
                 SeparationOverride = 5
             };
 
-            _bottomRightQuickButtonsContainer = new HBoxContainer
+            _bottomRightQuickButtonsContainer = new BoxContainer
             {
+                Orientation = LayoutOrientation.Horizontal,
                 Children =
                 {
                     _hudButtonPocket1,
@@ -129,8 +132,9 @@ namespace Content.Client.Inventory
                 },
                 SeparationOverride = 5
             };
-            _bottomLeftQuickButtonsContainer = new HBoxContainer
+            _bottomLeftQuickButtonsContainer = new BoxContainer
             {
+                Orientation = LayoutOrientation.Horizontal,
                 Children =
                 {
                     _hudButtonBelt,
diff --git a/Content.Client/Items/Components/ItemComponent.cs b/Content.Client/Items/Components/ItemComponent.cs
index f26d349996..cd552ee288 100644
--- a/Content.Client/Items/Components/ItemComponent.cs
+++ b/Content.Client/Items/Components/ItemComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Client.Hands;
 using Content.Shared.Item;
 using Robust.Shared.Containers;
diff --git a/Content.Client/Items/Managers/ItemSlotManager.cs b/Content.Client/Items/Managers/ItemSlotManager.cs
index c9a74cb10c..5fd3f0fbe0 100644
--- a/Content.Client/Items/Managers/ItemSlotManager.cs
+++ b/Content.Client/Items/Managers/ItemSlotManager.cs
@@ -74,7 +74,7 @@ namespace Content.Client.Items.Managers
                 var mousePosWorld = _eyeManager.ScreenToMap(args.PointerLocation);
 
                 var coordinates = _mapManager.TryFindGridAt(mousePosWorld, out var grid) ? grid.MapToGrid(mousePosWorld) :
-                    EntityCoordinates.FromMap(_entityManager, _mapManager, mousePosWorld);
+                    EntityCoordinates.FromMap(_mapManager, mousePosWorld);
 
                 var message = new FullInputCmdMessage(_gameTiming.CurTick, _gameTiming.TickFraction, funcId, BoundKeyState.Down,
                     coordinates, args.PointerLocation, item.Uid);
diff --git a/Content.Client/Items/UI/ItemStatusPanel.cs b/Content.Client/Items/UI/ItemStatusPanel.cs
index 6162c59e51..d880d7ea49 100644
--- a/Content.Client/Items/UI/ItemStatusPanel.cs
+++ b/Content.Client/Items/UI/ItemStatusPanel.cs
@@ -12,6 +12,7 @@ using Robust.Shared.Maths;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 using static Content.Client.IoC.StaticIoC;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Items.UI
 {
@@ -23,7 +24,7 @@ namespace Content.Client.Items.UI
         [ViewVariables]
         private readonly Label _itemNameLabel;
         [ViewVariables]
-        private readonly VBoxContainer _statusContents;
+        private readonly BoxContainer _statusContents;
         [ViewVariables]
         private readonly PanelContainer _panel;
 
@@ -47,12 +48,16 @@ namespace Content.Client.Items.UI
                 ModulateSelfOverride = Color.White.WithAlpha(0.9f),
                 Children =
                 {
-                    new VBoxContainer
+                    new BoxContainer
                     {
+                        Orientation = LayoutOrientation.Vertical,
                         SeparationOverride = 0,
                         Children =
                         {
-                            (_statusContents = new VBoxContainer()),
+                            (_statusContents = new BoxContainer
+                            {
+                                Orientation = LayoutOrientation.Vertical
+                            }),
                             (_itemNameLabel = new Label
                             {
                                 ClipText = true,
diff --git a/Content.Client/Kitchen/KitchenSpikeComponent.cs b/Content.Client/Kitchen/KitchenSpikeComponent.cs
index 0c7acf3137..efae8b89e6 100644
--- a/Content.Client/Kitchen/KitchenSpikeComponent.cs
+++ b/Content.Client/Kitchen/KitchenSpikeComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Shared.DragDrop;
 using Content.Shared.Kitchen.Components;
 using Robust.Shared.GameObjects;
diff --git a/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs b/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs
index 252c6aa012..e336bb73a6 100644
--- a/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs
+++ b/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs
@@ -15,6 +15,7 @@ using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
 using static Robust.Client.UserInterface.Controls.BaseButton;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Kitchen.UI
 {
@@ -165,9 +166,9 @@ namespace Content.Client.Kitchen.UI
 
             public ButtonGroup CookTimeButtonGroup { get; }
 
-            public VBoxContainer CookTimeButtonVbox { get; }
+            public BoxContainer CookTimeButtonVbox { get; }
 
-            private VBoxContainer ButtonGridContainer { get; }
+            private BoxContainer ButtonGridContainer { get; }
 
             private PanelContainer DisableCookingPanelOverlay { get; }
 
@@ -188,7 +189,10 @@ namespace Content.Client.Kitchen.UI
                     PanelOverride = new StyleBoxFlat {BackgroundColor = Color.Black.WithAlpha(0.60f)},
                 };
 
-                var hSplit = new HBoxContainer();
+                var hSplit = new BoxContainer
+                {
+                    Orientation = LayoutOrientation.Horizontal
+                };
 
                 IngredientsListReagents = new ItemList
                 {
@@ -217,17 +221,19 @@ namespace Content.Client.Kitchen.UI
 
                 hSplit.AddChild(IngredientsList);
 
-                var vSplit = new VBoxContainer
+                var vSplit = new BoxContainer
                 {
+                    Orientation = LayoutOrientation.Vertical,
                     VerticalExpand = true,
                     HorizontalExpand = true,
                 };
 
                 hSplit.AddChild(vSplit);
 
-                ButtonGridContainer = new VBoxContainer
+                ButtonGridContainer = new BoxContainer
                 {
-                    Align = BoxContainer.AlignMode.Center,
+                    Orientation = LayoutOrientation.Vertical,
+                    Align = AlignMode.Center,
                     SizeFlagsStretchRatio = 3
                 };
 
@@ -255,10 +261,11 @@ namespace Content.Client.Kitchen.UI
                 });
 
                 CookTimeButtonGroup = new ButtonGroup();
-                CookTimeButtonVbox = new VBoxContainer
+                CookTimeButtonVbox = new BoxContainer
                 {
+                    Orientation = LayoutOrientation.Vertical,
                     VerticalExpand = true,
-                    Align = BoxContainer.AlignMode.Center,
+                    Align = AlignMode.Center,
                 };
 
                 var index = 0;
@@ -301,8 +308,9 @@ namespace Content.Client.Kitchen.UI
 
                     Children =
                     {
-                        new VBoxContainer
+                        new BoxContainer
                         {
+                            Orientation = LayoutOrientation.Vertical,
                             Children =
                             {
                                 new PanelContainer
diff --git a/Content.Client/Kitchen/UI/ReagentGrinderBoundUserInterface.cs b/Content.Client/Kitchen/UI/ReagentGrinderBoundUserInterface.cs
index a9e9b5640e..e33cae9e5e 100644
--- a/Content.Client/Kitchen/UI/ReagentGrinderBoundUserInterface.cs
+++ b/Content.Client/Kitchen/UI/ReagentGrinderBoundUserInterface.cs
@@ -11,6 +11,7 @@ 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
 {
@@ -153,7 +154,7 @@ namespace Content.Client.Kitchen.UI
                 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}") : Loc.GetString("???");
+                    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]);
@@ -238,10 +239,14 @@ namespace Content.Client.Kitchen.UI
                 Owner = owner;
                 Title = Loc.GetString("grinder-menu-title");
 
-                var hSplit = new HBoxContainer();
-
-                var vBoxGrindJuiceButtonPanel = new VBoxContainer
+                var hSplit = new BoxContainer
                 {
+                    Orientation = LayoutOrientation.Horizontal
+                };
+
+                var vBoxGrindJuiceButtonPanel = new BoxContainer
+                {
+                    Orientation = LayoutOrientation.Vertical,
                     VerticalAlignment = VAlignment.Center
                 };
 
diff --git a/Content.Client/LateJoin/LateJoinGui.cs b/Content.Client/LateJoin/LateJoinGui.cs
index 780461f5bc..77e6d0f09d 100644
--- a/Content.Client/LateJoin/LateJoinGui.cs
+++ b/Content.Client/LateJoin/LateJoinGui.cs
@@ -16,6 +16,7 @@ using Robust.Shared.Log;
 using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.LateJoin
 {
@@ -27,7 +28,7 @@ namespace Content.Client.LateJoin
         public event Action<string>? SelectedId;
 
         private readonly Dictionary<string, JobButton> _jobButtons = new();
-        private readonly Dictionary<string, VBoxContainer> _jobCategories = new();
+        private readonly Dictionary<string, BoxContainer> _jobCategories = new();
 
         public LateJoinGui()
         {
@@ -38,9 +39,13 @@ namespace Content.Client.LateJoin
             Title = Loc.GetString("late-join-gui-title");
 
 
-            var jobList = new VBoxContainer();
-            var vBox = new VBoxContainer
+            var jobList = new BoxContainer
             {
+                Orientation = LayoutOrientation.Vertical
+            };
+            var vBox = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Vertical,
                 Children =
                 {
                     new ScrollContainer
@@ -64,8 +69,9 @@ namespace Content.Client.LateJoin
                 {
                     if (!_jobCategories.TryGetValue(department, out var category))
                     {
-                        category = new VBoxContainer
+                        category = new BoxContainer
                         {
+                            Orientation = LayoutOrientation.Vertical,
                             Name = department,
                             ToolTip = Loc.GetString("late-join-gui-jobs-amount-in-department-tooltip",
                                                     ("departmentName", department))
@@ -101,8 +107,9 @@ namespace Content.Client.LateJoin
 
                     var jobButton = new JobButton(job.ID);
 
-                    var jobSelector = new HBoxContainer
+                    var jobSelector = new BoxContainer
                     {
+                        Orientation = LayoutOrientation.Horizontal,
                         HorizontalExpand = true
                     };
 
diff --git a/Content.Client/Lathe/UI/LatheMenu.cs b/Content.Client/Lathe/UI/LatheMenu.cs
index 38bde6c6ca..12c6872156 100644
--- a/Content.Client/Lathe/UI/LatheMenu.cs
+++ b/Content.Client/Lathe/UI/LatheMenu.cs
@@ -8,6 +8,7 @@ using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.Utility;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Lathe.UI
 {
@@ -36,14 +37,16 @@ namespace Content.Client.Lathe.UI
 
             Title = "Lathe Menu";
 
-            var vBox = new VBoxContainer()
+            var vBox = new BoxContainer
             {
+                Orientation = LayoutOrientation.Vertical,
                 VerticalExpand = true,
                 SeparationOverride = 5,
             };
 
-            var hBoxButtons = new HBoxContainer()
+            var hBoxButtons = new BoxContainer
             {
+                Orientation = LayoutOrientation.Horizontal,
                 HorizontalExpand = true,
                 VerticalExpand = true,
                 SizeFlagsStretchRatio = 1,
@@ -76,8 +79,9 @@ namespace Content.Client.Lathe.UI
                 SizeFlagsStretchRatio = 3,
             };
 
-            var hBoxFilter = new HBoxContainer()
+            var hBoxFilter = new BoxContainer
             {
+                Orientation = LayoutOrientation.Horizontal,
                 HorizontalExpand = true,
                 VerticalExpand = true,
                 SizeFlagsStretchRatio = 1
diff --git a/Content.Client/Lathe/UI/LatheQueueMenu.cs b/Content.Client/Lathe/UI/LatheQueueMenu.cs
index 3d5ee6a0b5..7c5cbcc8fb 100644
--- a/Content.Client/Lathe/UI/LatheQueueMenu.cs
+++ b/Content.Client/Lathe/UI/LatheQueueMenu.cs
@@ -5,6 +5,7 @@ using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.Utility;
 using Robust.Shared.Localization;
 using Robust.Shared.ViewVariables;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Lathe.UI
 {
@@ -24,10 +25,14 @@ namespace Content.Client.Lathe.UI
             SetSize = MinSize = (300, 450);
             Title = Loc.GetString("lathequeue-menu-title");
 
-            var vBox = new VBoxContainer();
-
-            var hBox = new HBoxContainer()
+            var vBox = new BoxContainer
             {
+                Orientation = LayoutOrientation.Vertical
+            };
+
+            var hBox = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Horizontal,
                 HorizontalExpand = true,
                 SizeFlagsStretchRatio = 2,
             };
@@ -38,8 +43,9 @@ namespace Content.Client.Lathe.UI
                 SizeFlagsStretchRatio = 2,
             };
 
-            var vBoxInfo = new VBoxContainer()
+            var vBoxInfo = new BoxContainer
             {
+                Orientation = LayoutOrientation.Vertical,
                 VerticalExpand = true,
                 SizeFlagsStretchRatio = 3,
             };
@@ -91,7 +97,7 @@ namespace Content.Client.Lathe.UI
         {
             _icon.Texture = Texture.Transparent;
             _nameLabel.Text = "-------";
-            _description.Text = "lathequeue-menu-not-producing-text";
+            _description.Text = Loc.GetString("lathequeue-menu-not-producing-text");
         }
 
         public void PopulateList()
diff --git a/Content.Client/Launcher/LauncherConnectingGui.xaml b/Content.Client/Launcher/LauncherConnectingGui.xaml
index f879c5ff73..2d4aa5f1cb 100644
--- a/Content.Client/Launcher/LauncherConnectingGui.xaml
+++ b/Content.Client/Launcher/LauncherConnectingGui.xaml
@@ -6,48 +6,48 @@
     <parallax:ParallaxControl />
     <Control HorizontalAlignment="Center" VerticalAlignment="Center">
         <PanelContainer StyleClasses="AngleRect" />
-        <VBoxContainer MinSize="300 200">
-            <HBoxContainer>
+        <BoxContainer Orientation="Vertical" MinSize="300 200">
+            <BoxContainer Orientation="Horizontal">
                 <Label Margin="8 0 0 0" Text="{Loc 'connecting-title'}"
                        StyleClasses="LabelHeading" VAlign="Center" />
                 <Button Name="ExitButton" Text="{Loc 'connecting-exit'}"
                         HorizontalAlignment="Right" HorizontalExpand="True" />
-            </HBoxContainer>
+            </BoxContainer>
             <ui:HighDivider />
-            <VBoxContainer VerticalExpand="True" Margin="4 4 4 0">
+            <BoxContainer Orientation="Vertical" VerticalExpand="True" Margin="4 4 4 0">
                 <Control VerticalExpand="True" Margin="0 0 0 8">
-                    <VBoxContainer Name="ConnectingStatus">
+                    <BoxContainer Orientation="Vertical" Name="ConnectingStatus">
                         <Label Text="{Loc 'connecting-in-progress'}" Align="Center" />
                         <!-- Who the fuck named these cont- oh wait I did -->
                         <Label Name="ConnectStatus" StyleClasses="LabelSubText" Align="Center" />
-                    </VBoxContainer>
-                    <VBoxContainer Name="ConnectFail" Visible="False">
+                    </BoxContainer>
+                    <BoxContainer Orientation="Vertical" Name="ConnectFail" Visible="False">
                         <Label Name="ConnectFailReason" Align="Center" />
                         <Button Name="RetryButton" Text="{Loc 'connecting-retry'}"
                                 HorizontalAlignment="Center"
                                 VerticalExpand="True" VerticalAlignment="Bottom" />
-                    </VBoxContainer>
-                    <VBoxContainer Name="Disconnected">
+                    </BoxContainer>
+                    <BoxContainer Orientation="Vertical" Name="Disconnected">
                         <Label Text="{Loc 'connecting-disconnected'}" Align="Center" />
                         <Label Name="DisconnectReason" Align="Center" />
                         <Button Name="ReconnectButton" Text="{Loc 'connecting-reconnect'}"
                                 HorizontalAlignment="Center"
                                 VerticalExpand="True" VerticalAlignment="Bottom" />
-                    </VBoxContainer>
+                    </BoxContainer>
                 </Control>
                 <Label Name="ConnectingAddress" StyleClasses="LabelSubText" HorizontalAlignment="Center" />
-            </VBoxContainer>
+            </BoxContainer>
             <PanelContainer>
                 <PanelContainer.PanelOverride>
                     <gfx:StyleBoxFlat BackgroundColor="#444" ContentMarginTopOverride="2" />
                 </PanelContainer.PanelOverride>
             </PanelContainer>
 
-            <HBoxContainer Margin="12 0 4 0" VerticalAlignment="Bottom">
+            <BoxContainer Orientation="Horizontal" Margin="12 0 4 0" VerticalAlignment="Bottom">
                 <Label Text="{Loc 'connecting-tip'}" StyleClasses="LabelSubText" />
                 <Label Text="{Loc 'connecting-version'}" StyleClasses="LabelSubText"
                        HorizontalAlignment="Right" HorizontalExpand="True" />
-            </HBoxContainer>
-        </VBoxContainer>
+            </BoxContainer>
+        </BoxContainer>
     </Control>
 </Control>
diff --git a/Content.Client/Light/Components/HandheldLightComponent.cs b/Content.Client/Light/Components/HandheldLightComponent.cs
index 707d5f8bb4..e2dfa67dbc 100644
--- a/Content.Client/Light/Components/HandheldLightComponent.cs
+++ b/Content.Client/Light/Components/HandheldLightComponent.cs
@@ -7,6 +7,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 using Robust.Shared.Timing;
 using Robust.Shared.ViewVariables;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Light.Components
 {
@@ -55,8 +56,9 @@ namespace Content.Client.Light.Components
             {
                 _parent = parent;
 
-                var wrapper = new HBoxContainer
+                var wrapper = new BoxContainer
                 {
+                    Orientation = LayoutOrientation.Horizontal,
                     SeparationOverride = 4,
                     HorizontalAlignment = HAlignment.Center
                 };
diff --git a/Content.Client/Light/Visualizers/PoweredLightVisualizer.cs b/Content.Client/Light/Visualizers/PoweredLightVisualizer.cs
index 582f758899..703c76a14a 100644
--- a/Content.Client/Light/Visualizers/PoweredLightVisualizer.cs
+++ b/Content.Client/Light/Visualizers/PoweredLightVisualizer.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Content.Shared.Light;
 using JetBrains.Annotations;
diff --git a/Content.Client/Lobby/LobbyState.cs b/Content.Client/Lobby/LobbyState.cs
index 6689c0f7c9..fb85b825e3 100644
--- a/Content.Client/Lobby/LobbyState.cs
+++ b/Content.Client/Lobby/LobbyState.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using Content.Client.Chat;
 using Content.Client.Chat.Managers;
 using Content.Client.EscapeMenu.UI;
 using Content.Client.GameTicking.Managers;
@@ -74,24 +75,9 @@ namespace Content.Client.Lobby
             _chatManager.SetChatBox(_lobby.Chat);
             _voteManager.SetPopupContainer(_lobby.VoteContainer);
 
-            _lobby.Chat.DefaultChatFormat = "ooc \"{0}\"";
-
             _lobby.ServerName.Text = _baseClient.GameInfo?.ServerName;
 
-            _inputManager.SetInputCommand(ContentKeyFunctions.FocusChat,
-                InputCmdHandler.FromDelegate(_ => GameScreen.FocusChat(_lobby.Chat)));
-
-            _inputManager.SetInputCommand(ContentKeyFunctions.FocusOOC,
-                InputCmdHandler.FromDelegate(_ => GameScreen.FocusChannel(_lobby.Chat, ChatChannel.OOC)));
-
-            _inputManager.SetInputCommand(ContentKeyFunctions.FocusAdminChat,
-                InputCmdHandler.FromDelegate(_ => GameScreen.FocusChannel(_lobby.Chat, ChatChannel.AdminChat)));
-
-            _inputManager.SetInputCommand(ContentKeyFunctions.CycleChatChannelForward,
-                InputCmdHandler.FromDelegate(_ => _lobby.Chat.CycleChatChannel(true)));
-
-            _inputManager.SetInputCommand(ContentKeyFunctions.CycleChatChannelBackward,
-                InputCmdHandler.FromDelegate(_ => _lobby.Chat.CycleChatChannel(false)));
+            ChatInput.SetupChatInputHandlers(_inputManager, _lobby.Chat);
 
             UpdateLobbyUi();
 
diff --git a/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.cs b/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.cs
index 06d23ec908..45b66fd40e 100644
--- a/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.cs
+++ b/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.cs
@@ -16,6 +16,7 @@ using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
 using static Content.Shared.Inventory.EquipmentSlotDefines;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Lobby.UI
 {
@@ -24,7 +25,7 @@ namespace Content.Client.Lobby.UI
         private readonly IClientPreferencesManager _preferencesManager;
         private IEntity _previewDummy;
         private readonly Label _summaryLabel;
-        private readonly VBoxContainer _loaded;
+        private readonly BoxContainer _loaded;
         private readonly Label _unloaded;
 
         public LobbyCharacterPreviewPanel(IEntityManager entityManager,
@@ -51,18 +52,28 @@ namespace Content.Client.Lobby.UI
             var viewWest = MakeSpriteView(_previewDummy, Direction.West);
             var viewEast = MakeSpriteView(_previewDummy, Direction.East);
 
-            var vBox = new VBoxContainer();
+            var vBox = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Vertical
+            };
 
             vBox.AddChild(header);
 
             _unloaded = new Label {Text = Loc.GetString("lobby-character-preview-panel-unloaded-preferences-label")};
 
-            _loaded = new VBoxContainer {Visible = false};
+            _loaded = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Vertical,
+                Visible = false
+            };
 
             _loaded.AddChild(CharacterSetupButton);
             _loaded.AddChild(_summaryLabel);
 
-            var hBox = new HBoxContainer();
+            var hBox = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Horizontal
+            };
             hBox.AddChild(viewSouth);
             hBox.AddChild(viewNorth);
             hBox.AddChild(viewWest);
diff --git a/Content.Client/Lobby/UI/LobbyGui.xaml b/Content.Client/Lobby/UI/LobbyGui.xaml
index 71501731f4..e047a9cf6a 100644
--- a/Content.Client/Lobby/UI/LobbyGui.xaml
+++ b/Content.Client/Lobby/UI/LobbyGui.xaml
@@ -18,9 +18,9 @@
         <MarginContainer MarginBottomOverride="20" MarginLeftOverride="20" MarginRightOverride="20"
                          MarginTopOverride="20">
             <PanelContainer StyleClasses="AngleRect" />
-            <VBoxContainer>
+            <BoxContainer Orientation="Vertical">
                 <!-- Top row -->
-                <HBoxContainer MinSize="0 40">
+                <BoxContainer Orientation="Horizontal" MinSize="0 40">
                     <MarginContainer MarginLeftOverride="8">
                         <Label StyleClasses="LabelHeadingBigger" VAlign="Center" Text="{Loc 'Lobby'}" />
                     </MarginContainer>
@@ -28,7 +28,7 @@
                     <ui:VoteCallMenuButton Name="CCallVoteButton" StyleClasses="ButtonBig" />
                     <Button Name="COptionsButton" StyleClasses="ButtonBig" Text="{Loc 'Options'}" />
                     <Button Name="CLeaveButton" StyleClasses="ButtonBig" Text="{Loc 'Leave'}" />
-                </HBoxContainer>
+                </BoxContainer>
                 <!-- Gold line -->
                 <PanelContainer>
                     <PanelContainer.PanelOverride>
@@ -37,20 +37,20 @@
                     </PanelContainer.PanelOverride>
                 </PanelContainer>
                 <!-- Middle section with the two vertical panels -->
-                <HBoxContainer VerticalExpand="True">
+                <BoxContainer Orientation="Horizontal" VerticalExpand="True">
                     <!-- Left panel -->
-                    <VBoxContainer Name="CLeftPanelContainer" HorizontalExpand="True">
+                    <BoxContainer Orientation="Vertical" Name="CLeftPanelContainer" HorizontalExpand="True">
                         <hudUi:StripeBack>
                             <MarginContainer MarginLeftOverride="3" MarginRightOverride="3" MarginBottomOverride="3"
                                              MarginTopOverride="3">
-                                <HBoxContainer SeparationOverride="6">
+                                <BoxContainer Orientation="Horizontal" SeparationOverride="6">
                                     <Button Name="CObserveButton" Text="{Loc 'Observe'}" StyleClasses="ButtonBig" />
                                     <Label Name="CStartTime" Align="Right"
                                            FontColorOverride="{x:Static maths:Color.DarkGray}"
                                            StyleClasses="LabelBig" HorizontalExpand="True" />
                                     <Button Name="CReadyButton" ToggleMode="True" Text="{Loc 'Ready Up'}"
                                             StyleClasses="ButtonBig" />
-                                </HBoxContainer>
+                                </BoxContainer>
                             </MarginContainer>
                         </hudUi:StripeBack>
                         <MarginContainer VerticalExpand="True" MarginLeftOverride="3" MarginRightOverride="3"
@@ -58,7 +58,7 @@
                                          MarginTopOverride="3">
                             <chatUi:ChatBox Name="CChat" />
                         </MarginContainer>
-                    </VBoxContainer>
+                    </BoxContainer>
                     <!-- Gold line -->
                     <PanelContainer MinSize="2 0">
                         <PanelContainer.PanelOverride>
@@ -67,7 +67,7 @@
                     </PanelContainer>
                     <!-- Right panel -->
                     <Control HorizontalExpand="True">
-                        <VBoxContainer>
+                        <BoxContainer Orientation="Vertical">
                             <!-- Player list -->
                             <hudUi:NanoHeading Text="{Loc 'Online Players'}" />
                             <MarginContainer VerticalExpand="True"
@@ -84,13 +84,13 @@
                                              MarginBottomOverride="2" MarginTopOverride="3">
                                 <info:ServerInfo Name="CServerInfo" />
                             </MarginContainer>
-                        </VBoxContainer>
+                        </BoxContainer>
                         <MarginContainer SizeFlagsHorizontal="ShrinkEnd" MarginTopOverride="8" MarginRightOverride="8">
-                            <VBoxContainer Name="CVoteContainer" />
+                            <BoxContainer Orientation="Vertical" Name="CVoteContainer" />
                         </MarginContainer>
                     </Control>
-                </HBoxContainer>
-            </VBoxContainer>
+                </BoxContainer>
+            </BoxContainer>
         </MarginContainer>
 
     </Control>
diff --git a/Content.Client/Lobby/UI/LobbyGui.xaml.cs b/Content.Client/Lobby/UI/LobbyGui.xaml.cs
index a4bea076ff..f96344daa7 100644
--- a/Content.Client/Lobby/UI/LobbyGui.xaml.cs
+++ b/Content.Client/Lobby/UI/LobbyGui.xaml.cs
@@ -8,6 +8,7 @@ using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Lobby.UI
 {
@@ -21,7 +22,7 @@ namespace Content.Client.Lobby.UI
         public Button OptionsButton => COptionsButton;
         public Button LeaveButton => CLeaveButton;
         public ChatBox Chat => CChat;
-        public VBoxContainer VoteContainer => CVoteContainer;
+        public BoxContainer VoteContainer => CVoteContainer;
         public LobbyPlayerList OnlinePlayerList => COnlinePlayerList;
         public ServerInfo ServerInfo => CServerInfo;
         public LobbyCharacterPreviewPanel CharacterPreview { get; }
@@ -49,7 +50,7 @@ namespace Content.Client.Lobby.UI
     public class LobbyPlayerList : Control
     {
         private readonly ScrollContainer _scroll;
-        private readonly VBoxContainer _vBox;
+        private readonly BoxContainer _vBox;
 
         public LobbyPlayerList()
         {
@@ -57,7 +58,10 @@ namespace Content.Client.Lobby.UI
             {
                 PanelOverride = new StyleBoxFlat {BackgroundColor = Color.FromHex("#202028")},
             };
-            _vBox = new VBoxContainer();
+            _vBox = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Vertical
+            };
             _scroll = new ScrollContainer();
             _scroll.AddChild(_vBox);
             panel.AddChild(_scroll);
@@ -67,8 +71,9 @@ namespace Content.Client.Lobby.UI
         // Adds a row
         public void AddItem(string name, string status)
         {
-            var hbox = new HBoxContainer
+            var hbox = new BoxContainer
             {
+                Orientation = LayoutOrientation.Horizontal,
                 HorizontalExpand = true,
             };
 
diff --git a/Content.Client/MainMenu/MainMenu.cs b/Content.Client/MainMenu/MainMenu.cs
index 3cd942d225..0c4a791451 100644
--- a/Content.Client/MainMenu/MainMenu.cs
+++ b/Content.Client/MainMenu/MainMenu.cs
@@ -14,6 +14,7 @@ using Robust.Shared.Localization;
 using Robust.Shared.Log;
 using Robust.Shared.Network;
 using Robust.Shared.Utility;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 using UsernameHelpers = Robust.Shared.AuthLib.UsernameHelpers;
 
 namespace Content.Client.MainMenu
@@ -221,8 +222,9 @@ namespace Content.Client.MainMenu
                 var layout = new LayoutContainer();
                 AddChild(layout);
 
-                var vBox = new VBoxContainer
+                var vBox = new BoxContainer
                 {
+                    Orientation = LayoutOrientation.Vertical,
                     StyleIdentifier = "mainMenuVBox"
                 };
 
@@ -240,7 +242,11 @@ namespace Content.Client.MainMenu
                 };
                 vBox.AddChild(logo);
 
-                var userNameHBox = new HBoxContainer {SeparationOverride = 4};
+                var userNameHBox = new BoxContainer
+                {
+                    Orientation = LayoutOrientation.Horizontal,
+                    SeparationOverride = 4
+                };
                 vBox.AddChild(userNameHBox);
                 userNameHBox.AddChild(new Label {Text = Loc.GetString("main-menu-username-label") });
 
diff --git a/Content.Client/MedicalScanner/UI/MedicalScannerWindow.cs b/Content.Client/MedicalScanner/UI/MedicalScannerWindow.cs
index 5a51ee6f3f..2c42dc5fb9 100644
--- a/Content.Client/MedicalScanner/UI/MedicalScannerWindow.cs
+++ b/Content.Client/MedicalScanner/UI/MedicalScannerWindow.cs
@@ -6,6 +6,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using static Content.Shared.MedicalScanner.SharedMedicalScannerComponent;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.MedicalScanner.UI
 {
@@ -17,8 +18,9 @@ namespace Content.Client.MedicalScanner.UI
         {
             SetSize = (250, 100);
 
-            Contents.AddChild(new VBoxContainer
+            Contents.AddChild(new BoxContainer
             {
+                Orientation = LayoutOrientation.Vertical,
                 Children =
                 {
                     (ScanButton = new Button
diff --git a/Content.Client/MobState/DamageStateVisualizer.cs b/Content.Client/MobState/DamageStateVisualizer.cs
index 2e25961141..00dc0c175d 100644
--- a/Content.Client/MobState/DamageStateVisualizer.cs
+++ b/Content.Client/MobState/DamageStateVisualizer.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Collections.Generic;
 using Content.Shared.DrawDepth;
 using Content.Shared.MobState;
diff --git a/Content.Client/Morgue/Visualizers/MorgueVisualizer.cs b/Content.Client/Morgue/Visualizers/MorgueVisualizer.cs
index c1d5801780..cf1d385831 100644
--- a/Content.Client/Morgue/Visualizers/MorgueVisualizer.cs
+++ b/Content.Client/Morgue/Visualizers/MorgueVisualizer.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Shared.Morgue;
+using Content.Shared.Morgue;
 using Robust.Client.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
diff --git a/Content.Client/Movement/Visualizers/HandTeleporterVisualizer.cs b/Content.Client/Movement/Visualizers/HandTeleporterVisualizer.cs
deleted file mode 100644
index 597029a37e..0000000000
--- a/Content.Client/Movement/Visualizers/HandTeleporterVisualizer.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using Content.Shared.Portal.Components;
-using JetBrains.Annotations;
-using Robust.Client.GameObjects;
-
-namespace Content.Client.Movement.Visualizers
-{
-    [UsedImplicitly]
-    public class HandTeleporterVisualizer : AppearanceVisualizer
-    {
-
-        public override void OnChangeData(AppearanceComponent component)
-        {
-            var sprite = component.Owner.GetComponent<ISpriteComponent>();
-            if (!component.TryGetData(TeleporterVisuals.VisualState, out TeleporterVisualState state))
-            {
-                state = TeleporterVisualState.Ready;
-            }
-
-            switch (state)
-            {
-                case TeleporterVisualState.Charging:
-                    sprite.LayerSetState(0, "charging");
-                    break;
-                case TeleporterVisualState.Ready:
-                    sprite.LayerSetState(0, "ready");
-                    break;
-                default:
-                    throw new ArgumentOutOfRangeException();
-            }
-        }
-    }
-
-}
diff --git a/Content.Client/Movement/Visualizers/PortalVisualizer.cs b/Content.Client/Movement/Visualizers/PortalVisualizer.cs
deleted file mode 100644
index 4ab0bf605b..0000000000
--- a/Content.Client/Movement/Visualizers/PortalVisualizer.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using Content.Shared.Portal.Components;
-using JetBrains.Annotations;
-using Robust.Client.GameObjects;
-using Robust.Shared.GameObjects;
-
-namespace Content.Client.Movement.Visualizers
-{
-    [UsedImplicitly]
-    public class PortalVisualizer : AppearanceVisualizer
-    {
-        public override void InitializeEntity(IEntity entity)
-        {
-            base.InitializeEntity(entity);
-
-            var sprite = entity.GetComponent<ISpriteComponent>();
-
-            sprite.LayerMapSet(Layers.Portal, sprite.AddLayerState("portal-pending"));
-            sprite.LayerSetShader(Layers.Portal, "unshaded");
-
-        }
-
-        public override void OnChangeData(AppearanceComponent component)
-        {
-            base.OnChangeData(component);
-
-            var sprite = component.Owner.GetComponent<ISpriteComponent>();
-            if (component.TryGetData<PortalState>(PortalVisuals.State, out var state))
-            {
-                switch (state)
-                {
-                    case PortalState.Pending:
-                        sprite.LayerSetState(Layers.Portal, "portal-pending");
-                        break;
-                    // TODO: Spritework here?
-                    case PortalState.UnableToTeleport:
-                        sprite.LayerSetState(Layers.Portal, "portal-unconnected");
-                        break;
-                    case PortalState.RecentlyTeleported:
-                        sprite.LayerSetState(Layers.Portal, "portal-unconnected");
-                        break;
-                }
-            }
-            else
-            {
-                sprite.LayerSetState(Layers.Portal, "portal-pending");
-            }
-        }
-
-        enum Layers : byte
-        {
-            Portal
-        }
-    }
-}
diff --git a/Content.Client/PDA/PDABoundUserInterface.cs b/Content.Client/PDA/PDABoundUserInterface.cs
index b02cdfb52a..32e9e76ea3 100644
--- a/Content.Client/PDA/PDABoundUserInterface.cs
+++ b/Content.Client/PDA/PDABoundUserInterface.cs
@@ -14,6 +14,7 @@ using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
 using static Robust.Client.UserInterface.Controls.BaseButton;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.PDA
 {
@@ -243,15 +244,15 @@ namespace Content.Client.PDA
             public PanelContainer IDInfoContainer { get; }
             public RichTextLabel IDInfoLabel { get; }
 
-            public VBoxContainer UplinkTabContainer { get; }
+            public BoxContainer UplinkTabContainer { get; }
 
             protected readonly HSplitContainer CategoryAndListingsContainer;
 
             private readonly IPrototypeManager _prototypeManager;
 
-            public readonly VBoxContainer UplinkListingsContainer;
+            public readonly BoxContainer UplinkListingsContainer;
 
-            public readonly VBoxContainer CategoryListContainer;
+            public readonly BoxContainer CategoryListContainer;
             public readonly RichTextLabel BalanceInfo;
             public event Action<ButtonEventArgs, UplinkListingData>? OnListingButtonPressed;
             public event Action<ButtonEventArgs, UplinkCategory>? OnCategoryButtonPressed;
@@ -311,8 +312,9 @@ namespace Content.Client.PDA
                     VerticalAlignment = VAlignment.Center
                 };
 
-                var innerHBoxContainer = new HBoxContainer
+                var innerHBoxContainer = new BoxContainer
                 {
+                    Orientation = LayoutOrientation.Horizontal,
                     Children =
                     {
                         IDInfoLabel,
@@ -335,8 +337,9 @@ namespace Content.Client.PDA
                     ToggleMode = true,
                 };
 
-                var mainMenuTabContainer = new VBoxContainer
+                var mainMenuTabContainer = new BoxContainer
                 {
+                    Orientation = LayoutOrientation.Vertical,
                     VerticalExpand = true,
                     HorizontalExpand = true,
                     MinSize = (50, 50),
@@ -353,8 +356,9 @@ namespace Content.Client.PDA
 
                 #region UPLINK_TAB
                 //Uplink Tab
-                CategoryListContainer = new VBoxContainer
+                CategoryListContainer = new BoxContainer
                 {
+                    Orientation = LayoutOrientation.Vertical
                 };
 
                 BalanceInfo = new RichTextLabel
@@ -400,8 +404,9 @@ namespace Content.Client.PDA
                 masterPanelContainer.AddChild(CategoryAndListingsContainer);
 
                 //Actual list of buttons for buying a listing from the uplink.
-                UplinkListingsContainer = new VBoxContainer
+                UplinkListingsContainer = new BoxContainer
                 {
+                    Orientation = LayoutOrientation.Vertical,
                     HorizontalExpand = true,
                     VerticalExpand = true,
                     SizeFlagsStretchRatio = 2,
@@ -409,8 +414,9 @@ namespace Content.Client.PDA
                 };
                 uplinkShopScrollContainer.AddChild(UplinkListingsContainer);
 
-                var innerVboxContainer = new VBoxContainer
+                var innerVboxContainer = new BoxContainer
                 {
+                    Orientation = LayoutOrientation.Vertical,
                     VerticalExpand = true,
 
                     Children =
@@ -420,8 +426,9 @@ namespace Content.Client.PDA
                     }
                 };
 
-                UplinkTabContainer = new VBoxContainer
+                UplinkTabContainer = new BoxContainer
                 {
+                    Orientation = LayoutOrientation.Vertical,
                     Children =
                     {
                         innerVboxContainer
@@ -495,14 +502,16 @@ namespace Content.Client.PDA
                 };
 
                 //Padding for the price lable.
-                var pricePadding = new HBoxContainer
+                var pricePadding = new BoxContainer
                 {
+                    Orientation = LayoutOrientation.Horizontal,
                     MinSize = (32, 1),
                 };
 
                 //Contains the name of the item and its price. Used for spacing item name and price.
-                var listingButtonHbox = new HBoxContainer
+                var listingButtonHbox = new BoxContainer
                 {
+                    Orientation = LayoutOrientation.Horizontal,
                     Children =
                     {
                         itemLabel,
diff --git a/Content.Client/Paper/UI/PaperWindow.cs b/Content.Client/Paper/UI/PaperWindow.cs
index 6a0c01c083..946aae3354 100644
--- a/Content.Client/Paper/UI/PaperWindow.cs
+++ b/Content.Client/Paper/UI/PaperWindow.cs
@@ -2,6 +2,7 @@
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.Utility;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Paper.UI
 {
@@ -13,7 +14,10 @@ namespace Content.Client.Paper.UI
         public PaperWindow()
         {
             MinSize = SetSize = (300, 300);
-            var container = new VBoxContainer();
+            var container = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Vertical
+            };
             _label = new RichTextLabel();
             Input = new LineEdit {Visible = false};
             container.AddChild(_label);
diff --git a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.cs b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.cs
index d6da1a6434..d7c41f53ce 100644
--- a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.cs
+++ b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.cs
@@ -15,6 +15,7 @@ using Robust.Shared.Maths;
 using Robust.Shared.Noise;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.ParticleAccelerator.UI
 {
@@ -32,7 +33,7 @@ namespace Content.Client.ParticleAccelerator.UI
         private readonly Label _statusLabel;
         private readonly SpinBox _stateSpinBox;
 
-        private readonly VBoxContainer _alarmControl;
+        private readonly BoxContainer _alarmControl;
         private readonly Animation _alarmControlAnimation;
 
         private readonly PASegmentControl _endCapTexture;
@@ -138,8 +139,9 @@ namespace Content.Client.ParticleAccelerator.UI
             };
             _drawLabel = new Label();
             var imgSize = new Vector2(32, 32);
-            AddChild(new VBoxContainer
+            AddChild(new BoxContainer
             {
+                Orientation = LayoutOrientation.Vertical,
                 Children =
                 {
                     new Control
@@ -166,19 +168,22 @@ namespace Content.Client.ParticleAccelerator.UI
                         MinSize = (0, 4)
                     },
 
-                    new HBoxContainer
+                    new BoxContainer
                     {
+                        Orientation = LayoutOrientation.Horizontal,
                         VerticalExpand = true,
                         Children =
                         {
-                            new VBoxContainer
+                            new BoxContainer
                             {
+                                Orientation = LayoutOrientation.Vertical,
                                 Margin = new Thickness(4, 0, 0, 0),
                                 HorizontalExpand = true,
                                 Children =
                                 {
-                                    new HBoxContainer
+                                    new BoxContainer
                                     {
+                                        Orientation = LayoutOrientation.Horizontal,
                                         Children =
                                         {
                                             new Label
@@ -191,8 +196,9 @@ namespace Content.Client.ParticleAccelerator.UI
                                             _onButton
                                         }
                                     },
-                                    new HBoxContainer
+                                    new BoxContainer
                                     {
+                                        Orientation = LayoutOrientation.Horizontal,
                                         Children =
                                         {
                                             new Label
@@ -213,8 +219,9 @@ namespace Content.Client.ParticleAccelerator.UI
                                     {
                                         VerticalExpand = true,
                                     },
-                                    (_alarmControl = new VBoxContainer
+                                    (_alarmControl = new BoxContainer
                                     {
+                                        Orientation = LayoutOrientation.Vertical,
                                         Children =
                                         {
                                             new Label
@@ -228,8 +235,9 @@ namespace Content.Client.ParticleAccelerator.UI
                                     }),
                                 }
                             },
-                            new VBoxContainer
+                            new BoxContainer
                             {
+                                Orientation = LayoutOrientation.Vertical,
                                 MinSize = (186, 0),
                                 Children =
                                 {
@@ -292,8 +300,9 @@ namespace Content.Client.ParticleAccelerator.UI
                             }
                         }
                     },
-                    new HBoxContainer
+                    new BoxContainer
                     {
+                        Orientation = LayoutOrientation.Horizontal,
                         Margin = new Thickness(12, 0, 0, 0),
                         Children =
                         {
@@ -465,7 +474,7 @@ namespace Content.Client.ParticleAccelerator.UI
             {
                 _menu = menu;
                 _baseState = name;
-                _rsi = cache.GetResource<RSIResource>($"/Textures/Constructible/Specific/Engines/PA/{name}.rsi").RSI;
+                _rsi = cache.GetResource<RSIResource>($"/Textures/Structures/Power/Generation/PA/{name}.rsi").RSI;
 
                 AddChild(_base = new TextureRect {Texture = _rsi[$"{state}"].Frame0});
                 AddChild(_unlit = new TextureRect());
diff --git a/Content.Client/Physics/Controllers/MoverController.cs b/Content.Client/Physics/Controllers/MoverController.cs
index 7b2d05aa50..de4e4eb7b3 100644
--- a/Content.Client/Physics/Controllers/MoverController.cs
+++ b/Content.Client/Physics/Controllers/MoverController.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Shared.Movement;
 using Content.Shared.Movement.Components;
 using Robust.Client.Player;
diff --git a/Content.Client/Portal/PortalComponent.cs b/Content.Client/Portal/PortalComponent.cs
deleted file mode 100644
index 7ef2899c32..0000000000
--- a/Content.Client/Portal/PortalComponent.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Content.Shared.Portal.Components;
-using Robust.Shared.GameObjects;
-
-namespace Content.Client.Portal
-{
-    [RegisterComponent]
-    public class PortalComponent : SharedPortalComponent
-    {
-    }
-}
diff --git a/Content.Client/Power/APC/ApcBoundUserInterface.cs b/Content.Client/Power/APC/ApcBoundUserInterface.cs
index 0df4379d78..fd4724c544 100644
--- a/Content.Client/Power/APC/ApcBoundUserInterface.cs
+++ b/Content.Client/Power/APC/ApcBoundUserInterface.cs
@@ -8,6 +8,7 @@ using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Power.APC
 {
@@ -143,19 +144,28 @@ namespace Content.Client.Power.APC
             public ApcWindow()
             {
                 Title = "APC";
-                var rows = new VBoxContainer();
+                var rows = new BoxContainer
+                {
+                    Orientation = LayoutOrientation.Vertical
+                };
 
                 var statusHeader = new Label {Text = "Power Status: "};
                 rows.AddChild(statusHeader);
 
-                var breaker = new HBoxContainer();
+                var breaker = new BoxContainer
+                {
+                    Orientation = LayoutOrientation.Horizontal
+                };
                 var breakerLabel = new Label {Text = "Main Breaker: "};
                 BreakerButton = new CheckButton {Text = "Toggle"};
                 breaker.AddChild(breakerLabel);
                 breaker.AddChild(BreakerButton);
                 rows.AddChild(breaker);
 
-                var externalStatus = new HBoxContainer();
+                var externalStatus = new BoxContainer
+                {
+                    Orientation = LayoutOrientation.Horizontal
+                };
                 var externalStatusLabel = new Label {Text = "External Power: "};
                 ExternalPowerStateLabel = new Label {Text = "Good"};
                 ExternalPowerStateLabel.SetOnlyStyleClass(StyleNano.StyleClassPowerStateGood);
@@ -163,7 +173,10 @@ namespace Content.Client.Power.APC
                 externalStatus.AddChild(ExternalPowerStateLabel);
                 rows.AddChild(externalStatus);
 
-                var charge = new HBoxContainer();
+                var charge = new BoxContainer
+                {
+                    Orientation = LayoutOrientation.Horizontal
+                };
                 var chargeLabel = new Label {Text = "Charge:"};
                 ChargeBar = new ProgressBar
                 {
diff --git a/Content.Client/Power/SolarControlWindow.xaml b/Content.Client/Power/SolarControlWindow.xaml
index a51f57154c..f492c97fed 100644
--- a/Content.Client/Power/SolarControlWindow.xaml
+++ b/Content.Client/Power/SolarControlWindow.xaml
@@ -1,8 +1,8 @@
 <SS14Window xmlns="https://spacestation14.io"
-            xmlns:scc="clr-namespace:Content.Client.GameObjects.Components.Power"
+            xmlns:power="clr-namespace:Content.Client.Power"
             Title="{Loc 'solar-control-window-title'}"
             Resizable="False">
-    <HBoxContainer>
+    <BoxContainer Orientation="Horizontal">
         <GridContainer Columns="2">
             <!--
                 little secret: the reason I put the values
@@ -26,7 +26,7 @@
 
             <Label Text="{Loc 'solar-control-window-press-enter-to-confirm'}"/><Label Text=""/>
         </GridContainer>
-        <scc:SolarControlNotARadar Name="NotARadar"/>
-    </HBoxContainer>
+        <power:SolarControlNotARadar Name="NotARadar"/>
+    </BoxContainer>
 </SS14Window>
 
diff --git a/Content.Client/Power/SolarControlWindow.xaml.cs b/Content.Client/Power/SolarControlWindow.xaml.cs
index 5ced2ae49d..f56c46ca8f 100644
--- a/Content.Client/Power/SolarControlWindow.xaml.cs
+++ b/Content.Client/Power/SolarControlWindow.xaml.cs
@@ -1,21 +1,19 @@
 using System;
-using JetBrains.Annotations;
+using Content.Client.GameObjects.Components;
 using Content.Shared.Solar;
+using JetBrains.Annotations;
+using Robust.Client.AutoGenerated;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
-using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.XAML;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
-using Robust.Shared.GameObjects;
+using Robust.Client.UserInterface.XAML;
 using Robust.Shared.IoC;
-using Robust.Shared.Log;
-using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using Robust.Shared.Timing;
 
-namespace Content.Client.GameObjects.Components.Power
+namespace Content.Client.Power
 {
     [GenerateTypedNameReferences]
     public sealed partial class SolarControlWindow : SS14Window, IComputerWindow<SolarControlConsoleBoundInterfaceState>
@@ -31,7 +29,7 @@ namespace Content.Client.GameObjects.Components.Power
         {
             PanelRotation.OnTextEntered += (text) => {
                 double value;
-                if (double.TryParse(text.Text, out value))
+                if (double.TryParse((string?) text.Text, out value))
                 {
                     SolarControlConsoleAdjustMessage msg = new SolarControlConsoleAdjustMessage();
                     msg.Rotation = Angle.FromDegrees(value);
@@ -44,7 +42,7 @@ namespace Content.Client.GameObjects.Components.Power
             };
             PanelVelocity.OnTextEntered += (text) => {
                 double value;
-                if (double.TryParse(text.Text, out value))
+                if (double.TryParse((string?) text.Text, out value))
                 {
                     SolarControlConsoleAdjustMessage msg = new SolarControlConsoleAdjustMessage();
                     msg.Rotation = NotARadar.PredictedPanelRotation;
diff --git a/Content.Client/Preferences/UI/CharacterSetupGui.cs b/Content.Client/Preferences/UI/CharacterSetupGui.cs
index ee76b25e4d..0afabf0db5 100644
--- a/Content.Client/Preferences/UI/CharacterSetupGui.cs
+++ b/Content.Client/Preferences/UI/CharacterSetupGui.cs
@@ -17,12 +17,13 @@ using Robust.Shared.Localization;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Preferences.UI
 {
     public class CharacterSetupGui : Control
     {
-        private readonly VBoxContainer _charactersVBox;
+        private readonly BoxContainer _charactersVBox;
         private readonly Button _createNewCharacterButton;
         private readonly IEntityManager _entityManager;
         private readonly HumanoidProfileEditor _humanoidProfileEditor;
@@ -62,12 +63,17 @@ namespace Content.Client.Preferences.UI
 
             margin.AddChild(panel);
 
-            var vBox = new VBoxContainer {SeparationOverride = 0};
+            var vBox = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Vertical,
+                SeparationOverride = 0
+            };
 
             margin.AddChild(vBox);
 
-            var topHBox = new HBoxContainer
+            var topHBox = new BoxContainer
             {
+                Orientation = LayoutOrientation.Horizontal,
                 MinSize = (0, 40),
                 Children =
                 {
@@ -104,14 +110,18 @@ namespace Content.Client.Preferences.UI
                 }
             });
 
-            var hBox = new HBoxContainer
+            var hBox = new BoxContainer
             {
+                Orientation = LayoutOrientation.Horizontal,
                 VerticalExpand = true,
                 SeparationOverride = 0
             };
             vBox.AddChild(hBox);
 
-            _charactersVBox = new VBoxContainer();
+            _charactersVBox = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Vertical
+            };
 
             hBox.AddChild(new ScrollContainer
             {
@@ -271,8 +281,9 @@ namespace Content.Client.Preferences.UI
                     preferencesManager.DeleteCharacter(profile);
                 };
 
-                var internalHBox = new HBoxContainer
+                var internalHBox = new BoxContainer
                 {
+                    Orientation = LayoutOrientation.Horizontal,
                     HorizontalExpand = true,
                     SeparationOverride = 0,
                     Children =
diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.cs b/Content.Client/Preferences/UI/HumanoidProfileEditor.cs
index a16e28819c..153a83d304 100644
--- a/Content.Client/Preferences/UI/HumanoidProfileEditor.cs
+++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.cs
@@ -23,6 +23,7 @@ using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Preferences.UI
 {
@@ -52,7 +53,7 @@ namespace Content.Client.Preferences.UI
 
         private readonly List<JobPrioritySelector> _jobPriorities;
         private readonly OptionButton _preferenceUnavailableButton;
-        private readonly Dictionary<string, VBoxContainer> _jobCategories;
+        private readonly Dictionary<string, BoxContainer> _jobCategories;
 
         private readonly List<AntagPreferenceSelector> _antagPreferences;
 
@@ -75,21 +76,32 @@ namespace Content.Client.Preferences.UI
 
             _preferencesManager = preferencesManager;
 
-            var hbox = new HBoxContainer();
+            var hbox = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Horizontal
+            };
             AddChild(hbox);
 
             #region Left
 
-            var vBox = new VBoxContainer {Margin = new Thickness(10)};
+            var vBox = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Vertical,
+                Margin = new Thickness(10)
+            };
             hbox.AddChild(vBox);
 
-            var middleContainer = new HBoxContainer
+            var middleContainer = new BoxContainer
             {
+                Orientation = LayoutOrientation.Horizontal,
                 SeparationOverride = 10
             };
             vBox.AddChild(middleContainer);
 
-            var leftColumn = new VBoxContainer();
+            var leftColumn = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Vertical
+            };
             middleContainer.AddChild(leftColumn);
 
             #region Randomize
@@ -108,8 +120,9 @@ namespace Content.Client.Preferences.UI
             #region Name
 
             var namePanel = HighlightedContainer();
-            var nameHBox = new HBoxContainer
+            var nameHBox = new BoxContainer
             {
+                Orientation = LayoutOrientation.Horizontal,
                 VerticalExpand = true
             };
             var nameLabel = new Label { Text = Loc.GetString("humanoid-profile-editor-name-label") };
@@ -136,10 +149,14 @@ namespace Content.Client.Preferences.UI
 
             #region Appearance
 
-            var appearanceList = new VBoxContainer();
-
-            var appearanceVBox = new VBoxContainer
+            var appearanceList = new BoxContainer
             {
+                Orientation = LayoutOrientation.Vertical
+            };
+
+            var appearanceVBox = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Vertical,
                 Children =
                 {
                     new ScrollContainer
@@ -155,8 +172,9 @@ namespace Content.Client.Preferences.UI
             tabContainer.AddChild(appearanceVBox);
             tabContainer.SetTabTitle(0, Loc.GetString("humanoid-profile-editor-appearance-tab"));
 
-            var sexAndAgeRow = new HBoxContainer
+            var sexAndAgeRow = new BoxContainer
             {
+                Orientation = LayoutOrientation.Horizontal,
                 SeparationOverride = 10
             };
 
@@ -165,7 +183,10 @@ namespace Content.Client.Preferences.UI
             #region Sex
 
             var sexPanel = HighlightedContainer();
-            var sexHBox = new HBoxContainer();
+            var sexHBox = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Horizontal
+            };
             var sexLabel = new Label { Text = Loc.GetString("humanoid-profile-editor-sex-label") };
 
             var sexButtonGroup = new ButtonGroup();
@@ -212,7 +233,10 @@ namespace Content.Client.Preferences.UI
             #region Age
 
             var agePanel = HighlightedContainer();
-            var ageHBox = new HBoxContainer();
+            var ageHBox = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Horizontal
+            };
             var ageLabel = new Label { Text = Loc.GetString("humanoid-profile-editor-age-label") };
             _ageEdit = new LineEdit { MinSize = (40, 0) };
             _ageEdit.OnTextChanged += args =>
@@ -231,7 +255,10 @@ namespace Content.Client.Preferences.UI
             #region Gender
 
             var genderPanel = HighlightedContainer();
-            var genderHBox = new HBoxContainer();
+            var genderHBox = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Horizontal
+            };
             var genderLabel = new Label { Text = Loc.GetString("humanoid-profile-editor-pronouns-label") };
 
             _genderButton = new OptionButton();
@@ -257,7 +284,10 @@ namespace Content.Client.Preferences.UI
             #region Hair
 
             var hairPanel = HighlightedContainer();
-            var hairHBox = new HBoxContainer();
+            var hairHBox = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Horizontal
+            };
 
             _hairPicker = new HairStylePicker
             {
@@ -315,7 +345,10 @@ namespace Content.Client.Preferences.UI
             #region Clothing
 
             var clothingPanel = HighlightedContainer();
-            var clothingHBox = new HBoxContainer();
+            var clothingHBox = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Horizontal
+            };
             var clothingLabel = new Label { Text = Loc.GetString("humanoid-profile-editor-clothing-label") };
 
             _clothingButton = new OptionButton();
@@ -339,7 +372,10 @@ namespace Content.Client.Preferences.UI
             #region Backpack
 
             var backpackPanel = HighlightedContainer();
-            var backpackHBox = new HBoxContainer();
+            var backpackHBox = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Horizontal
+            };
             var backpackLabel = new Label { Text = Loc.GetString("humanoid-profile-editor-backpack-label") };
 
             _backpackButton = new OptionButton();
@@ -364,7 +400,10 @@ namespace Content.Client.Preferences.UI
             #region Eyes
 
             var eyesPanel = HighlightedContainer();
-            var eyesVBox = new VBoxContainer();
+            var eyesVBox = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Vertical
+            };
             var eyesLabel = new Label { Text = Loc.GetString("humanoid-profile-editor-eyes-label") };
 
             _eyesPicker = new EyeColorPicker();
@@ -389,10 +428,14 @@ namespace Content.Client.Preferences.UI
 
             #region Jobs
 
-            var jobList = new VBoxContainer();
+            var jobList = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Vertical
+            };
 
-                var jobVBox = new VBoxContainer
+                var jobVBox = new BoxContainer
                 {
+                    Orientation = LayoutOrientation.Vertical,
                     Children =
                     {
                         (_preferenceUnavailableButton = new OptionButton()),
@@ -428,7 +471,7 @@ namespace Content.Client.Preferences.UI
             };
 
             _jobPriorities = new List<JobPrioritySelector>();
-            _jobCategories = new Dictionary<string, VBoxContainer>();
+            _jobCategories = new Dictionary<string, BoxContainer>();
 
             var firstCategory = true;
 
@@ -438,8 +481,9 @@ namespace Content.Client.Preferences.UI
                 {
                     if (!_jobCategories.TryGetValue(department, out var category))
                     {
-                        category = new VBoxContainer
+                        category = new BoxContainer
                         {
+                            Orientation = LayoutOrientation.Vertical,
                             Name = department,
                             ToolTip = Loc.GetString("humanoid-profile-editor-jobs-amount-in-department-tooltip",
                                                     ("departmentName", department))
@@ -509,10 +553,14 @@ namespace Content.Client.Preferences.UI
 
             #region Antags
 
-            var antagList = new VBoxContainer();
+            var antagList = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Vertical
+            };
 
-                var antagVBox = new VBoxContainer
+                var antagVBox = new BoxContainer
                 {
+                    Orientation = LayoutOrientation.Vertical,
                     Children =
                     {
                         new ScrollContainer
@@ -552,13 +600,19 @@ namespace Content.Client.Preferences.UI
 
             #endregion Antags
 
-            var rightColumn = new VBoxContainer();
+            var rightColumn = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Vertical
+            };
             middleContainer.AddChild(rightColumn);
 
             #region Import/Export
 
             var importExportPanelContainer = HighlightedContainer();
-            var importExportHBox = new HBoxContainer();
+            var importExportHBox = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Horizontal
+            };
             var importButton = new Button
             {
                 Text = Loc.GetString("humanoid-profile-editor-import-button"),
@@ -598,8 +652,9 @@ namespace Content.Client.Preferences.UI
 
             #region Right
 
-            vBox = new VBoxContainer()
+            vBox = new BoxContainer
             {
+                Orientation = LayoutOrientation.Vertical,
                 VerticalExpand = true,
                 HorizontalExpand = true,
             };
@@ -925,8 +980,9 @@ namespace Content.Client.Preferences.UI
                     icon.Texture = specifier.Frame0();
                 }
 
-                AddChild(new HBoxContainer
+                AddChild(new BoxContainer
                 {
+                    Orientation = LayoutOrientation.Horizontal,
                     Children =
                     {
                         icon,
@@ -968,8 +1024,9 @@ namespace Content.Client.Preferences.UI
                 _checkBox = new CheckBox {Text = $"{antag.Name}"};
                 _checkBox.OnToggled += OnCheckBoxToggled;
 
-                AddChild(new HBoxContainer
+                AddChild(new BoxContainer
                 {
+                    Orientation = LayoutOrientation.Horizontal,
                     Children =
                     {
                         _checkBox
diff --git a/Content.Client/Research/UI/ResearchConsoleMenu.cs b/Content.Client/Research/UI/ResearchConsoleMenu.cs
index 0686157a73..608aee28be 100644
--- a/Content.Client/Research/UI/ResearchConsoleMenu.cs
+++ b/Content.Client/Research/UI/ResearchConsoleMenu.cs
@@ -7,6 +7,7 @@ using Robust.Client.Utility;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Prototypes;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Research.UI
 {
@@ -71,36 +72,41 @@ namespace Content.Client.Research.UI
 
             _futureTechnologies.OnItemSelected += FutureTechnologySelected;
 
-            var vbox = new VBoxContainer()
+            var vbox = new BoxContainer
             {
+                Orientation = LayoutOrientation.Vertical,
                 HorizontalExpand = true,
                 VerticalExpand = true,
             };
 
-            var hboxTechnologies = new HBoxContainer()
+            var hboxTechnologies = new BoxContainer
             {
+                Orientation = LayoutOrientation.Horizontal,
                 HorizontalExpand = true,
                 VerticalExpand = true,
                 SizeFlagsStretchRatio = 2,
                 SeparationOverride = 10,
             };
 
-            var hboxSelected = new HBoxContainer()
+            var hboxSelected = new BoxContainer
             {
+                Orientation = LayoutOrientation.Horizontal,
                 HorizontalExpand = true,
                 VerticalExpand = true,
                 SizeFlagsStretchRatio = 1
             };
 
-            var vboxPoints = new VBoxContainer()
+            var vboxPoints = new BoxContainer
             {
+                Orientation = LayoutOrientation.Vertical,
                 HorizontalExpand = true,
                 VerticalExpand = true,
                 SizeFlagsStretchRatio = 1,
             };
 
-            var vboxTechInfo = new VBoxContainer()
+            var vboxTechInfo = new BoxContainer
             {
+                Orientation = LayoutOrientation.Vertical,
                 HorizontalExpand = true,
                 VerticalExpand = true,
                 SizeFlagsStretchRatio = 3,
@@ -109,9 +115,10 @@ namespace Content.Client.Research.UI
             _pointLabel = new Label() { Text = Loc.GetString("research-console-menu-research-points-text", ("points", 0)) };
             _pointsPerSecondLabel = new Label() { Text = Loc.GetString("research-console-menu-points-per-second-text", ("pointsPerSecond", 0)) };
 
-            var vboxPointsButtons = new VBoxContainer()
+            var vboxPointsButtons = new BoxContainer
             {
-                Align = BoxContainer.AlignMode.End,
+                Orientation = LayoutOrientation.Vertical,
+                Align = AlignMode.End,
                 HorizontalExpand = true,
                 VerticalExpand = true,
             };
@@ -264,7 +271,7 @@ namespace Content.Client.Research.UI
 
             _technologyIcon.Texture = TechnologySelected.Icon.Frame0();
             _technologyName.Text = TechnologySelected.Name;
-            _technologyDescription.Text = TechnologySelected.Description + $"\n{TechnologySelected.RequiredPoints} " + Loc.GetString("research-console-menu-research-points-text").ToLowerInvariant();
+            _technologyDescription.Text = TechnologySelected.Description + $"\n{TechnologySelected.RequiredPoints} " + Loc.GetString("research-console-menu-research-points-text" ,("points", Owner.Points)).ToLowerInvariant();
             _technologyRequirements.Text = Loc.GetString("research-console-tech-requirements-none");
 
             var prototypeMan = IoCManager.Resolve<IPrototypeManager>();
@@ -286,7 +293,7 @@ namespace Content.Client.Research.UI
         public void PopulatePoints()
         {
             _pointLabel.Text = Loc.GetString("research-console-menu-research-points-text", ("points", Owner.Points));
-            _pointsPerSecondLabel.Text = Loc.GetString("research-console-menu-points-per-second-text", ("pointsPerSeconds", Owner.PointsPerSecond));
+            _pointsPerSecondLabel.Text = Loc.GetString("research-console-menu-points-per-second-text", ("pointsPerSecond", Owner.PointsPerSecond));
         }
 
         /// <summary>
diff --git a/Content.Client/Rotatable/RotatableComponent.cs b/Content.Client/Rotatable/RotatableComponent.cs
index 2e46278b35..5284292c8c 100644
--- a/Content.Client/Rotatable/RotatableComponent.cs
+++ b/Content.Client/Rotatable/RotatableComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Shared.Rotatable;
 using Robust.Shared.GameObjects;
 
diff --git a/Content.Client/RoundEnd/RoundEndSummaryWindow.cs b/Content.Client/RoundEnd/RoundEndSummaryWindow.cs
index 3f012842ab..e8f245c1ce 100644
--- a/Content.Client/RoundEnd/RoundEndSummaryWindow.cs
+++ b/Content.Client/RoundEnd/RoundEndSummaryWindow.cs
@@ -7,13 +7,14 @@ using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.Localization;
 using static Content.Shared.GameTicking.SharedGameTicker;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.RoundEnd
 {
     public sealed class RoundEndSummaryWindow : SS14Window
     {
-        private VBoxContainer RoundEndSummaryTab { get; }
-        private VBoxContainer PlayerManifestoTab { get; }
+        private BoxContainer RoundEndSummaryTab { get; }
+        private BoxContainer PlayerManifestoTab { get; }
         private TabContainer RoundEndWindowTabs { get; }
 
         public RoundEndSummaryWindow(string gm, string roundEnd, TimeSpan roundTimeSpan, RoundEndMessageEvent.RoundEndPlayerInfo[] info)
@@ -27,14 +28,16 @@ namespace Content.Client.RoundEnd
             //This tab would be a good place for things like: "x many people died.",
             //"clown slipped the crew x times.", "x shots were fired this round.", etc.
             //Also good for serious info.
-            RoundEndSummaryTab = new VBoxContainer()
+            RoundEndSummaryTab = new BoxContainer
             {
+                Orientation = LayoutOrientation.Vertical,
                 Name = Loc.GetString("round-end-summary-window-round-end-summary-tab-title")
             };
 
             //Tab for listing  unique info per player.
-            PlayerManifestoTab = new VBoxContainer()
+            PlayerManifestoTab = new BoxContainer
             {
+                Orientation = LayoutOrientation.Vertical,
                 Name = Loc.GetString("round-end-summary-window-player-manifesto-tab-title")
             };
 
@@ -70,7 +73,10 @@ namespace Content.Client.RoundEnd
             {
                 VerticalExpand = true
             };
-            var innerScrollContainer = new VBoxContainer();
+            var innerScrollContainer = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Vertical
+            };
 
             //Put observers at the bottom of the list. Put antags on top.
             var manifestSortedList = info.OrderBy(p => p.Observer).ThenBy(p => !p.Antag);
diff --git a/Content.Client/Sandbox/SandboxManager.cs b/Content.Client/Sandbox/SandboxManager.cs
index 1fc549548d..a13fd35be8 100644
--- a/Content.Client/Sandbox/SandboxManager.cs
+++ b/Content.Client/Sandbox/SandboxManager.cs
@@ -19,6 +19,7 @@ using Robust.Shared.Localization;
 using Robust.Shared.Map;
 using Robust.Shared.Network;
 using Robust.Shared.Prototypes;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Sandbox
 {
@@ -47,7 +48,11 @@ namespace Content.Client.Sandbox
 
             Title = Loc.GetString("sandbox-window-title");
 
-            var vBox = new VBoxContainer { SeparationOverride = 4 };
+            var vBox = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Vertical,
+                SeparationOverride = 4
+            };
             Contents.AddChild(vBox);
 
             RespawnButton = new Button { Text = Loc.GetString("sandbox-window-respawn-button") };
diff --git a/Content.Client/Shuttles/ShuttleConsoleComponent.cs b/Content.Client/Shuttles/ShuttleConsoleComponent.cs
new file mode 100644
index 0000000000..e5632721f3
--- /dev/null
+++ b/Content.Client/Shuttles/ShuttleConsoleComponent.cs
@@ -0,0 +1,12 @@
+using Content.Shared.Shuttles;
+using Robust.Shared.GameObjects;
+
+namespace Content.Client.Shuttles
+{
+    [RegisterComponent]
+    [ComponentReference(typeof(SharedShuttleConsoleComponent))]
+    internal sealed class ShuttleConsoleComponent : SharedShuttleConsoleComponent
+    {
+
+    }
+}
diff --git a/Content.Client/Shuttles/ShuttleConsoleSystem.cs b/Content.Client/Shuttles/ShuttleConsoleSystem.cs
new file mode 100644
index 0000000000..cb0f6f7b0c
--- /dev/null
+++ b/Content.Client/Shuttles/ShuttleConsoleSystem.cs
@@ -0,0 +1,9 @@
+using Content.Shared.Shuttles;
+
+namespace Content.Client.Shuttles
+{
+    internal sealed class ShuttleConsoleSystem : SharedShuttleConsoleSystem
+    {
+
+    }
+}
diff --git a/Content.Client/Singularity/SingularityOverlay.cs b/Content.Client/Singularity/SingularityOverlay.cs
index fd546799c2..119dda3050 100644
--- a/Content.Client/Singularity/SingularityOverlay.cs
+++ b/Content.Client/Singularity/SingularityOverlay.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Collections.Generic;
 using System.Linq;
 using Content.Shared.Singularity.Components;
diff --git a/Content.Client/Singularity/Visualizers/SingularityVisualizer.cs b/Content.Client/Singularity/Visualizers/SingularityVisualizer.cs
index c7ac7d2f8f..cf5acade56 100644
--- a/Content.Client/Singularity/Visualizers/SingularityVisualizer.cs
+++ b/Content.Client/Singularity/Visualizers/SingularityVisualizer.cs
@@ -33,7 +33,7 @@ namespace Content.Client.Singularity.Visualizers
                 return;
             }
 
-            sprite.LayerSetRSI(Layer, "Constructible/Power/Singularity/singularity_" + level + ".rsi");
+            sprite.LayerSetRSI(Layer, "Structures/Power/Generation/Singularity/singularity_" + level + ".rsi");
             sprite.LayerSetState(Layer, "singularity_" + level);
         }
     }
diff --git a/Content.Client/Slippery/SlipperySystem.cs b/Content.Client/Slippery/SlipperySystem.cs
new file mode 100644
index 0000000000..fcd2052e86
--- /dev/null
+++ b/Content.Client/Slippery/SlipperySystem.cs
@@ -0,0 +1,9 @@
+using Content.Shared.Slippery;
+
+namespace Content.Client.Slippery
+{
+    internal sealed class SlipperySystem : SharedSlipperySystem
+    {
+        protected override void PlaySound(SlipperyComponent component) {}
+    }
+}
diff --git a/Content.Client/Spawners/ClientEntitySpawnerComponent.cs b/Content.Client/Spawners/ClientEntitySpawnerComponent.cs
index 3a35e0a14c..bb17ab1700 100644
--- a/Content.Client/Spawners/ClientEntitySpawnerComponent.cs
+++ b/Content.Client/Spawners/ClientEntitySpawnerComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Collections.Generic;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
diff --git a/Content.Client/Stack/StackVisualizer.cs b/Content.Client/Stack/StackVisualizer.cs
index 7324bd1b8a..092e81f5bd 100644
--- a/Content.Client/Stack/StackVisualizer.cs
+++ b/Content.Client/Stack/StackVisualizer.cs
@@ -1,4 +1,3 @@
-#nullable enable
 
 using System.Collections.Generic;
 using Content.Shared.Rounding;
diff --git a/Content.Client/Storage/ClientStorageComponent.cs b/Content.Client/Storage/ClientStorageComponent.cs
index 0d552e681b..c194b6d296 100644
--- a/Content.Client/Storage/ClientStorageComponent.cs
+++ b/Content.Client/Storage/ClientStorageComponent.cs
@@ -16,6 +16,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 using Robust.Shared.Network;
 using Robust.Shared.Players;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Storage
 {
@@ -177,7 +178,7 @@ namespace Content.Client.Storage
         private class StorageWindow : SS14Window
         {
             private Control VSplitContainer;
-            private readonly VBoxContainer _entityList;
+            private readonly BoxContainer _entityList;
             private readonly Label _information;
             public ClientStorageComponent StorageEntity;
 
@@ -213,8 +214,9 @@ namespace Content.Client.Storage
                     }
                 };
 
-                VSplitContainer = new VBoxContainer()
+                VSplitContainer = new BoxContainer
                 {
+                    Orientation = LayoutOrientation.Vertical,
                     MouseFilter = MouseFilterMode.Ignore,
                 };
                 containerButton.AddChild(VSplitContainer);
@@ -232,8 +234,9 @@ namespace Content.Client.Storage
                     HScrollEnabled = false,
                     VScrollEnabled = true,
                 };
-                _entityList = new VBoxContainer
+                _entityList = new BoxContainer
                 {
+                    Orientation = LayoutOrientation.Vertical,
                     HorizontalExpand = true
                 };
                 listScrollContainer.AddChild(_entityList);
@@ -346,7 +349,10 @@ namespace Content.Client.Storage
                 };
                 AddChild(ActualButton);
 
-                var hBoxContainer = new HBoxContainer();
+                var hBoxContainer = new BoxContainer
+                {
+                    Orientation = LayoutOrientation.Horizontal
+                };
                 EntitySpriteView = new SpriteView
                 {
                     MinSize = new Vector2(32.0f, 32.0f),
diff --git a/Content.Client/Storage/Visualizers/BagOpenCloseVisualizer.cs b/Content.Client/Storage/Visualizers/BagOpenCloseVisualizer.cs
index 96f95b10a8..38dabbee29 100644
--- a/Content.Client/Storage/Visualizers/BagOpenCloseVisualizer.cs
+++ b/Content.Client/Storage/Visualizers/BagOpenCloseVisualizer.cs
@@ -1,5 +1,4 @@
-#nullable enable
-
+
 using Content.Shared.Stacks;
 using Content.Shared.Storage;
 using JetBrains.Annotations;
diff --git a/Content.Client/Storage/Visualizers/MappedItemVisualizer.cs b/Content.Client/Storage/Visualizers/MappedItemVisualizer.cs
new file mode 100644
index 0000000000..e3efd2712a
--- /dev/null
+++ b/Content.Client/Storage/Visualizers/MappedItemVisualizer.cs
@@ -0,0 +1,71 @@
+using System.Collections.Generic;
+using System.Linq;
+using Content.Shared.Storage.ItemCounter;
+using JetBrains.Annotations;
+using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Serialization.Manager.Attributes;
+using Robust.Shared.Utility;
+
+namespace Content.Client.Storage.Visualizers
+{
+    [UsedImplicitly]
+    public class MappedItemVisualizer : AppearanceVisualizer
+    {
+        [DataField("sprite")] private ResourcePath? _rsiPath;
+        private List<string> _spriteLayers = new();
+
+        public override void InitializeEntity(IEntity entity)
+        {
+            base.InitializeEntity(entity);
+
+            if (entity.TryGetComponent<ISpriteComponent>(out var spriteComponent))
+            {
+                _rsiPath ??= spriteComponent.BaseRSI!.Path!;
+            }
+        }
+
+
+        public override void OnChangeData(AppearanceComponent component)
+        {
+            base.OnChangeData(component);
+            if (component.Owner.TryGetComponent<ISpriteComponent>(out var spriteComponent))
+            {
+                if (_spriteLayers.Count == 0)
+                {
+                    InitLayers(spriteComponent, component);
+                }
+                EnableLayers(spriteComponent, component);
+                
+            }
+        }
+
+        private void InitLayers(ISpriteComponent spriteComponent, AppearanceComponent component)
+        {
+            if (!component.TryGetData<ShowLayerData>(StorageMapVisuals.InitLayers, out var wrapper))
+                return;
+
+            _spriteLayers.AddRange(wrapper.QueuedEntities);
+
+            foreach (var sprite in _spriteLayers)
+            {
+                spriteComponent.LayerMapReserveBlank(sprite);
+                spriteComponent.LayerSetSprite(sprite, new SpriteSpecifier.Rsi(_rsiPath!, sprite));
+                spriteComponent.LayerSetVisible(sprite, false);
+            }
+        }
+
+        private void EnableLayers(ISpriteComponent spriteComponent, AppearanceComponent component)
+        {
+            if (!component.TryGetData<ShowLayerData>(StorageMapVisuals.LayerChanged, out var wrapper))
+                return;
+
+
+            foreach (var layerName in _spriteLayers)
+            {
+                var show = wrapper.QueuedEntities.Contains(layerName);
+                spriteComponent.LayerSetVisible(layerName, show);
+            }
+        }
+    }
+}
diff --git a/Content.Client/Strip/StrippingMenu.cs b/Content.Client/Strip/StrippingMenu.cs
index a91793d3a2..e284eea90f 100644
--- a/Content.Client/Strip/StrippingMenu.cs
+++ b/Content.Client/Strip/StrippingMenu.cs
@@ -3,20 +3,22 @@ using Content.Client.Stylesheets;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Strip
 {
     public class StrippingMenu : SS14Window
     {
-        private readonly VBoxContainer _vboxContainer;
+        private readonly BoxContainer _vboxContainer;
 
         public StrippingMenu(string title)
         {
             MinSize = SetSize = (400, 600);
             Title = title;
 
-            _vboxContainer = new VBoxContainer()
+            _vboxContainer = new BoxContainer
             {
+                Orientation = LayoutOrientation.Vertical,
                 VerticalExpand = true,
                 SeparationOverride = 5,
             };
@@ -39,8 +41,9 @@ namespace Content.Client.Strip
 
             button.OnPressed += onPressed;
 
-            _vboxContainer.AddChild(new HBoxContainer()
+            _vboxContainer.AddChild(new BoxContainer
             {
+                Orientation = LayoutOrientation.Horizontal,
                 HorizontalExpand = true,
                 SeparationOverride = 5,
                 Children =
diff --git a/Content.Client/Stylesheets/StyleNano.cs b/Content.Client/Stylesheets/StyleNano.cs
index 3bdd6478cf..21005e0d0c 100644
--- a/Content.Client/Stylesheets/StyleNano.cs
+++ b/Content.Client/Stylesheets/StyleNano.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Linq;
 using Content.Client.Actions.UI;
 using Content.Client.Examine;
diff --git a/Content.Client/Suspicion/SuspicionGui.xaml b/Content.Client/Suspicion/SuspicionGui.xaml
index a9290ae0ab..abe4aea834 100644
--- a/Content.Client/Suspicion/SuspicionGui.xaml
+++ b/Content.Client/Suspicion/SuspicionGui.xaml
@@ -1,7 +1,7 @@
 <Control xmlns="https://spacestation14.io">
-    <VBoxContainer SeparationOverride="0">
+    <BoxContainer Orientation="Vertical" SeparationOverride="0">
         <Button Name="RoleButton">
             <Label Name="TimerLabel" SizeFlagsHorizontal="ShrinkEnd" SizeFlagsVertical="ShrinkEnd" />
         </Button>
-    </VBoxContainer>
+    </BoxContainer>
 </Control>
diff --git a/Content.Client/Suspicion/SuspicionRoleComponent.cs b/Content.Client/Suspicion/SuspicionRoleComponent.cs
index cebcef3922..28b62ad913 100644
--- a/Content.Client/Suspicion/SuspicionRoleComponent.cs
+++ b/Content.Client/Suspicion/SuspicionRoleComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Collections.Generic;
 using Content.Client.HUD;
 using Content.Shared.Suspicion;
diff --git a/Content.Client/Tools/Components/MultiToolComponent.cs b/Content.Client/Tools/Components/MultiToolComponent.cs
index 4752efef76..df90cd55be 100644
--- a/Content.Client/Tools/Components/MultiToolComponent.cs
+++ b/Content.Client/Tools/Components/MultiToolComponent.cs
@@ -1,11 +1,11 @@
 using Content.Client.Items.Components;
 using Content.Client.Message;
 using Content.Client.Stylesheets;
-using Content.Shared.NetIDs;
 using Content.Shared.Tool;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Timing;
 using Robust.Shared.ViewVariables;
@@ -13,6 +13,7 @@ using Robust.Shared.ViewVariables;
 namespace Content.Client.Tools.Components
 {
     [RegisterComponent]
+    [NetworkedComponent()]
     public class MultiToolComponent : Component, IItemStatus
     {
         private ToolQuality _behavior;
@@ -24,7 +25,6 @@ namespace Content.Client.Tools.Components
         [ViewVariables] public ToolQuality? Behavior => _behavior;
 
         public override string Name => "MultiTool";
-        public override uint? NetID => ContentNetIDs.MULTITOOLS;
 
         public override void HandleComponentState(ComponentState? curState, ComponentState? nextState)
         {
diff --git a/Content.Client/Tools/Components/WelderComponent.cs b/Content.Client/Tools/Components/WelderComponent.cs
index f37a81ff5a..91efcaf270 100644
--- a/Content.Client/Tools/Components/WelderComponent.cs
+++ b/Content.Client/Tools/Components/WelderComponent.cs
@@ -2,11 +2,11 @@ using System;
 using Content.Client.Items.Components;
 using Content.Client.Message;
 using Content.Client.Stylesheets;
-using Content.Shared.NetIDs;
 using Content.Shared.Tool;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Localization;
 using Robust.Shared.Timing;
 using Robust.Shared.ViewVariables;
@@ -14,10 +14,10 @@ using Robust.Shared.ViewVariables;
 namespace Content.Client.Tools.Components
 {
     [RegisterComponent]
+    [NetworkedComponent()]
     public class WelderComponent : SharedToolComponent, IItemStatus
     {
         public override string Name => "Welder";
-        public override uint? NetID => ContentNetIDs.WELDER;
 
         private ToolQuality _behavior;
         [ViewVariables(VVAccess.ReadWrite)] private bool _uiUpdateNeeded;
diff --git a/Content.Client/UserInterface/Atmos/GasTank/GasTankWindow.cs b/Content.Client/UserInterface/Atmos/GasTank/GasTankWindow.cs
index d51adb623c..054015794a 100644
--- a/Content.Client/UserInterface/Atmos/GasTank/GasTankWindow.cs
+++ b/Content.Client/UserInterface/Atmos/GasTank/GasTankWindow.cs
@@ -10,6 +10,7 @@ using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.UserInterface.Atmos.GasTank
 {
@@ -18,7 +19,7 @@ namespace Content.Client.UserInterface.Atmos.GasTank
     {
         private GasTankBoundUserInterface _owner;
         private readonly Label _lblName;
-        private readonly VBoxContainer _topContainer;
+        private readonly BoxContainer _topContainer;
         private readonly Control _contentContainer;
 
 
@@ -68,11 +69,15 @@ namespace Content.Client.UserInterface.Atmos.GasTank
             LayoutContainer.SetGrowHorizontal(bottomWrap, LayoutContainer.GrowDirection.Both);
 
 
-            var topContainerWrap = new VBoxContainer
+            var topContainerWrap = new BoxContainer
             {
+                Orientation = LayoutOrientation.Vertical,
                 Children =
                 {
-                    (_topContainer = new VBoxContainer()),
+                    (_topContainer = new BoxContainer
+                    {
+                        Orientation = LayoutOrientation.Vertical
+                    }),
                     new Control {MinSize = (0, 110)}
                 }
             };
@@ -83,8 +88,9 @@ namespace Content.Client.UserInterface.Atmos.GasTank
 
             var font = _resourceCache.GetFont("/Fonts/Boxfont-round/Boxfont Round.ttf", 13);
 
-            var topRow = new HBoxContainer
+            var topRow = new BoxContainer
             {
+                Orientation = LayoutOrientation.Horizontal,
                 Margin = new Thickness(4, 2, 12, 2),
                 Children =
                 {
@@ -111,8 +117,9 @@ namespace Content.Client.UserInterface.Atmos.GasTank
                 PanelOverride = new StyleBoxFlat {BackgroundColor = Color.FromHex("#202025")},
                 Children =
                 {
-                    (_contentContainer = new VBoxContainer
+                    (_contentContainer = new BoxContainer
                     {
+                        Orientation = LayoutOrientation.Vertical,
                         Margin = new Thickness(8, 4),
                     })
                 }
@@ -141,8 +148,9 @@ namespace Content.Client.UserInterface.Atmos.GasTank
             _btnInternals = new Button {Text = Loc.GetString("gas-tank-window-internals-toggle-button") };
 
             _contentContainer.AddChild(
-                new HBoxContainer
+                new BoxContainer
                 {
+                    Orientation = LayoutOrientation.Horizontal,
                     Margin = new Thickness(0, 7, 0, 0),
                     Children = {_lblInternals, _btnInternals}
                 });
diff --git a/Content.Client/Verbs/VerbSystem.cs b/Content.Client/Verbs/VerbSystem.cs
index 36a01098d6..4714562f3f 100644
--- a/Content.Client/Verbs/VerbSystem.cs
+++ b/Content.Client/Verbs/VerbSystem.cs
@@ -23,6 +23,7 @@ using Robust.Shared.Log;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Utility;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 using Timer = Robust.Shared.Timing.Timer;
 
 namespace Content.Client.Verbs
@@ -326,13 +327,16 @@ namespace Content.Client.Verbs
 
         private sealed class VerbPopup : Popup
         {
-            public VBoxContainer List { get; }
+            public BoxContainer List { get; }
 
             public VerbPopup()
             {
                 AddChild(new PanelContainer
                 {
-                    Children = {(List = new VBoxContainer())},
+                    Children = {(List = new BoxContainer
+                    {
+                        Orientation = LayoutOrientation.Vertical
+                    })},
                     PanelOverride = new StyleBoxFlat {BackgroundColor = Color.FromHex("#111E")}
                 });
             }
@@ -357,8 +361,9 @@ namespace Content.Client.Verbs
 
             public VerbButton()
             {
-                AddChild(new HBoxContainer
+                AddChild(new BoxContainer
                 {
+                    Orientation = LayoutOrientation.Horizontal,
                     Children =
                     {
                         (_icon = new TextureRect
@@ -417,8 +422,9 @@ namespace Content.Client.Verbs
 
                 MouseFilter = MouseFilterMode.Stop;
 
-                AddChild(new HBoxContainer
+                AddChild(new BoxContainer
                 {
+                    Orientation = LayoutOrientation.Horizontal,
                     Children =
                     {
                         (_icon = new TextureRect
diff --git a/Content.Client/Viewport/GameScreen.cs b/Content.Client/Viewport/GameScreen.cs
index 2052f41317..522f7e5f0b 100644
--- a/Content.Client/Viewport/GameScreen.cs
+++ b/Content.Client/Viewport/GameScreen.cs
@@ -1,4 +1,5 @@
 using Content.Client.Administration.Managers;
+using Content.Client.Chat;
 using Content.Client.Chat.Managers;
 using Content.Client.Chat.UI;
 using Content.Client.Construction.UI;
@@ -6,13 +7,11 @@ using Content.Client.HUD;
 using Content.Client.HUD.UI;
 using Content.Client.Voting;
 using Content.Shared.Chat;
-using Content.Shared.Input;
 using Robust.Client.Graphics;
 using Robust.Client.Input;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Configuration;
-using Robust.Shared.Input.Binding;
 using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 using Robust.Shared.Timing;
@@ -43,7 +42,16 @@ namespace Content.Client.Viewport
         {
             base.Startup();
 
-            _gameChat = new ChatBox();
+            _gameChat = new HudChatBox {PreferredChannel = ChatSelectChannel.Local};
+
+            UserInterfaceManager.StateRoot.AddChild(_gameChat);
+            LayoutContainer.SetAnchorAndMarginPreset(_gameChat, LayoutContainer.LayoutPreset.TopRight, margin: 10);
+            LayoutContainer.SetAnchorAndMarginPreset(_gameChat, LayoutContainer.LayoutPreset.TopRight, margin: 10);
+            LayoutContainer.SetMarginLeft(_gameChat, -475);
+            LayoutContainer.SetMarginBottom(_gameChat, HudChatBox.InitialChatBottom);
+
+            _chatManager.ChatBoxOnResized(new ChatResizedEventArgs(HudChatBox.InitialChatBottom));
+
             Viewport = new MainViewport
             {
                 Viewport =
@@ -59,28 +67,8 @@ namespace Content.Client.Viewport
             _userInterfaceManager.StateRoot.AddChild(_gameHud.RootControl);
             _chatManager.SetChatBox(_gameChat);
             _voteManager.SetPopupContainer(_gameHud.VoteContainer);
-            _gameChat.DefaultChatFormat = "say \"{0}\"";
 
-            _inputManager.SetInputCommand(ContentKeyFunctions.FocusChat,
-                InputCmdHandler.FromDelegate(_ => FocusChat(_gameChat)));
-
-            _inputManager.SetInputCommand(ContentKeyFunctions.FocusOOC,
-                InputCmdHandler.FromDelegate(_ => FocusChannel(_gameChat, ChatChannel.OOC)));
-
-            _inputManager.SetInputCommand(ContentKeyFunctions.FocusLocalChat,
-                InputCmdHandler.FromDelegate(_ => FocusChannel(_gameChat, ChatChannel.Local)));
-
-            _inputManager.SetInputCommand(ContentKeyFunctions.FocusRadio,
-                InputCmdHandler.FromDelegate(_ => FocusChannel(_gameChat, ChatChannel.Radio)));
-
-            _inputManager.SetInputCommand(ContentKeyFunctions.FocusAdminChat,
-                InputCmdHandler.FromDelegate(_ => FocusChannel(_gameChat, ChatChannel.AdminChat)));
-
-            _inputManager.SetInputCommand(ContentKeyFunctions.CycleChatChannelForward,
-                InputCmdHandler.FromDelegate(_ => _gameChat.CycleChatChannel(true)));
-
-            _inputManager.SetInputCommand(ContentKeyFunctions.CycleChatChannelBackward,
-                InputCmdHandler.FromDelegate(_ => _gameChat.CycleChatChannel(false)));
+            ChatInput.SetupChatInputHandlers(_inputManager, _gameChat);
 
             SetupPresenters();
 
@@ -98,7 +86,6 @@ namespace Content.Client.Viewport
             _gameHud.RootControl.Orphan();
             // Clear viewport to some fallback, whatever.
             _eyeManager.MainViewport = _userInterfaceManager.MainViewport;
-
         }
 
         /// <summary>
@@ -120,23 +107,17 @@ namespace Content.Client.Viewport
         internal static void FocusChat(ChatBox chat)
         {
             if (chat.UserInterfaceManager.KeyboardFocused != null)
-            {
                 return;
-            }
 
-            chat.Input.IgnoreNext = true;
-            chat.Input.GrabKeyboardFocus();
+            chat.Focus();
         }
-        internal static void FocusChannel(ChatBox chat, ChatChannel channel)
+
+        internal static void FocusChannel(ChatBox chat, ChatSelectChannel channel)
         {
             if (chat.UserInterfaceManager.KeyboardFocused != null)
-            {
                 return;
-            }
 
-            chat.SelectChannel(channel);
-            chat.Input.IgnoreNext = true;
-            chat.Input.GrabKeyboardFocus();
+            chat.Focus(channel);
         }
 
         public override void FrameUpdate(FrameEventArgs e)
diff --git a/Content.Client/Viewport/GameScreenBase.cs b/Content.Client/Viewport/GameScreenBase.cs
index c9e4590837..92b704e839 100644
--- a/Content.Client/Viewport/GameScreenBase.cs
+++ b/Content.Client/Viewport/GameScreenBase.cs
@@ -234,7 +234,7 @@ namespace Content.Client.Viewport
                 entityToClick = GetEntityUnderPosition(mousePosWorld)?.Uid ?? EntityUid.Invalid;
 
                 coordinates = MapManager.TryFindGridAt(mousePosWorld, out var grid) ? grid.MapToGrid(mousePosWorld) :
-                    EntityCoordinates.FromMap(EntityManager, MapManager, mousePosWorld);
+                    EntityCoordinates.FromMap(MapManager, mousePosWorld);
             }
 
             var message = new FullInputCmdMessage(Timing.CurTick, Timing.TickFraction, funcId, kArgs.State,
diff --git a/Content.Client/Voting/UI/VoteCallMenu.xaml b/Content.Client/Voting/UI/VoteCallMenu.xaml
index 5867ca9588..a5e1204521 100644
--- a/Content.Client/Voting/UI/VoteCallMenu.xaml
+++ b/Content.Client/Voting/UI/VoteCallMenu.xaml
@@ -3,37 +3,28 @@
                  xmlns:hudUi="clr-namespace:Content.Client.HUD.UI"
                  MouseFilter="Stop" MinSize="350 150">
     <PanelContainer StyleClasses="AngleRect" />
-    <VBoxContainer>
-        <HBoxContainer>
-            <MarginContainer MarginLeftOverride="8" HorizontalExpand="True">
-                <Label Text="{Loc 'ui-vote-create-title'}" VAlign="Center" StyleClasses="LabelHeading" />
-            </MarginContainer>
-            <MarginContainer MarginRightOverride="8">
-                <TextureButton Name="CloseButton" StyleClasses="windowCloseButton"
-                               SizeFlagsVertical="ShrinkCenter" />
-            </MarginContainer>
-        </HBoxContainer>
+    <BoxContainer Orientation="Vertical">
+        <BoxContainer Margin="8 0" Orientation="Horizontal">
+            <Label Text="{Loc 'ui-vote-create-title'}"
+                   HorizontalExpand="True" VAlign="Center" StyleClasses="LabelHeading" />
+            <TextureButton Name="CloseButton" StyleClasses="windowCloseButton"
+                           VerticalAlignment="Center" />
+        </BoxContainer>
         <hudUi:HighDivider />
 
-        <MarginContainer SizeFlagsHorizontal="Fill" SizeFlagsVertical="Expand"
-                         MarginLeftOverride="8" MarginRightOverride="8" MarginTopOverride="2">
-            <HBoxContainer>
+        <BoxContainer Orientation="Vertical" Margin="8 2 8 0" VerticalExpand="True" VerticalAlignment="Top">
+            <BoxContainer Orientation="Horizontal">
                 <OptionButton Name="VoteTypeButton" HorizontalExpand="True" />
                 <Control HorizontalExpand="True">
                     <OptionButton Name="VoteSecondButton" Visible="False" />
                 </Control>
-            </HBoxContainer>
-        </MarginContainer>
+            </BoxContainer>
+            <Label Name="VoteTypeTimeoutLabel" Visible="False" />
+        </BoxContainer>
 
-        <MarginContainer SizeFlagsHorizontal="Fill"
-                         MarginLeftOverride="8" MarginRightOverride="8" MarginBottomOverride="2">
-            <Button Name="CreateButton" Text="{Loc 'ui-vote-create-button'}" />
-        </MarginContainer>
+        <Button Margin="8 2" Name="CreateButton" Text="{Loc 'ui-vote-create-button'}" />
 
         <PanelContainer StyleClasses="LowDivider" />
-        <MarginContainer MarginLeftOverride="12">
-            <Label StyleClasses="LabelSubText" Text="{Loc 'ui-vote-fluff'}" />
-        </MarginContainer>
-
-    </VBoxContainer>
+        <Label Margin="12 0 0 0" StyleClasses="LabelSubText" Text="{Loc 'ui-vote-fluff'}" />
+    </BoxContainer>
 </ui:VoteCallMenu>
diff --git a/Content.Client/Voting/UI/VoteCallMenu.xaml.cs b/Content.Client/Voting/UI/VoteCallMenu.xaml.cs
index 780b201069..58c56ace4c 100644
--- a/Content.Client/Voting/UI/VoteCallMenu.xaml.cs
+++ b/Content.Client/Voting/UI/VoteCallMenu.xaml.cs
@@ -1,5 +1,5 @@
-#nullable enable
 using Content.Client.Stylesheets;
+using Content.Shared.Voting;
 using JetBrains.Annotations;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Console;
@@ -10,6 +10,7 @@ using Robust.Shared.Console;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
+using Robust.Shared.Timing;
 
 namespace Content.Client.Voting.UI
 {
@@ -17,12 +18,15 @@ namespace Content.Client.Voting.UI
     public partial class VoteCallMenu : BaseWindow
     {
         [Dependency] private readonly IClientConsoleHost _consoleHost = default!;
+        [Dependency] private readonly IVoteManager _voteManager = default!;
+        [Dependency] private readonly IGameTiming _gameTiming = default!;
 
-        public static readonly (string name, string id, (string name, string id)[]? secondaries)[] AvailableVoteTypes =
-        {
-            ("ui-vote-type-restart", "restart", null),
-            ("ui-vote-type-gamemode", "preset", null)
-        };
+        public static readonly (string name, StandardVoteType type, (string name, string id)[]? secondaries)[]
+            AvailableVoteTypes =
+            {
+                ("ui-vote-type-restart", StandardVoteType.Restart, null),
+                ("ui-vote-type-gamemode", StandardVoteType.Preset, null)
+            };
 
         public VoteCallMenu()
         {
@@ -43,6 +47,33 @@ namespace Content.Client.Voting.UI
             CreateButton.OnPressed += CreatePressed;
         }
 
+        protected override void Opened()
+        {
+            base.Opened();
+
+            _voteManager.CanCallVoteChanged += CanCallVoteChanged;
+        }
+
+        public override void Close()
+        {
+            base.Close();
+
+            _voteManager.CanCallVoteChanged -= CanCallVoteChanged;
+        }
+
+        protected override void FrameUpdate(FrameEventArgs args)
+        {
+            base.FrameUpdate(args);
+
+            UpdateVoteTimeout();
+        }
+
+        private void CanCallVoteChanged(bool obj)
+        {
+            if (!obj)
+                Close();
+        }
+
         private void CreatePressed(BaseButton.ButtonEventArgs obj)
         {
             var typeId = VoteTypeButton.SelectedId;
@@ -63,6 +94,20 @@ namespace Content.Client.Voting.UI
             Close();
         }
 
+        private void UpdateVoteTimeout()
+        {
+            var (_, typeKey, _) = AvailableVoteTypes[VoteTypeButton.SelectedId];
+            var isAvailable = _voteManager.CanCallStandardVote(typeKey, out var timeout);
+            CreateButton.Disabled = !isAvailable;
+            VoteTypeTimeoutLabel.Visible = !isAvailable;
+
+            if (!isAvailable)
+            {
+                var remaining = timeout - _gameTiming.RealTime;
+                VoteTypeTimeoutLabel.Text = Loc.GetString("ui-vote-type-timeout", ("remaining", remaining.ToString("mm\\:ss")));
+            }
+        }
+
         private static void VoteSecondSelected(OptionButton.ItemSelectedEventArgs obj)
         {
             obj.Button.SelectId(obj.Id);
diff --git a/Content.Client/Voting/UI/VotePopup.xaml b/Content.Client/Voting/UI/VotePopup.xaml
index b33c4aaa36..39817bd553 100644
--- a/Content.Client/Voting/UI/VotePopup.xaml
+++ b/Content.Client/Voting/UI/VotePopup.xaml
@@ -1,18 +1,13 @@
-<Control xmlns="https://spacestation14.io">
+<Control xmlns="https://spacestation14.io" MinWidth="300">
     <PanelContainer StyleClasses="AngleRect" />
-    <MarginContainer MarginLeftOverride="4" MarginRightOverride="4" MarginTopOverride="4" MarginBottomOverride="4">
-        <VBoxContainer>
-            <Label Name="VoteCaller" />
-            <Label Name="VoteTitle" />
+    <BoxContainer Margin="4" Orientation="Vertical">
+        <Label Name="VoteCaller" />
+        <Label Name="VoteTitle" />
 
-            <GridContainer Columns="3" Name="VoteOptionsContainer" />
-            <HBoxContainer>
-                <MarginContainer HorizontalExpand="True" MarginLeftOverride="2" MarginRightOverride="2"
-                                     MarginTopOverride="2" MarginBottomOverride="2">
-                    <ProgressBar Name="TimeLeftBar" MinValue="0" MaxValue="1" />
-                </MarginContainer>
-                <Label Name="TimeLeftText" />
-            </HBoxContainer>
-        </VBoxContainer>
-    </MarginContainer>
+        <GridContainer Columns="3" Name="VoteOptionsContainer" />
+        <BoxContainer Orientation="Horizontal">
+            <ProgressBar Margin="4" HorizontalExpand="True" Name="TimeLeftBar" MinValue="0" MaxValue="1" />
+            <Label Name="TimeLeftText" />
+        </BoxContainer>
+    </BoxContainer>
 </Control>
diff --git a/Content.Client/Voting/VoteManager.cs b/Content.Client/Voting/VoteManager.cs
index e73e098d9e..bd70402fb0 100644
--- a/Content.Client/Voting/VoteManager.cs
+++ b/Content.Client/Voting/VoteManager.cs
@@ -9,7 +9,6 @@ using Robust.Shared.IoC;
 using Robust.Shared.Network;
 using Robust.Shared.Timing;
 
-#nullable enable
 
 namespace Content.Client.Voting
 {
@@ -20,7 +19,10 @@ namespace Content.Client.Voting
         void ClearPopupContainer();
         void SetPopupContainer(Control container);
         bool CanCallVote { get; }
+
+        bool CanCallStandardVote(StandardVoteType type, out TimeSpan whenCan);
         event Action<bool> CanCallVoteChanged;
+        event Action CanCallStandardVotesChanged;
     }
 
     public sealed class VoteManager : IVoteManager
@@ -30,13 +32,17 @@ namespace Content.Client.Voting
         [Dependency] private readonly IClientConsoleHost _console = default!;
         [Dependency] private readonly IBaseClient _client = default!;
 
+        private readonly Dictionary<StandardVoteType, TimeSpan> _standardVoteTimeouts = new();
         private readonly Dictionary<int, ActiveVote> _votes = new();
         private readonly Dictionary<int, UI.VotePopup> _votePopups = new();
         private Control? _popupContainer;
 
         public bool CanCallVote { get; private set; }
+
         public event Action<bool>? CanCallVoteChanged;
 
+        public event Action? CanCallStandardVotesChanged;
+
         public void Initialize()
         {
             _netManager.RegisterNetMessage<MsgVoteData>(ReceiveVoteData);
@@ -55,6 +61,11 @@ namespace Content.Client.Voting
             }
         }
 
+        public bool CanCallStandardVote(StandardVoteType type, out TimeSpan whenCan)
+        {
+            return !_standardVoteTimeouts.TryGetValue(type, out whenCan);
+        }
+
         public void ClearPopupContainer()
         {
             if (_popupContainer == null)
@@ -162,11 +173,20 @@ namespace Content.Client.Voting
 
         private void ReceiveVoteCanCall(MsgVoteCanCall message)
         {
-            if (CanCallVote == message.CanCall)
-                return;
+            if (CanCallVote != message.CanCall)
+            {
+                // TODO: actually use the "when can call vote" time for UI display or something.
+                CanCallVote = message.CanCall;
+                CanCallVoteChanged?.Invoke(CanCallVote);
+            }
 
-            CanCallVote = message.CanCall;
-            CanCallVoteChanged?.Invoke(CanCallVote);
+            _standardVoteTimeouts.Clear();
+            foreach (var (type, time) in message.VotesUnavailable)
+            {
+                _standardVoteTimeouts.Add(type, _gameTiming.RealServerToLocal(time));
+            }
+
+            CanCallStandardVotesChanged?.Invoke();
         }
 
         public void SendCastVote(int voteId, int option)
diff --git a/Content.Client/Wall/Components/LowWallComponent.cs b/Content.Client/Wall/Components/LowWallComponent.cs
index e66e2495f7..eb4b8863b3 100644
--- a/Content.Client/Wall/Components/LowWallComponent.cs
+++ b/Content.Client/Wall/Components/LowWallComponent.cs
@@ -104,7 +104,7 @@ namespace Content.Client.Wall.Components
                 cornerNE |= CornerFill.CounterClockwise;
                 cornerNW |= CornerFill.Clockwise;
 
-                if (!nl)
+                if (!nl && !e && !w)
                 {
                     lowCornerNE |= CornerFill.CounterClockwise;
                     lowCornerNW |= CornerFill.Clockwise;
diff --git a/Content.Client/Weapons/Ranged/Barrels/Components/ClientBatteryBarrelComponent.cs b/Content.Client/Weapons/Ranged/Barrels/Components/ClientBatteryBarrelComponent.cs
index d2286b87bd..f84355b22b 100644
--- a/Content.Client/Weapons/Ranged/Barrels/Components/ClientBatteryBarrelComponent.cs
+++ b/Content.Client/Weapons/Ranged/Barrels/Components/ClientBatteryBarrelComponent.cs
@@ -1,22 +1,23 @@
-using System;
+using System;
 using Content.Client.Items.Components;
 using Content.Client.Stylesheets;
-using Content.Shared.NetIDs;
 using Content.Shared.Weapons.Ranged.Barrels.Components;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Maths;
 using Robust.Shared.ViewVariables;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Weapons.Ranged.Barrels.Components
 {
     [RegisterComponent]
+    [NetworkedComponent()]
     public class ClientBatteryBarrelComponent : Component, IItemStatus
     {
         public override string Name => "BatteryBarrel";
-        public override uint? NetID => ContentNetIDs.BATTERY_BARREL;
 
         private StatusControl? _statusControl;
 
@@ -58,7 +59,7 @@ namespace Content.Client.Weapons.Ranged.Barrels.Components
         private sealed class StatusControl : Control
         {
             private readonly ClientBatteryBarrelComponent _parent;
-            private readonly HBoxContainer _bulletsList;
+            private readonly BoxContainer _bulletsList;
             private readonly Label _noBatteryLabel;
             private readonly Label _ammoCount;
 
@@ -69,8 +70,9 @@ namespace Content.Client.Weapons.Ranged.Barrels.Components
                 HorizontalExpand = true;
                 VerticalAlignment = VAlignment.Center;
 
-                AddChild(new HBoxContainer
+                AddChild(new BoxContainer
                 {
+                    Orientation = LayoutOrientation.Horizontal,
                     HorizontalExpand = true,
                     Children =
                     {
@@ -79,8 +81,9 @@ namespace Content.Client.Weapons.Ranged.Barrels.Components
                             HorizontalExpand = true,
                             Children =
                             {
-                                (_bulletsList = new HBoxContainer
+                                (_bulletsList = new BoxContainer
                                 {
+                                    Orientation = LayoutOrientation.Horizontal,
                                     VerticalAlignment = VAlignment.Center,
                                     SeparationOverride = 4
                                 }),
diff --git a/Content.Client/Weapons/Ranged/Barrels/Components/ClientBoltActionBarrelComponent.cs b/Content.Client/Weapons/Ranged/Barrels/Components/ClientBoltActionBarrelComponent.cs
index f36ccf2995..3b28481fc0 100644
--- a/Content.Client/Weapons/Ranged/Barrels/Components/ClientBoltActionBarrelComponent.cs
+++ b/Content.Client/Weapons/Ranged/Barrels/Components/ClientBoltActionBarrelComponent.cs
@@ -1,24 +1,25 @@
-using System;
+using System;
 using Content.Client.IoC;
 using Content.Client.Items.Components;
 using Content.Client.Resources;
 using Content.Client.Stylesheets;
-using Content.Shared.NetIDs;
 using Content.Shared.Weapons.Ranged.Barrels.Components;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Maths;
 using Robust.Shared.ViewVariables;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Weapons.Ranged.Barrels.Components
 {
     [RegisterComponent]
+    [NetworkedComponent()]
     public class ClientBoltActionBarrelComponent : Component, IItemStatus
     {
         public override string Name => "BoltActionBarrel";
-        public override uint? NetID => ContentNetIDs.BOLTACTION_BARREL;
 
         private StatusControl? _statusControl;
 
@@ -68,8 +69,8 @@ namespace Content.Client.Weapons.Ranged.Barrels.Components
         private sealed class StatusControl : Control
         {
             private readonly ClientBoltActionBarrelComponent _parent;
-            private readonly HBoxContainer _bulletsListTop;
-            private readonly HBoxContainer _bulletsListBottom;
+            private readonly BoxContainer _bulletsListTop;
+            private readonly BoxContainer _bulletsListBottom;
             private readonly TextureRect _chamberedBullet;
             private readonly Label _noMagazineLabel;
 
@@ -79,16 +80,22 @@ namespace Content.Client.Weapons.Ranged.Barrels.Components
                 _parent = parent;
                 HorizontalExpand = true;
                 VerticalAlignment = VAlignment.Center;
-                AddChild(new VBoxContainer
+                AddChild(new BoxContainer
                 {
+                    Orientation = LayoutOrientation.Vertical,
                     HorizontalExpand = true,
                     VerticalAlignment = VAlignment.Center,
                     SeparationOverride = 0,
                     Children =
                     {
-                        (_bulletsListTop = new HBoxContainer {SeparationOverride = 0}),
-                        new HBoxContainer
+                        (_bulletsListTop = new BoxContainer
                         {
+                            Orientation = LayoutOrientation.Horizontal,
+                            SeparationOverride = 0
+                        }),
+                        new BoxContainer
+                        {
+                            Orientation = LayoutOrientation.Horizontal,
                             HorizontalExpand = true,
                             Children =
                             {
@@ -97,8 +104,9 @@ namespace Content.Client.Weapons.Ranged.Barrels.Components
                                     HorizontalExpand = true,
                                     Children =
                                     {
-                                        (_bulletsListBottom = new HBoxContainer
+                                        (_bulletsListBottom = new BoxContainer
                                         {
+                                            Orientation = LayoutOrientation.Horizontal,
                                             VerticalAlignment = VAlignment.Center,
                                             SeparationOverride = 0
                                         }),
diff --git a/Content.Client/Weapons/Ranged/Barrels/Components/ClientMagazineBarrelComponent.cs b/Content.Client/Weapons/Ranged/Barrels/Components/ClientMagazineBarrelComponent.cs
index dd05d7ede1..cd3701dcdb 100644
--- a/Content.Client/Weapons/Ranged/Barrels/Components/ClientMagazineBarrelComponent.cs
+++ b/Content.Client/Weapons/Ranged/Barrels/Components/ClientMagazineBarrelComponent.cs
@@ -1,9 +1,8 @@
-using System;
+using System;
 using Content.Client.IoC;
 using Content.Client.Items.Components;
 using Content.Client.Resources;
 using Content.Client.Stylesheets;
-using Content.Shared.NetIDs;
 using Content.Shared.Weapons.Ranged;
 using Content.Shared.Weapons.Ranged.Barrels.Components;
 using Robust.Client.Animations;
@@ -12,15 +11,18 @@ using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Animations;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Maths;
 using Robust.Shared.Network;
 using Robust.Shared.Players;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Weapons.Ranged.Barrels.Components
 {
     [RegisterComponent]
+    [NetworkedComponent()]
     public class ClientMagazineBarrelComponent : Component, IItemStatus
     {
         private static readonly Animation AlarmAnimationSmg = new()
@@ -70,7 +72,6 @@ namespace Content.Client.Weapons.Ranged.Barrels.Components
         };
 
         public override string Name => "MagazineBarrel";
-        public override uint? NetID => ContentNetIDs.MAGAZINE_BARREL;
 
         private StatusControl? _statusControl;
 
@@ -134,7 +135,7 @@ namespace Content.Client.Weapons.Ranged.Barrels.Components
         private sealed class StatusControl : Control
         {
             private readonly ClientMagazineBarrelComponent _parent;
-            private readonly HBoxContainer _bulletsList;
+            private readonly BoxContainer _bulletsList;
             private readonly TextureRect _chamberedBullet;
             private readonly Label _noMagazineLabel;
             private readonly Label _ammoCount;
@@ -146,8 +147,9 @@ namespace Content.Client.Weapons.Ranged.Barrels.Components
                 HorizontalExpand = true;
                 VerticalAlignment = VAlignment.Center;
 
-                AddChild(new HBoxContainer
+                AddChild(new BoxContainer
                 {
+                    Orientation = LayoutOrientation.Horizontal,
                     HorizontalExpand = true,
                     Children =
                     {
@@ -163,8 +165,9 @@ namespace Content.Client.Weapons.Ranged.Barrels.Components
                             HorizontalExpand = true,
                             Children =
                             {
-                                (_bulletsList = new HBoxContainer
+                                (_bulletsList = new BoxContainer
                                 {
+                                    Orientation = LayoutOrientation.Horizontal,
                                     VerticalAlignment = VAlignment.Center,
                                     SeparationOverride = 0
                                 }),
diff --git a/Content.Client/Weapons/Ranged/Barrels/Components/ClientPumpBarrelComponent.cs b/Content.Client/Weapons/Ranged/Barrels/Components/ClientPumpBarrelComponent.cs
index 3f9f70b885..215b63235c 100644
--- a/Content.Client/Weapons/Ranged/Barrels/Components/ClientPumpBarrelComponent.cs
+++ b/Content.Client/Weapons/Ranged/Barrels/Components/ClientPumpBarrelComponent.cs
@@ -1,24 +1,25 @@
-using System;
+using System;
 using Content.Client.IoC;
 using Content.Client.Items.Components;
 using Content.Client.Resources;
 using Content.Client.Stylesheets;
-using Content.Shared.NetIDs;
 using Content.Shared.Weapons.Ranged.Barrels.Components;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Maths;
 using Robust.Shared.ViewVariables;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Weapons.Ranged.Barrels.Components
 {
     [RegisterComponent]
+    [NetworkedComponent()]
     public class ClientPumpBarrelComponent : Component, IItemStatus
     {
         public override string Name => "PumpBarrel";
-        public override uint? NetID => ContentNetIDs.PUMP_BARREL;
 
         private StatusControl? _statusControl;
 
@@ -68,8 +69,8 @@ namespace Content.Client.Weapons.Ranged.Barrels.Components
         private sealed class StatusControl : Control
         {
             private readonly ClientPumpBarrelComponent _parent;
-            private readonly HBoxContainer _bulletsListTop;
-            private readonly HBoxContainer _bulletsListBottom;
+            private readonly BoxContainer _bulletsListTop;
+            private readonly BoxContainer _bulletsListBottom;
             private readonly TextureRect _chamberedBullet;
             private readonly Label _noMagazineLabel;
 
@@ -79,16 +80,22 @@ namespace Content.Client.Weapons.Ranged.Barrels.Components
                 _parent = parent;
                 HorizontalExpand = true;
                 VerticalAlignment = VAlignment.Center;
-                AddChild(new VBoxContainer
+                AddChild(new BoxContainer
                 {
+                    Orientation = LayoutOrientation.Vertical,
                     HorizontalExpand = true,
                     VerticalAlignment = VAlignment.Center,
                     SeparationOverride = 0,
                     Children =
                     {
-                        (_bulletsListTop = new HBoxContainer {SeparationOverride = 0}),
-                        new HBoxContainer
+                        (_bulletsListTop = new BoxContainer
                         {
+                            Orientation = LayoutOrientation.Horizontal,
+                            SeparationOverride = 0
+                        }),
+                        new BoxContainer
+                        {
+                            Orientation = LayoutOrientation.Horizontal,
                             HorizontalExpand = true,
                             Children =
                             {
@@ -97,8 +104,9 @@ namespace Content.Client.Weapons.Ranged.Barrels.Components
                                     HorizontalExpand = true,
                                     Children =
                                     {
-                                        (_bulletsListBottom = new HBoxContainer
+                                        (_bulletsListBottom = new BoxContainer
                                         {
+                                            Orientation = LayoutOrientation.Horizontal,
                                             VerticalAlignment = VAlignment.Center,
                                             SeparationOverride = 0
                                         }),
diff --git a/Content.Client/Weapons/Ranged/Barrels/Components/ClientRevolverBarrelComponent.cs b/Content.Client/Weapons/Ranged/Barrels/Components/ClientRevolverBarrelComponent.cs
index 1b009c25a3..0058700482 100644
--- a/Content.Client/Weapons/Ranged/Barrels/Components/ClientRevolverBarrelComponent.cs
+++ b/Content.Client/Weapons/Ranged/Barrels/Components/ClientRevolverBarrelComponent.cs
@@ -1,22 +1,23 @@
-using Content.Client.IoC;
+using Content.Client.IoC;
 using Content.Client.Items.Components;
 using Content.Client.Resources;
-using Content.Shared.NetIDs;
 using Content.Shared.Weapons.Ranged.Barrels.Components;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Maths;
 using Robust.Shared.ViewVariables;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Weapons.Ranged.Barrels.Components
 {
     [RegisterComponent]
+    [NetworkedComponent()]
     public class ClientRevolverBarrelComponent : Component, IItemStatus
     {
         public override string Name => "RevolverBarrel";
-        public override uint? NetID => ContentNetIDs.REVOLVER_BARREL;
 
         private StatusControl? _statusControl;
 
@@ -62,7 +63,7 @@ namespace Content.Client.Weapons.Ranged.Barrels.Components
         private sealed class StatusControl : Control
         {
             private readonly ClientRevolverBarrelComponent _parent;
-            private readonly HBoxContainer _bulletsList;
+            private readonly BoxContainer _bulletsList;
 
             public StatusControl(ClientRevolverBarrelComponent parent)
             {
@@ -70,8 +71,9 @@ namespace Content.Client.Weapons.Ranged.Barrels.Components
                 _parent = parent;
                 HorizontalExpand = true;
                 VerticalAlignment = VAlignment.Center;
-                AddChild((_bulletsList = new HBoxContainer
+                AddChild((_bulletsList = new BoxContainer
                 {
+                    Orientation = LayoutOrientation.Horizontal,
                     HorizontalExpand = true,
                     VerticalAlignment = VAlignment.Center,
                     SeparationOverride = 0
diff --git a/Content.Client/Window/WindowComponent.cs b/Content.Client/Window/WindowComponent.cs
index b88b6ebe13..135e94dba0 100644
--- a/Content.Client/Window/WindowComponent.cs
+++ b/Content.Client/Window/WindowComponent.cs
@@ -38,7 +38,7 @@ namespace Content.Client.Window
             if (_sprite != null)
             {
                 var state0 = $"{_stateBase}0";
-                const string cracksRSIPath = "/Textures/Constructible/Structures/Windows/cracks.rsi";
+                const string cracksRSIPath = "/Textures/Structures/Windows/cracks.rsi";
                 _sprite.LayerMapSet(CornerLayers.SE, _sprite.AddLayerState(state0));
                 _sprite.LayerSetDirOffset(CornerLayers.SE, SpriteComponent.DirectionOffset.None);
                 _sprite.LayerMapSet(WindowDamageLayers.DamageSE, _sprite.AddLayerState("0_1", cracksRSIPath));
diff --git a/Content.Client/Wires/UI/WiresMenu.cs b/Content.Client/Wires/UI/WiresMenu.cs
index af42de171c..dce0c0d600 100644
--- a/Content.Client/Wires/UI/WiresMenu.cs
+++ b/Content.Client/Wires/UI/WiresMenu.cs
@@ -15,6 +15,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using static Content.Shared.Wires.SharedWiresComponent;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Wires.UI
 {
@@ -66,8 +67,9 @@ namespace Content.Client.Wires.UI
                 MouseFilter = MouseFilterMode.Pass
             };
 
-            var shadow = new HBoxContainer
+            var shadow = new BoxContainer
             {
+                Orientation = LayoutOrientation.Horizontal,
                 Children =
                 {
                     new PanelContainer
@@ -90,8 +92,16 @@ namespace Content.Client.Wires.UI
                 }
             };
 
-            var wrappingHBox = new HBoxContainer();
-            _wiresHBox = new HBoxContainer {SeparationOverride = 4, VerticalAlignment = VAlignment.Bottom};
+            var wrappingHBox = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Horizontal
+            };
+            _wiresHBox = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Horizontal,
+                SeparationOverride = 4,
+                VerticalAlignment = VAlignment.Bottom
+            };
 
             wrappingHBox.AddChild(new Control {MinSize = (20, 0)});
             wrappingHBox.AddChild(_wiresHBox);
@@ -123,11 +133,15 @@ namespace Content.Client.Wires.UI
             LayoutContainer.SetAnchorPreset(bottomWrap, LayoutContainer.LayoutPreset.VerticalCenterWide);
             LayoutContainer.SetGrowHorizontal(bottomWrap, LayoutContainer.GrowDirection.Both);
 
-            var topContainerWrap = new VBoxContainer
+            var topContainerWrap = new BoxContainer
             {
+                Orientation = LayoutOrientation.Vertical,
                 Children =
                 {
-                    (_topContainer = new VBoxContainer()),
+                    (_topContainer = new BoxContainer
+                    {
+                        Orientation = LayoutOrientation.Vertical
+                    }),
                     new Control {MinSize = (0, 110)}
                 }
             };
@@ -140,8 +154,9 @@ namespace Content.Client.Wires.UI
             var fontSmall = _resourceCache.GetFont("/Fonts/Boxfont-round/Boxfont Round.ttf", 10);
 
             Button helpButton;
-            var topRow = new HBoxContainer
+            var topRow = new BoxContainer
             {
+                Orientation = LayoutOrientation.Horizontal,
                 Margin = new Thickness(4, 2, 12, 2),
                 Children =
                 {
@@ -188,8 +203,9 @@ namespace Content.Client.Wires.UI
                 PanelOverride = new StyleBoxFlat {BackgroundColor = Color.FromHex("#202025")},
                 Children =
                 {
-                    new HBoxContainer
+                    new BoxContainer
                     {
+                        Orientation = LayoutOrientation.Horizontal,
                         Children =
                         {
                             (_statusContainer = new GridContainer
@@ -553,7 +569,11 @@ namespace Content.Client.Wires.UI
 
                 var font = resourceCache.GetFont("/Fonts/Boxfont-round/Boxfont Round.ttf", 12);
 
-                var hBox = new HBoxContainer {SeparationOverride = 4};
+                var hBox = new BoxContainer
+                {
+                    Orientation = LayoutOrientation.Horizontal,
+                    SeparationOverride = 4
+                };
                 hBox.AddChild(new Label
                 {
                     Text = data.Text,
diff --git a/Content.IntegrationTests/Tests/Doors/AirlockTest.cs b/Content.IntegrationTests/Tests/Doors/AirlockTest.cs
index 9e8433b6e0..4bbd571e78 100644
--- a/Content.IntegrationTests/Tests/Doors/AirlockTest.cs
+++ b/Content.IntegrationTests/Tests/Doors/AirlockTest.cs
@@ -126,8 +126,7 @@ namespace Content.IntegrationTests.Tests.Doors
 
             server.Assert(() =>
             {
-                var mapId = new MapId(1);
-                mapManager.CreateNewMapEntity(mapId);
+                var mapId = mapManager.CreateMap();
 
                 var humanCoordinates = new MapCoordinates((physicsDummyStartingX, 0), mapId);
                 physicsDummy = entityManager.SpawnEntity("PhysicsDummy", humanCoordinates);
@@ -159,6 +158,7 @@ namespace Content.IntegrationTests.Tests.Doors
             // Sanity check
             // Sloth: Okay I'm sorry but I hate having to rewrite tests for every refactor
             // If you see this yell at me in discord so I can continue to pretend this didn't happen.
+            // REMINDER THAT I STILL HAVE TO FIX THIS TEST EVERY OTHER PHYSICS PR
             // Assert.That(physicsDummy.Transform.MapPosition.X, Is.GreaterThan(physicsDummyStartingX));
 
             // Blocked by the airlock
diff --git a/Content.IntegrationTests/Tests/Lobby/CharacterCreationTest.cs b/Content.IntegrationTests/Tests/Lobby/CharacterCreationTest.cs
index fcae9955d8..461a1fc30b 100644
--- a/Content.IntegrationTests/Tests/Lobby/CharacterCreationTest.cs
+++ b/Content.IntegrationTests/Tests/Lobby/CharacterCreationTest.cs
@@ -4,7 +4,6 @@ using Content.Client.Lobby;
 using Content.Client.Preferences;
 using Content.Client.State;
 using Content.Server.GameTicking;
-using Content.Server.Interfaces;
 using Content.Server.Preferences;
 using Content.Server.Preferences.Managers;
 using Content.Shared;
diff --git a/Content.IntegrationTests/Tests/Networking/NetworkIdsMatchTest.cs b/Content.IntegrationTests/Tests/Networking/NetworkIdsMatchTest.cs
new file mode 100644
index 0000000000..3d0a541202
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Networking/NetworkIdsMatchTest.cs
@@ -0,0 +1,66 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using NUnit.Framework;
+using Robust.Server.Player;
+using Robust.Shared.Enums;
+using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
+using Robust.Shared.Network;
+
+namespace Content.IntegrationTests.Tests.Networking
+{
+    [TestFixture]
+    class NetworkIdsMatchTest : ContentIntegrationTest
+    {
+        [Test]
+        public async Task TestConnect()
+        {
+            var client = StartClient();
+            var server = StartServer();
+
+            await ConnectNetworking(client, server);
+            
+            var clientCompFactory = client.ResolveDependency<IComponentFactory>();
+            var serverCompFactory = server.ResolveDependency<IComponentFactory>();
+
+            var clientNetComps = clientCompFactory.NetworkedComponents;
+            var serverNetComps = serverCompFactory.NetworkedComponents;
+
+            Assert.That(clientNetComps, Is.Not.Null);
+            Assert.That(serverNetComps, Is.Not.Null);
+            Assert.That(clientNetComps.Count, Is.EqualTo(serverNetComps.Count));
+
+            // Checks that at least Metadata and Transform are registered.
+            Assert.That(clientNetComps.Count, Is.GreaterThanOrEqualTo(2));
+
+            for (var netId = 0; netId < clientNetComps.Count; netId++)
+            {
+                Assert.That(clientNetComps[netId].Name, Is.EqualTo(serverNetComps[netId].Name));
+            }
+        }
+
+        private static async Task ConnectNetworking(ClientIntegrationInstance client, ServerIntegrationInstance server)
+        {
+            await Task.WhenAll(client.WaitIdleAsync(), server.WaitIdleAsync());
+
+            // Connect.
+
+            client.SetConnectTarget(server);
+
+            client.Post(() => IoCManager.Resolve<IClientNetManager>().ClientConnect(null, 0, null));
+
+            // Run some ticks for the handshake to complete and such.
+
+            for (var i = 0; i < 10; i++)
+            {
+                server.RunTicks(1);
+                await server.WaitIdleAsync();
+                client.RunTicks(1);
+                await client.WaitIdleAsync();
+            }
+
+            await Task.WhenAll(client.WaitIdleAsync(), server.WaitIdleAsync());
+        }
+    }
+}
diff --git a/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs b/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs
index 5b918488bb..75288a7eaf 100644
--- a/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs
+++ b/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs
@@ -3,13 +3,13 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Content.Shared.NetIDs;
 using NUnit.Framework;
 using Robust.Client.GameObjects;
 using Robust.Client.GameStates;
 using Robust.Server.Player;
 using Robust.Shared;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Players;
@@ -391,10 +391,10 @@ namespace Content.IntegrationTests.Tests.Networking
             }
         }
 
+        [NetworkedComponent()]
         private sealed class PredictionTestComponent : Component
         {
             public override string Name => "PredictionTest";
-            public override uint? NetID => ContentNetIDs.PREDICTION_TEST;
 
             private bool _foo;
 
@@ -428,7 +428,7 @@ namespace Content.IntegrationTests.Tests.Networking
             {
                 public bool Foo { get; }
 
-                public PredictionComponentState(bool foo) : base(ContentNetIDs.PREDICTION_TEST)
+                public PredictionComponentState(bool foo)
                 {
                     Foo = foo;
                 }
diff --git a/Content.IntegrationTests/Tests/Physics/PhysicsTestBedTest.cs b/Content.IntegrationTests/Tests/Physics/PhysicsTestBedTest.cs
deleted file mode 100644
index f288792c9d..0000000000
--- a/Content.IntegrationTests/Tests/Physics/PhysicsTestBedTest.cs
+++ /dev/null
@@ -1,267 +0,0 @@
-/*
-MIT License
-
-Copyright (c) 2019 Erin Catto
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-These tests are derived from box2d's testbed tests but done in a way as to be automated and useful for CI.
- */
-
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using NUnit.Framework;
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-using Robust.Shared.Map;
-using Robust.Shared.Maths;
-using Robust.Shared.Physics;
-using Robust.Shared.Physics.Collision.Shapes;
-using Robust.Shared.Physics.Dynamics;
-
-namespace Content.IntegrationTests.Tests.Physics
-{
-    [TestFixture]
-    public class PhysicsTestBedTest : ContentIntegrationTest
-    {
-        [Test]
-        public async Task TestBoxStack()
-        {
-            var server = StartServer();
-            await server.WaitIdleAsync();
-
-            var mapManager = server.ResolveDependency<IMapManager>();
-            var entitySystemManager = server.ResolveDependency<IEntitySystemManager>();
-            var physicsSystem = entitySystemManager.GetEntitySystem<SharedPhysicsSystem>();
-            MapId mapId;
-
-            var columnCount = 1;
-            var rowCount = 15;
-            PhysicsComponent[] bodies = new PhysicsComponent[columnCount * rowCount];
-            Vector2 firstPos = Vector2.Zero;
-
-            await server.WaitPost(() =>
-            {
-                mapId = mapManager.CreateMap();
-                physicsSystem.Maps[mapId].Gravity = new Vector2(0, -9.8f);
-
-                var entityManager = IoCManager.Resolve<IEntityManager>();
-
-                var ground = entityManager.SpawnEntity(null, new MapCoordinates(0, 0, mapId)).AddComponent<PhysicsComponent>();
-
-                var horizontal = new EdgeShape(new Vector2(-20, 0), new Vector2(20, 0));
-                var horizontalFixture = new Fixture(ground, horizontal)
-                {
-                    CollisionLayer = 1,
-                    CollisionMask = 1,
-                    Hard = true
-                };
-                ground.AddFixture(horizontalFixture);
-
-                var vertical = new EdgeShape(new Vector2(10, 0), new Vector2(10, 10));
-                var verticalFixture = new Fixture(ground, vertical)
-                {
-                    CollisionLayer = 1,
-                    CollisionMask = 1,
-                    Hard = true
-                };
-                ground.AddFixture(verticalFixture);
-
-                var xs = new[]
-                {
-                    0.0f, -10.0f, -5.0f, 5.0f, 10.0f
-                };
-
-                PolygonShape shape;
-
-                for (var j = 0; j < columnCount; j++)
-                {
-                    for (var i = 0; i < rowCount; i++)
-                    {
-                        var x = 0.0f;
-
-                        var box = entityManager.SpawnEntity(null,
-                            new MapCoordinates(new Vector2(xs[j] + x, 0.55f + 2.1f * i), mapId)).AddComponent<PhysicsComponent>();
-
-                        box.BodyType = BodyType.Dynamic;
-                        box.SleepingAllowed = false;
-                        shape = new PolygonShape(0.001f) {Vertices = new List<Vector2>()
-                        {
-                            new(0.5f, -0.5f),
-                            new(0.5f, 0.5f),
-                            new(-0.5f, 0.5f),
-                            new(-0.5f, -0.5f),
-                        }};
-                        box.FixedRotation = true;
-                        // TODO: Need to detect shape and work out if we need to use fixedrotation
-
-                        var fixture = new Fixture(box, shape)
-                        {
-                            CollisionMask = 1,
-                            CollisionLayer = 1,
-                            Hard = true,
-                        };
-                        box.AddFixture(fixture);
-
-                        bodies[j * rowCount + i] = box;
-                    }
-                }
-
-                firstPos = bodies[0].Owner.Transform.WorldPosition;
-            });
-
-            await server.WaitRunTicks(1);
-
-            // Check that gravity workin
-            await server.WaitAssertion(() =>
-            {
-                Assert.That(firstPos != bodies[0].Owner.Transform.WorldPosition);
-            });
-
-            // Assert
-
-            await server.WaitRunTicks(150);
-
-            // Assert settled, none below 0, etc.
-            await server.WaitAssertion(() =>
-            {
-                for (var j = 0; j < columnCount; j++)
-                {
-                    for (var i = 0; i < bodies.Length; i++)
-                    {
-                        var body = bodies[j * columnCount + i];
-                        var worldPos = body.Owner.Transform.WorldPosition;
-
-                        // TODO: Multi-column support but I cbf right now
-                        // Can't be more exact as some level of sinking is allowed.
-                        Assert.That(worldPos.EqualsApprox(new Vector2(0.0f, i + 0.5f), 0.1f), $"Expected y-value of {i + 0.5f} but found {worldPos.Y}");
-                    }
-                }
-            });
-        }
-
-        [Test]
-        public async Task TestCircleStack()
-        {
-            var server = StartServer();
-            await server.WaitIdleAsync();
-
-            var mapManager = server.ResolveDependency<IMapManager>();
-            var entitySystemManager = server.ResolveDependency<IEntitySystemManager>();
-            var physicsSystem = entitySystemManager.GetEntitySystem<SharedPhysicsSystem>();
-            MapId mapId;
-
-            var columnCount = 1;
-            var rowCount = 15;
-            PhysicsComponent[] bodies = new PhysicsComponent[columnCount * rowCount];
-            Vector2 firstPos = Vector2.Zero;
-
-            await server.WaitPost(() =>
-            {
-                mapId = mapManager.CreateMap();
-                physicsSystem.Maps[mapId].Gravity = new Vector2(0, -9.8f);
-
-                var entityManager = IoCManager.Resolve<IEntityManager>();
-
-                var ground = entityManager.SpawnEntity(null, new MapCoordinates(0, 0, mapId)).AddComponent<PhysicsComponent>();
-
-                var horizontal = new EdgeShape(new Vector2(-20, 0), new Vector2(20, 0));
-                var horizontalFixture = new Fixture(ground, horizontal)
-                {
-                    CollisionLayer = 1,
-                    CollisionMask = 1,
-                    Hard = true
-                };
-                ground.AddFixture(horizontalFixture);
-
-                var vertical = new EdgeShape(new Vector2(10, 0), new Vector2(10, 10));
-                var verticalFixture = new Fixture(ground, vertical)
-                {
-                    CollisionLayer = 1,
-                    CollisionMask = 1,
-                    Hard = true
-                };
-                ground.AddFixture(verticalFixture);
-
-                var xs = new[]
-                {
-                    0.0f, -10.0f, -5.0f, 5.0f, 10.0f
-                };
-
-                PhysShapeCircle shape;
-
-                for (var j = 0; j < columnCount; j++)
-                {
-                    for (var i = 0; i < rowCount; i++)
-                    {
-                        var x = 0.0f;
-
-                        var circle = entityManager.SpawnEntity(null,
-                            new MapCoordinates(new Vector2(xs[j] + x, 0.55f + 2.1f * i), mapId)).AddComponent<PhysicsComponent>();
-
-                        circle.BodyType = BodyType.Dynamic;
-                        circle.SleepingAllowed = false;
-                        shape = new PhysShapeCircle {Radius = 0.5f};
-
-                        var fixture = new Fixture(circle, shape)
-                        {
-                            CollisionMask = 1,
-                            CollisionLayer = 1,
-                            Hard = true,
-                        };
-                        circle.AddFixture(fixture);
-
-                        bodies[j * rowCount + i] = circle;
-                    }
-                }
-
-                firstPos = bodies[0].Owner.Transform.WorldPosition;
-            });
-
-            await server.WaitRunTicks(1);
-
-            // Check that gravity workin
-            await server.WaitAssertion(() =>
-            {
-                Assert.That(firstPos != bodies[0].Owner.Transform.WorldPosition);
-            });
-
-            // Assert
-
-            await server.WaitRunTicks(150);
-
-            // Assert settled, none below 0, etc.
-            await server.WaitAssertion(() =>
-            {
-                for (var j = 0; j < columnCount; j++)
-                {
-                    for (var i = 0; i < bodies.Length; i++)
-                    {
-                        var body = bodies[j * columnCount + i];
-                        var worldPos = body.Owner.Transform.WorldPosition;
-
-                        // TODO: Multi-column support but I cbf right now
-                        // Can't be more exact as some level of sinking is allowed.
-                        Assert.That(worldPos.EqualsApprox(new Vector2(0.0f, i + 0.5f), 0.1f), $"Expected y-value of {i + 0.5f} but found {worldPos.Y}");
-                    }
-                }
-            });
-        }
-    }
-}
diff --git a/Content.IntegrationTests/Tests/SaveLoadMapTest.cs b/Content.IntegrationTests/Tests/SaveLoadMapTest.cs
index 0769aca59c..61cb861f87 100644
--- a/Content.IntegrationTests/Tests/SaveLoadMapTest.cs
+++ b/Content.IntegrationTests/Tests/SaveLoadMapTest.cs
@@ -27,12 +27,12 @@ namespace Content.IntegrationTests.Tests
             var mapLoader = server.ResolveDependency<IMapLoader>();
             var mapManager = server.ResolveDependency<IMapManager>();
             var entityManager = server.ResolveDependency<IEntityManager>();
+            var resManager = server.ResolveDependency<IResourceManager>();
 
             server.Post(() =>
             {
                 var dir = new ResourcePath(mapPath).Directory;
-                IoCManager.Resolve<IResourceManager>()
-                    .UserData.CreateDir(dir);
+                resManager.UserData.CreateDir(dir);
 
                 var mapId = mapManager.CreateMap(new MapId(5));
 
diff --git a/Content.IntegrationTests/Tests/ShuttleTest.cs b/Content.IntegrationTests/Tests/ShuttleTest.cs
new file mode 100644
index 0000000000..1696f36bec
--- /dev/null
+++ b/Content.IntegrationTests/Tests/ShuttleTest.cs
@@ -0,0 +1,49 @@
+#nullable enable
+using System.Threading.Tasks;
+using Content.Server.Shuttles;
+using NUnit.Framework;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Map;
+using Robust.Shared.Maths;
+using Robust.Shared.Physics;
+
+namespace Content.IntegrationTests.Tests
+{
+    [TestFixture]
+    public class ShuttleTest : ContentIntegrationTest
+    {
+        [Test]
+        public async Task Test()
+        {
+            var server = StartServer();
+
+            await server.WaitIdleAsync();
+
+            var entMan = server.ResolveDependency<IEntityManager>();
+            var mapMan = server.ResolveDependency<IMapManager>();
+            IEntity? gridEnt = null;
+
+            await server.WaitAssertion(() =>
+            {
+                var mapId = mapMan.CreateMap();
+                var grid = mapMan.CreateGrid(mapId);
+                gridEnt = entMan.GetEntity(grid.GridEntityId);
+
+                Assert.That(gridEnt.TryGetComponent(out ShuttleComponent? shuttleComponent));
+                Assert.That(gridEnt.TryGetComponent(out PhysicsComponent? physicsComponent));
+                Assert.That(physicsComponent!.BodyType, Is.EqualTo(BodyType.Dynamic));
+                Assert.That(gridEnt.Transform.LocalPosition, Is.EqualTo(Vector2.Zero));
+                physicsComponent.ApplyLinearImpulse(Vector2.One);
+            });
+
+            // TODO: Should have tests that collision + rendertree + pointlights work on a moved grid but I'll deal with that
+            // when we get rotations.
+            await server.WaitRunTicks(1);
+
+            await server.WaitAssertion(() =>
+            {
+                Assert.That(gridEnt?.Transform.LocalPosition, Is.Not.EqualTo(Vector2.Zero));
+            });
+        }
+    }
+}
diff --git a/Content.IntegrationTests/Tests/Utility/EntitySystemExtensionsTest.cs b/Content.IntegrationTests/Tests/Utility/EntitySystemExtensionsTest.cs
index 8f3b154593..08f8a411f5 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.Physics;
 using Robust.Shared.Physics.Broadphase;
 
 namespace Content.IntegrationTests.Tests.Utility
@@ -39,7 +40,7 @@ namespace Content.IntegrationTests.Tests.Utility
 
             var sMapManager = server.ResolveDependency<IMapManager>();
             var sEntityManager = server.ResolveDependency<IEntityManager>();
-            var broady = server.ResolveDependency<IEntitySystemManager>().GetEntitySystem<SharedBroadPhaseSystem>();
+            var broady = server.ResolveDependency<IEntitySystemManager>().GetEntitySystem<SharedBroadphaseSystem>();
 
             await server.WaitAssertion(() =>
             {
diff --git a/Content.Server/AI/Commands/AddAiCommand.cs b/Content.Server/AI/Commands/AddAiCommand.cs
index 35067fe14d..24d4fc38fe 100644
--- a/Content.Server/AI/Commands/AddAiCommand.cs
+++ b/Content.Server/AI/Commands/AddAiCommand.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Server.Administration;
+using Content.Server.Administration;
 using Content.Server.AI.Components;
 using Content.Server.AI.Utility;
 using Content.Server.AI.Utility.AiLogic;
diff --git a/Content.Server/AI/Components/AiControllerComponent.cs b/Content.Server/AI/Components/AiControllerComponent.cs
index 138acd552e..389a1ca766 100644
--- a/Content.Server/AI/Components/AiControllerComponent.cs
+++ b/Content.Server/AI/Components/AiControllerComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Server.GameTicking;
+using Content.Server.GameTicking;
 using Content.Shared.Movement.Components;
 using Content.Shared.Roles;
 using Robust.Shared.GameObjects;
diff --git a/Content.Server/AI/Components/AiFactionPrototype.cs b/Content.Server/AI/Components/AiFactionPrototype.cs
index e88c4f53a4..b890a76ade 100644
--- a/Content.Server/AI/Components/AiFactionPrototype.cs
+++ b/Content.Server/AI/Components/AiFactionPrototype.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Collections.Generic;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager.Attributes;
diff --git a/Content.Server/AI/Components/AiFactionTagComponent.cs b/Content.Server/AI/Components/AiFactionTagComponent.cs
index 3b132c4ad1..5a7ca92326 100644
--- a/Content.Server/AI/Components/AiFactionTagComponent.cs
+++ b/Content.Server/AI/Components/AiFactionTagComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.AI.EntitySystems;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
diff --git a/Content.Server/AI/EntitySystems/AiFactionTagSystem.cs b/Content.Server/AI/EntitySystems/AiFactionTagSystem.cs
index 2158c08e36..e87b74ead1 100644
--- a/Content.Server/AI/EntitySystems/AiFactionTagSystem.cs
+++ b/Content.Server/AI/EntitySystems/AiFactionTagSystem.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using Content.Server.AI.Components;
diff --git a/Content.Server/AI/EntitySystems/AiSystem.cs b/Content.Server/AI/EntitySystems/AiSystem.cs
index d6ff8acf9a..ab17ce6cf5 100644
--- a/Content.Server/AI/EntitySystems/AiSystem.cs
+++ b/Content.Server/AI/EntitySystems/AiSystem.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using Content.Server.AI.Components;
diff --git a/Content.Server/AI/Operators/Inventory/OpenStorageOperator.cs b/Content.Server/AI/Operators/Inventory/OpenStorageOperator.cs
index defbf77b01..32250ab9b8 100644
--- a/Content.Server/AI/Operators/Inventory/OpenStorageOperator.cs
+++ b/Content.Server/AI/Operators/Inventory/OpenStorageOperator.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Server.AI.Utility;
+using Content.Server.AI.Utility;
 using Content.Server.AI.WorldState.States.Inventory;
 using Content.Server.Storage.Components;
 using Content.Shared.Interaction;
diff --git a/Content.Server/AI/Operators/Inventory/PickupEntityOperator.cs b/Content.Server/AI/Operators/Inventory/PickupEntityOperator.cs
index 4fcab41407..7b2e60635a 100644
--- a/Content.Server/AI/Operators/Inventory/PickupEntityOperator.cs
+++ b/Content.Server/AI/Operators/Inventory/PickupEntityOperator.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Hands.Components;
 using Content.Server.Interaction;
 using Content.Server.Items;
diff --git a/Content.Server/AI/Operators/Inventory/UseItemInInventoryOperator.cs b/Content.Server/AI/Operators/Inventory/UseItemInInventoryOperator.cs
index 0ae76846f5..fec7a7b7a9 100644
--- a/Content.Server/AI/Operators/Inventory/UseItemInInventoryOperator.cs
+++ b/Content.Server/AI/Operators/Inventory/UseItemInInventoryOperator.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Hands.Components;
 using Content.Server.Items;
 using Robust.Shared.GameObjects;
diff --git a/Content.Server/AI/Operators/Nutrition/UseDrinkInInventoryOperator.cs b/Content.Server/AI/Operators/Nutrition/UseDrinkInInventoryOperator.cs
index ded30b2b83..ff73ea4082 100644
--- a/Content.Server/AI/Operators/Nutrition/UseDrinkInInventoryOperator.cs
+++ b/Content.Server/AI/Operators/Nutrition/UseDrinkInInventoryOperator.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Hands.Components;
 using Content.Server.Items;
 using Content.Server.Nutrition.Components;
diff --git a/Content.Server/AI/Operators/Nutrition/UseFoodInInventoryOperator.cs b/Content.Server/AI/Operators/Nutrition/UseFoodInInventoryOperator.cs
index 8b8668e31e..c92ae7d52e 100644
--- a/Content.Server/AI/Operators/Nutrition/UseFoodInInventoryOperator.cs
+++ b/Content.Server/AI/Operators/Nutrition/UseFoodInInventoryOperator.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Hands.Components;
 using Content.Server.Items;
 using Content.Server.Nutrition.Components;
diff --git a/Content.Server/AI/Pathfinding/Accessible/ReachableArgs.cs b/Content.Server/AI/Pathfinding/Accessible/ReachableArgs.cs
index 2ce6a8a1d1..8ea9eab95e 100644
--- a/Content.Server/AI/Pathfinding/Accessible/ReachableArgs.cs
+++ b/Content.Server/AI/Pathfinding/Accessible/ReachableArgs.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Content.Server.Access.Components;
 using Content.Server.AI.Components;
 using Robust.Shared.GameObjects;
diff --git a/Content.Server/AI/Utility/BehaviorSetPrototype.cs b/Content.Server/AI/Utility/BehaviorSetPrototype.cs
index a6b0dc3e66..1ab3f3da82 100644
--- a/Content.Server/AI/Utility/BehaviorSetPrototype.cs
+++ b/Content.Server/AI/Utility/BehaviorSetPrototype.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Collections.Generic;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager.Attributes;
diff --git a/Content.Server/AI/Utility/NpcBehaviorManager.cs b/Content.Server/AI/Utility/NpcBehaviorManager.cs
index 4763f77899..8610bc4ed2 100644
--- a/Content.Server/AI/Utility/NpcBehaviorManager.cs
+++ b/Content.Server/AI/Utility/NpcBehaviorManager.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using Content.Server.AI.EntitySystems;
diff --git a/Content.Server/AI/Utils/Visibility.cs b/Content.Server/AI/Utils/Visibility.cs
index c374b6534a..ad79951620 100644
--- a/Content.Server/AI/Utils/Visibility.cs
+++ b/Content.Server/AI/Utils/Visibility.cs
@@ -41,7 +41,7 @@ namespace Content.Server.AI.Utils
                 angle.ToVec(),
                 (int)(CollisionGroup.Opaque | CollisionGroup.Impassable | CollisionGroup.MobImpassable));
 
-            var rayCastResults = EntitySystem.Get<SharedBroadPhaseSystem>().IntersectRay(owner.Transform.MapID, ray, range, owner).ToList();
+            var rayCastResults = EntitySystem.Get<SharedBroadphaseSystem>().IntersectRay(owner.Transform.MapID, ray, range, owner).ToList();
 
             return rayCastResults.Count > 0 && rayCastResults[0].HitEntity == target;
         }
diff --git a/Content.Server/AME/AMENodeGroup.cs b/Content.Server/AME/AMENodeGroup.cs
index a015d20a72..eb9acc62c3 100644
--- a/Content.Server/AME/AMENodeGroup.cs
+++ b/Content.Server/AME/AMENodeGroup.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/Content.Server/AME/Components/AMEControllerComponent.cs b/Content.Server/AME/Components/AMEControllerComponent.cs
index 4a4a064b28..785431be0e 100644
--- a/Content.Server/AME/Components/AMEControllerComponent.cs
+++ b/Content.Server/AME/Components/AMEControllerComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Linq;
 using System.Threading.Tasks;
 using Content.Server.Hands.Components;
diff --git a/Content.Server/AME/Components/AMEFuelContainerComponent.cs b/Content.Server/AME/Components/AMEFuelContainerComponent.cs
index 269a4077be..ff5558c917 100644
--- a/Content.Server/AME/Components/AMEFuelContainerComponent.cs
+++ b/Content.Server/AME/Components/AMEFuelContainerComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Robust.Shared.GameObjects;
 using Robust.Shared.ViewVariables;
 
diff --git a/Content.Server/AME/Components/AMEPartComponent.cs b/Content.Server/AME/Components/AMEPartComponent.cs
index 8b0b140a73..8dacbf8763 100644
--- a/Content.Server/AME/Components/AMEPartComponent.cs
+++ b/Content.Server/AME/Components/AMEPartComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Linq;
 using System.Threading.Tasks;
 using Content.Server.Hands.Components;
diff --git a/Content.Server/AME/Components/AMEShieldComponent.cs b/Content.Server/AME/Components/AMEShieldComponent.cs
index b68646dcd1..4c64181a16 100644
--- a/Content.Server/AME/Components/AMEShieldComponent.cs
+++ b/Content.Server/AME/Components/AMEShieldComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Content.Shared.AME;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
diff --git a/Content.Server/Access/Components/AccessComponent.cs b/Content.Server/Access/Components/AccessComponent.cs
index f1393397ab..fd85a535d5 100644
--- a/Content.Server/Access/Components/AccessComponent.cs
+++ b/Content.Server/Access/Components/AccessComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Collections.Generic;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
diff --git a/Content.Server/Access/Components/AccessReaderComponent.cs b/Content.Server/Access/Components/AccessReaderComponent.cs
index 64ab8cafe6..2eafac583a 100644
--- a/Content.Server/Access/Components/AccessReaderComponent.cs
+++ b/Content.Server/Access/Components/AccessReaderComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/Content.Server/Access/Components/IAccess.cs b/Content.Server/Access/Components/IAccess.cs
index 7b04b26c48..46f91f40a3 100644
--- a/Content.Server/Access/Components/IAccess.cs
+++ b/Content.Server/Access/Components/IAccess.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 
diff --git a/Content.Server/Access/Components/IdCardConsoleComponent.cs b/Content.Server/Access/Components/IdCardConsoleComponent.cs
index f9de78f2ac..87f0085931 100644
--- a/Content.Server/Access/Components/IdCardConsoleComponent.cs
+++ b/Content.Server/Access/Components/IdCardConsoleComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
diff --git a/Content.Server/Access/Components/PresetIdCardComponent.cs b/Content.Server/Access/Components/PresetIdCardComponent.cs
index 4442a07944..58c07df48c 100644
--- a/Content.Server/Access/Components/PresetIdCardComponent.cs
+++ b/Content.Server/Access/Components/PresetIdCardComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Shared.Roles;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
diff --git a/Content.Server/Actions/Actions/CombatMode.cs b/Content.Server/Actions/Actions/CombatMode.cs
index ea0a356a06..4ce41fd4bb 100644
--- a/Content.Server/Actions/Actions/CombatMode.cs
+++ b/Content.Server/Actions/Actions/CombatMode.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.CombatMode;
 using Content.Shared.Actions.Behaviors;
 using Content.Shared.Notification;
@@ -20,7 +19,7 @@ namespace Content.Server.Actions.Actions
                 return false;
             }
 
-            args.Performer.PopupMessage(args.ToggledOn ? Loc.GetString("hud-combat-enabled") : Loc.GetString("hud-combat-disabled"));
+            args.Performer.PopupMessage(Loc.GetString(args.ToggledOn ? "hud-combat-enabled" : "hud-combat-disabled"));
             combatMode.IsInCombatMode = args.ToggledOn;
 
             return true;
diff --git a/Content.Server/Actions/Actions/DisarmAction.cs b/Content.Server/Actions/Actions/DisarmAction.cs
index fc06630b98..2af0fe9a88 100644
--- a/Content.Server/Actions/Actions/DisarmAction.cs
+++ b/Content.Server/Actions/Actions/DisarmAction.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Act;
 using Content.Server.Interaction;
 using Content.Server.Notification;
diff --git a/Content.Server/Actions/Actions/GhostBoo.cs b/Content.Server/Actions/Actions/GhostBoo.cs
index eec44b21ff..2287f123d1 100644
--- a/Content.Server/Actions/Actions/GhostBoo.cs
+++ b/Content.Server/Actions/Actions/GhostBoo.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Linq;
 using Content.Server.Ghost;
 using Content.Shared.Actions.Behaviors;
diff --git a/Content.Server/Actions/Actions/ScreamAction.cs b/Content.Server/Actions/Actions/ScreamAction.cs
index fdad420c57..a98c5d3599 100644
--- a/Content.Server/Actions/Actions/ScreamAction.cs
+++ b/Content.Server/Actions/Actions/ScreamAction.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.CharacterAppearance.Components;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Actions.Behaviors;
diff --git a/Content.Server/Actions/Commands/CooldownAction.cs b/Content.Server/Actions/Commands/CooldownAction.cs
index 6ae705647a..b4eeca63ea 100644
--- a/Content.Server/Actions/Commands/CooldownAction.cs
+++ b/Content.Server/Actions/Commands/CooldownAction.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Content.Server.Administration;
 using Content.Server.Commands;
diff --git a/Content.Server/Actions/Commands/GrantAction.cs b/Content.Server/Actions/Commands/GrantAction.cs
index 2ad39f0b0c..b864e904ff 100644
--- a/Content.Server/Actions/Commands/GrantAction.cs
+++ b/Content.Server/Actions/Commands/GrantAction.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Content.Server.Administration;
 using Content.Server.Commands;
diff --git a/Content.Server/Actions/Commands/RevokeAction.cs b/Content.Server/Actions/Commands/RevokeAction.cs
index 3c2f938099..4366c7fca3 100644
--- a/Content.Server/Actions/Commands/RevokeAction.cs
+++ b/Content.Server/Actions/Commands/RevokeAction.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Content.Server.Administration;
 using Content.Server.Commands;
diff --git a/Content.Server/Actions/ServerActionsComponent.cs b/Content.Server/Actions/ServerActionsComponent.cs
index ab89458458..584de89606 100644
--- a/Content.Server/Actions/ServerActionsComponent.cs
+++ b/Content.Server/Actions/ServerActionsComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Actions;
diff --git a/Content.Server/Administration/AdminRank.cs b/Content.Server/Administration/AdminRank.cs
index 925022498e..2f27891ea7 100644
--- a/Content.Server/Administration/AdminRank.cs
+++ b/Content.Server/Administration/AdminRank.cs
@@ -1,6 +1,5 @@
 using Content.Shared.Administration;
 
-#nullable enable
 
 namespace Content.Server.Administration
 {
diff --git a/Content.Server/Administration/Commands/BanCommand.cs b/Content.Server/Administration/Commands/BanCommand.cs
index 64ebd4807f..e776000dd6 100644
--- a/Content.Server/Administration/Commands/BanCommand.cs
+++ b/Content.Server/Administration/Commands/BanCommand.cs
@@ -8,7 +8,6 @@ using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.IoC;
 
-#nullable enable
 
 namespace Content.Server.Administration.Commands
 {
diff --git a/Content.Server/Administration/Commands/DeAdminCommand.cs b/Content.Server/Administration/Commands/DeAdminCommand.cs
index e53e5551a6..63feb7846b 100644
--- a/Content.Server/Administration/Commands/DeAdminCommand.cs
+++ b/Content.Server/Administration/Commands/DeAdminCommand.cs
@@ -5,7 +5,6 @@ using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.IoC;
 
-#nullable enable
 
 namespace Content.Server.Administration.Commands
 {
diff --git a/Content.Server/Administration/Commands/DeleteComponent.cs b/Content.Server/Administration/Commands/DeleteComponent.cs
index 8c05561cc9..b22af15355 100644
--- a/Content.Server/Administration/Commands/DeleteComponent.cs
+++ b/Content.Server/Administration/Commands/DeleteComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Shared.Administration;
+using Content.Shared.Administration;
 using Robust.Shared.Console;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
diff --git a/Content.Server/Administration/Commands/DeleteEntitiesWithId.cs b/Content.Server/Administration/Commands/DeleteEntitiesWithId.cs
index 08551517cd..c9beaff729 100644
--- a/Content.Server/Administration/Commands/DeleteEntitiesWithId.cs
+++ b/Content.Server/Administration/Commands/DeleteEntitiesWithId.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Shared.Administration;
 using Robust.Shared.Console;
 using Robust.Shared.GameObjects;
diff --git a/Content.Server/Administration/Commands/ExplosionCommand.cs b/Content.Server/Administration/Commands/ExplosionCommand.cs
index 7b7fc97250..50d553fd72 100644
--- a/Content.Server/Administration/Commands/ExplosionCommand.cs
+++ b/Content.Server/Administration/Commands/ExplosionCommand.cs
@@ -4,7 +4,6 @@ using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.Map;
 
-#nullable enable
 
 namespace Content.Server.Administration.Commands
 {
diff --git a/Content.Server/Administration/Commands/FindEntitiesWithComponents.cs b/Content.Server/Administration/Commands/FindEntitiesWithComponents.cs
index 0e4b0b6190..a386be5263 100644
--- a/Content.Server/Administration/Commands/FindEntitiesWithComponents.cs
+++ b/Content.Server/Administration/Commands/FindEntitiesWithComponents.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/Content.Server/Administration/Commands/OpenPermissionsCommand.cs b/Content.Server/Administration/Commands/OpenPermissionsCommand.cs
index 11628a0f26..2a1c00596a 100644
--- a/Content.Server/Administration/Commands/OpenPermissionsCommand.cs
+++ b/Content.Server/Administration/Commands/OpenPermissionsCommand.cs
@@ -5,7 +5,6 @@ using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.IoC;
 
-#nullable enable
 
 namespace Content.Server.Administration.Commands
 {
diff --git a/Content.Server/Administration/Commands/PardonCommand.cs b/Content.Server/Administration/Commands/PardonCommand.cs
index da23be1e2d..ff088591ab 100644
--- a/Content.Server/Administration/Commands/PardonCommand.cs
+++ b/Content.Server/Administration/Commands/PardonCommand.cs
@@ -6,7 +6,6 @@ using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.IoC;
 
-#nullable enable
 
 namespace Content.Server.Administration.Commands
 {
diff --git a/Content.Server/Administration/Commands/PromoteHostCommand.cs b/Content.Server/Administration/Commands/PromoteHostCommand.cs
index 7bd0b39cec..7b66ee4a4e 100644
--- a/Content.Server/Administration/Commands/PromoteHostCommand.cs
+++ b/Content.Server/Administration/Commands/PromoteHostCommand.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Server.Administration.Managers;
+using Content.Server.Administration.Managers;
 using JetBrains.Annotations;
 using Robust.Server.Player;
 using Robust.Shared.Console;
diff --git a/Content.Server/Administration/Commands/ReAdminCommand.cs b/Content.Server/Administration/Commands/ReAdminCommand.cs
index 760638228f..1d6764ee46 100644
--- a/Content.Server/Administration/Commands/ReAdminCommand.cs
+++ b/Content.Server/Administration/Commands/ReAdminCommand.cs
@@ -3,7 +3,6 @@ using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.IoC;
 
-#nullable enable
 
 namespace Content.Server.Administration.Commands
 {
diff --git a/Content.Server/Administration/Commands/ReadyAll.cs b/Content.Server/Administration/Commands/ReadyAll.cs
index 33930bf2cd..c36ed3484f 100644
--- a/Content.Server/Administration/Commands/ReadyAll.cs
+++ b/Content.Server/Administration/Commands/ReadyAll.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Server.GameTicking;
+using Content.Server.GameTicking;
 using Content.Shared.Administration;
 using Robust.Server.Player;
 using Robust.Shared.Console;
diff --git a/Content.Server/Administration/Commands/RemoveExtraComponents.cs b/Content.Server/Administration/Commands/RemoveExtraComponents.cs
index 98f7834fe9..9feb0aa471 100644
--- a/Content.Server/Administration/Commands/RemoveExtraComponents.cs
+++ b/Content.Server/Administration/Commands/RemoveExtraComponents.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Shared.Administration;
+using Content.Shared.Administration;
 using Robust.Shared.Console;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
diff --git a/Content.Server/Administration/Commands/SetAdminOOC.cs b/Content.Server/Administration/Commands/SetAdminOOC.cs
index f18723d4c7..20e69eb341 100644
--- a/Content.Server/Administration/Commands/SetAdminOOC.cs
+++ b/Content.Server/Administration/Commands/SetAdminOOC.cs
@@ -1,7 +1,5 @@
-#nullable enable
 
 using Content.Server.Database;
-using Content.Server.Interfaces;
 using Content.Server.Preferences.Managers;
 using Content.Shared.Administration;
 using Robust.Server.Player;
diff --git a/Content.Server/Administration/Commands/SetMindCommand.cs b/Content.Server/Administration/Commands/SetMindCommand.cs
index 88a25fd64d..9b24a636b5 100644
--- a/Content.Server/Administration/Commands/SetMindCommand.cs
+++ b/Content.Server/Administration/Commands/SetMindCommand.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Mind.Components;
 using Content.Server.Players;
 using Content.Shared.Administration;
diff --git a/Content.Server/Administration/Commands/SetOutfitCommand.cs b/Content.Server/Administration/Commands/SetOutfitCommand.cs
index 44a6e82a3c..6337a9fb05 100644
--- a/Content.Server/Administration/Commands/SetOutfitCommand.cs
+++ b/Content.Server/Administration/Commands/SetOutfitCommand.cs
@@ -1,7 +1,5 @@
-#nullable enable
 using Content.Server.Administration.UI;
 using Content.Server.EUI;
-using Content.Server.Interfaces;
 using Content.Server.Inventory.Components;
 using Content.Server.Items;
 using Content.Server.PDA;
diff --git a/Content.Server/Administration/Managers/AdminManager.cs b/Content.Server/Administration/Managers/AdminManager.cs
index 2815c6d9df..89fb59ecd0 100644
--- a/Content.Server/Administration/Managers/AdminManager.cs
+++ b/Content.Server/Administration/Managers/AdminManager.cs
@@ -23,7 +23,6 @@ using Robust.Shared.Network;
 using Robust.Shared.Utility;
 using YamlDotNet.RepresentationModel;
 
-#nullable enable
 
 namespace Content.Server.Administration.Managers
 {
diff --git a/Content.Server/Administration/Managers/IAdminManager.cs b/Content.Server/Administration/Managers/IAdminManager.cs
index 553628c6c5..40ac0b27bb 100644
--- a/Content.Server/Administration/Managers/IAdminManager.cs
+++ b/Content.Server/Administration/Managers/IAdminManager.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using Content.Shared.Administration;
 using Robust.Server.Player;
 
-#nullable enable
 
 namespace Content.Server.Administration.Managers
 {
diff --git a/Content.Server/Administration/UI/PermissionsEui.cs b/Content.Server/Administration/UI/PermissionsEui.cs
index 0fce245536..aeaa14d02a 100644
--- a/Content.Server/Administration/UI/PermissionsEui.cs
+++ b/Content.Server/Administration/UI/PermissionsEui.cs
@@ -14,7 +14,6 @@ using Robust.Shared.Network;
 using DbAdminRank = Content.Server.Database.AdminRank;
 using static Content.Shared.Administration.PermissionsEuiMsg;
 
-#nullable enable
 
 namespace Content.Server.Administration.UI
 {
diff --git a/Content.Server/Administration/Verbs/AdminAddReagentVerb.cs b/Content.Server/Administration/Verbs/AdminAddReagentVerb.cs
index 9abc73fcf1..dae951605b 100644
--- a/Content.Server/Administration/Verbs/AdminAddReagentVerb.cs
+++ b/Content.Server/Administration/Verbs/AdminAddReagentVerb.cs
@@ -13,7 +13,6 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 
-#nullable enable
 
 namespace Content.Server.Administration.Verbs
 {
diff --git a/Content.Server/Administration/Verbs/DeleteVerb.cs b/Content.Server/Administration/Verbs/DeleteVerb.cs
index c1938af26c..262347fdda 100644
--- a/Content.Server/Administration/Verbs/DeleteVerb.cs
+++ b/Content.Server/Administration/Verbs/DeleteVerb.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Shared.Verbs;
 using Robust.Server.Console;
 using Robust.Server.GameObjects;
diff --git a/Content.Server/Afk/AfkManager.cs b/Content.Server/Afk/AfkManager.cs
new file mode 100644
index 0000000000..ae93e81254
--- /dev/null
+++ b/Content.Server/Afk/AfkManager.cs
@@ -0,0 +1,103 @@
+using System;
+using System.Collections.Generic;
+using Content.Shared.CCVar;
+using JetBrains.Annotations;
+using Robust.Server.Player;
+using Robust.Shared.Configuration;
+using Robust.Shared.Console;
+using Robust.Shared.Enums;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Input;
+using Robust.Shared.IoC;
+using Robust.Shared.Timing;
+
+namespace Content.Server.Afk
+{
+    /// <summary>
+    /// Tracks AFK (away from keyboard) status for players.
+    /// </summary>
+    /// <seealso cref="CCVars.AfkTime"/>
+    public interface IAfkManager
+    {
+        /// <summary>
+        /// Check whether this player is currently AFK.
+        /// </summary>
+        /// <param name="player">The player to check.</param>
+        /// <returns>True if the player is AFK, false otherwise.</returns>
+        bool IsAfk(IPlayerSession player);
+
+        /// <summary>
+        /// Resets AFK status for the player as if they just did an action and are definitely not AFK.
+        /// </summary>
+        /// <param name="player">The player to set AFK status for.</param>
+        void PlayerDidAction(IPlayerSession player);
+
+        void Initialize();
+    }
+
+    [UsedImplicitly]
+    public class AfkManager : IAfkManager, IEntityEventSubscriber
+    {
+        [Dependency] private readonly IEntityManager _entityManager = default!;
+        [Dependency] private readonly IPlayerManager _playerManager = default!;
+        [Dependency] private readonly IGameTiming _gameTiming = default!;
+        [Dependency] private readonly IConfigurationManager _cfg = default!;
+        [Dependency] private readonly IConsoleHost _consoleHost = default!;
+
+        private readonly Dictionary<IPlayerSession, TimeSpan> _lastActionTimes = new();
+
+        public void Initialize()
+        {
+            // Connecting, console commands and input commands all reset AFK status.
+
+            _playerManager.PlayerStatusChanged += PlayerStatusChanged;
+            _consoleHost.AnyCommandExecuted += ConsoleHostOnAnyCommandExecuted;
+
+            _entityManager.EventBus.SubscribeSessionEvent<FullInputCmdMessage>(
+                EventSource.Network,
+                this,
+                HandleInputCmd);
+        }
+
+        public void PlayerDidAction(IPlayerSession player)
+        {
+            if (player.Status == SessionStatus.Disconnected)
+                // Make sure we don't re-add to the dictionary if the player is disconnected now.
+                return;
+
+            _lastActionTimes[player] = _gameTiming.RealTime;
+        }
+
+        public bool IsAfk(IPlayerSession player)
+        {
+            if (!_lastActionTimes.TryGetValue(player, out var time))
+                // Some weird edge case like disconnected clients. Just say true I guess.
+                return true;
+
+            var timeOut = TimeSpan.FromSeconds(_cfg.GetCVar(CCVars.AfkTime));
+            return _gameTiming.RealTime - time > timeOut;
+        }
+
+        private void PlayerStatusChanged(object? sender, SessionStatusEventArgs e)
+        {
+            if (e.NewStatus == SessionStatus.Disconnected)
+            {
+                _lastActionTimes.Remove(e.Session);
+                return;
+            }
+
+            PlayerDidAction(e.Session);
+        }
+
+        private void ConsoleHostOnAnyCommandExecuted(IConsoleShell shell, string commandname, string argstr, string[] args)
+        {
+            if (shell.Player is IPlayerSession player)
+                PlayerDidAction(player);
+        }
+
+        private void HandleInputCmd(FullInputCmdMessage msg, EntitySessionEventArgs args)
+        {
+            PlayerDidAction((IPlayerSession) args.SenderSession);
+        }
+    }
+}
diff --git a/Content.Server/Afk/IsAfkCommand.cs b/Content.Server/Afk/IsAfkCommand.cs
new file mode 100644
index 0000000000..b166851b50
--- /dev/null
+++ b/Content.Server/Afk/IsAfkCommand.cs
@@ -0,0 +1,36 @@
+using Content.Server.Administration;
+using Content.Shared.Administration;
+using Robust.Server.Player;
+using Robust.Shared.Console;
+using Robust.Shared.IoC;
+
+namespace Content.Server.Afk
+{
+    [AdminCommand(AdminFlags.Admin)]
+    public sealed class IsAfkCommand : IConsoleCommand
+    {
+        public string Command => "isafk";
+        public string Description => "Checks if a specified player is AFK";
+        public string Help => "Usage: isafk <playerName>";
+
+        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        {
+            var playerManager = IoCManager.Resolve<IPlayerManager>();
+            var afkManager = IoCManager.Resolve<IAfkManager>();
+
+            if (args.Length == 0)
+            {
+                shell.WriteError("Need one argument");
+                return;
+            }
+
+            if (!playerManager.TryGetSessionByUsername(args[0], out var player))
+            {
+                shell.WriteError("Unable to find that player");
+                return;
+            }
+
+            shell.WriteLine(afkManager.IsAfk(player) ? "They are indeed AFK" : "They are not AFK");
+        }
+    }
+}
diff --git a/Content.Server/Alert/Click/RemoveCuffs.cs b/Content.Server/Alert/Click/RemoveCuffs.cs
index f00c219928..6ef8fd87c4 100644
--- a/Content.Server/Alert/Click/RemoveCuffs.cs
+++ b/Content.Server/Alert/Click/RemoveCuffs.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Cuffs.Components;
 using Content.Shared.Alert;
 using JetBrains.Annotations;
diff --git a/Content.Server/Alert/Click/StopPiloting.cs b/Content.Server/Alert/Click/StopPiloting.cs
index 3708bd2a7f..51d5cb17bc 100644
--- a/Content.Server/Alert/Click/StopPiloting.cs
+++ b/Content.Server/Alert/Click/StopPiloting.cs
@@ -1,6 +1,8 @@
-using Content.Server.Shuttle;
+using Content.Server.Shuttles;
 using Content.Shared.Alert;
+using Content.Shared.Shuttles;
 using JetBrains.Annotations;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
 namespace Content.Server.Alert.Click
@@ -14,9 +16,10 @@ namespace Content.Server.Alert.Click
     {
         public void AlertClicked(ClickAlertEventArgs args)
         {
-            if (args.Player.TryGetComponent(out ShuttleControllerComponent? controller))
+            if (args.Player.TryGetComponent(out PilotComponent? pilotComponent) &&
+                pilotComponent.Console != null)
             {
-                controller.RemoveController();
+                EntitySystem.Get<ShuttleConsoleSystem>().RemovePilot(pilotComponent);
             }
         }
     }
diff --git a/Content.Server/Alert/Commands/ClearAlert.cs b/Content.Server/Alert/Commands/ClearAlert.cs
index 415ac67921..3ddc04a72d 100644
--- a/Content.Server/Alert/Commands/ClearAlert.cs
+++ b/Content.Server/Alert/Commands/ClearAlert.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Content.Server.Administration;
 using Content.Server.Commands;
diff --git a/Content.Server/Alert/Commands/ShowAlert.cs b/Content.Server/Alert/Commands/ShowAlert.cs
index 4a3e56679b..05cf1397a8 100644
--- a/Content.Server/Alert/Commands/ShowAlert.cs
+++ b/Content.Server/Alert/Commands/ShowAlert.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Content.Server.Administration;
 using Content.Server.Commands;
diff --git a/Content.Server/Arcade/Components/BlockGameArcadeComponent.cs b/Content.Server/Arcade/Components/BlockGameArcadeComponent.cs
index 6634ae5d9a..dc9025f18c 100644
--- a/Content.Server/Arcade/Components/BlockGameArcadeComponent.cs
+++ b/Content.Server/Arcade/Components/BlockGameArcadeComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -7,8 +6,6 @@ using Content.Server.UserInterface;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Arcade;
 using Content.Shared.Interaction;
-using Content.Shared.Interaction.Events;
-using Content.Shared.NetIDs;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.GameObjects;
@@ -25,7 +22,6 @@ namespace Content.Server.Arcade.Components
         [Dependency] private readonly IRobustRandom _random = default!;
 
         public override string Name => "BlockGameArcade";
-        public override uint? NetID => ContentNetIDs.BLOCKGAME_ARCADE;
 
         [ComponentDependency] private readonly ApcPowerReceiverComponent? _powerReceiverComponent = default!;
 
diff --git a/Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs b/Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs
index 3654ad9a96..01e97629cc 100644
--- a/Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs
+++ b/Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Collections.Generic;
 using Content.Server.Power.Components;
 using Content.Server.UserInterface;
@@ -7,7 +6,6 @@ using Content.Server.WireHacking;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Arcade;
 using Content.Shared.Interaction;
-using Content.Shared.Interaction.Events;
 using Content.Shared.Sound;
 using Content.Shared.Wires;
 using Robust.Server.GameObjects;
diff --git a/Content.Server/Atmos/AtmosHelpers.cs b/Content.Server/Atmos/AtmosHelpers.cs
deleted file mode 100644
index a89bc200c7..0000000000
--- a/Content.Server/Atmos/AtmosHelpers.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-#nullable enable
-using System.Diagnostics.CodeAnalysis;
-using Content.Server.Atmos.EntitySystems;
-using Content.Shared.Atmos;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Map;
-
-namespace Content.Server.Atmos
-{
-    public static class AtmosHelpers
-    {
-        public static TileAtmosphere? GetTileAtmosphere(this EntityCoordinates coordinates)
-        {
-            return EntitySystem.Get<AtmosphereSystem>().GetGridAtmosphere(coordinates).GetTile(coordinates);
-        }
-
-        public static GasMixture? GetTileAir(this EntityCoordinates coordinates, IEntityManager? entityManager = null)
-        {
-            return coordinates.GetTileAtmosphere()?.Air;
-        }
-
-        public static bool TryGetTileAtmosphere(this EntityCoordinates coordinates, [NotNullWhen(true)] out TileAtmosphere? atmosphere)
-        {
-            // ReSharper disable once ConditionIsAlwaysTrueOrFalse
-            return !Equals(atmosphere = coordinates.GetTileAtmosphere(), default);
-        }
-
-        public static bool TryGetTileAir(this EntityCoordinates coordinates, [NotNullWhen(true)] out GasMixture? air, IEntityManager? entityManager = null)
-        {
-            // ReSharper disable once ConditionIsAlwaysTrueOrFalse
-            return !Equals(air = coordinates.GetTileAir(entityManager), default);
-        }
-
-        public static bool IsTileAirProbablySafe(this EntityCoordinates coordinates)
-        {
-            // Note that oxygen mix isn't checked, but survival boxes make that not necessary.
-            var air = coordinates.GetTileAir();
-            if (air == null)
-                return false;
-            if (air.Pressure <= Atmospherics.WarningLowPressure)
-                return false;
-            if (air.Pressure >= Atmospherics.WarningHighPressure)
-                return false;
-            if (air.Temperature <= 260)
-                return false;
-            if (air.Temperature >= 360)
-                return false;
-            return true;
-        }
-
-        public static bool InvalidateTileAir(this EntityCoordinates coordinates)
-        {
-            if (!coordinates.TryGetTileAtmosphere(out var tileAtmos))
-            {
-                return false;
-            }
-
-            tileAtmos.Invalidate();
-            return true;
-        }
-    }
-}
diff --git a/Content.Server/Commands/Atmos/AddAtmosCommand.cs b/Content.Server/Atmos/Commands/AddAtmosCommand.cs
similarity index 94%
rename from Content.Server/Commands/Atmos/AddAtmosCommand.cs
rename to Content.Server/Atmos/Commands/AddAtmosCommand.cs
index 5afc24057b..4759998b1a 100644
--- a/Content.Server/Commands/Atmos/AddAtmosCommand.cs
+++ b/Content.Server/Atmos/Commands/AddAtmosCommand.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Server.Administration;
+using Content.Server.Administration;
 using Content.Server.Atmos.Components;
 using Content.Shared.Administration;
 using Robust.Shared.Console;
@@ -7,7 +6,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 
-namespace Content.Server.Commands.Atmos
+namespace Content.Server.Atmos.Commands
 {
     [AdminCommand(AdminFlags.Debug)]
     public class AddAtmosCommand : IConsoleCommand
diff --git a/Content.Server/Atmos/Commands/AddGasCommand.cs b/Content.Server/Atmos/Commands/AddGasCommand.cs
new file mode 100644
index 0000000000..61438b748f
--- /dev/null
+++ b/Content.Server/Atmos/Commands/AddGasCommand.cs
@@ -0,0 +1,43 @@
+using Content.Server.Administration;
+using Content.Server.Atmos.EntitySystems;
+using Content.Shared.Administration;
+using Content.Shared.Atmos;
+using Robust.Shared.Console;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Map;
+using Robust.Shared.Maths;
+
+namespace Content.Server.Atmos.Commands
+{
+    [AdminCommand(AdminFlags.Debug)]
+    public class AddGasCommand : IConsoleCommand
+    {
+        public string Command => "addgas";
+        public string Description => "Adds gas at a certain position.";
+        public string Help => "addgas <X> <Y> <GridId> <Gas> <moles>";
+
+        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        {
+            if (args.Length < 5) return;
+            if(!int.TryParse(args[0], out var x)
+               || !int.TryParse(args[1], out var y)
+               || !int.TryParse(args[2], out var id)
+               || !(AtmosCommandUtils.TryParseGasID(args[3], out var gasId))
+               || !float.TryParse(args[4], out var moles)) return;
+
+            var gridId = new GridId(id);
+
+            var atmosphereSystem = EntitySystem.Get<AtmosphereSystem>();
+            var indices = new Vector2i(x, y);
+            var tile = atmosphereSystem.GetTileMixture(gridId, indices, true);
+
+            if (tile == null)
+            {
+                shell.WriteLine("Invalid coordinates or tile.");
+                return;
+            }
+
+            tile.AdjustMoles(gasId, moles);
+        }
+    }
+}
diff --git a/Content.Server/Commands/Atmos/AddUnsimulatedAtmosCommand.cs b/Content.Server/Atmos/Commands/AddUnsimulatedAtmosCommand.cs
similarity index 94%
rename from Content.Server/Commands/Atmos/AddUnsimulatedAtmosCommand.cs
rename to Content.Server/Atmos/Commands/AddUnsimulatedAtmosCommand.cs
index 94c0e73e09..67541a5361 100644
--- a/Content.Server/Commands/Atmos/AddUnsimulatedAtmosCommand.cs
+++ b/Content.Server/Atmos/Commands/AddUnsimulatedAtmosCommand.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Server.Administration;
+using Content.Server.Administration;
 using Content.Server.Atmos.Components;
 using Content.Shared.Administration;
 using Robust.Shared.Console;
@@ -7,7 +6,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 
-namespace Content.Server.Commands.Atmos
+namespace Content.Server.Atmos.Commands
 {
     [AdminCommand(AdminFlags.Debug)]
     public class AddUnsimulatedAtmosCommand : IConsoleCommand
diff --git a/Content.Server/Commands/Atmos/DeleteGasCommand.cs b/Content.Server/Atmos/Commands/DeleteGasCommand.cs
similarity index 80%
rename from Content.Server/Commands/Atmos/DeleteGasCommand.cs
rename to Content.Server/Atmos/Commands/DeleteGasCommand.cs
index 2f03714c37..a06da56564 100644
--- a/Content.Server/Commands/Atmos/DeleteGasCommand.cs
+++ b/Content.Server/Atmos/Commands/DeleteGasCommand.cs
@@ -1,7 +1,6 @@
-#nullable enable
 using System;
 using Content.Server.Administration;
-using Content.Server.Atmos.Components;
+using Content.Server.Atmos.EntitySystems;
 using Content.Shared.Administration;
 using Content.Shared.Atmos;
 using Robust.Server.Player;
@@ -10,7 +9,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 
-namespace Content.Server.Commands.Atmos
+namespace Content.Server.Atmos.Commands
 {
     [AdminCommand(AdminFlags.Debug)]
     public class DeleteGasCommand : IConsoleCommand
@@ -128,55 +127,39 @@ namespace Content.Server.Commands.Atmos
 
             var mapManager = IoCManager.Resolve<IMapManager>();
 
-            if (!mapManager.TryGetGrid(gridId, out var grid))
+            if (!mapManager.TryGetGrid(gridId, out _))
             {
                 shell.WriteLine($"No grid exists with id {gridId}");
                 return;
             }
 
-            var entityManager = IoCManager.Resolve<IEntityManager>();
-
-            if (!entityManager.TryGetEntity(grid.GridEntityId, out var gridEntity))
-            {
-                shell.WriteLine($"Grid {gridId} has no entity.");
-                return;
-            }
-
-            if (!gridEntity.TryGetComponent(out GridAtmosphereComponent? atmosphere))
-            {
-                shell.WriteLine($"Grid {gridId} has no {nameof(GridAtmosphereComponent)}");
-                return;
-            }
+            var atmosphereSystem = EntitySystem.Get<AtmosphereSystem>();
 
             var tiles = 0;
             var moles = 0f;
 
             if (gas == null)
             {
-                foreach (var tile in atmosphere)
+                foreach (var tile in atmosphereSystem.GetAllTileMixtures(gridId, true))
                 {
-                    if (tile.Air == null || tile.Air.Immutable) continue;
+                    if (tile.Immutable) continue;
 
                     tiles++;
-                    moles += tile.Air.TotalMoles;
+                    moles += tile.TotalMoles;
 
-                    tile.Air.Clear();
-
-                    tile.Invalidate();
+                    tile.Clear();
                 }
             }
             else
             {
-                foreach (var tile in atmosphere)
+                foreach (var tile in atmosphereSystem.GetAllTileMixtures(gridId, true))
                 {
-                    if (tile.Air == null || tile.Air.Immutable) continue;
+                    if (tile.Immutable) continue;
 
                     tiles++;
-                    moles += tile.Air.TotalMoles;
+                    moles += tile.TotalMoles;
 
-                    tile.Air.SetMoles(gas.Value, 0);
-
-                    tile.Invalidate();
+                    tile.SetMoles(gas.Value, 0);
                 }
             }
 
diff --git a/Content.Server/Commands/Atmos/FillGasCommand.cs b/Content.Server/Atmos/Commands/FillGasCommand.cs
similarity index 58%
rename from Content.Server/Commands/Atmos/FillGasCommand.cs
rename to Content.Server/Atmos/Commands/FillGasCommand.cs
index 604f1f0165..d2b25313fc 100644
--- a/Content.Server/Commands/Atmos/FillGasCommand.cs
+++ b/Content.Server/Atmos/Commands/FillGasCommand.cs
@@ -1,6 +1,5 @@
-#nullable enable
-using Content.Server.Administration;
-using Content.Server.Atmos.Components;
+using Content.Server.Administration;
+using Content.Server.Atmos.EntitySystems;
 using Content.Shared.Administration;
 using Content.Shared.Atmos;
 using Robust.Shared.Console;
@@ -8,7 +7,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 
-namespace Content.Server.Commands.Atmos
+namespace Content.Server.Atmos.Commands
 {
     [AdminCommand(AdminFlags.Debug)]
     public class FillGas : IConsoleCommand
@@ -28,32 +27,17 @@ namespace Content.Server.Commands.Atmos
 
             var mapMan = IoCManager.Resolve<IMapManager>();
 
-            if (!gridId.IsValid() || !mapMan.TryGetGrid(gridId, out var gridComp))
+            if (!gridId.IsValid() || !mapMan.TryGetGrid(gridId, out _))
             {
                 shell.WriteLine("Invalid grid ID.");
                 return;
             }
 
-            var entMan = IoCManager.Resolve<IEntityManager>();
+            var atmosphereSystem = EntitySystem.Get<AtmosphereSystem>();
 
-            if (!entMan.TryGetEntity(gridComp.GridEntityId, out var grid))
+            foreach (var tile in atmosphereSystem.GetAllTileMixtures(gridId, true))
             {
-                shell.WriteLine("Failed to get grid entity.");
-                return;
-            }
-
-            if (!grid.HasComponent<IGridAtmosphereComponent>())
-            {
-                shell.WriteLine("Grid doesn't have an atmosphere.");
-                return;
-            }
-
-            var gam = grid.GetComponent<IGridAtmosphereComponent>();
-
-            foreach (var tile in gam)
-            {
-                tile.Air?.AdjustMoles(gasId, moles);
-                tile.Invalidate();
+                tile.AdjustMoles(gasId, moles);
             }
         }
     }
diff --git a/Content.Server/Commands/Atmos/FixGridAtmos.cs b/Content.Server/Atmos/Commands/FixGridAtmos.cs
similarity index 59%
rename from Content.Server/Commands/Atmos/FixGridAtmos.cs
rename to Content.Server/Atmos/Commands/FixGridAtmos.cs
index 0a2885088e..0d49cc5fcb 100644
--- a/Content.Server/Commands/Atmos/FixGridAtmos.cs
+++ b/Content.Server/Atmos/Commands/FixGridAtmos.cs
@@ -1,7 +1,5 @@
-#nullable enable
 using Content.Server.Administration;
-using Content.Server.Atmos;
-using Content.Server.Atmos.Components;
+using Content.Server.Atmos.EntitySystems;
 using Content.Shared.Administration;
 using Content.Shared.Atmos;
 using Robust.Shared.Console;
@@ -9,7 +7,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 
-namespace Content.Server.Commands.Atmos
+namespace Content.Server.Atmos.Commands
 {
     [AdminCommand(AdminFlags.Debug)]
     public class FixGridAtmos : IConsoleCommand
@@ -26,7 +24,7 @@ namespace Content.Server.Commands.Atmos
             }
 
             var mapManager = IoCManager.Resolve<IMapManager>();
-            var entityManager = IoCManager.Resolve<IEntityManager>();
+            var atmosphereSystem = EntitySystem.Get<AtmosphereSystem>();
 
             var mixture = new GasMixture(Atmospherics.CellVolume) { Temperature = Atmospherics.T20C };
             mixture.AdjustMoles(Gas.Oxygen, Atmospherics.OxygenMolesStandard);
@@ -41,32 +39,19 @@ namespace Content.Server.Commands.Atmos
                     continue;
                 }
 
-                if (!mapManager.TryGetGrid(new GridId(i), out var grid))
+                var gridId = new GridId(i);
+
+                if (!mapManager.TryGetGrid(gridId, out _))
                 {
                     shell.WriteError($"Grid \"{i}\" doesn't exist.");
                     continue;
                 }
 
-                if (!entityManager.TryGetEntity(grid.GridEntityId, out var entity))
+                foreach (var tile in atmosphereSystem.GetAllTileMixtures(gridId, true))
                 {
-                    shell.WriteError($"Grid entity for grid \"{i}\" doesn't exist.");
-                    continue;
-                }
-
-                var gridAtmosphere = new GridAtmosphereComponent() {Owner = entity};
-
-                // Inject dependencies manually or a NRE will eat your face.
-                IoCManager.InjectDependencies(gridAtmosphere);
-
-                entityManager.ComponentManager.AddComponent(entity, gridAtmosphere, true);
-
-                gridAtmosphere.RepopulateTiles();
-
-                foreach (var tile in gridAtmosphere)
-                {
-                    tile.Air = (GasMixture) mixture.Clone();
-                    tile.Air.Volume = gridAtmosphere.GetVolumeForCells(1);
-                    tile.Invalidate();
+                    tile.Clear();
+                    atmosphereSystem.Merge(tile, mixture);
+                    tile.Temperature = mixture.Temperature;
                 }
             }
         }
diff --git a/Content.Server/Commands/Atmos/ListGasesCommand.cs b/Content.Server/Atmos/Commands/ListGasesCommand.cs
similarity index 88%
rename from Content.Server/Commands/Atmos/ListGasesCommand.cs
rename to Content.Server/Atmos/Commands/ListGasesCommand.cs
index 9b90a51755..6fad4670fe 100644
--- a/Content.Server/Commands/Atmos/ListGasesCommand.cs
+++ b/Content.Server/Atmos/Commands/ListGasesCommand.cs
@@ -1,11 +1,10 @@
-#nullable enable
-using Content.Server.Administration;
+using Content.Server.Administration;
 using Content.Server.Atmos.EntitySystems;
 using Content.Shared.Administration;
 using Robust.Shared.Console;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.Commands.Atmos
+namespace Content.Server.Atmos.Commands
 {
     [AdminCommand(AdminFlags.Debug)]
     public class ListGasesCommand : IConsoleCommand
diff --git a/Content.Server/Atmos/Commands/RemoveGasCommand.cs b/Content.Server/Atmos/Commands/RemoveGasCommand.cs
new file mode 100644
index 0000000000..bd5cee5a7b
--- /dev/null
+++ b/Content.Server/Atmos/Commands/RemoveGasCommand.cs
@@ -0,0 +1,46 @@
+using Content.Server.Administration;
+using Content.Server.Atmos.EntitySystems;
+using Content.Shared.Administration;
+using Robust.Shared.Console;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Map;
+using Robust.Shared.Maths;
+
+namespace Content.Server.Atmos.Commands
+{
+    [AdminCommand(AdminFlags.Debug)]
+    public class RemoveGasCommand : IConsoleCommand
+    {
+        public string Command => "removegas";
+        public string Description => "Removes an amount of gases.";
+        public string Help => "removegas <X> <Y> <GridId> <amount> <ratio>\nIf <ratio> is true, amount will be treated as the ratio of gas to be removed.";
+
+        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        {
+            if (args.Length < 5) return;
+            if(!int.TryParse(args[0], out var x)
+               || !int.TryParse(args[1], out var y)
+               || !int.TryParse(args[2], out var id)
+               || !float.TryParse(args[3], out var amount)
+               || !bool.TryParse(args[4], out var ratio)) return;
+
+            var gridId = new GridId(id);
+
+            var atmosphereSystem = EntitySystem.Get<AtmosphereSystem>();
+            var indices = new Vector2i(x, y);
+            var tile = atmosphereSystem.GetTileMixture(gridId, indices, true);
+
+            if (tile == null)
+            {
+                shell.WriteLine("Invalid coordinates or tile.");
+                return;
+            }
+
+            if (ratio)
+                tile.RemoveRatio(amount);
+            else
+                tile.Remove(amount);
+        }
+    }
+
+}
diff --git a/Content.Server/Commands/Atmos/SetAtmosTemperatureCommand.cs b/Content.Server/Atmos/Commands/SetAtmosTemperatureCommand.cs
similarity index 62%
rename from Content.Server/Commands/Atmos/SetAtmosTemperatureCommand.cs
rename to Content.Server/Atmos/Commands/SetAtmosTemperatureCommand.cs
index 660173b566..af12a8a752 100644
--- a/Content.Server/Commands/Atmos/SetAtmosTemperatureCommand.cs
+++ b/Content.Server/Atmos/Commands/SetAtmosTemperatureCommand.cs
@@ -1,6 +1,5 @@
-#nullable enable
-using Content.Server.Administration;
-using Content.Server.Atmos.Components;
+using Content.Server.Administration;
+using Content.Server.Atmos.EntitySystems;
 using Content.Shared.Administration;
 using Content.Shared.Atmos;
 using Robust.Shared.Console;
@@ -8,7 +7,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 
-namespace Content.Server.Commands.Atmos
+namespace Content.Server.Atmos.Commands
 {
     [AdminCommand(AdminFlags.Debug)]
     public class SetAtmosTemperatureCommand : IConsoleCommand
@@ -39,32 +38,13 @@ namespace Content.Server.Commands.Atmos
                 return;
             }
 
-            var entMan = IoCManager.Resolve<IEntityManager>();
-
-            if (!entMan.TryGetEntity(gridComp.GridEntityId, out var grid))
-            {
-                shell.WriteLine("Failed to get grid entity.");
-                return;
-            }
-
-            if (!grid.HasComponent<GridAtmosphereComponent>())
-            {
-                shell.WriteLine("Grid doesn't have an atmosphere.");
-                return;
-            }
-
-            var gam = grid.GetComponent<GridAtmosphereComponent>();
+            var atmosphereSystem = EntitySystem.Get<AtmosphereSystem>();
 
             var tiles = 0;
-            foreach (var tile in gam)
+            foreach (var tile in atmosphereSystem.GetAllTileMixtures(gridId, true))
             {
-                if (tile.Air == null)
-                    continue;
-
                 tiles++;
-
-                tile.Air.Temperature = temperature;
-                tile.Invalidate();
+                tile.Temperature = temperature;
             }
 
             shell.WriteLine($"Changed the temperature of {tiles} tiles.");
diff --git a/Content.Server/Atmos/Commands/SetTemperatureCommand.cs b/Content.Server/Atmos/Commands/SetTemperatureCommand.cs
new file mode 100644
index 0000000000..5b7ad506e2
--- /dev/null
+++ b/Content.Server/Atmos/Commands/SetTemperatureCommand.cs
@@ -0,0 +1,48 @@
+using Content.Server.Administration;
+using Content.Server.Atmos.EntitySystems;
+using Content.Shared.Administration;
+using Content.Shared.Atmos;
+using Robust.Shared.Console;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Map;
+using Robust.Shared.Maths;
+
+namespace Content.Server.Atmos.Commands
+{
+    [AdminCommand(AdminFlags.Debug)]
+    public class SetTemperatureCommand : IConsoleCommand
+    {
+        public string Command => "settemp";
+        public string Description => "Sets a tile's temperature (in kelvin).";
+        public string Help => "Usage: settemp <X> <Y> <GridId> <Temperature>";
+
+        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        {
+            if (args.Length < 4) return;
+            if(!int.TryParse(args[0], out var x)
+               || !int.TryParse(args[1], out var y)
+               || !int.TryParse(args[2], out var id)
+               || !float.TryParse(args[3], out var temperature)) return;
+
+            var gridId = new GridId(id);
+
+            if (temperature < Atmospherics.TCMB)
+            {
+                shell.WriteLine("Invalid temperature.");
+                return;
+            }
+
+            var atmosphereSystem = EntitySystem.Get<AtmosphereSystem>();
+            var indices = new Vector2i(x, y);
+            var tile = atmosphereSystem.GetTileMixture(gridId, indices, true);
+
+            if (tile == null)
+            {
+                shell.WriteLine("Invalid coordinates or tile.");
+                return;
+            }
+
+            tile.Temperature = temperature;
+        }
+    }
+}
diff --git a/Content.Server/Commands/Atmos/ShowAtmosCommand.cs b/Content.Server/Atmos/Commands/ShowAtmosCommand.cs
similarity index 95%
rename from Content.Server/Commands/Atmos/ShowAtmosCommand.cs
rename to Content.Server/Atmos/Commands/ShowAtmosCommand.cs
index 35bbf3fc29..6e6a176628 100644
--- a/Content.Server/Commands/Atmos/ShowAtmosCommand.cs
+++ b/Content.Server/Atmos/Commands/ShowAtmosCommand.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Administration;
 using Content.Server.Atmos.EntitySystems;
 using Content.Shared.Administration;
@@ -6,7 +5,7 @@ using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.Commands.Atmos
+namespace Content.Server.Atmos.Commands
 {
     [AdminCommand(AdminFlags.Debug)]
     public class ShowAtmos : IConsoleCommand
diff --git a/Content.Server/Atmos/Components/AirtightComponent.cs b/Content.Server/Atmos/Components/AirtightComponent.cs
index aa4818c54c..ef543e940f 100644
--- a/Content.Server/Atmos/Components/AirtightComponent.cs
+++ b/Content.Server/Atmos/Components/AirtightComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Atmos.EntitySystems;
 using Content.Shared.Atmos;
 using Robust.Shared.GameObjects;
@@ -12,163 +11,37 @@ using Robust.Shared.ViewVariables;
 namespace Content.Server.Atmos.Components
 {
     [RegisterComponent]
-    public class AirtightComponent : Component, IMapInit
+    public class AirtightComponent : Component
     {
-        [Dependency] private readonly IMapManager _mapManager = default!;
-
-        private (GridId, Vector2i) _lastPosition;
-        private AtmosphereSystem _atmosphereSystem = default!;
-
         public override string Name => "Airtight";
 
+        public (GridId Grid, Vector2i Tile) LastPosition { get; set; }
+
         [DataField("airBlockedDirection", customTypeSerializer: typeof(FlagSerializer<AtmosDirectionFlags>))]
         [ViewVariables]
-        private int _initialAirBlockedDirection = (int) AtmosDirection.All;
+        public int InitialAirBlockedDirection { get; set; } = (int) AtmosDirection.All;
 
         [ViewVariables]
-        private int _currentAirBlockedDirection;
+        public int CurrentAirBlockedDirection;
 
         [DataField("airBlocked")]
-        private bool _airBlocked = true;
+        public bool AirBlocked { get; set; } = true;
 
         [DataField("fixVacuum")]
-        private bool _fixVacuum = true;
+        public bool FixVacuum { get; set; } = true;
 
         [ViewVariables]
         [DataField("rotateAirBlocked")]
-        private bool _rotateAirBlocked = true;
+        public bool RotateAirBlocked { get; set; } = true;
 
         [ViewVariables]
         [DataField("fixAirBlockedDirectionInitialize")]
-        private bool _fixAirBlockedDirectionInitialize = true;
+        public bool FixAirBlockedDirectionInitialize { get; set; } = true;
 
         [ViewVariables]
         [DataField("noAirWhenFullyAirBlocked")]
-        public bool NoAirWhenFullyAirBlocked { get; } = true;
+        public bool NoAirWhenFullyAirBlocked { get; set; } = true;
 
-        [ViewVariables(VVAccess.ReadWrite)]
-        public bool AirBlocked
-        {
-            get => _airBlocked;
-            set
-            {
-                _airBlocked = value;
-
-                UpdatePosition();
-            }
-        }
-
-        public AtmosDirection AirBlockedDirection
-        {
-            get => (AtmosDirection)_currentAirBlockedDirection;
-            set
-            {
-                _currentAirBlockedDirection = (int) value;
-                _initialAirBlockedDirection = (int)Rotate(AirBlockedDirection, -Owner.Transform.LocalRotation);
-
-                UpdatePosition();
-            }
-        }
-
-        [ViewVariables]
-        public bool FixVacuum => _fixVacuum;
-
-        protected override void Initialize()
-        {
-            base.Initialize();
-
-            _atmosphereSystem = EntitySystem.Get<AtmosphereSystem>();
-
-            if (_fixAirBlockedDirectionInitialize)
-                RotateEvent(new RotateEvent(Owner, Angle.Zero, Owner.Transform.WorldRotation));
-
-            // Adding this component will immediately anchor the entity, because the atmos system
-            // requires airtight entities to be anchored for performance.
-            Owner.Transform.Anchored = true;
-
-            UpdatePosition();
-        }
-
-        public void RotateEvent(RotateEvent ev)
-        {
-            if (!_rotateAirBlocked || ev.Sender != Owner || _initialAirBlockedDirection == (int)AtmosDirection.Invalid)
-                return;
-
-            _currentAirBlockedDirection = (int) Rotate((AtmosDirection)_initialAirBlockedDirection, ev.NewRotation);
-            UpdatePosition();
-        }
-
-        private AtmosDirection Rotate(AtmosDirection myDirection, Angle myAngle)
-        {
-            var newAirBlockedDirs = AtmosDirection.Invalid;
-
-            if (myAngle == Angle.Zero)
-                return myDirection;
-
-            // TODO ATMOS MULTIZ When we make multiZ atmos, special case this.
-            for (var i = 0; i < Atmospherics.Directions; i++)
-            {
-                var direction = (AtmosDirection) (1 << i);
-                if (!myDirection.IsFlagSet(direction)) continue;
-                var angle = direction.ToAngle();
-                angle += myAngle;
-                newAirBlockedDirs |= angle.ToAtmosDirectionCardinal();
-            }
-
-            return newAirBlockedDirs;
-        }
-
-        public void MapInit()
-        {
-            UpdatePosition();
-        }
-
-        protected override void Shutdown()
-        {
-            base.Shutdown();
-
-            _airBlocked = false;
-
-            InvalidatePosition(_lastPosition.Item1, _lastPosition.Item2);
-
-            if (_fixVacuum)
-            {
-                _atmosphereSystem.GetGridAtmosphere(_lastPosition.Item1)?.FixVacuum(_lastPosition.Item2);
-            }
-        }
-
-        public void AnchorStateChanged()
-        {
-            var gridId = Owner.Transform.GridID;
-            var coords = Owner.Transform.Coordinates;
-
-            var grid = _mapManager.GetGrid(gridId);
-            var tilePos = grid.TileIndicesFor(coords);
-
-            // Update and invalidate new position.
-            _lastPosition = (gridId, tilePos);
-            InvalidatePosition(gridId, tilePos);
-        }
-
-        private void UpdatePosition()
-        {
-            if (!Owner.Transform.Anchored || !Owner.Transform.GridID.IsValid())
-                return;
-
-            var grid = _mapManager.GetGrid(Owner.Transform.GridID);
-            _lastPosition = (Owner.Transform.GridID, grid.TileIndicesFor(Owner.Transform.Coordinates));
-            InvalidatePosition(_lastPosition.Item1, _lastPosition.Item2);
-        }
-
-        private void InvalidatePosition(GridId gridId, Vector2i pos)
-        {
-            if (!gridId.IsValid())
-                return;
-
-            var gridAtmos = _atmosphereSystem.GetGridAtmosphere(gridId);
-
-            gridAtmos?.UpdateAdjacentBits(pos);
-            gridAtmos?.Invalidate(pos);
-        }
+        public AtmosDirection AirBlockedDirection => (AtmosDirection)CurrentAirBlockedDirection;
     }
 }
diff --git a/Content.Server/Atmos/Components/AtmosExposedComponent.cs b/Content.Server/Atmos/Components/AtmosExposedComponent.cs
index e0ea5ee76a..e742458f10 100644
--- a/Content.Server/Atmos/Components/AtmosExposedComponent.cs
+++ b/Content.Server/Atmos/Components/AtmosExposedComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Server.Atmos.EntitySystems;
+using Content.Server.Atmos.EntitySystems;
 using Content.Server.Temperature.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.ViewVariables;
diff --git a/Content.Server/Atmos/Components/BreathToolComponent.cs b/Content.Server/Atmos/Components/BreathToolComponent.cs
index 2e715cf5f2..6b4ca06792 100644
--- a/Content.Server/Atmos/Components/BreathToolComponent.cs
+++ b/Content.Server/Atmos/Components/BreathToolComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Server.Body.Respiratory;
+using Content.Server.Body.Respiratory;
 using Content.Shared.Inventory;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
diff --git a/Content.Server/Atmos/Components/FirelockComponent.cs b/Content.Server/Atmos/Components/FirelockComponent.cs
index 961cb51d84..b1849cd757 100644
--- a/Content.Server/Atmos/Components/FirelockComponent.cs
+++ b/Content.Server/Atmos/Components/FirelockComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Doors;
 using Content.Server.Doors.Components;
@@ -29,7 +28,7 @@ namespace Content.Server.Atmos.Components
                 _doorComponent.Close();
                 if (Owner.TryGetComponent(out AirtightComponent? airtight))
                 {
-                    airtight.AirBlocked = true;
+                    EntitySystem.Get<AirtightSystem>().SetAirblocked(airtight, true);
                 }
                 return true;
             }
@@ -75,15 +74,12 @@ namespace Content.Server.Atmos.Components
         {
             var atmosphereSystem = EntitySystem.Get<AtmosphereSystem>();
 
-            var gridAtmosphere = atmosphereSystem.GetGridAtmosphere(Owner.Transform.Coordinates);
-
             var minMoles = float.MaxValue;
             var maxMoles = 0f;
 
-            foreach (var (_, adjacent) in gridAtmosphere.GetAdjacentTiles(Owner.Transform.Coordinates))
+            foreach (var adjacent in atmosphereSystem.GetAdjacentTileMixtures(Owner.Transform.Coordinates))
             {
-                // includeAirBlocked remains false, and therefore Air must be present
-                var moles = adjacent.Air!.TotalMoles;
+                var moles = adjacent.TotalMoles;
                 if (moles < minMoles)
                     minMoles = moles;
                 if (moles > maxMoles)
@@ -97,17 +93,18 @@ namespace Content.Server.Atmos.Components
         {
             var atmosphereSystem = EntitySystem.Get<AtmosphereSystem>();
 
-            if (!Owner.Transform.Coordinates.TryGetTileAtmosphere(out var tileAtmos))
+            if (!atmosphereSystem.TryGetGridAndTile(Owner.Transform.Coordinates, out var tuple))
                 return false;
 
-            if (tileAtmos.Hotspot.Valid)
+            if (atmosphereSystem.GetTileMixture(tuple.Value.Grid, tuple.Value.Tile) == null)
+                return false;
+
+            if (atmosphereSystem.IsHotspotActive(tuple.Value.Grid, tuple.Value.Tile))
                 return true;
 
-            var gridAtmosphere = atmosphereSystem.GetGridAtmosphere(Owner.Transform.Coordinates);
-
-            foreach (var (_, adjacent) in gridAtmosphere.GetAdjacentTiles(tileAtmos.GridIndices))
+            foreach (var adjacent in atmosphereSystem.GetAdjacentTiles(Owner.Transform.Coordinates))
             {
-                if (adjacent.Hotspot.Valid)
+                if (atmosphereSystem.IsHotspotActive(tuple.Value.Grid, adjacent))
                     return true;
             }
 
diff --git a/Content.Server/Atmos/Components/FlammableComponent.cs b/Content.Server/Atmos/Components/FlammableComponent.cs
index 6ca5e0a913..99aa2402f8 100644
--- a/Content.Server/Atmos/Components/FlammableComponent.cs
+++ b/Content.Server/Atmos/Components/FlammableComponent.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Content.Server.Alert;
+using Content.Server.Atmos.EntitySystems;
 using Content.Server.Stunnable.Components;
 using Content.Server.Temperature.Components;
 using Content.Shared.ActionBlocker;
@@ -17,24 +18,22 @@ using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 using Robust.Shared.Physics;
-using Robust.Shared.Physics.Collision;
-using Robust.Shared.Physics.Dynamics;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Atmos.Components
 {
     [RegisterComponent]
-    public class FlammableComponent : SharedFlammableComponent, IStartCollide, IFireAct, IInteractUsing
+    public class FlammableComponent : SharedFlammableComponent, IFireAct, IInteractUsing
     {
         private bool _resisting = false;
         private readonly List<EntityUid> _collided = new();
 
         [ViewVariables(VVAccess.ReadWrite)]
-        public bool OnFire { get; private set; }
+        public bool OnFire { get; set; }
 
         [ViewVariables(VVAccess.ReadWrite)]
-        public float FireStacks { get; private set; }
+        public float FireStacks { get; set; }
 
         [ViewVariables(VVAccess.ReadWrite)]
         [DataField("fireSpread")]
@@ -44,17 +43,6 @@ namespace Content.Server.Atmos.Components
         [DataField("canResistFire")]
         public bool CanResistFire { get; private set; } = false;
 
-        public void Ignite()
-        {
-            if (FireStacks > 0 && !OnFire)
-            {
-                OnFire = true;
-
-            }
-
-            UpdateAppearance();
-        }
-
         public void Extinguish()
         {
             if (!OnFire) return;
@@ -122,7 +110,7 @@ namespace Content.Server.Atmos.Components
                 return;
             }
 
-            tile.HotspotExpose(700, 50, true);
+            EntitySystem.Get<AtmosphereSystem>().HotspotExpose(tile.GridIndex, tile.GridIndices, 700f, 50f, true);
 
             var physics = Owner.GetComponent<IPhysBody>();
 
@@ -144,37 +132,7 @@ namespace Content.Server.Atmos.Components
             }
         }
 
-        void IStartCollide.CollideWith(Fixture ourFixture, Fixture otherFixture, in Manifold manifold)
-        {
-            if (!otherFixture.Body.Owner.TryGetComponent(out FlammableComponent? otherFlammable))
-                return;
-
-            if (!FireSpread || !otherFlammable.FireSpread)
-                return;
-
-            if (OnFire)
-            {
-                if (otherFlammable.OnFire)
-                {
-                    var fireSplit = (FireStacks + otherFlammable.FireStacks) / 2;
-                    FireStacks = fireSplit;
-                    otherFlammable.FireStacks = fireSplit;
-                }
-                else
-                {
-                    FireStacks /= 2;
-                    otherFlammable.FireStacks += FireStacks;
-                    otherFlammable.Ignite();
-                }
-            } else if (otherFlammable.OnFire)
-            {
-                otherFlammable.FireStacks /= 2;
-                FireStacks += otherFlammable.FireStacks;
-                Ignite();
-            }
-        }
-
-        private void UpdateAppearance()
+        public void UpdateAppearance()
         {
             if (Owner.Deleted || !Owner.TryGetComponent(out AppearanceComponent? appearanceComponent)) return;
             appearanceComponent.SetData(FireVisuals.OnFire, OnFire);
@@ -184,7 +142,7 @@ namespace Content.Server.Atmos.Components
         public void FireAct(float temperature, float volume)
         {
             AdjustFireStacks(3);
-            Ignite();
+            EntitySystem.Get<FlammableSystem>().Ignite(this);
         }
 
         // This needs some improvements...
@@ -211,7 +169,7 @@ namespace Content.Server.Atmos.Components
             {
                 if (hotItem.IsCurrentlyHot())
                 {
-                    Ignite();
+                    EntitySystem.Get<FlammableSystem>().Ignite(this);
                     return true;
                 }
             }
diff --git a/Content.Server/Atmos/Components/GasAnalyzerComponent.cs b/Content.Server/Atmos/Components/GasAnalyzerComponent.cs
index 23d7b499aa..1e09798edd 100644
--- a/Content.Server/Atmos/Components/GasAnalyzerComponent.cs
+++ b/Content.Server/Atmos/Components/GasAnalyzerComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Content.Server.Atmos.EntitySystems;
@@ -124,8 +123,7 @@ namespace Content.Server.Atmos.Components
         {
             // Already get the pressure before Dirty(), because we can't get the EntitySystem in that thread or smth
             var pressure = 0f;
-            var gam = EntitySystem.Get<AtmosphereSystem>().GetGridAtmosphere(Owner.Transform.Coordinates);
-            var tile = gam?.GetTile(Owner.Transform.Coordinates)?.Air;
+            var tile = EntitySystem.Get<AtmosphereSystem>().GetTileMixture(Owner.Transform.Coordinates);
             if (tile != null)
             {
                 pressure = tile.Pressure;
@@ -183,9 +181,8 @@ namespace Content.Server.Atmos.Components
                 pos = _position.Value;
             }
 
-            var atmosSystem = EntitySystem.Get<AtmosphereSystem>();
-            var gam = atmosSystem.GetGridAtmosphere(pos);
-            var tile = gam.GetTile(pos)?.Air;
+            var atmosphereSystem = EntitySystem.Get<AtmosphereSystem>();
+            var tile = atmosphereSystem.GetTileMixture(pos);
             if (tile == null)
             {
                 error = "No Atmosphere!";
@@ -202,7 +199,7 @@ namespace Content.Server.Atmos.Components
 
             for (var i = 0; i < Atmospherics.TotalNumberOfGases; i++)
             {
-                var gas = atmosSystem.GetGas(i);
+                var gas = atmosphereSystem.GetGas(i);
 
                 if (tile.Moles[i] <= Atmospherics.GasMinMoles) continue;
 
diff --git a/Content.Server/Atmos/Components/GasMixtureHolderComponent.cs b/Content.Server/Atmos/Components/GasMixtureHolderComponent.cs
index 3293839aa8..50b5af62f8 100644
--- a/Content.Server/Atmos/Components/GasMixtureHolderComponent.cs
+++ b/Content.Server/Atmos/Components/GasMixtureHolderComponent.cs
@@ -1,5 +1,4 @@
-using Content.Server.Interfaces;
-using Robust.Shared.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
diff --git a/Content.Server/Atmos/Components/GasTankComponent.cs b/Content.Server/Atmos/Components/GasTankComponent.cs
index 81f1706817..cf341e3c01 100644
--- a/Content.Server/Atmos/Components/GasTankComponent.cs
+++ b/Content.Server/Atmos/Components/GasTankComponent.cs
@@ -1,10 +1,8 @@
-#nullable enable
 #nullable disable warnings
 using System;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Body.Respiratory;
 using Content.Server.Explosion;
-using Content.Server.Interfaces;
 using Content.Server.NodeContainer;
 using Content.Server.NodeContainer.Nodes;
 using Content.Server.UserInterface;
@@ -282,8 +280,9 @@ namespace Content.Server.Atmos.Components
             {
                 if (_integrity <= 0)
                 {
-                    var tileAtmos = Owner.Transform.Coordinates.GetTileAtmosphere();
-                    tileAtmos?.AssumeAir(Air);
+                    var environment = atmosphereSystem.GetTileMixture(Owner.Transform.Coordinates, true);
+                    if(environment != null)
+                        atmosphereSystem.Merge(environment, Air);
 
                     if(_ruptureSound.TryGetSound(out var sound))
                         SoundSystem.Play(Filter.Pvs(Owner), sound, Owner.Transform.Coordinates, AudioHelpers.WithVariation(0.125f));
@@ -300,12 +299,12 @@ namespace Content.Server.Atmos.Components
             {
                 if (_integrity <= 0)
                 {
-                    var tileAtmos = Owner.Transform.Coordinates.GetTileAtmosphere();
-                    if (tileAtmos == null)
+                    var environment = atmosphereSystem.GetTileMixture(Owner.Transform.Coordinates, true);
+                    if (environment == null)
                         return;
 
                     var leakedGas = Air.RemoveRatio(0.25f);
-                    tileAtmos.AssumeAir(leakedGas);
+                    atmosphereSystem.Merge(environment, leakedGas);
                 }
                 else
                 {
diff --git a/Content.Server/Atmos/Components/GridAtmosphereComponent.cs b/Content.Server/Atmos/Components/GridAtmosphereComponent.cs
index 6b7b902285..53670f8d05 100644
--- a/Content.Server/Atmos/Components/GridAtmosphereComponent.cs
+++ b/Content.Server/Atmos/Components/GridAtmosphereComponent.cs
@@ -1,25 +1,13 @@
-#nullable enable
-// ReSharper disable once RedundantUsingDirective
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.CompilerServices;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Atmos.Piping.Components;
-using Content.Server.CPUJob.JobQueues.Queues;
 using Content.Server.NodeContainer.NodeGroups;
-using Content.Shared.Atmos;
-using Content.Shared.Maps;
-using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-using Robust.Shared.Log;
-using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
-using Robust.Shared.Timing;
 using Robust.Shared.ViewVariables;
 using Dependency = Robust.Shared.IoC.DependencyAttribute;
 
@@ -32,34 +20,21 @@ namespace Content.Server.Atmos.Components
     [RegisterComponent, Serializable]
     public class GridAtmosphereComponent : Component, IGridAtmosphereComponent, ISerializationHooks
     {
-        [Dependency] private IMapManager _mapManager = default!;
-        [Dependency] private ITileDefinitionManager _tileDefinitionManager = default!;
-        [Dependency] private IServerEntityManager _serverEntityManager = default!;
-        [Dependency] private IGameTiming _gameTiming = default!;
-
-        public GridTileLookupSystem GridTileLookupSystem { get; private set; } = default!;
-        internal GasTileOverlaySystem GasTileOverlaySystem { get; private set; } = default!;
-        public AtmosphereSystem AtmosphereSystem { get; private set; } = default!;
-
         public override string Name => "GridAtmosphere";
-
-        public bool ProcessingPaused { get; set; } = false;
-        public float Timer { get; set; }
-        private GridId _gridId;
-
-        [ComponentDependency] private IMapGridComponent? _mapGridComponent;
-
         public virtual bool Simulated => true;
 
+        [ViewVariables]
+        public bool RevalidatePaused { get; set; } = false;
+
+        [ViewVariables]
+        public bool ProcessingPaused { get; set; } = false;
+
+        [ViewVariables]
+        public float Timer { get; set; } = 0f;
+
         [ViewVariables]
         public int UpdateCounter { get; set; } = 0;
 
-        [ViewVariables]
-        public readonly HashSet<ExcitedGroup> ExcitedGroups = new(1000);
-
-        [ViewVariables]
-        public int ExcitedGroupCount => ExcitedGroups.Count;
-
         [DataField("uniqueMixes")]
         public List<GasMixture>? UniqueMixes;
 
@@ -75,6 +50,12 @@ namespace Content.Server.Atmos.Components
         [ViewVariables]
         public int ActiveTilesCount => ActiveTiles.Count;
 
+        [ViewVariables]
+        public readonly HashSet<ExcitedGroup> ExcitedGroups = new(1000);
+
+        [ViewVariables]
+        public int ExcitedGroupCount => ExcitedGroups.Count;
+
         [ViewVariables]
         public readonly HashSet<TileAtmosphere> HotspotTiles = new(1000);
 
@@ -87,9 +68,6 @@ namespace Content.Server.Atmos.Components
         [ViewVariables]
         public int SuperconductivityTilesCount => SuperconductivityTiles.Count;
 
-        [ViewVariables]
-        public readonly HashSet<Vector2i> InvalidatedCoords = new(1000);
-
         [ViewVariables]
         public HashSet<TileAtmosphere> HighPressureDelta = new(1000);
 
@@ -114,22 +92,21 @@ namespace Content.Server.Atmos.Components
         [ViewVariables]
         public Queue<AtmosDeviceComponent> CurrentRunAtmosDevices = new();
 
+        [ViewVariables]
+        public readonly HashSet<Vector2i> InvalidatedCoords = new(1000);
+
+        [ViewVariables]
+        public Queue<Vector2i> CurrentRunInvalidatedCoordinates = new();
+
+        [ViewVariables]
+        public int InvalidatedCoordsCount => InvalidatedCoords.Count;
+
+        [ViewVariables]
+        public long EqualizationQueueCycleControl { get; set; }
+
         [ViewVariables]
         public AtmosphereProcessingState State { get; set; } = AtmosphereProcessingState.TileEqualize;
 
-        public GridAtmosphereComponent()
-        {
-            ProcessingPaused = false;
-        }
-
-        /// <inheritdoc />
-        public virtual void PryTile(Vector2i indices)
-        {
-            if (IsSpace(indices) || IsAirBlocked(indices)) return;
-
-            indices.PryTile(_gridId, _mapManager, _tileDefinitionManager, _serverEntityManager);
-        }
-
         void ISerializationHooks.BeforeSerialization()
         {
             var uniqueMixes = new List<GasMixture>();
@@ -158,404 +135,5 @@ namespace Content.Server.Atmos.Components
             UniqueMixes = uniqueMixes;
             TilesUniqueMixes = tiles;
         }
-
-        protected override void Initialize()
-        {
-            base.Initialize();
-
-            Tiles.Clear();
-
-            if (TilesUniqueMixes != null && Owner.TryGetComponent(out IMapGridComponent? mapGrid))
-            {
-                foreach (var (indices, mix) in TilesUniqueMixes)
-                {
-                    try
-                    {
-                        Tiles.Add(indices, new TileAtmosphere(this, mapGrid.GridIndex, indices, (GasMixture) UniqueMixes![mix].Clone()));
-                    }
-                    catch (ArgumentOutOfRangeException)
-                    {
-                        Logger.Error($"Error during atmos serialization! Tile at {indices} points to an unique mix ({mix}) out of range!");
-                        throw;
-                    }
-
-                    Invalidate(indices);
-                }
-            }
-
-            GridTileLookupSystem = EntitySystem.Get<GridTileLookupSystem>();
-            GasTileOverlaySystem = EntitySystem.Get<GasTileOverlaySystem>();
-            AtmosphereSystem = EntitySystem.Get<AtmosphereSystem>();
-
-            RepopulateTiles();
-        }
-
-        protected override void OnAdd()
-        {
-            base.OnAdd();
-
-            if (Owner.TryGetComponent(out IMapGridComponent? mapGrid))
-                _gridId = mapGrid.GridIndex;
-        }
-
-        public virtual void RepopulateTiles()
-        {
-            if (!Owner.TryGetComponent(out IMapGridComponent? mapGrid)) return;
-
-            foreach (var tile in mapGrid.Grid.GetAllTiles())
-            {
-                if(!Tiles.ContainsKey(tile.GridIndices))
-                    Tiles.Add(tile.GridIndices, new TileAtmosphere(this, tile.GridIndex, tile.GridIndices, new GasMixture(GetVolumeForCells(1)){Temperature = Atmospherics.T20C}));
-
-                Invalidate(tile.GridIndices);
-            }
-
-            foreach (var (_, tile) in Tiles.ToArray())
-            {
-                tile.UpdateAdjacent();
-                tile.UpdateVisuals();
-            }
-        }
-
-        /// <inheritdoc />
-        public virtual void Invalidate(Vector2i indices)
-        {
-            InvalidatedCoords.Add(indices);
-        }
-
-        public virtual void Revalidate()
-        {
-            foreach (var indices in InvalidatedCoords)
-            {
-                var tile = GetTile(indices);
-
-                if (tile == null)
-                {
-                    tile = new TileAtmosphere(this, _gridId, indices, new GasMixture(GetVolumeForCells(1)){Temperature = Atmospherics.T20C});
-                    Tiles[indices] = tile;
-                }
-
-                var isAirBlocked = IsAirBlocked(indices);
-
-                if (IsSpace(indices) && !isAirBlocked)
-                {
-                    tile.Air = new GasMixture(GetVolumeForCells(1));
-                    tile.Air.MarkImmutable();
-                    Tiles[indices] = tile;
-
-                } else if (isAirBlocked)
-                {
-                    var nullAir = false;
-
-                    foreach (var airtight in GetObstructingComponents(indices))
-                    {
-                        if (airtight.NoAirWhenFullyAirBlocked)
-                        {
-                            nullAir = true;
-                            break;
-                        }
-                    }
-
-                    if(nullAir)
-                        tile.Air = null;
-                }
-                else
-                {
-                    if (tile.Air == null && NeedsVacuumFixing(indices))
-                    {
-                        FixVacuum(tile.GridIndices);
-                    }
-
-                    // Tile used to be space, but isn't anymore.
-                    if (tile.Air?.Immutable ?? false)
-                    {
-                        tile.Air = null;
-                    }
-
-                    tile.Air ??= new GasMixture(GetVolumeForCells(1)){Temperature = Atmospherics.T20C};
-                }
-
-                // By removing the active tile, we effectively remove its excited group, if any.
-                RemoveActiveTile(tile);
-
-                // Then we activate the tile again.
-                AddActiveTile(tile);
-
-                tile.BlockedAirflow = GetBlockedDirections(indices);
-
-                // TODO ATMOS: Query all the contents of this tile (like walls) and calculate the correct thermal conductivity
-                tile.ThermalConductivity = tile.Tile?.Tile.GetContentTileDefinition().ThermalConductivity ?? 0.5f;
-                tile.UpdateAdjacent();
-                GasTileOverlaySystem.Invalidate(_gridId, indices);
-
-                for (var i = 0; i < Atmospherics.Directions; i++)
-                {
-                    var direction = (AtmosDirection) (1 << i);
-                    var otherIndices = indices.Offset(direction.ToDirection());
-                    var otherTile = GetTile(otherIndices);
-                    if (otherTile != null) AddActiveTile(otherTile);
-                }
-            }
-
-            InvalidatedCoords.Clear();
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public void UpdateAdjacentBits(Vector2i indices)
-        {
-            GetTile(indices)?.UpdateAdjacent();
-        }
-
-        /// <inheritdoc />
-        public virtual void FixVacuum(Vector2i indices)
-        {
-            var tile = GetTile(indices);
-            if (tile?.GridIndex != _gridId) return;
-            // includeAirBlocked is false, therefore all tiles in this have Air != null.
-            var adjacent = GetAdjacentTiles(indices);
-            tile.Air = new GasMixture(GetVolumeForCells(1)){Temperature = Atmospherics.T20C};
-            Tiles[indices] = tile;
-
-            var ratio = 1f / adjacent.Count;
-
-            foreach (var (_, adj) in adjacent)
-            {
-                var mix = adj.Air!.RemoveRatio(ratio);
-                AtmosphereSystem.Merge(tile.Air, mix);
-                AtmosphereSystem.Merge(adj.Air, mix);
-            }
-        }
-
-        /// <inheritdoc />
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public virtual void AddActiveTile(TileAtmosphere tile)
-        {
-            if (tile?.GridIndex != _gridId || tile.Air == null) return;
-            tile.Excited = true;
-            ActiveTiles.Add(tile);
-        }
-
-        /// <inheritdoc />
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public virtual void RemoveActiveTile(TileAtmosphere tile, bool disposeGroup = true)
-        {
-            ActiveTiles.Remove(tile);
-            tile.Excited = false;
-            if(disposeGroup)
-                tile.ExcitedGroup?.Dispose();
-            else
-                tile.ExcitedGroup?.RemoveTile(tile);
-        }
-
-        /// <inheritdoc />
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public virtual void AddHotspotTile(TileAtmosphere tile)
-        {
-            if (tile?.GridIndex != _gridId || tile?.Air == null) return;
-            HotspotTiles.Add(tile);
-        }
-
-        /// <inheritdoc />
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public virtual void RemoveHotspotTile(TileAtmosphere tile)
-        {
-            HotspotTiles.Remove(tile);
-        }
-
-        public virtual void AddSuperconductivityTile(TileAtmosphere tile)
-        {
-            if (tile?.GridIndex != _gridId || !AtmosphereSystem.Superconduction) return;
-            SuperconductivityTiles.Add(tile);
-        }
-
-        public virtual void RemoveSuperconductivityTile(TileAtmosphere tile)
-        {
-            SuperconductivityTiles.Remove(tile);
-        }
-
-        /// <inheritdoc />
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public virtual void AddHighPressureDelta(TileAtmosphere tile)
-        {
-            if (tile.GridIndex != _gridId) return;
-            HighPressureDelta.Add(tile);
-        }
-
-        /// <inheritdoc />
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public virtual bool HasHighPressureDelta(TileAtmosphere tile)
-        {
-            return HighPressureDelta.Contains(tile);
-        }
-
-        /// <inheritdoc />
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public virtual void AddExcitedGroup(ExcitedGroup excitedGroup)
-        {
-            ExcitedGroups.Add(excitedGroup);
-        }
-
-        /// <inheritdoc />
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public virtual void RemoveExcitedGroup(ExcitedGroup excitedGroup)
-        {
-            ExcitedGroups.Remove(excitedGroup);
-        }
-
-        public virtual void AddPipeNet(IPipeNet pipeNet)
-        {
-            PipeNets.Add(pipeNet);
-        }
-
-        public virtual void RemovePipeNet(IPipeNet pipeNet)
-        {
-            PipeNets.Remove(pipeNet);
-        }
-
-        public virtual void AddAtmosDevice(AtmosDeviceComponent atmosDevice)
-        {
-            AtmosDevices.Add(atmosDevice);
-        }
-
-        public virtual void RemoveAtmosDevice(AtmosDeviceComponent atmosDevice)
-        {
-            AtmosDevices.Remove(atmosDevice);
-        }
-
-        /// <inheritdoc />
-        public virtual TileAtmosphere? GetTile(EntityCoordinates coordinates, bool createSpace = true)
-        {
-            return GetTile(coordinates.ToVector2i(_serverEntityManager, _mapManager), createSpace);
-        }
-
-        /// <inheritdoc />
-        public virtual TileAtmosphere? GetTile(Vector2i indices, bool createSpace = true)
-        {
-            if (Tiles.TryGetValue(indices, out var tile)) return tile;
-
-            // We don't have that tile!
-            if (IsSpace(indices) && createSpace)
-            {
-                return new TileAtmosphere(this, _gridId, indices, new GasMixture(GetVolumeForCells(1)){Temperature = Atmospherics.TCMB}, true);
-            }
-
-            return null;
-        }
-
-        /// <inheritdoc />
-        public bool IsAirBlocked(Vector2i indices, AtmosDirection direction = AtmosDirection.All)
-        {
-            var directions = AtmosDirection.Invalid;
-
-            foreach (var obstructingComponent in GetObstructingComponents(indices))
-            {
-                if (!obstructingComponent.AirBlocked)
-                    continue;
-
-                // We set the directions that are air-blocked so far,
-                // as you could have a full obstruction with only 4 directional air blockers.
-                directions |= obstructingComponent.AirBlockedDirection;
-
-                if (directions.IsFlagSet(direction))
-                    return true;
-            }
-
-            return false;
-        }
-
-        /// <inheritdoc />
-        public virtual bool IsSpace(Vector2i indices)
-        {
-            if (_mapGridComponent == null) return default;
-
-            return _mapGridComponent.Grid.GetTileRef(indices).IsSpace();
-        }
-
-        public Dictionary<AtmosDirection, TileAtmosphere> GetAdjacentTiles(EntityCoordinates coordinates, bool includeAirBlocked = false)
-        {
-            return GetAdjacentTiles(coordinates.ToVector2i(_serverEntityManager, _mapManager), includeAirBlocked);
-        }
-
-        public Dictionary<AtmosDirection, TileAtmosphere> GetAdjacentTiles(Vector2i indices, bool includeAirBlocked = false)
-        {
-            var sides = new Dictionary<AtmosDirection, TileAtmosphere>();
-            for (var i = 0; i < Atmospherics.Directions; i++)
-            {
-                var direction = (AtmosDirection) (1 << i);
-                var side = indices.Offset(direction.ToDirection());
-                var tile = GetTile(side);
-                if (tile != null && (tile.Air != null || includeAirBlocked))
-                    sides[direction] = tile;
-            }
-
-            return sides;
-        }
-
-        public long EqualizationQueueCycleControl { get; set; }
-
-        /// <inheritdoc />
-        public float GetVolumeForCells(int cellCount)
-        {
-            if (_mapGridComponent == null) return default;
-
-            return _mapGridComponent.Grid.TileSize * cellCount * Atmospherics.CellVolume;
-        }
-
-        protected virtual IEnumerable<AirtightComponent> GetObstructingComponents(Vector2i indices)
-        {
-            var gridLookup = EntitySystem.Get<GridTileLookupSystem>();
-
-            foreach (var v in gridLookup.GetEntitiesIntersecting(_gridId, indices))
-            {
-                if (v.TryGetComponent<AirtightComponent>(out var ac))
-                    yield return ac;
-            }
-        }
-
-        private bool NeedsVacuumFixing(Vector2i indices)
-        {
-            var value = false;
-
-            foreach (var airtightComponent in GetObstructingComponents(indices))
-            {
-                value |= airtightComponent.FixVacuum;
-            }
-
-            return value;
-        }
-
-        private AtmosDirection GetBlockedDirections(Vector2i indices)
-        {
-            var value = AtmosDirection.Invalid;
-
-            foreach (var airtightComponent in GetObstructingComponents(indices))
-            {
-                if(airtightComponent.AirBlocked)
-                    value |= airtightComponent.AirBlockedDirection;
-            }
-
-            return value;
-        }
-
-        public void Dispose()
-        {
-
-        }
-
-        public IEnumerator<TileAtmosphere> GetEnumerator()
-        {
-            return Tiles.Values.GetEnumerator();
-        }
-
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-
-        /// <inheritdoc />
-        public virtual void BurnTile(Vector2i gridIndices)
-        {
-            // TODO ATMOS
-        }
     }
 }
diff --git a/Content.Server/Atmos/Components/IGridAtmosphereComponent.cs b/Content.Server/Atmos/Components/IGridAtmosphereComponent.cs
index e82e0a75b1..11b953b2fa 100644
--- a/Content.Server/Atmos/Components/IGridAtmosphereComponent.cs
+++ b/Content.Server/Atmos/Components/IGridAtmosphereComponent.cs
@@ -1,182 +1,12 @@
-#nullable enable
-using System.Collections.Generic;
-using Content.Server.Atmos.Piping.Components;
-using Content.Server.NodeContainer.NodeGroups;
-using Content.Shared.Atmos;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Map;
-using Robust.Shared.Maths;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.Atmos.Components
 {
-    public interface IGridAtmosphereComponent : IComponent, IEnumerable<TileAtmosphere>
+    public interface IGridAtmosphereComponent : IComponent
     {
         /// <summary>
         ///     Whether this atmosphere is simulated or not.
         /// </summary>
         bool Simulated { get; }
-
-        /// <summary>
-        ///     Number of times <see cref="Update"/> has been called.
-        /// </summary>
-        int UpdateCounter { get; }
-
-        /// <summary>
-        ///     Control variable for equalization.
-        /// </summary>
-        long EqualizationQueueCycleControl { get; set; }
-
-        /// <summary>
-        ///     Attemps to pry a tile.
-        /// </summary>
-        /// <param name="indices"></param>
-        void PryTile(Vector2i indices);
-
-        /// <summary>
-        ///     Burns a tile.
-        /// </summary>
-        /// <param name="gridIndices"></param>
-        void BurnTile(Vector2i gridIndices);
-
-        /// <summary>
-        ///     Invalidates a coordinate to be revalidated again.
-        ///     Use this after changing a tile's gas contents, or when the tile becomes space, etc.
-        /// </summary>
-        /// <param name="indices"></param>
-        void Invalidate(Vector2i indices);
-
-        /// <summary>
-        ///     Attempts to fix a sudden vacuum by creating gas.
-        /// </summary>
-        void FixVacuum(Vector2i indices);
-
-        /// <summary>
-        ///     Revalidates indices immediately.
-        /// </summary>
-        /// <param name="indices"></param>
-        void UpdateAdjacentBits(Vector2i indices);
-
-        /// <summary>
-        ///     Adds an active tile so it becomes processed every update until it becomes inactive.
-        ///     Also makes the tile excited.
-        /// </summary>
-        /// <param name="tile"></param>
-        void AddActiveTile(TileAtmosphere tile);
-
-        /// <summary>
-        ///     Removes an active tile and disposes of its <seealso cref="ExcitedGroup"/>.
-        ///     Use with caution.
-        /// </summary>
-        /// <param name="tile"></param>
-        void RemoveActiveTile(TileAtmosphere tile, bool disposeGroup = true);
-
-        /// <summary>
-        ///     Marks a tile as having a hotspot so it can be processed.
-        /// </summary>
-        /// <param name="tile"></param>
-        void AddHotspotTile(TileAtmosphere tile);
-
-        /// <summary>
-        ///     Removes a tile from the hotspot processing list.
-        /// </summary>
-        /// <param name="tile"></param>
-        void RemoveHotspotTile(TileAtmosphere tile);
-
-        /// <summary>
-        ///     Marks a tile as superconductive so it can be processed.
-        /// </summary>
-        /// <param name="tile"></param>
-        void AddSuperconductivityTile(TileAtmosphere tile);
-
-        /// <summary>
-        ///     Removes a tile from the superconductivity processing list.
-        /// </summary>
-        /// <param name="tile"></param>
-        void RemoveSuperconductivityTile(TileAtmosphere tile);
-
-        /// <summary>
-        ///     Marks a tile has having high pressure differences that need to be equalized.
-        /// </summary>
-        /// <param name="tile"></param>
-        void AddHighPressureDelta(TileAtmosphere tile);
-
-        /// <summary>
-        ///     Returns whether the tile in question is marked as having high pressure differences or not.
-        /// </summary>
-        /// <param name="tile"></param>
-        /// <returns></returns>
-        bool HasHighPressureDelta(TileAtmosphere tile);
-
-        /// <summary>
-        ///     Adds a excited group to be processed.
-        /// </summary>
-        /// <param name="excitedGroup"></param>
-        void AddExcitedGroup(ExcitedGroup excitedGroup);
-
-        /// <summary>
-        ///     Removes an excited group.
-        /// </summary>
-        /// <param name="excitedGroup"></param>
-        void RemoveExcitedGroup(ExcitedGroup excitedGroup);
-
-        /// <summary>
-        ///     Returns a tile.
-        /// </summary>
-        /// <param name="indices"></param>
-        /// <param name="createSpace"></param>
-        /// <returns></returns>
-        TileAtmosphere? GetTile(Vector2i indices, bool createSpace = true);
-
-        /// <summary>
-        ///     Returns a tile.
-        /// </summary>
-        /// <param name="coordinates"></param>
-        /// <param name="createSpace"></param>
-        /// <returns></returns>
-        TileAtmosphere? GetTile(EntityCoordinates coordinates, bool createSpace = true);
-
-        /// <summary>
-        ///     Returns if the tile in question is air-blocked.
-        ///     This could be due to a wall, an airlock, etc.
-        ///     <seealso cref="AirtightComponent"/>
-        /// </summary>
-        /// <param name="indices"></param>
-        /// <param name="direction"></param>
-        /// <returns></returns>
-        bool IsAirBlocked(Vector2i indices, AtmosDirection direction);
-
-        /// <summary>
-        ///     Returns if the tile in question is space.
-        /// </summary>
-        /// <param name="indices"></param>
-        /// <returns></returns>
-        bool IsSpace(Vector2i indices);
-
-        /// <summary>
-        ///     Returns the volume in liters for a number of cells/tiles.
-        /// </summary>
-        /// <param name="cellCount"></param>
-        /// <returns></returns>
-        float GetVolumeForCells(int cellCount);
-
-        void RepopulateTiles();
-
-        /// <summary>
-        ///     Returns a dictionary of adjacent TileAtmospheres.
-        /// </summary>
-        Dictionary<AtmosDirection, TileAtmosphere> GetAdjacentTiles(EntityCoordinates coordinates, bool includeAirBlocked = false);
-
-        /// <summary>
-        ///     Returns a dictionary of adjacent TileAtmospheres.
-        /// </summary>
-        Dictionary<AtmosDirection, TileAtmosphere> GetAdjacentTiles(Vector2i indices, bool includeAirBlocked = false);
-
-        void AddPipeNet(IPipeNet pipeNet);
-
-        void RemovePipeNet(IPipeNet pipeNet);
-
-        void AddAtmosDevice(AtmosDeviceComponent atmosDevice);
-
-        void RemoveAtmosDevice(AtmosDeviceComponent atmosDevice);
     }
 }
diff --git a/Content.Server/Atmos/Components/MovedByPressureComponent.cs b/Content.Server/Atmos/Components/MovedByPressureComponent.cs
index 3c7c2e7c09..75a72d4b55 100644
--- a/Content.Server/Atmos/Components/MovedByPressureComponent.cs
+++ b/Content.Server/Atmos/Components/MovedByPressureComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using System.Diagnostics.CodeAnalysis;
 using Content.Shared.Atmos;
 using Content.Shared.MobState;
diff --git a/Content.Server/Atmos/Components/SpaceGridAtmosphereComponent.cs b/Content.Server/Atmos/Components/SpaceGridAtmosphereComponent.cs
index ff63d979ea..6fa75f774d 100644
--- a/Content.Server/Atmos/Components/SpaceGridAtmosphereComponent.cs
+++ b/Content.Server/Atmos/Components/SpaceGridAtmosphereComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using Content.Shared.Atmos;
 using Robust.Shared.GameObjects;
@@ -13,22 +12,5 @@ namespace Content.Server.Atmos.Components
     public class SpaceGridAtmosphereComponent : UnsimulatedGridAtmosphereComponent
     {
         public override string Name => "SpaceGridAtmosphere";
-
-        public override void RepopulateTiles() { }
-
-        public override bool IsSpace(Vector2i indices)
-        {
-            return true;
-        }
-
-        public override TileAtmosphere GetTile(Vector2i indices, bool createSpace = true)
-        {
-            return new(this, GridId.Invalid, indices, new GasMixture(Atmospherics.CellVolume), true);
-        }
-
-        protected override IEnumerable<AirtightComponent> GetObstructingComponents(Vector2i indices)
-        {
-            return Enumerable.Empty<AirtightComponent>();
-        }
     }
 }
diff --git a/Content.Server/Atmos/Components/UnsimulatedGridAtmosphereComponent.cs b/Content.Server/Atmos/Components/UnsimulatedGridAtmosphereComponent.cs
index 090f506902..806164e6c1 100644
--- a/Content.Server/Atmos/Components/UnsimulatedGridAtmosphereComponent.cs
+++ b/Content.Server/Atmos/Components/UnsimulatedGridAtmosphereComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Content.Server.Atmos.Piping.Components;
 using Content.Server.NodeContainer.NodeGroups;
 using Content.Shared.Atmos;
@@ -17,55 +16,5 @@ namespace Content.Server.Atmos.Components
         public override string Name => "UnsimulatedGridAtmosphere";
 
         public override bool Simulated => false;
-
-        public override void PryTile(Vector2i indices) { }
-
-        public override void RepopulateTiles()
-        {
-            if (!Owner.TryGetComponent(out IMapGridComponent? mapGrid)) return;
-
-            foreach (var tile in mapGrid.Grid.GetAllTiles())
-            {
-                if(!Tiles.ContainsKey(tile.GridIndices))
-                    Tiles.Add(tile.GridIndices, new TileAtmosphere(this, tile.GridIndex, tile.GridIndices, new GasMixture(GetVolumeForCells(1)){Temperature = Atmospherics.T20C}));
-            }
-        }
-
-        public override void Invalidate(Vector2i indices) { }
-
-        public override void Revalidate() { }
-
-        public override void FixVacuum(Vector2i indices) { }
-
-        public override void AddActiveTile(TileAtmosphere? tile) { }
-
-        public override void RemoveActiveTile(TileAtmosphere? tile, bool disposeGroup = true) { }
-
-        public override void AddHotspotTile(TileAtmosphere? tile) { }
-
-        public override void RemoveHotspotTile(TileAtmosphere? tile) { }
-
-        public override void AddSuperconductivityTile(TileAtmosphere? tile) { }
-
-        public override void RemoveSuperconductivityTile(TileAtmosphere? tile) { }
-
-        public override void AddHighPressureDelta(TileAtmosphere? tile) { }
-
-        public override bool HasHighPressureDelta(TileAtmosphere tile)
-        {
-            return false;
-        }
-
-        public override void AddExcitedGroup(ExcitedGroup excitedGroup) { }
-
-        public override void RemoveExcitedGroup(ExcitedGroup excitedGroup) { }
-
-        public override void AddPipeNet(IPipeNet pipeNet) { }
-
-        public override void RemovePipeNet(IPipeNet pipeNet) { }
-
-        public override void AddAtmosDevice(AtmosDeviceComponent atmosDevice) { }
-
-        public override void RemoveAtmosDevice(AtmosDeviceComponent atmosDevice) { }
     }
 }
diff --git a/Content.Server/Atmos/EntitySystems/AirtightSystem.cs b/Content.Server/Atmos/EntitySystems/AirtightSystem.cs
index f933e893b1..a1fea661a1 100644
--- a/Content.Server/Atmos/EntitySystems/AirtightSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/AirtightSystem.cs
@@ -1,26 +1,121 @@
 using Content.Server.Atmos.Components;
+using Content.Shared.Atmos;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
+using Robust.Shared.Map;
+using Robust.Shared.Maths;
 
 namespace Content.Server.Atmos.EntitySystems
 {
     [UsedImplicitly]
     public class AirtightSystem : EntitySystem
     {
+        [Dependency] private readonly IMapManager _mapManager = default!;
+
         public override void Initialize()
         {
+            SubscribeLocalEvent<AirtightComponent, ComponentInit>(OnAirtightInit);
+            SubscribeLocalEvent<AirtightComponent, ComponentShutdown>(OnAirtightShutdown);
+            SubscribeLocalEvent<AirtightComponent, MapInitEvent>(OnMapInit);
             SubscribeLocalEvent<AirtightComponent, AnchorStateChangedEvent>(OnAirtightPositionChanged);
             SubscribeLocalEvent<AirtightComponent, RotateEvent>(OnAirtightRotated);
         }
 
-        private void OnAirtightPositionChanged(EntityUid uid, AirtightComponent component, AnchorStateChangedEvent args)
+        private void OnAirtightInit(EntityUid uid, AirtightComponent airtight, ComponentInit args)
         {
-            component.AnchorStateChanged();
+            if (airtight.FixAirBlockedDirectionInitialize)
+                OnAirtightRotated(uid, airtight, new RotateEvent(airtight.Owner, Angle.Zero, airtight.Owner.Transform.WorldRotation));
+
+            // Adding this component will immediately anchor the entity, because the atmos system
+            // requires airtight entities to be anchored for performance.
+            airtight.Owner.Transform.Anchored = true;
+
+            UpdatePosition(airtight);
+        }
+
+        private void OnAirtightShutdown(EntityUid uid, AirtightComponent airtight, ComponentShutdown args)
+        {
+            SetAirblocked(airtight, false);
+
+            InvalidatePosition(airtight.LastPosition.Item1, airtight.LastPosition.Item2);
+
+            if (airtight.FixVacuum)
+            {
+                Get<AtmosphereSystem>().FixVacuum(airtight.LastPosition.Item1, airtight.LastPosition.Item2);
+            }
+        }
+
+        private void OnMapInit(EntityUid uid, AirtightComponent airtight, MapInitEvent args)
+        {
+        }
+
+        private void OnAirtightPositionChanged(EntityUid uid, AirtightComponent airtight, AnchorStateChangedEvent args)
+        {
+            var gridId = airtight.Owner.Transform.GridID;
+            var coords = airtight.Owner.Transform.Coordinates;
+
+            var grid = _mapManager.GetGrid(gridId);
+            var tilePos = grid.TileIndicesFor(coords);
+
+            // Update and invalidate new position.
+            airtight.LastPosition = (gridId, tilePos);
+            InvalidatePosition(gridId, tilePos);
         }
 
         private void OnAirtightRotated(EntityUid uid, AirtightComponent airtight, RotateEvent ev)
         {
-            airtight.RotateEvent(ev);
+            if (!airtight.RotateAirBlocked || airtight.InitialAirBlockedDirection == (int)AtmosDirection.Invalid)
+                return;
+
+            airtight.CurrentAirBlockedDirection = (int) Rotate((AtmosDirection)airtight.InitialAirBlockedDirection, ev.NewRotation);
+            UpdatePosition(airtight);
+        }
+
+        public void SetAirblocked(AirtightComponent airtight, bool airblocked)
+        {
+            airtight.AirBlocked = airblocked;
+            UpdatePosition(airtight);
+        }
+
+        public void UpdatePosition(AirtightComponent airtight)
+        {
+            if (!airtight.Owner.Transform.Anchored || !airtight.Owner.Transform.GridID.IsValid())
+                return;
+
+            var grid = _mapManager.GetGrid(airtight.Owner.Transform.GridID);
+            airtight.LastPosition = (airtight.Owner.Transform.GridID, grid.TileIndicesFor(airtight.Owner.Transform.Coordinates));
+            InvalidatePosition(airtight.LastPosition.Item1, airtight.LastPosition.Item2);
+        }
+
+        public void InvalidatePosition(GridId gridId, Vector2i pos)
+        {
+            if (!gridId.IsValid())
+                return;
+
+            var atmosphereSystem = Get<AtmosphereSystem>();
+            atmosphereSystem.UpdateAdjacent(gridId, pos);
+            atmosphereSystem.InvalidateTile(gridId, pos);
+        }
+
+        private AtmosDirection Rotate(AtmosDirection myDirection, Angle myAngle)
+        {
+            var newAirBlockedDirs = AtmosDirection.Invalid;
+
+            if (myAngle == Angle.Zero)
+                return myDirection;
+
+            // TODO ATMOS MULTIZ: When we make multiZ atmos, special case this.
+            for (var i = 0; i < Atmospherics.Directions; i++)
+            {
+                var direction = (AtmosDirection) (1 << i);
+                if (!myDirection.IsFlagSet(direction)) continue;
+                var angle = direction.ToAngle();
+                angle += myAngle;
+                newAirBlockedDirs |= angle.ToAtmosDirectionCardinal();
+            }
+
+            return newAirBlockedDirs;
         }
     }
 }
diff --git a/Content.Server/Atmos/EntitySystems/AtmosDebugOverlaySystem.cs b/Content.Server/Atmos/EntitySystems/AtmosDebugOverlaySystem.cs
index d7e66d5045..87a9bc0952 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosDebugOverlaySystem.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosDebugOverlaySystem.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Content.Server.Atmos.Components;
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.EntitySystems;
@@ -110,7 +109,7 @@ namespace Content.Server.Atmos.EntitySystems
                 {
                     gases[i] = tile.Air.GetMoles(i);
                 }
-                return new AtmosDebugOverlayData(tile.Air.Temperature, gases, tile.PressureDirectionForDebugOverlay, tile.ExcitedGroup != null, tile.BlockedAirflow);
+                return new AtmosDebugOverlayData(tile.Air.Temperature, gases, tile.PressureDirection, tile.ExcitedGroup != null, tile.BlockedAirflow);
             }
         }
 
@@ -128,6 +127,7 @@ 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(gam.GetTile(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 f2baf06066..4693761b33 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.CVars.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.CVars.cs
@@ -1,11 +1,19 @@
 using Content.Shared.CCVar;
+using Robust.Shared.Configuration;
+using Robust.Shared.IoC;
 
 namespace Content.Server.Atmos.EntitySystems
 {
     public partial class AtmosphereSystem
     {
+        [Dependency] private readonly IConfigurationManager _cfg = default!;
+
         public bool SpaceWind { get; private set; }
+        public string? SpaceWindSound { get; private set; }
         public bool MonstermosEqualization { get; private set; }
+        public bool MonstermosDepressurization { get; private set; }
+        public bool MonstermosRipTiles { get; private set; }
+        public bool GridImpulse { get; private set; }
         public bool Superconduction { get; private set; }
         public bool ExcitedGroupsSpaceIsAllConsuming { get; private set; }
         public float AtmosMaxProcessTime { get; private set; }
@@ -15,7 +23,11 @@ namespace Content.Server.Atmos.EntitySystems
         private void InitializeCVars()
         {
             _cfg.OnValueChanged(CCVars.SpaceWind, value => SpaceWind = value, true);
+            _cfg.OnValueChanged(CCVars.SpaceWindSound, value => SpaceWindSound = value, true);
             _cfg.OnValueChanged(CCVars.MonstermosEqualization, value => MonstermosEqualization = value, true);
+            _cfg.OnValueChanged(CCVars.MonstermosDepressurization, value => MonstermosDepressurization = value, true);
+            _cfg.OnValueChanged(CCVars.MonstermosRipTiles, value => MonstermosRipTiles = value, true);
+            _cfg.OnValueChanged(CCVars.AtmosGridImpulse, value => GridImpulse = value, true);
             _cfg.OnValueChanged(CCVars.Superconduction, value => Superconduction = value, true);
             _cfg.OnValueChanged(CCVars.AtmosMaxProcessTime, value => AtmosMaxProcessTime = value, true);
             _cfg.OnValueChanged(CCVars.AtmosTickRate, value => AtmosTickRate = value, true);
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.ExcitedGroup.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.ExcitedGroup.cs
new file mode 100644
index 0000000000..982f192bb0
--- /dev/null
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.ExcitedGroup.cs
@@ -0,0 +1,137 @@
+using Content.Server.Atmos.Components;
+using Content.Shared.Atmos;
+using Robust.Shared.Utility;
+
+namespace Content.Server.Atmos.EntitySystems
+{
+    public partial class AtmosphereSystem
+    {
+        private void ExcitedGroupAddTile(ExcitedGroup excitedGroup, TileAtmosphere tile)
+        {
+            DebugTools.Assert(!excitedGroup.Disposed, "Excited group is disposed!");
+            DebugTools.Assert(tile.ExcitedGroup == null, "Tried to add a tile to an excited group when it's already in another one!");
+            excitedGroup.Tiles.Add(tile);
+            tile.ExcitedGroup = excitedGroup;
+            ExcitedGroupResetCooldowns(excitedGroup);
+        }
+
+        private void ExcitedGroupRemoveTile(ExcitedGroup excitedGroup, TileAtmosphere tile)
+        {
+            DebugTools.Assert(!excitedGroup.Disposed, "Excited group is disposed!");
+            DebugTools.Assert(tile.ExcitedGroup == excitedGroup, "Tried to remove a tile from an excited group it's not present in!");
+            tile.ExcitedGroup = null;
+            excitedGroup.Tiles.Remove(tile);
+        }
+
+        private void ExcitedGroupMerge(GridAtmosphereComponent gridAtmosphere, ExcitedGroup ourGroup, ExcitedGroup otherGroup)
+        {
+            DebugTools.Assert(!ourGroup.Disposed, "Excited group is disposed!");
+            DebugTools.Assert(!otherGroup.Disposed, "Excited group is disposed!");
+            DebugTools.Assert(gridAtmosphere.ExcitedGroups.Contains(ourGroup), "Grid Atmosphere does not contain Excited Group!");
+            DebugTools.Assert(gridAtmosphere.ExcitedGroups.Contains(otherGroup), "Grid Atmosphere does not contain Excited Group!");
+            var ourSize = ourGroup.Tiles.Count;
+            var otherSize = otherGroup.Tiles.Count;
+
+            ExcitedGroup winner;
+            ExcitedGroup loser;
+
+            if (ourSize > otherSize)
+            {
+                winner = ourGroup;
+                loser = otherGroup;
+            }
+            else
+            {
+                winner = otherGroup;
+                loser = ourGroup;
+            }
+
+            foreach (var tile in loser.Tiles)
+            {
+                tile.ExcitedGroup = winner;
+                winner.Tiles.Add(tile);
+            }
+
+            loser.Tiles.Clear();
+            ExcitedGroupDispose(gridAtmosphere, loser);
+            ExcitedGroupResetCooldowns(winner);
+        }
+
+        private void ExcitedGroupResetCooldowns(ExcitedGroup excitedGroup)
+        {
+            DebugTools.Assert(!excitedGroup.Disposed, "Excited group is disposed!");
+            excitedGroup.BreakdownCooldown = 0;
+            excitedGroup.DismantleCooldown = 0;
+        }
+
+        private void ExcitedGroupSelfBreakdown(GridAtmosphereComponent gridAtmosphere, ExcitedGroup excitedGroup)
+        {
+            DebugTools.Assert(!excitedGroup.Disposed, "Excited group is disposed!");
+            DebugTools.Assert(gridAtmosphere.ExcitedGroups.Contains(excitedGroup), "Grid Atmosphere does not contain Excited Group!");
+            var combined = new GasMixture(Atmospherics.CellVolume);
+
+            var tileSize = excitedGroup.Tiles.Count;
+
+            if (excitedGroup.Disposed) return;
+
+            if (tileSize == 0)
+            {
+                ExcitedGroupDispose(gridAtmosphere, excitedGroup);
+                return;
+            }
+
+            foreach (var tile in excitedGroup.Tiles)
+            {
+                if (tile?.Air == null)
+                    continue;
+
+                Merge(combined, tile.Air);
+
+                if (!ExcitedGroupsSpaceIsAllConsuming || !tile.Air.Immutable)
+                    continue;
+
+                combined.Clear();
+                break;
+            }
+
+            combined.Multiply(1 / (float)tileSize);
+
+            foreach (var tile in excitedGroup.Tiles)
+            {
+                if (tile?.Air == null) continue;
+                tile.Air.CopyFromMutable(combined);
+                InvalidateVisuals(tile.GridIndex, tile.GridIndices);
+            }
+
+            excitedGroup.BreakdownCooldown = 0;
+        }
+
+        private void ExcitedGroupDismantle(GridAtmosphereComponent gridAtmosphere, ExcitedGroup excitedGroup, bool unexcite = true)
+        {
+            foreach (var tile in excitedGroup.Tiles)
+            {
+                tile.ExcitedGroup = null;
+
+                if (!unexcite)
+                    continue;
+
+                RemoveActiveTile(gridAtmosphere, tile);
+            }
+
+            excitedGroup.Tiles.Clear();
+        }
+
+        private void ExcitedGroupDispose(GridAtmosphereComponent gridAtmosphere, ExcitedGroup excitedGroup)
+        {
+            if (excitedGroup.Disposed)
+                return;
+
+            DebugTools.Assert(gridAtmosphere.ExcitedGroups.Contains(excitedGroup), "Grid Atmosphere does not contain Excited Group!");
+
+            excitedGroup.Disposed = true;
+
+            gridAtmosphere.ExcitedGroups.Remove(excitedGroup);
+            ExcitedGroupDismantle(gridAtmosphere, excitedGroup, false);
+        }
+    }
+}
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Gases.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Gases.cs
index 106a635c4a..ba11dd0740 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Gases.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Gases.cs
@@ -2,14 +2,17 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Content.Server.Atmos.Reactions;
-using Content.Server.Interfaces;
 using Content.Shared.Atmos;
+using Robust.Shared.IoC;
 using Robust.Shared.Maths;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Atmos.EntitySystems
 {
     public partial class AtmosphereSystem
     {
+        [Dependency] private readonly IPrototypeManager _protoMan = default!;
+
         private GasReactionPrototype[] _gasReactions = Array.Empty<GasReactionPrototype>();
         private float[] _gasSpecificHeats = new float[Atmospherics.TotalNumberOfGases];
 
@@ -51,16 +54,23 @@ namespace Content.Server.Atmos.EntitySystems
             return mixture.Temperature * GetHeatCapacity(mixture);
         }
 
+        public float GetThermalEnergy(GasMixture mixture, float cachedHeatCapacity)
+        {
+            return mixture.Temperature * cachedHeatCapacity;
+        }
+
         public void Merge(GasMixture receiver, GasMixture giver)
         {
             if (receiver.Immutable) return;
 
             if (MathF.Abs(receiver.Temperature - giver.Temperature) > Atmospherics.MinimumTemperatureDeltaToConsider)
             {
-                var combinedHeatCapacity = GetHeatCapacity(receiver) + GetHeatCapacity(giver);
+                var receiverHeatCapacity = GetHeatCapacity(receiver);
+                var giverHeatCapacity = GetHeatCapacity(giver);
+                var combinedHeatCapacity = receiverHeatCapacity + giverHeatCapacity;
                 if (combinedHeatCapacity > 0f)
                 {
-                    receiver.Temperature = (GetThermalEnergy(giver) + GetThermalEnergy(receiver)) / combinedHeatCapacity;
+                    receiver.Temperature = (GetThermalEnergy(giver, giverHeatCapacity) + GetThermalEnergy(receiver, receiverHeatCapacity)) / combinedHeatCapacity;
                 }
             }
 
@@ -263,7 +273,7 @@ namespace Content.Server.Atmos.EntitySystems
             Merge(destination, buffer);
         }
 
-        public ReactionResult React(GasMixture mixture, IGasMixtureHolder holder)
+        public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder)
         {
             var reaction = ReactionResult.NoReaction;
             var temperature = mixture.Temperature;
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Grid.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Grid.cs
new file mode 100644
index 0000000000..41424c990a
--- /dev/null
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Grid.cs
@@ -0,0 +1,1573 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using Content.Server.Atmos.Components;
+using Content.Server.Atmos.Piping.Components;
+using Content.Server.Atmos.Reactions;
+using Content.Server.NodeContainer.NodeGroups;
+using Content.Shared.Atmos;
+using Content.Shared.Maps;
+using Robust.Shared.GameObjects;
+// ReSharper disable once RedundantUsingDirective
+using Robust.Shared.IoC;
+using Robust.Shared.Log;
+using Robust.Shared.Map;
+using Robust.Shared.Maths;
+using Robust.Shared.Utility;
+using Dependency = Robust.Shared.IoC.DependencyAttribute;
+
+namespace Content.Server.Atmos.EntitySystems
+{
+    public partial class AtmosphereSystem
+    {
+        [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!;
+
+        private GasTileOverlaySystem _gasTileOverlaySystem = default!;
+
+        private void InitializeGrid()
+        {
+            _gasTileOverlaySystem = Get<GasTileOverlaySystem>();
+
+            SubscribeLocalEvent<GridAtmosphereComponent, ComponentInit>(OnGridAtmosphereInit);
+        }
+
+        private void OnGridAtmosphereInit(EntityUid uid, GridAtmosphereComponent gridAtmosphere, ComponentInit args)
+        {
+            base.Initialize();
+
+            gridAtmosphere.Tiles.Clear();
+
+            if (!ComponentManager.TryGetComponent(uid, out IMapGridComponent? mapGrid))
+                return;
+
+            if (gridAtmosphere.TilesUniqueMixes != null)
+            {
+                foreach (var (indices, mix) in gridAtmosphere.TilesUniqueMixes)
+                {
+                    try
+                    {
+                        gridAtmosphere.Tiles.Add(indices, new TileAtmosphere(mapGrid.GridIndex, indices, (GasMixture) gridAtmosphere.UniqueMixes![mix].Clone()));
+                    }
+                    catch (ArgumentOutOfRangeException)
+                    {
+                        Logger.Error($"Error during atmos serialization! Tile at {indices} points to an unique mix ({mix}) out of range!");
+                        throw;
+                    }
+
+                    InvalidateTile(gridAtmosphere, indices);
+                }
+            }
+
+            GridRepopulateTiles(mapGrid.Grid, gridAtmosphere);
+        }
+
+        #region Grid Is Simulated
+
+        /// <summary>
+        ///     Returns whether a grid has a simulated atmosphere.
+        /// </summary>
+        /// <param name="coordinates">Coordinates to be checked.</param>
+        /// <returns>Whether the grid has a simulated atmosphere.</returns>
+        public bool IsSimulatedGrid(EntityCoordinates coordinates)
+        {
+            if (TryGetGridAndTile(coordinates, out var tuple))
+                return IsSimulatedGrid(tuple.Value.Grid);
+
+            return false;
+        }
+
+        /// <summary>
+        ///     Returns whether a grid has a simulated atmosphere.
+        /// </summary>
+        /// <param name="grid">Grid to be checked.</param>
+        /// <returns>Whether the grid has a simulated atmosphere.</returns>
+        public bool IsSimulatedGrid(GridId grid)
+        {
+            if (!_mapManager.TryGetGrid(grid, out var mapGrid))
+                return false;
+
+            if (ComponentManager.HasComponent<GridAtmosphereComponent>(mapGrid.GridEntityId))
+                return true;
+
+            return false;
+        }
+
+        #endregion
+
+        #region Grid Get All Mixtures
+
+        /// <summary>
+        ///     Gets all tile mixtures within a grid atmosphere, optionally invalidating them all.
+        /// </summary>
+        /// <param name="coordinates">Coordinates where to get the grid to get all tile mixtures from.</param>
+        /// <param name="invalidate">Whether to invalidate all tiles.</param>
+        /// <returns>All tile mixtures in a grid.</returns>
+        public IEnumerable<GasMixture> GetAllTileMixtures(EntityCoordinates coordinates, bool invalidate = false)
+        {
+            if (TryGetGridAndTile(coordinates, out var tuple))
+                return GetAllTileMixtures(tuple.Value.Grid, invalidate);
+
+            return Enumerable.Empty<GasMixture>();
+        }
+
+        /// <summary>
+        ///     Gets all tile mixtures within a grid atmosphere, optionally invalidating them all.
+        /// </summary>
+        /// <param name="grid">Grid where to get all tile mixtures from.</param>
+        /// <param name="invalidate">Whether to invalidate all tiles.</param>
+        /// <returns>All tile mixtures in a grid.</returns>
+        public IEnumerable<GasMixture> GetAllTileMixtures(GridId grid, bool invalidate = false)
+        {
+            if (!_mapManager.TryGetGrid(grid, out var mapGrid))
+                return Enumerable.Empty<GasMixture>();
+
+            if (ComponentManager.TryGetComponent(mapGrid.GridEntityId, out GridAtmosphereComponent? gridAtmosphere))
+            {
+                return GetAllTileMixtures(gridAtmosphere, invalidate);
+            }
+
+            return Enumerable.Empty<GasMixture>();
+        }
+
+        /// <summary>
+        ///     Gets all tile mixtures within a grid atmosphere, optionally invalidating them all.
+        /// </summary>
+        /// <param name="gridAtmosphere">Grid Atmosphere to get all mixtures from.</param>
+        /// <param name="invalidate">Whether to invalidate all mixtures.</param>
+        /// <returns>All the tile mixtures in a grid.</returns>
+        public IEnumerable<GasMixture> GetAllTileMixtures(GridAtmosphereComponent gridAtmosphere, bool invalidate = false)
+        {
+            foreach (var (indices, tile) in gridAtmosphere.Tiles)
+            {
+                if (tile.Air == null)
+                    continue;
+
+                if (invalidate)
+                    InvalidateTile(gridAtmosphere, indices);
+
+                yield return tile.Air;
+            }
+        }
+
+        #endregion
+
+        #region Grid Cell Volume
+
+        /// <summary>
+        ///     Gets the volume in liters for a number of tiles, on a specific grid.
+        /// </summary>
+        /// <param name="grid">The grid in question.</param>
+        /// <param name="tiles">The amount of tiles.</param>
+        /// <returns>The volume in liters that the tiles occupy.</returns>
+        public float GetVolumeForTiles(GridId grid, int tiles = 1)
+        {
+            if (!_mapManager.TryGetGrid(grid, out var mapGrid))
+                return Atmospherics.CellVolume * tiles;
+
+            return GetVolumeForTiles(mapGrid, tiles);
+
+        }
+
+        /// <summary>
+        ///     Gets the volume in liters for a number of tiles, on a specific grid.
+        /// </summary>
+        /// <param name="mapGrid">The grid in question.</param>
+        /// <param name="tiles">The amount of tiles.</param>
+        /// <returns>The volume in liters that the tiles occupy.</returns>
+        public float GetVolumeForTiles(IMapGrid mapGrid, int tiles = 1)
+        {
+            return Atmospherics.CellVolume * mapGrid.TileSize * tiles;
+
+        }
+
+        #endregion
+
+        #region Grid Get Obstructing
+
+        /// <summary>
+        ///     Gets all obstructing AirtightComponent instances in a specific tile.
+        /// </summary>
+        /// <param name="mapGrid">The grid where to get the tile.</param>
+        /// <param name="tile">The indices of the tile.</param>
+        /// <returns></returns>
+        public virtual IEnumerable<AirtightComponent> GetObstructingComponents(IMapGrid mapGrid, Vector2i tile)
+        {
+            foreach (var uid in mapGrid.GetAnchoredEntities(tile))
+            {
+                if (ComponentManager.TryGetComponent<AirtightComponent>(uid, out var ac))
+                    yield return ac;
+            }
+        }
+
+        private AtmosDirection GetBlockedDirections(IMapGrid mapGrid, Vector2i indices)
+        {
+            var value = AtmosDirection.Invalid;
+
+            foreach (var airtightComponent in GetObstructingComponents(mapGrid, indices))
+            {
+                if(airtightComponent.AirBlocked)
+                    value |= airtightComponent.AirBlockedDirection;
+            }
+
+            return value;
+        }
+
+        #endregion
+
+        #region Grid Revalidate
+
+        /// <summary>
+        ///     Revalidates all invalid coordinates in a grid atmosphere.
+        /// </summary>
+        /// <param name="mapGrid">The grid in question.</param>
+        /// <param name="gridAtmosphere">The grid atmosphere in question.</param>
+        /// <returns>Whether the process succeeded or got paused due to time constrains.</returns>
+        private bool GridRevalidate(IMapGrid mapGrid, GridAtmosphereComponent gridAtmosphere)
+        {
+            var volume = GetVolumeForTiles(mapGrid, 1);
+
+            if (!gridAtmosphere.RevalidatePaused)
+                gridAtmosphere.CurrentRunInvalidatedCoordinates = new Queue<Vector2i>(gridAtmosphere.InvalidatedCoords);
+
+            gridAtmosphere.InvalidatedCoords.Clear();
+
+            var number = 0;
+            while (gridAtmosphere.CurrentRunInvalidatedCoordinates.TryDequeue(out var indices))
+            {
+                var tile = GetTileAtmosphere(gridAtmosphere, indices);
+
+                if (tile == null)
+                {
+                    tile = new TileAtmosphere(mapGrid.Index, indices, new GasMixture(volume){Temperature = Atmospherics.T20C});
+                    gridAtmosphere.Tiles[indices] = tile;
+                }
+
+                var isAirBlocked = IsTileAirBlocked(mapGrid, indices);
+
+                tile.BlockedAirflow = GetBlockedDirections(mapGrid, indices);
+                UpdateAdjacent(mapGrid, gridAtmosphere, tile);
+
+                if (IsTileSpace(mapGrid, indices) && !isAirBlocked)
+                {
+                    tile.Air = new GasMixture(volume);
+                    tile.Air.MarkImmutable();
+                    gridAtmosphere.Tiles[indices] = tile;
+
+                } else if (isAirBlocked)
+                {
+                    var nullAir = false;
+
+                    foreach (var airtight in GetObstructingComponents(mapGrid, indices))
+                    {
+                        if (!airtight.NoAirWhenFullyAirBlocked)
+                            continue;
+
+                        nullAir = true;
+                        break;
+                    }
+
+                    if (nullAir)
+                    {
+                        tile.Air = null;
+                        tile.Hotspot = new Hotspot();
+                    }
+                }
+                else
+                {
+                    if (tile.Air == null && NeedsVacuumFixing(mapGrid, indices))
+                    {
+                        FixVacuum(gridAtmosphere, tile.GridIndices);
+                    }
+
+                    // Tile used to be space, but isn't anymore.
+                    if (tile.Air?.Immutable ?? false)
+                    {
+                        tile.Air = null;
+                    }
+
+                    tile.Air ??= new GasMixture(volume){Temperature = Atmospherics.T20C};
+                }
+
+                // By removing the active tile, we effectively remove its excited group, if any.
+                RemoveActiveTile(gridAtmosphere, tile);
+
+                // Then we activate the tile again.
+                AddActiveTile(gridAtmosphere, tile);
+
+                // TODO ATMOS: Query all the contents of this tile (like walls) and calculate the correct thermal conductivity
+                tile.ThermalConductivity = tile.Tile?.Tile.GetContentTileDefinition().ThermalConductivity ?? 0.5f;
+                InvalidateVisuals(mapGrid.Index, indices);
+
+                for (var i = 0; i < Atmospherics.Directions; i++)
+                {
+                    var direction = (AtmosDirection) (1 << i);
+                    var otherIndices = indices.Offset(direction.ToDirection());
+                    var otherTile = GetTileAtmosphereOrCreateSpace(mapGrid, gridAtmosphere, otherIndices);
+                    if (otherTile != null)
+                        AddActiveTile(gridAtmosphere, otherTile);
+                }
+
+                if (number++ < InvalidCoordinatesLagCheckIterations) continue;
+                number = 0;
+                // Process the rest next time.
+                if (_simulationStopwatch.Elapsed.TotalMilliseconds >= AtmosMaxProcessTime)
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        #endregion
+
+        #region Grid Repopulate
+
+        /// <summary>
+        ///     Repopulates all tiles on a grid atmosphere.
+        /// </summary>
+        /// <param name="mapGrid">The grid where to get all valid tiles from.</param>
+        /// <param name="gridAtmosphere">The grid atmosphere where the tiles will be repopulated.</param>
+        public void GridRepopulateTiles(IMapGrid mapGrid, GridAtmosphereComponent gridAtmosphere)
+        {
+            var volume = GetVolumeForTiles(mapGrid, 1);
+
+            foreach (var tile in mapGrid.GetAllTiles())
+            {
+                if(!gridAtmosphere.Tiles.ContainsKey(tile.GridIndices))
+                    gridAtmosphere.Tiles[tile.GridIndices] = new TileAtmosphere(tile.GridIndex, tile.GridIndices, new GasMixture(volume){Temperature = Atmospherics.T20C});
+
+                InvalidateTile(gridAtmosphere, tile.GridIndices);
+            }
+
+            foreach (var (position, tile) in gridAtmosphere.Tiles.ToArray())
+            {
+                UpdateAdjacent(mapGrid, gridAtmosphere, tile);
+                InvalidateVisuals(mapGrid.Index, position);
+            }
+        }
+
+        #endregion
+
+        #region Tile Pry
+
+        /// <summary>
+        ///     Pries a tile in a grid.
+        /// </summary>
+        /// <param name="mapGrid">The grid in question.</param>
+        /// <param name="tile">The indices of the tile.</param>
+        private void PryTile(IMapGrid mapGrid, Vector2i tile)
+        {
+            if (!mapGrid.TryGetTileRef(tile, out var tileRef))
+                return;
+
+            tileRef.PryTile(_mapManager, _tileDefinitionManager, EntityManager);
+        }
+
+        #endregion
+
+        #region Tile Invalidate
+
+        /// <summary>
+        ///     Invalidates a tile at a certain position.
+        /// </summary>
+        /// <param name="coordinates">Coordinates of the tile.</param>
+        public void InvalidateTile(EntityCoordinates coordinates)
+        {
+            if(TryGetGridAndTile(coordinates, out var tuple))
+                InvalidateTile(tuple.Value.Grid, tuple.Value.Tile);
+        }
+
+        /// <summary>
+        ///     Invalidates a tile at a certain position.
+        /// </summary>
+        /// <param name="grid">Grid where to invalidate the tile.</param>
+        /// <param name="tile">The indices of the tile.</param>
+        public void InvalidateTile(GridId grid, Vector2i tile)
+        {
+            if (!_mapManager.TryGetGrid(grid, out var mapGrid))
+                return;
+
+            if (ComponentManager.TryGetComponent(mapGrid.GridEntityId, out GridAtmosphereComponent? gridAtmosphere))
+            {
+                InvalidateTile(gridAtmosphere, tile);
+                return;
+            }
+        }
+
+        /// <summary>
+        ///     Invalidates a tile at a certain position.
+        /// </summary>
+        /// <param name="gridAtmosphere">Grid Atmosphere where to invalidate the tile.</param>
+        /// <param name="tile">The tile's indices.</param>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public void InvalidateTile(GridAtmosphereComponent gridAtmosphere, Vector2i tile)
+        {
+            gridAtmosphere.InvalidatedCoords.Add(tile);
+        }
+
+        #endregion
+
+        #region Tile Invalidate Visuals
+
+        public void InvalidateVisuals(EntityCoordinates coordinates)
+        {
+            if(TryGetGridAndTile(coordinates, out var tuple))
+                InvalidateVisuals(tuple.Value.Grid, tuple.Value.Tile);
+        }
+
+        public void InvalidateVisuals(GridId grid, Vector2i tile)
+        {
+            _gasTileOverlaySystem.Invalidate(grid, tile);
+        }
+
+        #endregion
+
+        #region Tile Atmosphere Get
+
+        /// <summary>
+        ///     Gets the tile atmosphere in a position, or null.
+        /// </summary>
+        /// <param name="coordinates">Coordinates where to get the tile.</param>
+        /// <remarks>Do NOT use this outside of atmos internals.</remarks>
+        /// <returns>The Tile Atmosphere in the position, or null if not on a grid.</returns>
+        public TileAtmosphere? GetTileAtmosphere(EntityCoordinates coordinates)
+        {
+            if (TryGetGridAndTile(coordinates, out var tuple))
+                return GetTileAtmosphere(tuple.Value.Grid, tuple.Value.Tile);
+
+            return null;
+        }
+
+        /// <summary>
+        ///     Gets the tile atmosphere in a position, or null.
+        /// </summary>
+        /// <param name="grid">Grid where to get the tile.</param>
+        /// <param name="tile">Indices of the tile.</param>
+        /// <remarks>Do NOT use this outside of atmos internals.</remarks>
+        /// <returns>The Tile Atmosphere in the position, or null.</returns>
+        public TileAtmosphere? GetTileAtmosphere(GridId grid, Vector2i tile)
+        {
+            if (!_mapManager.TryGetGrid(grid, out var mapGrid))
+                return null;
+
+            if(ComponentManager.TryGetComponent(mapGrid.GridEntityId, out GridAtmosphereComponent? gridAtmosphere))
+            {
+                return GetTileAtmosphere(gridAtmosphere, tile);
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        ///     Gets the tile atmosphere in a position, or null.
+        /// </summary>
+        /// <param name="gridAtmosphere">Grid atmosphere where to get the tile.</param>
+        /// <param name="tile">Indices of the tile.</param>
+        /// <remarks>Do NOT use this outside of atmos internals.</remarks>
+        /// <returns>The Tile Atmosphere in the position, or null.</returns>
+        public TileAtmosphere? GetTileAtmosphere(GridAtmosphereComponent gridAtmosphere, Vector2i tile)
+        {
+            if (gridAtmosphere.Tiles.TryGetValue(tile, out var tileAtmosphere))
+                return tileAtmosphere;
+
+            return null;
+        }
+
+        /// <summary>
+        ///     Gets the tile atmosphere in a position and if not possible returns a space tile or null.
+        /// </summary>
+        /// <param name="coordinates">Coordinates of the tile.</param>
+        /// <remarks>Do NOT use this outside of atmos internals.</remarks>
+        /// <returns>The tile atmosphere of a specific position in a grid, a space tile atmosphere if the tile is space or null if not on a grid.</returns>
+        public TileAtmosphere? GetTileAtmosphereOrCreateSpace(EntityCoordinates coordinates)
+        {
+            if (TryGetGridAndTile(coordinates, out var tuple))
+                return GetTileAtmosphereOrCreateSpace(tuple.Value.Grid, tuple.Value.Tile);
+
+            return null;
+        }
+
+        /// <summary>
+        ///     Gets the tile atmosphere in a position and if not possible returns a space tile or null.
+        /// </summary>
+        /// <param name="grid">Grid where to get the tile.</param>
+        /// <param name="tile">Indices of the tile.</param>
+        /// <remarks>Do NOT use this outside of atmos internals.</remarks>
+        /// <returns>The tile atmosphere of a specific position in a grid, a space tile atmosphere if the tile is space or null if the grid doesn't exist.</returns>
+        public TileAtmosphere? GetTileAtmosphereOrCreateSpace(GridId grid, Vector2i tile)
+        {
+            if (!_mapManager.TryGetGrid(grid, out var mapGrid))
+                return null;
+
+            if (ComponentManager.TryGetComponent(mapGrid.GridEntityId, out GridAtmosphereComponent? gridAtmosphere))
+            {
+                return GetTileAtmosphereOrCreateSpace(mapGrid, gridAtmosphere, tile);
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        ///     Gets the tile atmosphere in a position and if not possible returns a space tile or null.
+        /// </summary>
+        /// <param name="mapGrid">Grid where to get the tile.</param>
+        /// <param name="gridAtmosphere">Grid Atmosphere where to get the tile.</param>
+        /// <param name="tile">Indices of the tile.</param>
+        /// <remarks>Do NOT use this outside of atmos internals.</remarks>
+        /// <returns>The tile atmosphere of a specific position in a grid or a space tile atmosphere if the tile is space.</returns>
+        public TileAtmosphere GetTileAtmosphereOrCreateSpace(IMapGrid mapGrid, GridAtmosphereComponent gridAtmosphere, Vector2i tile)
+        {
+            var tileAtmosphere = GetTileAtmosphere(gridAtmosphere, tile);
+
+            if (tileAtmosphere != null)
+                return tileAtmosphere;
+
+            // That tile must be space, or something has gone horribly wrong!
+            DebugTools.Assert(IsTileSpace(mapGrid, tile));
+            return new TileAtmosphere(mapGrid.Index, tile, new GasMixture(Atmospherics.CellVolume) {Temperature = Atmospherics.TCMB}, true);
+        }
+
+        #endregion
+
+        #region Tile Active Add
+
+        /// <summary>
+        ///     Makes a tile become active and start processing.
+        /// </summary>
+        /// <param name="coordinates">Coordinates where to get the tile.</param>
+        public void AddActiveTile(EntityCoordinates coordinates)
+        {
+            if(TryGetGridAndTile(coordinates, out var tuple))
+                AddActiveTile(tuple.Value.Grid, tuple.Value.Tile);
+        }
+
+        /// <summary>
+        ///     Makes a tile become active and start processing.
+        /// </summary>
+        /// <param name="grid">Grid where to get the tile.</param>
+        /// <param name="tile">Indices of the tile to be activated.</param>
+        public void AddActiveTile(GridId grid, Vector2i tile)
+        {
+            if (!_mapManager.TryGetGrid(grid, out var mapGrid))
+                return;
+
+            if (ComponentManager.TryGetComponent(mapGrid.GridEntityId, out GridAtmosphereComponent? gridAtmosphere))
+            {
+                AddActiveTile(gridAtmosphere, tile);
+                return;
+            }
+        }
+
+        /// <summary>
+        ///     Makes a tile become active and start processing.
+        /// </summary>
+        /// <param name="gridAtmosphere">Grid Atmosphere where to get the tile.</param>
+        /// <param name="tile">Indices of the tile to be activated.</param>
+        public void AddActiveTile(GridAtmosphereComponent gridAtmosphere, Vector2i tile)
+        {
+            if (!gridAtmosphere.Tiles.TryGetValue(tile, out var tileAtmosphere))
+                return;
+
+            AddActiveTile(gridAtmosphere, tileAtmosphere);
+        }
+
+        /// <summary>
+        ///     Makes a tile become active and start processing. Does NOT check if the tile belongs to the grid atmos.
+        /// </summary>
+        /// <param name="gridAtmosphere">Grid Atmosphere where to get the tile.</param>
+        /// <param name="tile">Tile Atmosphere to be activated.</param>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private void AddActiveTile(GridAtmosphereComponent gridAtmosphere, TileAtmosphere tile)
+        {
+            if (tile.Air == null)
+                return;
+
+            tile.Excited = true;
+            gridAtmosphere.ActiveTiles.Add(tile);
+        }
+
+        #endregion
+
+        #region Tile Active Remove
+
+        /// <summary>
+        ///     Makes a tile become inactive and stop processing.
+        /// </summary>
+        /// <param name="coordinates">Coordinates where to get the tile.</param>
+        /// <param name="disposeExcitedGroup">Whether to dispose of the tile's <see cref="ExcitedGroup"/></param>
+        public void RemoveActiveTile(EntityCoordinates coordinates, bool disposeExcitedGroup = true)
+        {
+            if(TryGetGridAndTile(coordinates, out var tuple))
+                RemoveActiveTile(tuple.Value.Grid, tuple.Value.Tile, disposeExcitedGroup);
+        }
+
+        /// <summary>
+        ///     Makes a tile become inactive and stop processing.
+        /// </summary>
+        /// <param name="grid">Grid where to get the tile.</param>
+        /// <param name="tile">Indices of the tile to be deactivated.</param>
+        /// <param name="disposeExcitedGroup">Whether to dispose of the tile's <see cref="ExcitedGroup"/></param>
+        public void RemoveActiveTile(GridId grid, Vector2i tile, bool disposeExcitedGroup = true)
+        {
+            if (!_mapManager.TryGetGrid(grid, out var mapGrid))
+                return;
+
+            if (ComponentManager.TryGetComponent(mapGrid.GridEntityId, out GridAtmosphereComponent? gridAtmosphere))
+            {
+                RemoveActiveTile(gridAtmosphere, tile);
+                return;
+            }
+        }
+
+        /// <summary>
+        ///     Makes a tile become inactive and stop processing.
+        /// </summary>
+        /// <param name="gridAtmosphere">Grid Atmosphere where to get the tile.</param>
+        /// <param name="tile">Indices of the tile to be deactivated.</param>
+        /// <param name="disposeExcitedGroup">Whether to dispose of the tile's <see cref="ExcitedGroup"/></param>
+        public void RemoveActiveTile(GridAtmosphereComponent gridAtmosphere, Vector2i tile, bool disposeExcitedGroup = true)
+        {
+            if (!gridAtmosphere.Tiles.TryGetValue(tile, out var tileAtmosphere))
+                return;
+
+            RemoveActiveTile(gridAtmosphere, tileAtmosphere, disposeExcitedGroup);
+        }
+
+        /// <summary>
+        ///     Makes a tile become inactive and stop processing.
+        /// </summary>
+        /// <param name="gridAtmosphere">Grid Atmosphere where to get the tile.</param>
+        /// <param name="tile">Tile Atmosphere to be deactivated.</param>
+        /// <param name="disposeExcitedGroup">Whether to dispose of the tile's <see cref="ExcitedGroup"/></param>
+        private void RemoveActiveTile(GridAtmosphereComponent gridAtmosphere, TileAtmosphere tile, bool disposeExcitedGroup = true)
+        {
+            tile.Excited = false;
+            gridAtmosphere.ActiveTiles.Remove(tile);
+
+            if (tile.ExcitedGroup == null)
+                return;
+
+            if (disposeExcitedGroup)
+                ExcitedGroupDispose(gridAtmosphere, tile.ExcitedGroup);
+            else
+                ExcitedGroupRemoveTile(tile.ExcitedGroup, tile);
+        }
+
+        #endregion
+
+        #region Tile Mixture
+
+        /// <summary>
+        ///     Returns a reference to the gas mixture on a tile, or null.
+        /// </summary>
+        /// <param name="coordinates">Coordinates where to get the tile.</param>
+        /// <param name="invalidate">Whether to invalidate the tile.</param>
+        /// <returns>The tile mixture, or null</returns>
+        public GasMixture? GetTileMixture(EntityCoordinates coordinates, bool invalidate = false)
+        {
+            return TryGetGridAndTile(coordinates, out var tuple)
+                ? GetTileMixture(tuple.Value.Grid, tuple.Value.Tile, invalidate) : null;
+        }
+
+        /// <summary>
+        ///     Returns a reference to the gas mixture on a tile, or null.
+        /// </summary>
+        /// <param name="grid">Grid where to get the tile air.</param>
+        /// <param name="tile">Indices of the tile.</param>
+        /// <param name="invalidate">Whether to invalidate the tile.</param>
+        /// <returns>The tile mixture, or null</returns>
+        public GasMixture? GetTileMixture(GridId grid, Vector2i tile, bool invalidate = false)
+        {
+            if (!_mapManager.TryGetGrid(grid, out var mapGrid))
+                return null;
+
+            if (ComponentManager.TryGetComponent(mapGrid.GridEntityId, out GridAtmosphereComponent? gridAtmosphere))
+            {
+                return GetTileMixture(gridAtmosphere, tile, invalidate);
+            }
+
+            if (ComponentManager.TryGetComponent(mapGrid.GridEntityId, out SpaceGridAtmosphereComponent? spaceAtmosphere))
+            {
+                // Always return a new space gas mixture in this case.
+                return GasMixture.SpaceGas;
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        ///     Returns a reference to the gas mixture on a tile, or null.
+        /// </summary>
+        /// <param name="gridAtmosphere">Grid Atmosphere where to get the tile air.</param>
+        /// <param name="tile">Indices of the tile.</param>
+        /// <param name="invalidate">Whether to invalidate the tile.</param>
+        /// <returns>The tile mixture, or null</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public GasMixture? GetTileMixture(GridAtmosphereComponent gridAtmosphere, Vector2i tile, bool invalidate = false)
+        {
+            if (!gridAtmosphere.Tiles.TryGetValue(tile, out var tileAtmosphere))
+                return null;
+
+            // Invalidate the tile if needed.
+            if (invalidate)
+                InvalidateTile(gridAtmosphere, tile);
+
+            // Return actual tile air or null.
+            return tileAtmosphere.Air;
+        }
+
+        #endregion
+
+        #region Tile React
+
+        /// <summary>
+        ///     Causes a gas mixture reaction on a specific tile.
+        /// </summary>
+        /// <param name="coordinates">Coordinates where to get the tile.</param>
+        /// <returns>Reaction results.</returns>
+        public ReactionResult React(EntityCoordinates coordinates)
+        {
+            if (TryGetGridAndTile(coordinates, out var tuple))
+                return React(tuple.Value.Grid, tuple.Value.Tile);
+
+            return ReactionResult.NoReaction;
+        }
+
+        /// <summary>
+        ///     Causes a gas mixture reaction on a specific tile.
+        /// </summary>
+        /// <param name="grid">Grid where to get the tile.</param>
+        /// <param name="tile">Indices of the tile.</param>
+        /// <returns>Reaction results.</returns>
+        public ReactionResult React(GridId grid, Vector2i tile)
+        {
+            if (!_mapManager.TryGetGrid(grid, out var mapGrid))
+                return ReactionResult.NoReaction;
+
+            if (ComponentManager.TryGetComponent(mapGrid.GridEntityId, out GridAtmosphereComponent? gridAtmosphere))
+            {
+                return React(gridAtmosphere, tile);
+            }
+
+            return ReactionResult.NoReaction;
+        }
+
+        /// <summary>
+        ///     Causes a gas mixture reaction on a specific tile.
+        /// </summary>
+        /// <param name="gridAtmosphere">Grid Atmosphere where to get the tile.</param>
+        /// <param name="tile">Indices of the tile.</param>
+        /// <returns>Reaction results.</returns>
+        public ReactionResult React(GridAtmosphereComponent gridAtmosphere, Vector2i tile)
+        {
+            if (!gridAtmosphere.Tiles.TryGetValue(tile, out var tileAtmosphere) || tileAtmosphere.Air == null)
+                return ReactionResult.NoReaction;
+
+            InvalidateTile(gridAtmosphere, tile);
+
+            return React(tileAtmosphere.Air, tileAtmosphere);
+        }
+
+        #endregion
+
+        #region Tile Air-blocked
+
+        /// <summary>
+        ///     Returns if the tile in question is "air-blocked" in a certain direction or not.
+        ///     This could be due to a number of reasons, such as walls, doors, etc.
+        /// </summary>
+        /// <param name="coordinates">Coordinates where to get the tile.</param>
+        /// <param name="direction">Directions to check.</param>
+        /// <returns>Whether the tile is blocked in the directions specified.</returns>
+        public bool IsTileAirBlocked(EntityCoordinates coordinates, AtmosDirection direction = AtmosDirection.All)
+        {
+            if (TryGetGridAndTile(coordinates, out var tuple))
+                return IsTileAirBlocked(tuple.Value.Grid, tuple.Value.Tile, direction);
+
+            return false;
+        }
+
+        /// <summary>
+        ///     Returns if the tile in question is "air-blocked" in a certain direction or not.
+        ///     This could be due to a number of reasons, such as walls, doors, etc.
+        /// </summary>
+        /// <param name="grid">Grid where to get the tile.</param>
+        /// <param name="tile">Indices of the tile.</param>
+        /// <param name="direction">Directions to check.</param>
+        /// <returns>Whether the tile is blocked in the directions specified.</returns>
+        public bool IsTileAirBlocked(GridId grid, Vector2i tile, AtmosDirection direction = AtmosDirection.All)
+        {
+            if (!_mapManager.TryGetGrid(grid, out var mapGrid))
+                return false;
+
+            return IsTileAirBlocked(mapGrid, tile, direction);
+        }
+
+        /// <summary>
+        ///     Returns if the tile in question is "air-blocked" in a certain direction or not.
+        ///     This could be due to a number of reasons, such as walls, doors, etc.
+        /// </summary>
+        /// <param name="mapGrid">Grid where to get the tile.</param>
+        /// <param name="tile">Indices of the tile.</param>
+        /// <param name="direction">Directions to check.</param>
+        /// <returns>Whether the tile is blocked in the directions specified.</returns>
+        public bool IsTileAirBlocked(IMapGrid mapGrid, Vector2i tile, AtmosDirection direction = AtmosDirection.All)
+        {
+            var directions = AtmosDirection.Invalid;
+
+            foreach (var obstructingComponent in GetObstructingComponents(mapGrid, tile))
+            {
+                if (!obstructingComponent.AirBlocked)
+                    continue;
+
+                // We set the directions that are air-blocked so far,
+                // as you could have a full obstruction with only 4 directional air blockers.
+                directions |= obstructingComponent.AirBlockedDirection;
+
+                if (directions.IsFlagSet(direction))
+                    return true;
+            }
+
+            return false;
+        }
+
+        #endregion
+
+        #region Tile Space
+
+        /// <summary>
+        ///     Returns whether the specified tile is a space tile or not.
+        /// </summary>
+        /// <param name="coordinates">Coordinates where to check the tile.</param>
+        /// <returns>Whether the tile is space or not.</returns>
+        public bool IsTileSpace(EntityCoordinates coordinates)
+        {
+            if (TryGetGridAndTile(coordinates, out var tuple))
+                return IsTileSpace(tuple.Value.Grid, tuple.Value.Tile);
+
+            return true;
+        }
+
+        /// <summary>
+        ///     Returns whether the specified tile is a space tile or not.
+        /// </summary>
+        /// <param name="grid">Grid where to check the tile.</param>
+        /// <param name="tile">Indices of the tile.</param>
+        /// <returns>Whether the tile is space or not.</returns>
+        public bool IsTileSpace(GridId grid, Vector2i tile)
+        {
+            return !_mapManager.TryGetGrid(grid, out var mapGrid) || IsTileSpace(mapGrid, tile);
+        }
+
+        public bool IsTileSpace(IMapGrid mapGrid, Vector2i tile)
+        {
+            if (!mapGrid.TryGetTileRef(tile, out var tileRef))
+                return true;
+
+            return ((ContentTileDefinition) _tileDefinitionManager[tileRef.Tile.TypeId]).IsSpace;
+        }
+
+        #endregion
+
+        #region Adjacent Get Positions
+
+        /// <summary>
+        ///     Gets all the positions adjacent to a tile. Can include air-blocked directions.
+        /// </summary>
+        /// <param name="coordinates">Coordinates where to get the tile.</param>
+        /// <param name="includeBlocked">Whether to include tiles in directions the tile is air-blocked in.</param>
+        /// <returns>The positions adjacent to the tile.</returns>
+        public IEnumerable<Vector2i> GetAdjacentTiles(EntityCoordinates coordinates, bool includeBlocked = false)
+        {
+            if (TryGetGridAndTile(coordinates, out var tuple))
+                return GetAdjacentTiles(tuple.Value.Grid, tuple.Value.Tile, includeBlocked);
+
+            return Enumerable.Empty<Vector2i>();
+        }
+
+        /// <summary>
+        ///     Gets all the positions adjacent to a tile. Can include air-blocked directions.
+        /// </summary>
+        /// <param name="grid">Grid where to get the tiles.</param>
+        /// <param name="tile">Indices of the tile.</param>
+        /// <param name="includeBlocked">Whether to include tiles in directions the tile is air-blocked in.</param>
+        /// <returns>The positions adjacent to the tile.</returns>
+        public IEnumerable<Vector2i> GetAdjacentTiles(GridId grid, Vector2i tile, bool includeBlocked = false)
+        {
+            if (!_mapManager.TryGetGrid(grid, out var mapGrid))
+                return Enumerable.Empty<Vector2i>();
+
+            if (ComponentManager.TryGetComponent(mapGrid.GridEntityId, out GridAtmosphereComponent? gridAtmosphere))
+            {
+                return GetAdjacentTiles(gridAtmosphere, tile, includeBlocked);
+            }
+
+            return Enumerable.Empty<Vector2i>();
+        }
+
+        /// <summary>
+        ///     Gets all the positions adjacent to a tile. Can include air-blocked directions.
+        /// </summary>
+        /// <param name="gridAtmosphere">Grid Atmosphere where to get the tiles.</param>
+        /// <param name="tile">Indices of the tile.</param>
+        /// <param name="includeBlocked">Whether to include tiles in directions the tile is air-blocked in.</param>
+        /// <returns>The positions adjacent to the tile.</returns>
+        public IEnumerable<Vector2i> GetAdjacentTiles(GridAtmosphereComponent gridAtmosphere, Vector2i tile, bool includeBlocked = false)
+        {
+            if(!gridAtmosphere.Tiles.TryGetValue(tile, out var tileAtmosphere))
+                yield break;
+
+            for (var i = 0; i < tileAtmosphere.AdjacentTiles.Length; i++)
+            {
+                var adjacentTile = tileAtmosphere.AdjacentTiles[i];
+                // TileAtmosphere has nullable disabled, so just in case...
+                // ReSharper disable once ConditionIsAlwaysTrueOrFalse
+                if (adjacentTile?.Air == null)
+                    continue;
+
+                if (!includeBlocked)
+                {
+                    var direction = (AtmosDirection) (1 << i);
+                    if (tileAtmosphere.BlockedAirflow.IsFlagSet(direction))
+                        continue;
+                }
+
+                yield return adjacentTile.GridIndices;
+            }
+        }
+
+        #endregion
+
+        #region Adjacent Get Mixture
+
+        /// <summary>
+        ///     Gets all tile gas mixtures adjacent to a specific tile, and optionally invalidates them.
+        ///     Does not return the tile in question, only the adjacent ones.
+        /// </summary>
+        /// <param name="coordinates">Coordinates where to get the tile.</param>
+        /// <param name="includeBlocked">Whether to include tiles in directions the tile is air-blocked in.</param>
+        /// <param name="invalidate">Whether to invalidate all adjacent tiles.</param>
+        /// <returns>All adjacent tile gas mixtures to the tile in question</returns>
+        public IEnumerable<GasMixture> GetAdjacentTileMixtures(EntityCoordinates coordinates, bool includeBlocked = false, bool invalidate = false)
+        {
+            if (TryGetGridAndTile(coordinates, out var tuple))
+                return GetAdjacentTileMixtures(tuple.Value.Grid, tuple.Value.Tile);
+
+            return Enumerable.Empty<GasMixture>();
+        }
+
+        /// <summary>
+        ///     Gets all tile gas mixtures adjacent to a specific tile, and optionally invalidates them.
+        ///     Does not return the tile in question, only the adjacent ones.
+        /// </summary>
+        /// <param name="grid">Grid where to get the tile.</param>
+        /// <param name="tile">Indices of the tile.</param>
+        /// <param name="includeBlocked">Whether to include tiles in directions the tile is air-blocked in.</param>
+        /// <param name="invalidate">Whether to invalidate all adjacent tiles.</param>
+        /// <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)
+        {
+            if (!_mapManager.TryGetGrid(grid, out var mapGrid))
+                return Enumerable.Empty<GasMixture>();
+
+            if (ComponentManager.TryGetComponent(mapGrid.GridEntityId, out GridAtmosphereComponent? gridAtmosphere))
+            {
+                return GetAdjacentTileMixtures(gridAtmosphere, tile, includeBlocked, invalidate);
+            }
+
+            return Enumerable.Empty<GasMixture>();
+        }
+
+        /// <summary>
+        ///     Gets all tile gas mixtures adjacent to a specific tile, and optionally invalidates them.
+        ///     Does not return the tile in question, only the adjacent ones.
+        /// </summary>
+        /// <param name="gridAtmosphere">Grid Atmosphere where to get the tile.</param>
+        /// <param name="tile">Indices of the tile.</param>
+        /// <param name="includeBlocked">Whether to include tiles in directions the tile is air-blocked in.</param>
+        /// <param name="invalidate">Whether to invalidate all adjacent tiles.</param>
+        /// <returns>All adjacent tile gas mixtures to the tile in question</returns>
+        public IEnumerable<GasMixture> GetAdjacentTileMixtures(GridAtmosphereComponent gridAtmosphere, Vector2i tile, bool includeBlocked = false, bool invalidate = false)
+        {
+            if (!gridAtmosphere.Tiles.TryGetValue(tile, out var tileAtmosphere))
+                return Enumerable.Empty<GasMixture>();
+
+            return GetAdjacentTileMixtures(gridAtmosphere, tileAtmosphere, includeBlocked, invalidate);
+        }
+
+        /// <summary>
+        ///     Gets all tile gas mixtures adjacent to a specific tile, and optionally invalidates them.
+        ///     Does not return the tile in question, only the adjacent ones.
+        /// </summary>
+        /// <param name="gridAtmosphere">Grid Atmosphere where the tile is.</param>
+        /// <param name="tile">Tile Atmosphere in question.</param>
+        /// <param name="includeBlocked">Whether to include tiles in directions the tile is air-blocked in.</param>
+        /// <param name="invalidate">Whether to invalidate all adjacent tiles.</param>
+        /// <returns>All adjacent tile gas mixtures to the tile in question</returns>
+        private IEnumerable<GasMixture> GetAdjacentTileMixtures(GridAtmosphereComponent gridAtmosphere, TileAtmosphere tile, bool includeBlocked = false, bool invalidate = false)
+        {
+            for (var i = 0; i < tile.AdjacentTiles.Length; i++)
+            {
+                var adjacentTile = tile.AdjacentTiles[i];
+
+                // TileAtmosphere has nullable disabled, so just in case...
+                // ReSharper disable once ConditionIsAlwaysTrueOrFalse
+                if (adjacentTile?.Air == null)
+                    continue;
+
+                if (!includeBlocked)
+                {
+                    var direction = (AtmosDirection) (1 << i);
+                    if (tile.BlockedAirflow.IsFlagSet(direction))
+                        continue;
+                }
+
+                if (invalidate)
+                    InvalidateTile(gridAtmosphere, adjacentTile.GridIndices);
+
+                yield return adjacentTile.Air;
+            }
+        }
+
+        #endregion
+
+        #region Adjacent Update
+
+        /// <summary>
+        ///     Immediately updates a tile's blocked air directions.
+        /// </summary>
+        /// <param name="coordinates">Coordinates where to get the tile.</param>
+        public void UpdateAdjacent(EntityCoordinates coordinates)
+        {
+            if(TryGetGridAndTile(coordinates, out var tuple))
+                UpdateAdjacent(tuple.Value.Grid, tuple.Value.Tile);
+        }
+
+        /// <summary>
+        ///     Immediately updates a tile's blocked air directions.
+        /// </summary>
+        /// <param name="grid">Grid where to get the tile.</param>
+        /// <param name="tile">Indices of the tile.</param>
+        public void UpdateAdjacent(GridId grid, Vector2i tile)
+        {
+            if (!_mapManager.TryGetGrid(grid, out var mapGrid))
+                return;
+
+            if (ComponentManager.TryGetComponent(mapGrid.GridEntityId, out GridAtmosphereComponent? gridAtmosphere))
+            {
+                UpdateAdjacent(mapGrid, gridAtmosphere, tile);
+                return;
+            }
+        }
+
+        /// <summary>
+        ///     Immediately updates a tile's blocked air directions.
+        /// </summary>
+        /// <param name="mapGrid">Grid where to get the tile.</param>
+        /// <param name="gridAtmosphere">Grid Atmosphere where to get the tile.</param>
+        /// <param name="tile">Indices of the tile.</param>
+        public void UpdateAdjacent(IMapGrid mapGrid, GridAtmosphereComponent gridAtmosphere, Vector2i tile)
+        {
+            if (!gridAtmosphere.Tiles.TryGetValue(tile, out var tileAtmosphere))
+                return;
+
+            UpdateAdjacent(mapGrid, gridAtmosphere, tileAtmosphere);
+        }
+
+        /// <summary>
+        ///     Immediately updates a tile's blocked air directions.
+        /// </summary>
+        /// <param name="mapGrid">Grid where to get the tile.</param>
+        /// <param name="gridAtmosphere">Grid Atmosphere of the tile.</param>
+        /// <param name="tileAtmosphere">Tile Atmosphere to be updated.</param>
+        private void UpdateAdjacent(IMapGrid mapGrid, GridAtmosphereComponent gridAtmosphere, TileAtmosphere tileAtmosphere)
+        {
+            tileAtmosphere.AdjacentBits = AtmosDirection.Invalid;
+
+            for (var i = 0; i < Atmospherics.Directions; i++)
+            {
+                var direction = (AtmosDirection) (1 << i);
+
+                var otherIndices = tileAtmosphere.GridIndices.Offset(direction.ToDirection());
+
+                var adjacent = GetTileAtmosphereOrCreateSpace(mapGrid, gridAtmosphere, otherIndices);
+                tileAtmosphere.AdjacentTiles[direction.ToIndex()] = adjacent;
+
+                UpdateAdjacent(mapGrid, gridAtmosphere, adjacent, direction.GetOpposite());
+
+                if (!tileAtmosphere.BlockedAirflow.IsFlagSet(direction)
+                    && !IsTileAirBlocked(mapGrid, adjacent.GridIndices, direction.GetOpposite()))
+                {
+                    tileAtmosphere.AdjacentBits |= direction;
+                }
+            }
+        }
+
+        /// <summary>
+        ///     Immediately updates a tile's single blocked air direction.
+        /// </summary>
+        /// <param name="coordinates">Coordinates where to get the tile.</param>
+        /// <param name="direction">Direction to be updated.</param>
+        public void UpdateAdjacent(EntityCoordinates coordinates, AtmosDirection direction)
+        {
+            if(TryGetGridAndTile(coordinates, out var tuple))
+                UpdateAdjacent(tuple.Value.Grid, tuple.Value.Tile, direction);
+        }
+
+        /// <summary>
+        ///     Immediately updates a tile's single blocked air direction.
+        /// </summary>
+        /// <param name="grid">Grid where to get the tile.</param>
+        /// <param name="tile">Indices of the tile.</param>
+        /// <param name="direction">Direction to be updated.</param>
+        public void UpdateAdjacent(GridId grid, Vector2i tile, AtmosDirection direction)
+        {
+            if (!_mapManager.TryGetGrid(grid, out var mapGrid))
+                return;
+
+            if (ComponentManager.TryGetComponent(mapGrid.GridEntityId, out GridAtmosphereComponent? gridAtmosphere))
+            {
+                UpdateAdjacent(mapGrid, gridAtmosphere, tile, direction);
+                return;
+            }
+        }
+
+        /// <summary>
+        ///     Immediately updates a tile's single blocked air direction.
+        /// </summary>
+        /// <param name="mapGrid">Grid where to get the tile.</param>
+        /// <param name="gridAtmosphere">Grid Atmosphere where to get the tile.</param>
+        /// <param name="tile">Indices of the tile.</param>
+        /// <param name="direction">Direction to be updated.</param>
+        public void UpdateAdjacent(IMapGrid mapGrid, GridAtmosphereComponent gridAtmosphere, Vector2i tile, AtmosDirection direction)
+        {
+            if (!gridAtmosphere.Tiles.TryGetValue(tile, out var tileAtmosphere))
+                return;
+
+            UpdateAdjacent(mapGrid, gridAtmosphere, tileAtmosphere, direction);
+        }
+
+        /// <summary>
+        ///     Immediately updates a tile's single blocked air direction.
+        /// </summary>
+        /// <param name="mapGrid">Grid where to get the tile.</param>
+        /// <param name="gridAtmosphere">Grid where to get the tile.</param>
+        /// <param name="tile">Tile Atmosphere to be updated.</param>
+        /// <param name="direction">Direction to be updated.</param>
+        private void UpdateAdjacent(IMapGrid mapGrid, GridAtmosphereComponent gridAtmosphere, TileAtmosphere tile, AtmosDirection direction)
+        {
+            tile.AdjacentTiles[direction.ToIndex()] = GetTileAtmosphereOrCreateSpace(mapGrid, gridAtmosphere, tile.GridIndices.Offset(direction.ToDirection()));
+
+            if (!tile.BlockedAirflow.IsFlagSet(direction) && !IsTileAirBlocked(mapGrid, tile.GridIndices.Offset(direction.ToDirection()), direction.GetOpposite()))
+            {
+                tile.AdjacentBits |= direction;
+            }
+            else
+            {
+                tile.AdjacentBits &= ~direction;
+            }
+        }
+
+        #endregion
+
+        #region Hotspot Expose
+
+        /// <summary>
+        ///     Exposes temperature to a tile, creating a hotspot (fire) if the conditions are ideal.
+        ///     Can also be used to make an existing hotspot hotter/bigger. Also invalidates the tile.
+        /// </summary>
+        /// <param name="coordinates">Coordinates where to get the tile.</param>
+        /// <param name="exposedTemperature">Temperature to expose to the tile.</param>
+        /// <param name="exposedVolume">Volume of the exposed temperature.</param>
+        /// <param name="soh">If true, the existing hotspot values will be set to the exposed values, but only if they're smaller.</param>
+        public void HotspotExpose(EntityCoordinates coordinates, float exposedTemperature, float exposedVolume, bool soh = false)
+        {
+            if(TryGetGridAndTile(coordinates, out var tuple))
+                HotspotExpose(tuple.Value.Grid, tuple.Value.Tile, exposedTemperature, exposedVolume, soh);
+        }
+
+        /// <summary>
+        ///     Exposes temperature to a tile, creating a hotspot (fire) if the conditions are ideal.
+        ///     Can also be used to make an existing hotspot hotter/bigger. Also invalidates the tile.
+        /// </summary>
+        /// <param name="grid">Grid where to get the tile.</param>
+        /// <param name="tile">Indices of the tile.</param>
+        /// <param name="exposedTemperature">Temperature to expose to the tile.</param>
+        /// <param name="exposedVolume">Volume of the exposed temperature.</param>
+        /// <param name="soh">If true, the existing hotspot values will be set to the exposed values, but only if they're smaller.</param>
+        public void HotspotExpose(GridId grid, Vector2i tile, float exposedTemperature, float exposedVolume, bool soh = false)
+        {
+            if (!_mapManager.TryGetGrid(grid, out var mapGrid))
+                return;
+
+            if (ComponentManager.TryGetComponent(mapGrid.GridEntityId, out GridAtmosphereComponent? gridAtmosphere))
+            {
+                var tileAtmosphere = GetTileAtmosphere(gridAtmosphere, tile);
+
+                if (tileAtmosphere == null)
+                    return;
+
+                HotspotExpose(gridAtmosphere, tileAtmosphere, exposedTemperature, exposedVolume, soh);
+                InvalidateTile(gridAtmosphere, tile);
+                return;
+            }
+        }
+
+        #endregion
+
+        #region Hotspot Extinguish
+
+        /// <summary>
+        ///     Extinguishes a hotspot (fire) on a certain tile, if any. Also invalidates the tile.
+        /// </summary>
+        /// <param name="coordinates">Coordinates where to get the tile.</param>
+        public void HotspotExtinguish(EntityCoordinates coordinates)
+        {
+            if(TryGetGridAndTile(coordinates, out var tuple))
+                HotspotExtinguish(tuple.Value.Grid, tuple.Value.Tile);
+        }
+
+        /// <summary>
+        ///     Extinguishes a hotspot (fire) on a certain tile, if any. Also invalidates the tile.
+        /// </summary>
+        /// <param name="grid">Grid where to get the tile.</param>
+        /// <param name="tile">Indices of the tile.</param>
+        public void HotspotExtinguish(GridId grid, Vector2i tile)
+        {
+            if (!_mapManager.TryGetGrid(grid, out var mapGrid))
+                return;
+
+            if (ComponentManager.TryGetComponent(mapGrid.GridEntityId, out GridAtmosphereComponent? gridAtmosphere))
+            {
+                HotspotExtinguish(gridAtmosphere, tile);
+                return;
+            }
+        }
+
+        /// <summary>
+        ///     Extinguishes a hotspot (fire) on a certain tile, if any. Also invalidates the tile.
+        /// </summary>
+        /// <param name="gridAtmosphere">Grid Atmosphere where to get the tile.</param>
+        /// <param name="tile">Indices of the tile.</param>
+        public void HotspotExtinguish(GridAtmosphereComponent gridAtmosphere, Vector2i tile)
+        {
+            if (!gridAtmosphere.Tiles.TryGetValue(tile, out var tileAtmosphere))
+                return;
+
+            tileAtmosphere.Hotspot = new Hotspot();
+            InvalidateTile(gridAtmosphere, tile);
+        }
+
+        #endregion
+
+        #region Hotspot Active
+
+        /// <summary>
+        ///     Returns whether there's an active hotspot (fire) on a certain tile.
+        /// </summary>
+        /// <param name="coordinates">Position where to get the tile.</param>
+        /// <returns>Whether the hotspot is active or not.</returns>
+        public bool IsHotspotActive(EntityCoordinates coordinates)
+        {
+            if (TryGetGridAndTile(coordinates, out var tuple))
+                return IsHotspotActive(tuple.Value.Grid, tuple.Value.Tile);
+
+            return false;
+        }
+
+        /// <summary>
+        ///     Returns whether there's an active hotspot (fire) on a certain tile.
+        /// </summary>
+        /// <param name="grid">Grid where to get the tile</param>
+        /// <param name="tile">Indices for the tile</param>
+        /// <returns>Whether the hotspot is active or not.</returns>
+        public bool IsHotspotActive(GridId grid, Vector2i tile)
+        {
+            if (!_mapManager.TryGetGrid(grid, out var mapGrid))
+                return false;
+
+            if (ComponentManager.TryGetComponent(mapGrid.GridEntityId, out GridAtmosphereComponent? gridAtmosphere))
+            {
+                return IsHotspotActive(gridAtmosphere, tile);
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        ///     Returns whether there's an active hotspot (fire) on a certain tile.
+        /// </summary>
+        /// <param name="gridAtmosphere">Grid Atmosphere where to get the tile</param>
+        /// <param name="tile">Indices for the tile</param>
+        /// <returns>Whether the hotspot is active or not.</returns>
+        public bool IsHotspotActive(GridAtmosphereComponent gridAtmosphere, Vector2i tile)
+        {
+            if (!gridAtmosphere.Tiles.TryGetValue(tile, out var tileAtmosphere))
+                return false;
+
+            return tileAtmosphere.Hotspot.Valid;
+        }
+
+        #endregion
+
+        #region PipeNet Add
+
+        public void AddPipeNet(PipeNet pipeNet)
+        {
+            if (!_mapManager.TryGetGrid(pipeNet.Grid, out var mapGrid))
+                return;
+
+            if (ComponentManager.TryGetComponent(mapGrid.GridEntityId, out GridAtmosphereComponent? gridAtmosphere))
+            {
+                gridAtmosphere.PipeNets.Add(pipeNet);
+            }
+        }
+
+        #endregion
+
+        #region PipeNet Remove
+
+        public void RemovePipeNet(PipeNet pipeNet)
+        {
+            if (!_mapManager.TryGetGrid(pipeNet.Grid, out var mapGrid))
+                return;
+
+            if (ComponentManager.TryGetComponent(mapGrid.GridEntityId, out GridAtmosphereComponent? gridAtmosphere))
+            {
+                gridAtmosphere.PipeNets.Remove(pipeNet);
+            }
+        }
+
+        #endregion
+
+        #region AtmosDevice Add
+
+        public bool AddAtmosDevice(AtmosDeviceComponent atmosDevice)
+        {
+            var grid = atmosDevice.Owner.Transform.GridID;
+
+            if (!_mapManager.TryGetGrid(grid, out var mapGrid))
+                return false;
+
+            if (ComponentManager.TryGetComponent(mapGrid.GridEntityId, out GridAtmosphereComponent? gridAtmosphere))
+            {
+                atmosDevice.JoinedGrid = grid;
+                gridAtmosphere.AtmosDevices.Add(atmosDevice);
+                return true;
+            }
+
+            return false;
+        }
+
+        #endregion
+
+        #region AtmosDevice Remove
+
+        public bool RemoveAtmosDevice(AtmosDeviceComponent atmosDevice)
+        {
+            if (atmosDevice.JoinedGrid == null)
+                return false;
+
+            var grid = atmosDevice.JoinedGrid.Value;
+
+            if (!_mapManager.TryGetGrid(grid, out var mapGrid))
+                return false;
+
+            if (ComponentManager.TryGetComponent(mapGrid.GridEntityId, out GridAtmosphereComponent? gridAtmosphere)
+            && gridAtmosphere.AtmosDevices.Contains(atmosDevice))
+            {
+                atmosDevice.JoinedGrid = null;
+                gridAtmosphere.AtmosDevices.Remove(atmosDevice);
+                return true;
+            }
+
+            return false;
+        }
+
+        #endregion
+
+        #region Mixture Safety
+
+        /// <summary>
+        ///     Checks whether a tile's gas mixture is probably safe.
+        ///     This only checks temperature and pressure, not gas composition.
+        /// </summary>
+        /// <param name="coordinates">Coordinates where to get the tile.</param>
+        /// <returns>Whether the tile's gas mixture is probably safe.</returns>
+        public bool IsTileMixtureProbablySafe(EntityCoordinates coordinates)
+        {
+            return IsMixtureProbablySafe(GetTileMixture(coordinates));
+        }
+
+        /// <summary>
+        ///     Checks whether a tile's gas mixture is probably safe.
+        ///     This only checks temperature and pressure, not gas composition.
+        /// </summary>
+        /// <param name="grid">Grid where to get the tile.</param>
+        /// <param name="tile">Indices of the tile.</param>
+        /// <returns>Whether the tile's gas mixture is probably safe.</returns>
+        public bool IsTileMixtureProbablySafe(GridId grid, Vector2i tile)
+        {
+            return IsMixtureProbablySafe(GetTileMixture(grid, tile));
+        }
+
+        /// <summary>
+        ///     Checks whether a gas mixture is probably safe.
+        ///     This only checks temperature and pressure, not gas composition.
+        /// </summary>
+        /// <param name="air">Mixture to be checked.</param>
+        /// <returns>Whether the mixture is probably safe.</returns>
+        public bool IsMixtureProbablySafe(GasMixture? air)
+        {
+            // Note that oxygen mix isn't checked, but survival boxes make that not necessary.
+            if (air == null)
+                return false;
+
+            switch (air.Pressure)
+            {
+                case <= Atmospherics.WarningLowPressure:
+                case >= Atmospherics.WarningHighPressure:
+                    return false;
+            }
+
+            switch (air.Temperature)
+            {
+                case <= 260:
+                case >= 360:
+                    return false;
+            }
+
+            return true;
+        }
+
+        #endregion
+
+        #region Fix Vacuum
+
+        /// <summary>
+        ///     Attempts to fix a sudden vacuum by creating gas based on adjacent tiles.
+        /// </summary>
+        /// <param name="coordinates">Coordinates where to get the tile.</param>
+        public void FixVacuum(EntityCoordinates coordinates)
+        {
+            if(TryGetGridAndTile(coordinates, out var tuple))
+                FixVacuum(tuple.Value.Grid, tuple.Value.Tile);
+        }
+
+        /// <summary>
+        ///     Attempts to fix a sudden vacuum by creating gas based on adjacent tiles.
+        /// </summary>
+        /// <param name="grid">Grid where to get the tile.</param>
+        /// <param name="tile">Indices of the tile.</param>
+        public void FixVacuum(GridId grid, Vector2i tile)
+        {
+            if (!_mapManager.TryGetGrid(grid, out var mapGrid))
+                return;
+
+            if (ComponentManager.TryGetComponent(mapGrid.GridEntityId, out GridAtmosphereComponent? gridAtmosphere))
+            {
+                FixVacuum(gridAtmosphere, tile);
+                return;
+            }
+        }
+
+        public void FixVacuum(GridAtmosphereComponent gridAtmosphere, Vector2i tile)
+        {
+            if (!gridAtmosphere.Tiles.TryGetValue(tile, out var tileAtmosphere))
+                return;
+
+            var adjacent = GetAdjacentTileMixtures(gridAtmosphere, tileAtmosphere, false, true).ToArray();
+            tileAtmosphere.Air = new GasMixture(GetVolumeForTiles(tileAtmosphere.GridIndex, 1))
+                {Temperature = Atmospherics.T20C};
+
+            // Return early, let's not cause any funny NaNs.
+            if (adjacent.Length == 0)
+                return;
+
+            var ratio = 1f / adjacent.Length;
+            var totalTemperature = 0f;
+
+            foreach (var adj in adjacent)
+            {
+                totalTemperature += adj.Temperature;
+
+                // Remove a bit of gas from the adjacent ratio...
+                var mix = adj.RemoveRatio(ratio);
+
+                // And merge it to the new tile air.
+                Merge(tileAtmosphere.Air, mix);
+
+                // Return removed gas to its original mixture.
+                Merge(adj, mix);
+            }
+
+            // New temperature is the arithmetic mean of the sum of the adjacent temperatures...
+            tileAtmosphere.Air.Temperature = totalTemperature / adjacent.Length;
+        }
+
+        public bool NeedsVacuumFixing(IMapGrid mapGrid, Vector2i indices)
+        {
+            var value = false;
+
+            foreach (var airtightComponent in GetObstructingComponents(mapGrid, indices))
+            {
+                value |= airtightComponent.FixVacuum;
+            }
+
+            return value;
+        }
+
+        #endregion
+
+        #region Position Helpers
+
+        public bool TryGetGridAndTile(MapCoordinates coordinates, [NotNullWhen(true)] out (GridId Grid, Vector2i Tile)? tuple)
+        {
+            if (!_mapManager.TryFindGridAt(coordinates, out var grid))
+            {
+                tuple = null;
+                return false;
+            }
+
+            tuple = (grid.Index, grid.TileIndicesFor(coordinates));
+            return true;
+        }
+
+        public bool TryGetGridAndTile(EntityCoordinates coordinates, [NotNullWhen(true)] out (GridId Grid, Vector2i Tile)? tuple)
+        {
+            if (!coordinates.IsValid(EntityManager))
+            {
+                tuple = null;
+                return false;
+            }
+
+            var gridId = coordinates.GetGridId(EntityManager);
+
+            if (!_mapManager.TryGetGrid(gridId, out var grid))
+            {
+                tuple = null;
+                return false;
+            }
+
+            tuple = (gridId, grid.TileIndicesFor(coordinates));
+            return true;
+        }
+
+        public bool TryGetMapGrid(GridAtmosphereComponent gridAtmosphere, [NotNullWhen(true)] out IMapGrid? mapGrid)
+        {
+            if (gridAtmosphere.Owner.TryGetComponent(out IMapGridComponent? mapGridComponent))
+            {
+                mapGrid = mapGridComponent.Grid;
+                return true;
+            }
+
+            mapGrid = null;
+            return false;
+        }
+
+        #endregion
+    }
+}
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs
new file mode 100644
index 0000000000..badd27b9cc
--- /dev/null
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs
@@ -0,0 +1,69 @@
+using Content.Server.Atmos.Components;
+using Content.Shared.Atmos;
+using Content.Shared.Audio;
+using Robust.Server.GameObjects;
+using Robust.Shared.Audio;
+using Robust.Shared.Containers;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Map;
+using Robust.Shared.Maths;
+using Robust.Shared.Physics;
+using Robust.Shared.Player;
+
+namespace Content.Server.Atmos.EntitySystems
+{
+    public partial class AtmosphereSystem
+    {
+        private int _spaceWindSoundCooldown = 0;
+
+        private void HighPressureMovements(GridAtmosphereComponent gridAtmosphere, TileAtmosphere tile)
+        {
+            // TODO ATMOS finish this
+
+            if(tile.PressureDifference > 15)
+            {
+                if(_spaceWindSoundCooldown == 0)
+                {
+                    var coordinates = tile.GridIndices.ToEntityCoordinates(tile.GridIndex, _mapManager);
+                    if(!string.IsNullOrEmpty(SpaceWindSound))
+                        SoundSystem.Play(Filter.Pvs(coordinates), SpaceWindSound, coordinates,
+                            AudioHelpers.WithVariation(0.125f).WithVolume(MathHelper.Clamp(tile.PressureDifference / 10, 10, 100)));
+                }
+            }
+
+            foreach (var entity in Get<GridTileLookupSystem>().GetEntitiesIntersecting(tile.GridIndex, tile.GridIndices))
+            {
+                if (!entity.TryGetComponent(out IPhysBody? physics)
+                    || !entity.IsMovedByPressure(out var pressure)
+                    || entity.IsInContainer())
+                    continue;
+
+                var pressureMovements = physics.Owner.EnsureComponent<MovedByPressureComponent>();
+                if (pressure.LastHighPressureMovementAirCycle < gridAtmosphere.UpdateCounter)
+                {
+                    pressureMovements.ExperiencePressureDifference(gridAtmosphere.UpdateCounter, tile.PressureDifference, tile.PressureDirection, 0, tile.PressureSpecificTarget?.GridIndices.ToEntityCoordinates(tile.GridIndex, _mapManager) ?? EntityCoordinates.Invalid);
+                }
+
+            }
+
+            if (tile.PressureDifference > 100)
+            {
+                // TODO ATMOS Do space wind graphics here!
+            }
+
+            _spaceWindSoundCooldown++;
+            if (_spaceWindSoundCooldown > 75)
+                _spaceWindSoundCooldown = 0;
+        }
+
+        private void ConsiderPressureDifference(GridAtmosphereComponent gridAtmosphere, TileAtmosphere tile, TileAtmosphere other, float difference)
+        {
+            gridAtmosphere.HighPressureDelta.Add(tile);
+            if (difference > tile.PressureDifference)
+            {
+                tile.PressureDifference = difference;
+                tile.PressureDirection = ((Vector2i)(tile.GridIndices - other.GridIndices)).GetDir().ToAtmosDirection();
+            }
+        }
+    }
+}
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Hotspot.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Hotspot.cs
new file mode 100644
index 0000000000..1fbb4f0c7d
--- /dev/null
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Hotspot.cs
@@ -0,0 +1,153 @@
+#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
+{
+    public partial class AtmosphereSystem
+    {
+        private void ProcessHotspot(GridAtmosphereComponent gridAtmosphere, TileAtmosphere tile)
+        {
+            if (!tile.Hotspot.Valid)
+            {
+                gridAtmosphere.HotspotTiles.Remove(tile);
+                return;
+            }
+
+            if (!tile.Excited)
+            {
+                AddActiveTile(gridAtmosphere, tile);
+            }
+
+            if (!tile.Hotspot.SkippedFirstProcess)
+            {
+                tile.Hotspot.SkippedFirstProcess = true;
+                return;
+            }
+
+            if(tile.ExcitedGroup != null)
+                ExcitedGroupResetCooldowns(tile.ExcitedGroup);
+
+            if ((tile.Hotspot.Temperature < Atmospherics.FireMinimumTemperatureToExist) || (tile.Hotspot.Volume <= 1f)
+                || tile.Air == null || tile.Air.GetMoles(Gas.Oxygen) < 0.5f || (tile.Air.GetMoles(Gas.Plasma) < 0.5f && tile.Air.GetMoles(Gas.Tritium) < 0.5f))
+            {
+                tile.Hotspot = new Hotspot();
+                InvalidateVisuals(tile.GridIndex, tile.GridIndices);
+                return;
+            }
+
+            PerformHotspotExposure(tile);
+
+            if (tile.Hotspot.Bypassing)
+            {
+                tile.Hotspot.State = 3;
+                // TODO ATMOS: Burn tile here
+
+                if (tile.Air.Temperature > Atmospherics.FireMinimumTemperatureToSpread)
+                {
+                    var radiatedTemperature = tile.Air.Temperature * Atmospherics.FireSpreadRadiosityScale;
+                    foreach (var otherTile in tile.AdjacentTiles)
+                    {
+                        // TODO ATMOS: This is sus. Suss this out.
+                        if (otherTile == null)
+                            continue;
+
+                        if(!otherTile.Hotspot.Valid)
+                            HotspotExpose(gridAtmosphere, otherTile, radiatedTemperature, Atmospherics.CellVolume/4);
+                    }
+                }
+            }
+            else
+            {
+                tile.Hotspot.State = (byte) (tile.Hotspot.Volume > Atmospherics.CellVolume * 0.4f ? 2 : 1);
+            }
+
+            if (tile.Hotspot.Temperature > tile.MaxFireTemperatureSustained)
+                tile.MaxFireTemperatureSustained = tile.Hotspot.Temperature;
+
+            // TODO ATMOS Maybe destroy location here?
+        }
+
+        private void HotspotExpose(GridAtmosphereComponent gridAtmosphere, TileAtmosphere tile, float exposedTemperature, float exposedVolume, bool soh = false)
+        {
+            if (tile.Air == null)
+                return;
+
+            var oxygen = tile.Air.GetMoles(Gas.Oxygen);
+
+            if (oxygen < 0.5f)
+                return;
+
+            var plasma = tile.Air.GetMoles(Gas.Plasma);
+            var tritium = tile.Air.GetMoles(Gas.Tritium);
+
+            if (tile.Hotspot.Valid)
+            {
+                if (soh)
+                {
+                    if (plasma > 0.5f || tritium > 0.5f)
+                    {
+                        if (tile.Hotspot.Temperature < exposedTemperature)
+                            tile.Hotspot.Temperature = exposedTemperature;
+                        if (tile.Hotspot.Volume < exposedVolume)
+                            tile.Hotspot.Volume = exposedVolume;
+                    }
+                }
+
+                return;
+            }
+
+            if ((exposedTemperature > Atmospherics.PlasmaMinimumBurnTemperature) && (plasma > 0.5f || tritium > 0.5f))
+            {
+                tile.Hotspot = new Hotspot
+                {
+                    Volume = exposedVolume * 25f,
+                    Temperature = exposedTemperature,
+                    SkippedFirstProcess = tile.CurrentCycle > gridAtmosphere.UpdateCounter
+                };
+
+                tile.Hotspot.Start();
+
+                AddActiveTile(gridAtmosphere, tile);
+                gridAtmosphere.HotspotTiles.Add(tile);
+            }
+        }
+
+        private void PerformHotspotExposure(TileAtmosphere tile)
+        {
+            if (tile.Air == null || !tile.Hotspot.Valid) return;
+
+            tile.Hotspot.Bypassing = tile.Hotspot.SkippedFirstProcess && tile.Hotspot.Volume > tile.Air.Volume*0.95f;
+
+            if (tile.Hotspot.Bypassing)
+            {
+                tile.Hotspot.Volume = tile.Air.ReactionResults[GasReaction.Fire] * Atmospherics.FireGrowthRate;
+                tile.Hotspot.Temperature = tile.Air.Temperature;
+            }
+            else
+            {
+                var affected = tile.Air.RemoveRatio(tile.Hotspot.Volume / tile.Air.Volume);
+                affected.Temperature = tile.Hotspot.Temperature;
+                React(affected, tile);
+                tile.Hotspot.Temperature = affected.Temperature;
+                tile.Hotspot.Volume = affected.ReactionResults[GasReaction.Fire] * Atmospherics.FireGrowthRate;
+                Merge(tile.Air, affected);
+            }
+
+            var tileRef = tile.GridIndices.GetTileRef(tile.GridIndex);
+
+            foreach (var entity in tileRef.GetEntitiesInTileFast())
+            {
+                foreach (var fireAct in entity.GetAllComponents<IFireAct>())
+                {
+                    fireAct.FireAct(tile.Hotspot.Temperature, tile.Hotspot.Volume);
+                }
+            }
+        }
+    }
+}
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.LINDA.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.LINDA.cs
new file mode 100644
index 0000000000..93b73458b1
--- /dev/null
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.LINDA.cs
@@ -0,0 +1,136 @@
+#nullable disable warnings
+#nullable enable annotations
+using Content.Server.Atmos.Components;
+using Content.Shared.Atmos;
+
+namespace Content.Server.Atmos.EntitySystems
+{
+    public partial class AtmosphereSystem
+    {
+        private void ProcessCell(GridAtmosphereComponent gridAtmosphere, TileAtmosphere tile, int fireCount)
+        {
+            // Can't process a tile without air
+            if (tile.Air == null)
+            {
+                RemoveActiveTile(gridAtmosphere, tile);
+                return;
+            }
+
+            if (tile.ArchivedCycle < fireCount)
+                Archive(tile, fireCount);
+
+            tile.CurrentCycle = fireCount;
+            var adjacentTileLength = 0;
+
+            for (var i = 0; i < Atmospherics.Directions; i++)
+            {
+                var direction = (AtmosDirection) (1 << i);
+                if(tile.AdjacentBits.IsFlagSet(direction))
+                    adjacentTileLength++;
+            }
+
+            for(var i = 0; i < Atmospherics.Directions; i++)
+            {
+                var direction = (AtmosDirection) (1 << i);
+                if (!tile.AdjacentBits.IsFlagSet(direction)) continue;
+                var enemyTile = tile.AdjacentTiles[i];
+
+                // 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 (tile.ExcitedGroup != enemyTile.ExcitedGroup)
+                    {
+                        ExcitedGroupMerge(gridAtmosphere, tile.ExcitedGroup, enemyTile.ExcitedGroup);
+                    }
+
+                    shouldShareAir = true;
+                } else if (tile.Air!.Compare(enemyTile.Air!) != GasMixture.GasCompareResult.NoExchange)
+                {
+                    if (!enemyTile.Excited)
+                    {
+                        AddActiveTile(gridAtmosphere, enemyTile);
+                    }
+
+                    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);
+
+                    shouldShareAir = true;
+                }
+
+                if (shouldShareAir)
+                {
+                    var difference = Share(tile.Air!, enemyTile.Air!, adjacentTileLength);
+
+                    if (SpaceWind)
+                    {
+                        if (difference > 0)
+                        {
+                            ConsiderPressureDifference(gridAtmosphere, tile, enemyTile, difference);
+                        }
+                        else
+                        {
+                            ConsiderPressureDifference(gridAtmosphere, enemyTile, tile, -difference);
+                        }
+                    }
+
+                    LastShareCheck(tile);
+                }
+            }
+
+            if(tile.Air != null)
+                React(tile.Air, tile);
+
+            InvalidateVisuals(tile.GridIndex, tile.GridIndices);
+
+            var remove = true;
+
+            if(tile.Air!.Temperature > Atmospherics.MinimumTemperatureStartSuperConduction)
+                if (ConsiderSuperconductivity(gridAtmosphere, tile, true))
+                    remove = false;
+
+            if(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)
+                return;
+
+            switch (tile.Air.LastShare)
+            {
+                case > Atmospherics.MinimumAirToSuspend:
+                    ExcitedGroupResetCooldowns(tile.ExcitedGroup);
+                    break;
+                case > Atmospherics.MinimumMolesDeltaToMove:
+                    tile.ExcitedGroup.DismantleCooldown = 0;
+                    break;
+            }
+        }
+    }
+}
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Monstermos.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Monstermos.cs
new file mode 100644
index 0000000000..30b4df6473
--- /dev/null
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Monstermos.cs
@@ -0,0 +1,593 @@
+#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.Shared.Atmos;
+using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
+using Robust.Shared.Map;
+using Robust.Shared.Maths;
+using Robust.Shared.Random;
+
+namespace Content.Server.Atmos.EntitySystems
+{
+    public partial class AtmosphereSystem
+    {
+        [Dependency] private readonly IRobustRandom _robustRandom = default!;
+
+        private readonly TileAtmosphereComparer _monstermosComparer = new();
+
+        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];
+        private readonly TileAtmosphere[] _depressurizeTiles = new TileAtmosphere[Atmospherics.MonstermosHardTileLimit];
+        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)
+        {
+            if (tile.Air == null || (tile.MonstermosInfo.LastCycle >= cycleNum))
+                return; // Already done.
+
+            tile.MonstermosInfo = new MonstermosInfo();
+
+            var startingMoles = tile.Air.TotalMoles;
+            var runAtmos = false;
+
+            // We need to figure if this is necessary
+            for (var i = 0; i < Atmospherics.Directions; i++)
+            {
+                var direction = (AtmosDirection) (1 << i);
+                if (!tile.AdjacentBits.IsFlagSet(direction)) continue;
+                var other = tile.AdjacentTiles[i];
+                if (other?.Air == null) continue;
+                var comparisonMoles = other.Air.TotalMoles;
+                if (!(MathF.Abs(comparisonMoles - startingMoles) > Atmospherics.MinimumMolesDeltaToMove)) continue;
+                runAtmos = true;
+                break;
+            }
+
+            if (!runAtmos) // There's no need so we don't bother.
+            {
+                tile.MonstermosInfo.LastCycle = cycleNum;
+                return;
+            }
+
+            var queueCycle = ++gridAtmosphere.EqualizationQueueCycleControl;
+            var totalMoles = 0f;
+            _equalizeTiles[0] = tile;
+            tile.MonstermosInfo.LastQueueCycle = queueCycle;
+            var tileCount = 1;
+            for (var i = 0; i < tileCount; i++)
+            {
+                if (i > Atmospherics.MonstermosHardTileLimit) break;
+                var exploring = _equalizeTiles[i];
+
+                if (i < Atmospherics.MonstermosTileLimit)
+                {
+                    var tileMoles = exploring.Air.TotalMoles;
+                    exploring.MonstermosInfo.MoleDelta = tileMoles;
+                    totalMoles += tileMoles;
+                }
+
+                for (var j = 0; j < Atmospherics.Directions; j++)
+                {
+                    var direction = (AtmosDirection) (1 << j);
+                    if (!exploring.AdjacentBits.IsFlagSet(direction)) continue;
+                    var adj = exploring.AdjacentTiles[j];
+                    if (adj?.Air == null) continue;
+                    if(adj.MonstermosInfo.LastQueueCycle == queueCycle) continue;
+                    adj.MonstermosInfo = new MonstermosInfo {LastQueueCycle = queueCycle};
+
+                    if(tileCount < Atmospherics.MonstermosHardTileLimit)
+                        _equalizeTiles[tileCount++] = adj;
+
+                    if (adj.Air.Immutable)
+                    {
+                        // Looks like someone opened an airlock to space!
+
+                        ExplosivelyDepressurize(mapGrid, gridAtmosphere, tile, cycleNum);
+                        return;
+                    }
+                }
+            }
+
+            if (tileCount > Atmospherics.MonstermosTileLimit)
+            {
+                for (var i = Atmospherics.MonstermosTileLimit; i < tileCount; i++)
+                {
+                    //We unmark them. We shouldn't be pushing/pulling gases to/from them.
+                    var otherTile = _equalizeTiles[i];
+
+                    if (otherTile == null)
+                        continue;
+
+                    _equalizeTiles[i].MonstermosInfo.LastQueueCycle = 0;
+                }
+
+                tileCount = Atmospherics.MonstermosTileLimit;
+            }
+
+            var averageMoles = totalMoles / (tileCount);
+            var giverTilesLength = 0;
+            var takerTilesLength = 0;
+
+            for (var i = 0; i < tileCount; i++)
+            {
+                var otherTile = _equalizeTiles[i];
+                otherTile.MonstermosInfo.LastCycle = cycleNum;
+                otherTile.MonstermosInfo.MoleDelta -= averageMoles;
+                if (otherTile.MonstermosInfo.MoleDelta > 0)
+                {
+                    _equalizeGiverTiles[giverTilesLength++] = otherTile;
+                }
+                else
+                {
+                    _equalizeTakerTiles[takerTilesLength++] = otherTile;
+                }
+            }
+
+            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)
+            if (giverTilesLength > logN && takerTilesLength > logN)
+            {
+                // Even if it fails, it will speed up the next part.
+                Array.Sort(_equalizeTiles, 0, tileCount, _monstermosComparer);
+
+                for (var i = 0; i < tileCount; i++)
+                {
+                    var otherTile = _equalizeTiles[i];
+                    otherTile.MonstermosInfo.FastDone = true;
+                    if (!(otherTile.MonstermosInfo.MoleDelta > 0)) continue;
+                    var eligibleDirections = AtmosDirection.Invalid;
+                    var eligibleDirectionCount = 0;
+                    for (var j = 0; j < Atmospherics.Directions; j++)
+                    {
+                        var direction = (AtmosDirection) (1 << j);
+                        if (!otherTile.AdjacentBits.IsFlagSet(direction)) continue;
+                        var tile2 = otherTile.AdjacentTiles[j];
+
+                        // skip anything that isn't part of our current processing block.
+                        if (tile2.MonstermosInfo.FastDone || tile2.MonstermosInfo.LastQueueCycle != queueCycle)
+                            continue;
+
+                        eligibleDirections |= direction;
+                        eligibleDirectionCount++;
+                    }
+
+                    if (eligibleDirectionCount <= 0)
+                        continue; // Oof we've painted ourselves into a corner. Bad luck. Next part will handle this.
+
+                    var molesToMove = otherTile.MonstermosInfo.MoleDelta / eligibleDirectionCount;
+                    for (var j = 0; j < Atmospherics.Directions; j++)
+                    {
+                        var direction = (AtmosDirection) (1 << j);
+                        if (!eligibleDirections.IsFlagSet(direction)) continue;
+
+                        AdjustEqMovement(otherTile, direction, molesToMove);
+                        otherTile.MonstermosInfo.MoleDelta -= molesToMove;
+                        otherTile.AdjacentTiles[j].MonstermosInfo.MoleDelta += molesToMove;
+                    }
+                }
+
+                giverTilesLength = 0;
+                takerTilesLength = 0;
+
+                for (var i = 0; i < tileCount; i++)
+                {
+                    var otherTile = _equalizeTiles[i];
+                    if (otherTile.MonstermosInfo.MoleDelta > 0)
+                    {
+                        _equalizeGiverTiles[giverTilesLength++] = otherTile;
+                    }
+                    else
+                    {
+                        _equalizeTakerTiles[takerTilesLength++] = otherTile;
+                    }
+                }
+            }
+
+            // This is the part that can become O(n^2).
+            if (giverTilesLength < takerTilesLength)
+            {
+                // as an optimization, we choose one of two methods based on which list is smaller. We really want to avoid O(n^2) if we can.
+                for (var j = 0; j < giverTilesLength; j++)
+                {
+                    var giver = _equalizeGiverTiles[j];
+                    giver.MonstermosInfo.CurrentTransferDirection = AtmosDirection.Invalid;
+                    giver.MonstermosInfo.CurrentTransferAmount = 0;
+                    var queueCycleSlow = ++gridAtmosphere.EqualizationQueueCycleControl;
+                    var queueLength = 0;
+                    _equalizeQueue[queueLength++] = giver;
+                    giver.MonstermosInfo.LastSlowQueueCycle = queueCycleSlow;
+                    for (var i = 0; i < queueLength; i++)
+                    {
+                        if (giver.MonstermosInfo.MoleDelta <= 0)
+                            break; // We're done here now. Let's not do more work than needed.
+
+                        var otherTile = _equalizeQueue[i];
+                        for (var k = 0; k < Atmospherics.Directions; k++)
+                        {
+                            var direction = (AtmosDirection) (1 << k);
+                            if (!otherTile.AdjacentBits.IsFlagSet(direction)) continue;
+                            var otherTile2 = otherTile.AdjacentTiles[k];
+                            if (giver.MonstermosInfo.MoleDelta <= 0) break; // We're done here now. Let's not do more work than needed.
+                            if (otherTile2 == null || otherTile2.MonstermosInfo.LastQueueCycle != queueCycle) continue;
+                            if (otherTile2.MonstermosInfo.LastSlowQueueCycle == queueCycleSlow) continue;
+
+                            _equalizeQueue[queueLength++] = otherTile2;
+                            otherTile2.MonstermosInfo.LastSlowQueueCycle = queueCycleSlow;
+                            otherTile2.MonstermosInfo.CurrentTransferDirection = direction.GetOpposite();
+                            otherTile2.MonstermosInfo.CurrentTransferAmount = 0;
+                            if (otherTile2.MonstermosInfo.MoleDelta < 0)
+                            {
+                                // This tile needs gas. Let's give it to 'em.
+                                if (-otherTile2.MonstermosInfo.MoleDelta > giver.MonstermosInfo.MoleDelta)
+                                {
+                                    // We don't have enough gas!
+                                    otherTile2.MonstermosInfo.CurrentTransferAmount -= giver.MonstermosInfo.MoleDelta;
+                                    otherTile2.MonstermosInfo.MoleDelta += giver.MonstermosInfo.MoleDelta;
+                                    giver.MonstermosInfo.MoleDelta = 0;
+                                }
+                                else
+                                {
+                                    // We have enough gas.
+                                    otherTile2.MonstermosInfo.CurrentTransferAmount += otherTile2.MonstermosInfo.MoleDelta;
+                                    giver.MonstermosInfo.MoleDelta += otherTile2.MonstermosInfo.MoleDelta;
+                                    otherTile2.MonstermosInfo.MoleDelta = 0;
+                                }
+                            }
+                        }
+                    }
+
+                    // Putting this loop here helps make it O(n^2) over O(n^3)
+                    for (var i = queueLength - 1; i >= 0; i--)
+                    {
+                        var otherTile = _equalizeQueue[i];
+                        if (otherTile.MonstermosInfo.CurrentTransferAmount != 0 && otherTile.MonstermosInfo.CurrentTransferDirection != AtmosDirection.Invalid)
+                        {
+                            AdjustEqMovement(otherTile, otherTile.MonstermosInfo.CurrentTransferDirection, otherTile.MonstermosInfo.CurrentTransferAmount);
+                            otherTile.AdjacentTiles[otherTile.MonstermosInfo.CurrentTransferDirection.ToIndex()]
+                                .MonstermosInfo.CurrentTransferAmount += otherTile.MonstermosInfo.CurrentTransferAmount;
+                            otherTile.MonstermosInfo.CurrentTransferAmount = 0;
+                        }
+                    }
+                }
+            }
+            else
+            {
+                for (var j = 0; j < takerTilesLength; j++)
+                {
+                    var taker = _equalizeTakerTiles[j];
+                    taker.MonstermosInfo.CurrentTransferDirection = AtmosDirection.Invalid;
+                    taker.MonstermosInfo.CurrentTransferAmount = 0;
+                    var queueCycleSlow = ++gridAtmosphere.EqualizationQueueCycleControl;
+                    var queueLength = 0;
+                    _equalizeQueue[queueLength++] = taker;
+                    taker.MonstermosInfo.LastSlowQueueCycle = queueCycleSlow;
+                    for (var i = 0; i < queueLength; i++)
+                    {
+                        if (taker.MonstermosInfo.MoleDelta >= 0)
+                            break; // We're done here now. Let's not do more work than needed.
+
+                        var otherTile = _equalizeQueue[i];
+                        for (var k = 0; k < Atmospherics.Directions; k++)
+                        {
+                            var direction = (AtmosDirection) (1 << k);
+                            if (!otherTile.AdjacentBits.IsFlagSet(direction)) continue;
+                            var otherTile2 = otherTile.AdjacentTiles[k];
+
+                            if (taker.MonstermosInfo.MoleDelta >= 0) break; // We're done here now. Let's not do more work than needed.
+                            if (otherTile2 == null || otherTile2.MonstermosInfo.LastQueueCycle != queueCycle) continue;
+                            if (otherTile2.MonstermosInfo.LastSlowQueueCycle == queueCycleSlow) continue;
+                            _equalizeQueue[queueLength++] = otherTile2;
+                            otherTile2.MonstermosInfo.LastSlowQueueCycle = queueCycleSlow;
+                            otherTile2.MonstermosInfo.CurrentTransferDirection = direction.GetOpposite();
+                            otherTile2.MonstermosInfo.CurrentTransferAmount = 0;
+
+                            if (otherTile2.MonstermosInfo.MoleDelta > 0)
+                            {
+                                // This tile has gas we can suck, so let's
+                                if (otherTile2.MonstermosInfo.MoleDelta > -taker.MonstermosInfo.MoleDelta)
+                                {
+                                    // They have enough gas
+                                    otherTile2.MonstermosInfo.CurrentTransferAmount -= taker.MonstermosInfo.MoleDelta;
+                                    otherTile2.MonstermosInfo.MoleDelta += taker.MonstermosInfo.MoleDelta;
+                                    taker.MonstermosInfo.MoleDelta = 0;
+                                }
+                                else
+                                {
+                                    // They don't have enough gas!
+                                    otherTile2.MonstermosInfo.CurrentTransferAmount += otherTile2.MonstermosInfo.MoleDelta;
+                                    taker.MonstermosInfo.MoleDelta += otherTile2.MonstermosInfo.MoleDelta;
+                                    otherTile2.MonstermosInfo.MoleDelta = 0;
+                                }
+                            }
+                        }
+                    }
+
+                    for (var i = queueLength - 1; i >= 0; i--)
+                    {
+                        var otherTile = _equalizeQueue[i];
+                        if (otherTile.MonstermosInfo.CurrentTransferAmount == 0 || otherTile.MonstermosInfo.CurrentTransferDirection == AtmosDirection.Invalid)
+                            continue;
+
+                        AdjustEqMovement(otherTile, otherTile.MonstermosInfo.CurrentTransferDirection, otherTile.MonstermosInfo.CurrentTransferAmount);
+
+                        otherTile.AdjacentTiles[otherTile.MonstermosInfo.CurrentTransferDirection.ToIndex()]
+                            .MonstermosInfo.CurrentTransferAmount += otherTile.MonstermosInfo.CurrentTransferAmount;
+                        otherTile.MonstermosInfo.CurrentTransferAmount = 0;
+                    }
+                }
+            }
+
+            for (var i = 0; i < tileCount; i++)
+            {
+                var otherTile = _equalizeTiles[i];
+                FinalizeEq(gridAtmosphere, otherTile);
+            }
+
+            for (var i = 0; i < tileCount; 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;
+                    AddActiveTile(gridAtmosphere, otherTile2);
+                    break;
+                }
+            }
+
+            // We do cleanup.
+            Array.Clear(_equalizeTiles, 0, Atmospherics.MonstermosHardTileLimit);
+            Array.Clear(_equalizeGiverTiles, 0, Atmospherics.MonstermosTileLimit);
+            Array.Clear(_equalizeTakerTiles, 0, Atmospherics.MonstermosTileLimit);
+            Array.Clear(_equalizeQueue, 0, Atmospherics.MonstermosTileLimit);
+        }
+
+        public 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)
+                return;
+
+            const int limit = Atmospherics.MonstermosHardTileLimit;
+
+            var totalGasesRemoved = 0f;
+            var queueCycle = ++gridAtmosphere.EqualizationQueueCycleControl;
+
+            var tileCount = 0;
+            var spaceTileCount = 0;
+
+            _depressurizeTiles[tileCount++] = tile;
+
+            tile.MonstermosInfo = new MonstermosInfo {LastQueueCycle = queueCycle};
+
+            for (var i = 0; i < tileCount; i++)
+            {
+                var otherTile = _depressurizeTiles[i];
+                otherTile.MonstermosInfo.LastCycle = cycleNum;
+                otherTile.MonstermosInfo.CurrentTransferDirection = AtmosDirection.Invalid;
+                if (otherTile.Air.Immutable)
+                {
+                    _depressurizeSpaceTiles[spaceTileCount++] = otherTile;
+                    otherTile.PressureSpecificTarget = otherTile;
+                }
+                else
+                {
+                    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 == null) continue;
+                        if (otherTile2.MonstermosInfo.LastQueueCycle == queueCycle) continue;
+
+                        ConsiderFirelocks(gridAtmosphere, otherTile, otherTile2);
+
+                        // The firelocks might have closed on us.
+                        if (!otherTile.AdjacentBits.IsFlagSet(direction)) continue;
+                        otherTile2.MonstermosInfo = new MonstermosInfo {LastQueueCycle = queueCycle};
+                        _depressurizeTiles[tileCount++] = otherTile2;
+                    }
+                }
+
+                if (tileCount >= limit || spaceTileCount >= limit)
+                    break;
+            }
+
+            var queueCycleSlow = ++gridAtmosphere.EqualizationQueueCycleControl;
+            var progressionCount = 0;
+
+            for (var i = 0; i < spaceTileCount; i++)
+            {
+                var otherTile = _depressurizeSpaceTiles[i];
+                _depressurizeProgressionOrder[progressionCount++] = otherTile;
+                otherTile.MonstermosInfo.LastSlowQueueCycle = queueCycleSlow;
+                otherTile.MonstermosInfo.CurrentTransferDirection = AtmosDirection.Invalid;
+            }
+
+            for (var i = 0; i < progressionCount; i++)
+            {
+                var otherTile = _depressurizeProgressionOrder[i];
+                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;
+                    var tile2 = otherTile.AdjacentTiles[j];
+                    if (tile2?.MonstermosInfo.LastQueueCycle != queueCycle) continue;
+                    if (tile2.MonstermosInfo.LastSlowQueueCycle == queueCycleSlow) continue;
+                    if(tile2.Air?.Immutable ?? false) continue;
+                    tile2.MonstermosInfo.CurrentTransferDirection = direction.GetOpposite();
+                    tile2.MonstermosInfo.CurrentTransferAmount = 0;
+                    tile2.PressureSpecificTarget = otherTile.PressureSpecificTarget;
+                    tile2.MonstermosInfo.LastSlowQueueCycle = queueCycleSlow;
+                    _depressurizeProgressionOrder[progressionCount++] = tile2;
+                }
+            }
+
+            for (var i = progressionCount - 1; i >= 0; i--)
+            {
+                var otherTile = _depressurizeProgressionOrder[i];
+                if (otherTile.MonstermosInfo.CurrentTransferDirection == AtmosDirection.Invalid) continue;
+                gridAtmosphere.HighPressureDelta.Add(otherTile);
+                AddActiveTile(gridAtmosphere, otherTile);
+                var otherTile2 = otherTile.AdjacentTiles[otherTile.MonstermosInfo.CurrentTransferDirection.ToIndex()];
+                if (otherTile2?.Air == null) continue;
+                var sum = otherTile2.Air.TotalMoles;
+                totalGasesRemoved += sum;
+                otherTile.MonstermosInfo.CurrentTransferAmount += sum;
+                otherTile2.MonstermosInfo.CurrentTransferAmount += otherTile.MonstermosInfo.CurrentTransferAmount;
+                otherTile.PressureDifference = otherTile.MonstermosInfo.CurrentTransferAmount;
+                otherTile.PressureDirection = otherTile.MonstermosInfo.CurrentTransferDirection;
+
+                if (otherTile2.MonstermosInfo.CurrentTransferDirection == AtmosDirection.Invalid)
+                {
+                    otherTile2.PressureDifference = otherTile2.MonstermosInfo.CurrentTransferAmount;
+                    otherTile2.PressureDirection = otherTile.MonstermosInfo.CurrentTransferDirection;
+                }
+
+                otherTile.Air?.Clear();
+                InvalidateVisuals(otherTile.GridIndex, otherTile.GridIndices);
+                HandleDecompressionFloorRip(mapGrid, otherTile, sum);
+            }
+
+            if (GridImpulse && tileCount > 0)
+            {
+                var direction = ((Vector2)_depressurizeTiles[tileCount - 1].GridIndices - tile.GridIndices).Normalized;
+
+                var gridPhysics = ComponentManager.GetComponent<PhysicsComponent>(mapGrid.GridEntityId);
+
+                // TODO ATMOS: Come up with better values for these.
+                gridPhysics.ApplyLinearImpulse(direction * totalGasesRemoved * gridPhysics.Mass);
+                gridPhysics.ApplyAngularImpulse(Vector2.Cross(tile.GridIndices - gridPhysics.LocalCenter, direction) * totalGasesRemoved);
+            }
+
+            Array.Clear(_depressurizeTiles, 0, Atmospherics.MonstermosHardTileLimit);
+            Array.Clear(_depressurizeSpaceTiles, 0, Atmospherics.MonstermosHardTileLimit);
+            Array.Clear(_depressurizeProgressionOrder, 0, Atmospherics.MonstermosHardTileLimit * 2);
+        }
+
+        private void ConsiderFirelocks(GridAtmosphereComponent gridAtmosphere, TileAtmosphere tile, TileAtmosphere other)
+        {
+            if (!_mapManager.TryGetGrid(tile.GridIndex, out var mapGrid))
+                return;
+
+            var reconsiderAdjacent = false;
+
+            foreach (var entity in mapGrid.GetAnchoredEntities(tile.GridIndices))
+            {
+                if (!ComponentManager.TryGetComponent(entity, out FirelockComponent firelock))
+                    continue;
+
+                reconsiderAdjacent |= firelock.EmergencyPressureStop();
+            }
+
+            foreach (var entity in mapGrid.GetAnchoredEntities(other.GridIndices))
+            {
+                if (!ComponentManager.TryGetComponent(entity, out FirelockComponent firelock))
+                    continue;
+
+                reconsiderAdjacent |= firelock.EmergencyPressureStop();
+            }
+
+            if (!reconsiderAdjacent)
+                return;
+
+            UpdateAdjacent(mapGrid, gridAtmosphere, tile);
+            UpdateAdjacent(mapGrid, gridAtmosphere, other);
+            InvalidateVisuals(tile.GridIndex, tile.GridIndices);
+            InvalidateVisuals(other.GridIndex, other.GridIndices);
+        }
+
+        public void FinalizeEq(GridAtmosphereComponent gridAtmosphere, TileAtmosphere tile)
+        {
+            Span<float> transferDirections = stackalloc float[Atmospherics.Directions];
+            var hasTransferDirs = false;
+            for (var i = 0; i < Atmospherics.Directions; i++)
+            {
+                var amount = tile.MonstermosInfo[i];
+                if (amount == 0) continue;
+                transferDirections[i] = amount;
+                tile.MonstermosInfo[i] = 0; // Set them to 0 to prevent infinite recursion.
+                hasTransferDirs = true;
+            }
+
+            if (!hasTransferDirs) return;
+
+            for(var i = 0; i < Atmospherics.Directions; i++)
+            {
+                var direction = (AtmosDirection) (1 << i);
+                if (!tile.AdjacentBits.IsFlagSet(direction)) continue;
+                var amount = transferDirections[i];
+                var otherTile = tile.AdjacentTiles[i];
+                if (otherTile?.Air == null) continue;
+                if (amount > 0)
+                {
+                    if (tile.Air.TotalMoles < amount)
+                        FinalizeEqNeighbors(gridAtmosphere, tile, transferDirections);
+
+                    otherTile.MonstermosInfo[direction.GetOpposite()] = 0;
+                    Merge(otherTile.Air, tile.Air.Remove(amount));
+                    InvalidateVisuals(tile.GridIndex, tile.GridIndices);
+                    InvalidateVisuals(otherTile.GridIndex, otherTile.GridIndices);
+                    ConsiderPressureDifference(gridAtmosphere, tile, otherTile, amount);
+                }
+            }
+        }
+
+        private void FinalizeEqNeighbors(GridAtmosphereComponent gridAtmosphere, TileAtmosphere tile, ReadOnlySpan<float> transferDirs)
+        {
+            for (var i = 0; i < Atmospherics.Directions; i++)
+            {
+                var direction = (AtmosDirection) (1 << i);
+                var amount = transferDirs[i];
+                if(amount < 0 && tile.AdjacentBits.IsFlagSet(direction))
+                    FinalizeEq(gridAtmosphere, tile.AdjacentTiles[i]);  // A bit of recursion if needed.
+            }
+        }
+
+        private void AdjustEqMovement(TileAtmosphere tile, AtmosDirection direction, float amount)
+        {
+            tile.MonstermosInfo[direction] += amount;
+            tile.AdjacentTiles[direction.ToIndex()].MonstermosInfo[direction.GetOpposite()] -= amount;
+        }
+
+        private void HandleDecompressionFloorRip(IMapGrid mapGrid, TileAtmosphere tile, float sum)
+        {
+            if (!MonstermosRipTiles)
+                return;
+
+            var chance = MathHelper.Clamp(sum / 500, 0.005f, 0.5f);
+
+            if (sum > 20 && _robustRandom.Prob(chance))
+                PryTile(mapGrid, tile.GridIndices);
+        }
+
+        private class TileAtmosphereComparer : IComparer<TileAtmosphere>
+        {
+            public int Compare(TileAtmosphere a, TileAtmosphere b)
+            {
+                if (a == null && b == null)
+                    return 0;
+
+                if (a == null)
+                    return -1;
+
+                if (b == null)
+                    return 1;
+
+                return a.MonstermosInfo.MoleDelta.CompareTo(b.MonstermosInfo.MoleDelta);
+            }
+        }
+    }
+}
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs
index f2627ca8fb..184e0bf9f5 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using Content.Server.Atmos.Components;
 using Content.Server.Atmos.Piping.Components;
@@ -20,6 +21,11 @@ namespace Content.Server.Atmos.EntitySystems
         /// </summary>
         private const int LagCheckIterations = 30;
 
+        /// <summary>
+        ///     Check current execution time every n instances processed.
+        /// </summary>
+        private const int InvalidCoordinatesLagCheckIterations = 50;
+
         private int _currentRunAtmosphereIndex = 0;
         private bool _simulationPaused = false;
 
@@ -30,10 +36,13 @@ namespace Content.Server.Atmos.EntitySystems
             if(!atmosphere.ProcessingPaused)
                 atmosphere.CurrentRunTiles = new Queue<TileAtmosphere>(atmosphere.ActiveTiles);
 
+            if (!TryGetMapGrid(atmosphere, out var mapGrid))
+                throw new Exception("Tried to process a grid atmosphere on an entity that isn't a grid!");
+
             var number = 0;
             while (atmosphere.CurrentRunTiles.TryDequeue(out var tile))
             {
-                tile.EqualizePressureInZone(this, atmosphere.UpdateCounter);
+                EqualizePressureInZone(mapGrid, atmosphere, tile, atmosphere.UpdateCounter);
 
                 if (number++ < LagCheckIterations) continue;
                 number = 0;
@@ -55,7 +64,7 @@ namespace Content.Server.Atmos.EntitySystems
             var number = 0;
             while (atmosphere.CurrentRunTiles.TryDequeue(out var tile))
             {
-                tile.ProcessCell(this, atmosphere.UpdateCounter, SpaceWind);
+                ProcessCell(atmosphere, tile, atmosphere.UpdateCounter);
 
                 if (number++ < LagCheckIterations) continue;
                 number = 0;
@@ -69,22 +78,22 @@ namespace Content.Server.Atmos.EntitySystems
             return true;
         }
 
-        private bool ProcessExcitedGroups(GridAtmosphereComponent atmosphere)
+        private bool ProcessExcitedGroups(GridAtmosphereComponent gridAtmosphere)
         {
-            if(!atmosphere.ProcessingPaused)
-                atmosphere.CurrentRunExcitedGroups = new Queue<ExcitedGroup>(atmosphere.ExcitedGroups);
+            if(!gridAtmosphere.ProcessingPaused)
+                gridAtmosphere.CurrentRunExcitedGroups = new Queue<ExcitedGroup>(gridAtmosphere.ExcitedGroups);
 
             var number = 0;
-            while (atmosphere.CurrentRunExcitedGroups.TryDequeue(out var excitedGroup))
+            while (gridAtmosphere.CurrentRunExcitedGroups.TryDequeue(out var excitedGroup))
             {
                 excitedGroup.BreakdownCooldown++;
                 excitedGroup.DismantleCooldown++;
 
                 if(excitedGroup.BreakdownCooldown > Atmospherics.ExcitedGroupBreakdownCycles)
-                    excitedGroup.SelfBreakdown(this, ExcitedGroupsSpaceIsAllConsuming);
+                    ExcitedGroupSelfBreakdown(gridAtmosphere, excitedGroup);
 
                 else if(excitedGroup.DismantleCooldown > Atmospherics.ExcitedGroupsDismantleCycles)
-                    excitedGroup.Dismantle();
+                    ExcitedGroupDismantle(gridAtmosphere, excitedGroup);
 
                 if (number++ < LagCheckIterations) continue;
                 number = 0;
@@ -106,7 +115,7 @@ namespace Content.Server.Atmos.EntitySystems
             var number = 0;
             while (atmosphere.CurrentRunTiles.TryDequeue(out var tile))
             {
-                tile.HighPressureMovements();
+                HighPressureMovements(atmosphere, tile);
                 tile.PressureDifference = 0f;
                 tile.PressureSpecificTarget = null;
                 atmosphere.HighPressureDelta.Remove(tile);
@@ -131,7 +140,7 @@ namespace Content.Server.Atmos.EntitySystems
             var number = 0;
             while (atmosphere.CurrentRunTiles.TryDequeue(out var hotspot))
             {
-                hotspot.ProcessHotspot();
+                ProcessHotspot(atmosphere, hotspot);
 
                 if (number++ < LagCheckIterations) continue;
                 number = 0;
@@ -153,7 +162,7 @@ namespace Content.Server.Atmos.EntitySystems
             var number = 0;
             while (atmosphere.CurrentRunTiles.TryDequeue(out var superconductivity))
             {
-                superconductivity.Superconduct(this);
+                Superconduct(atmosphere, superconductivity);
 
                 if (number++ < LagCheckIterations) continue;
                 number = 0;
@@ -195,7 +204,7 @@ namespace Content.Server.Atmos.EntitySystems
                 atmosphere.CurrentRunAtmosDevices = new Queue<AtmosDeviceComponent>(atmosphere.AtmosDevices);
 
             var time = _gameTiming.CurTime;
-            var updateEvent = new AtmosDeviceUpdateEvent(atmosphere);
+            var updateEvent = new AtmosDeviceUpdateEvent();
             var number = 0;
             while (atmosphere.CurrentRunAtmosDevices.TryDequeue(out var device))
             {
@@ -237,8 +246,14 @@ namespace Content.Server.Atmos.EntitySystems
 
                 atmosphere.Timer += frameTime;
 
-                if (atmosphere.InvalidatedCoords.Count != 0)
-                    atmosphere.Revalidate();
+                if ((atmosphere.InvalidatedCoords.Count != 0 || atmosphere.RevalidatePaused) && TryGetMapGrid(atmosphere, out var mapGrid))
+                    if (!GridRevalidate(mapGrid, atmosphere))
+                    {
+                        atmosphere.RevalidatePaused = true;
+                        return;
+                    }
+
+                atmosphere.RevalidatePaused = false;
 
                 if (atmosphere.Timer < AtmosTime)
                     continue;
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Superconductivity.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Superconductivity.cs
new file mode 100644
index 0000000000..2853a6934e
--- /dev/null
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Superconductivity.cs
@@ -0,0 +1,160 @@
+using System;
+using Content.Server.Atmos.Components;
+using Content.Shared.Atmos;
+
+namespace Content.Server.Atmos.EntitySystems
+{
+    public partial class AtmosphereSystem
+    {
+        private void Superconduct(GridAtmosphereComponent gridAtmosphere, TileAtmosphere tile)
+        {
+            var directions = ConductivityDirections(gridAtmosphere, tile);
+
+            for(var i = 0; i < Atmospherics.Directions; i++)
+            {
+                var direction = (AtmosDirection) (1 << i);
+                if (!directions.IsFlagSet(direction)) continue;
+
+                var adjacent = tile.AdjacentTiles[direction.ToIndex()];
+
+                // TODO ATMOS handle adjacent being null.
+                if (adjacent == null || adjacent.ThermalConductivity == 0f)
+                    continue;
+
+                if(adjacent.ArchivedCycle < gridAtmosphere.UpdateCounter)
+                    Archive(adjacent, gridAtmosphere.UpdateCounter);
+
+                NeighborConductWithSource(gridAtmosphere, adjacent, tile);
+
+                ConsiderSuperconductivity(gridAtmosphere, adjacent);
+            }
+
+            RadiateToSpace(tile);
+            FinishSuperconduction(gridAtmosphere, tile);
+        }
+
+        private AtmosDirection ConductivityDirections(GridAtmosphereComponent gridAtmosphere, TileAtmosphere tile)
+        {
+            if(tile.Air == null)
+            {
+                if(tile.ArchivedCycle < gridAtmosphere.UpdateCounter)
+                    Archive(tile, gridAtmosphere.UpdateCounter);
+                return AtmosDirection.All;
+            }
+
+            // TODO ATMOS check if this is correct
+            return AtmosDirection.All;
+        }
+
+        public bool ConsiderSuperconductivity(GridAtmosphereComponent gridAtmosphere, TileAtmosphere tile)
+        {
+            if (tile.ThermalConductivity == 0f || !Superconduction)
+                return false;
+
+            gridAtmosphere.SuperconductivityTiles.Add(tile);
+            return true;
+        }
+
+        public bool ConsiderSuperconductivity(GridAtmosphereComponent gridAtmosphere, TileAtmosphere tile, bool starting)
+        {
+            if (!Superconduction)
+                return false;
+
+            if (tile.Air == null || tile.Air.Temperature < (starting
+                ? Atmospherics.MinimumTemperatureStartSuperConduction
+                : Atmospherics.MinimumTemperatureForSuperconduction))
+                return false;
+
+            return !(GetHeatCapacity(tile.Air) < Atmospherics.MCellWithRatio)
+                   && ConsiderSuperconductivity(gridAtmosphere, tile);
+        }
+
+        public void FinishSuperconduction(GridAtmosphereComponent gridAtmosphere, TileAtmosphere tile)
+        {
+            // Conduct with air on my tile if I have it
+            if (tile.Air != null)
+            {
+                tile.Temperature = TemperatureShare(tile.Air, tile.ThermalConductivity, tile.Temperature, tile.HeatCapacity);
+            }
+
+            FinishSuperconduction(gridAtmosphere, tile, tile.Air?.Temperature ?? tile.Temperature);
+        }
+
+        public void FinishSuperconduction(GridAtmosphereComponent gridAtmosphere, TileAtmosphere tile, float temperature)
+        {
+            // Make sure it's still hot enough to continue conducting.
+            if (temperature < Atmospherics.MinimumTemperatureForSuperconduction)
+            {
+                gridAtmosphere.SuperconductivityTiles.Remove(tile);
+            }
+        }
+
+        public void NeighborConductWithSource(GridAtmosphereComponent gridAtmosphere, TileAtmosphere tile, TileAtmosphere other)
+        {
+            if (tile.Air == null)
+            {
+                if (other.Tile != null)
+                {
+                    TemperatureShareOpenToSolid(other, tile);
+                }
+                else
+                {
+                    TemperatureShareMutualSolid(other, tile, tile.ThermalConductivity);
+                }
+
+                // TODO ATMOS: tile.TemperatureExpose(null, tile.Temperature, gridAtmosphere.GetVolumeForCells(1));
+                return;
+            }
+
+            if (other.Air != null)
+            {
+                TemperatureShare(other.Air, tile.Air, Atmospherics.WindowHeatTransferCoefficient);
+            }
+            else
+            {
+                TemperatureShareOpenToSolid(tile, other);
+            }
+
+            AddActiveTile(gridAtmosphere, tile);
+        }
+
+        private void TemperatureShareOpenToSolid(TileAtmosphere tile, TileAtmosphere other)
+        {
+            if (tile.Air == null)
+                return;
+
+            other.Temperature = TemperatureShare(tile.Air, other.ThermalConductivity, other.Temperature, other.HeatCapacity);
+        }
+
+        private void TemperatureShareMutualSolid(TileAtmosphere tile, TileAtmosphere other, float conductionCoefficient)
+        {
+            var deltaTemperature = (tile.TemperatureArchived - other.TemperatureArchived);
+            if (MathF.Abs(deltaTemperature) > Atmospherics.MinimumTemperatureDeltaToConsider
+                && tile.HeatCapacity != 0f && other.HeatCapacity != 0f)
+            {
+                var heat = conductionCoefficient * deltaTemperature *
+                           (tile.HeatCapacity * other.HeatCapacity / (tile.HeatCapacity + other.HeatCapacity));
+
+                tile.Temperature -= heat / tile.HeatCapacity;
+                other.Temperature += heat / other.HeatCapacity;
+            }
+        }
+
+        public void RadiateToSpace(TileAtmosphere tile)
+        {
+            // Considering 0ºC as the break even point for radiation in and out.
+            if (tile.Temperature > Atmospherics.T0C)
+            {
+                // Hardcoded space temperature.
+                var deltaTemperature = (tile.TemperatureArchived - Atmospherics.TCMB);
+                if ((tile.HeatCapacity > 0) && (MathF.Abs(deltaTemperature) > Atmospherics.MinimumTemperatureDeltaToConsider))
+                {
+                    var heat = tile.ThermalConductivity * deltaTemperature * (tile.HeatCapacity *
+                        Atmospherics.HeatCapacityVacuum / (tile.HeatCapacity + Atmospherics.HeatCapacityVacuum));
+
+                    tile.Temperature -= heat;
+                }
+            }
+        }
+    }
+}
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs
index 2094d2a52e..910ae05a51 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs
@@ -1,35 +1,21 @@
-using System;
-using System.Diagnostics.CodeAnalysis;
 using Content.Server.Atmos.Components;
 using Content.Server.NodeContainer.EntitySystems;
 using Content.Shared.Atmos.EntitySystems;
 using Content.Shared.Maps;
 using JetBrains.Annotations;
-using Robust.Server.GameObjects;
-using Robust.Shared.Configuration;
-using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
 
 namespace Content.Server.Atmos.EntitySystems
 {
     [UsedImplicitly]
     public partial class AtmosphereSystem : SharedAtmosphereSystem
     {
-        [Dependency] private readonly IPrototypeManager _protoMan = default!;
         [Dependency] private readonly IMapManager _mapManager = default!;
-        [Dependency] private readonly IPauseManager _pauseManager = default!;
-        [Dependency] private readonly IConfigurationManager _cfg = default!;
-
-        private GridTileLookupSystem? _gridTileLookup = null;
 
         private const float ExposedUpdateDelay = 1f;
         private float _exposedTimer = 0f;
 
-        public GridTileLookupSystem GridTileLookupSystem => _gridTileLookup ??= Get<GridTileLookupSystem>();
-
         public override void Initialize()
         {
             base.Initialize();
@@ -38,6 +24,7 @@ namespace Content.Server.Atmos.EntitySystems
 
             InitializeGases();
             InitializeCVars();
+            InitializeGrid();
 
             #region Events
 
@@ -67,7 +54,7 @@ namespace Content.Server.Atmos.EntitySystems
                 return;
             }
 
-            GetGridAtmosphere(eventArgs.NewTile.GridIndex)?.Invalidate(eventArgs.NewTile.GridIndices);
+            InvalidateTile(eventArgs.NewTile.GridIndex, eventArgs.NewTile.GridIndices);
         }
 
         private void OnMapCreated(object? sender, MapEventArgs e)
@@ -81,73 +68,6 @@ namespace Content.Server.Atmos.EntitySystems
                 map.AddComponent<SpaceGridAtmosphereComponent>();
         }
 
-        #region Helper Methods
-        public IGridAtmosphereComponent? GetGridAtmosphere(GridId gridId)
-        {
-            if (!gridId.IsValid())
-                return null;
-
-            if (!_mapManager.TryGetGrid(gridId, out var grid))
-                return null;
-
-            return ComponentManager.TryGetComponent(grid.GridEntityId, out IGridAtmosphereComponent? gridAtmosphere)
-                ? gridAtmosphere : null;
-        }
-
-        public IGridAtmosphereComponent GetGridAtmosphere(EntityCoordinates coordinates)
-        {
-            return GetGridAtmosphere(coordinates.ToMap(EntityManager));
-        }
-
-        public IGridAtmosphereComponent GetGridAtmosphere(MapCoordinates coordinates)
-        {
-            if (coordinates.MapId == MapId.Nullspace)
-            {
-                throw new ArgumentException($"Coordinates cannot be in nullspace!", nameof(coordinates));
-            }
-
-            if (_mapManager.TryFindGridAt(coordinates, out var grid))
-            {
-                if (ComponentManager.TryGetComponent(grid.GridEntityId, out IGridAtmosphereComponent? atmos))
-                {
-                    return atmos;
-                }
-            }
-
-            return _mapManager.GetMapEntity(coordinates.MapId).GetComponent<IGridAtmosphereComponent>();
-        }
-
-        /// <summary>
-        ///     Unlike <see cref="GetGridAtmosphere"/>, this doesn't return space grid when not found.
-        /// </summary>
-        public bool TryGetSimulatedGridAtmosphere(MapCoordinates coordinates, [NotNullWhen(true)] out IGridAtmosphereComponent? atmosphere)
-        {
-            if (coordinates.MapId == MapId.Nullspace)
-            {
-                atmosphere = null;
-                return false;
-            }
-
-            if (_mapManager.TryFindGridAt(coordinates, out var mapGrid)
-                && ComponentManager.TryGetComponent(mapGrid.GridEntityId, out IGridAtmosphereComponent? atmosGrid)
-                && atmosGrid.Simulated)
-            {
-                atmosphere = atmosGrid;
-                return true;
-            }
-
-            if (_mapManager.GetMapEntity(coordinates.MapId).TryGetComponent(out IGridAtmosphereComponent? atmosMap)
-                && atmosMap.Simulated)
-            {
-                atmosphere = atmosMap;
-                return true;
-            }
-
-            atmosphere = null;
-            return false;
-        }
-        #endregion
-
         public override void Update(float frameTime)
         {
             base.Update(frameTime);
@@ -158,9 +78,10 @@ namespace Content.Server.Atmos.EntitySystems
 
             if (_exposedTimer >= ExposedUpdateDelay)
             {
-                foreach (var exposed in EntityManager.ComponentManager.EntityQuery<AtmosExposedComponent>(true))
+                foreach (var exposed in EntityManager.ComponentManager.EntityQuery<AtmosExposedComponent>())
                 {
-                    var tile = exposed.Owner.Transform.Coordinates.GetTileAtmosphere();
+                    // TODO ATMOS: Kill this with fire.
+                    var tile = GetTileAtmosphereOrCreateSpace(exposed.Owner.Transform.Coordinates);
                     if (tile == null) continue;
                     exposed.Update(tile, _exposedTimer, this);
                 }
diff --git a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
new file mode 100644
index 0000000000..3a253f64e9
--- /dev/null
+++ b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
@@ -0,0 +1,56 @@
+using Content.Server.Atmos.Components;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Physics.Dynamics;
+
+namespace Content.Server.Atmos.EntitySystems
+{
+    internal sealed class FlammableSystem : EntitySystem
+    {
+        // TODO: Port the rest of Flammable.
+        public override void Initialize()
+        {
+            base.Initialize();
+            SubscribeLocalEvent<FlammableComponent, StartCollideEvent>(HandleCollide);
+        }
+
+        private void HandleCollide(EntityUid uid, FlammableComponent component, StartCollideEvent args)
+        {
+            if (!args.OtherFixture.Body.Owner.TryGetComponent(out FlammableComponent? otherFlammable))
+                return;
+
+            if (!component.FireSpread || !otherFlammable.FireSpread)
+                return;
+
+            if (component.OnFire)
+            {
+                if (otherFlammable.OnFire)
+                {
+                    var fireSplit = (component.FireStacks + otherFlammable.FireStacks) / 2;
+                    component.FireStacks = fireSplit;
+                    otherFlammable.FireStacks = fireSplit;
+                }
+                else
+                {
+                    component.FireStacks /= 2;
+                    otherFlammable.FireStacks += component.FireStacks;
+                    Ignite(otherFlammable);
+                }
+            } else if (otherFlammable.OnFire)
+            {
+                otherFlammable.FireStacks /= 2;
+                component.FireStacks += otherFlammable.FireStacks;
+                Ignite(component);
+            }
+        }
+
+        internal void Ignite(FlammableComponent component)
+        {
+            if (component.FireStacks > 0 && !component.OnFire)
+            {
+                component.OnFire = true;
+            }
+
+            component.UpdateAppearance();
+        }
+    }
+}
diff --git a/Content.Server/Atmos/EntitySystems/GasTileOverlaySystem.cs b/Content.Server/Atmos/EntitySystems/GasTileOverlaySystem.cs
index 4c9d0516b6..3a24573cc3 100644
--- a/Content.Server/Atmos/EntitySystems/GasTileOverlaySystem.cs
+++ b/Content.Server/Atmos/EntitySystems/GasTileOverlaySystem.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.CompilerServices;
@@ -145,14 +144,14 @@ namespace Content.Server.Atmos.EntitySystems
         /// <summary>
         ///     Checks whether the overlay-relevant data for a gas tile has been updated.
         /// </summary>
-        /// <param name="gam"></param>
+        /// <param name="grid"></param>
         /// <param name="oldTile"></param>
         /// <param name="indices"></param>
         /// <param name="overlayData"></param>
         /// <returns>true if updated</returns>
-        private bool TryRefreshTile(GridAtmosphereComponent gam, GasOverlayData oldTile, Vector2i indices, out GasOverlayData overlayData)
+        private bool TryRefreshTile(GridId grid, GasOverlayData oldTile, Vector2i indices, out GasOverlayData overlayData)
         {
-            var tile = gam.GetTile(indices);
+            var tile = _atmosphereSystem.GetTileAtmosphereOrCreateSpace(grid, indices);
 
             if (tile == null)
             {
@@ -288,7 +287,7 @@ namespace Content.Server.Atmos.EntitySystems
                 {
                     var chunk = GetOrCreateChunk(gridId, invalid);
 
-                    if (!TryRefreshTile(gam, chunk.GetData(invalid), invalid, out var data)) continue;
+                    if (!TryRefreshTile(grid.Index, chunk.GetData(invalid), invalid, out var data)) continue;
 
                     if (!updatedTiles.TryGetValue(chunk, out var tiles))
                     {
diff --git a/Content.Server/Atmos/ExcitedGroup.cs b/Content.Server/Atmos/ExcitedGroup.cs
index 76831b4d69..adb7c28465 100644
--- a/Content.Server/Atmos/ExcitedGroup.cs
+++ b/Content.Server/Atmos/ExcitedGroup.cs
@@ -1,146 +1,16 @@
-using System;
-using System.Collections.Generic;
-using Content.Server.Atmos.Components;
-using Content.Server.Atmos.EntitySystems;
-using Content.Shared.Atmos;
+using System.Collections.Generic;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Atmos
 {
-    public class ExcitedGroup : IDisposable
+    public class ExcitedGroup
     {
-        [ViewVariables]
-        private bool _disposed = false;
+        [ViewVariables] public bool Disposed = false;
 
-        [ViewVariables]
-        private readonly HashSet<TileAtmosphere> _tiles = new();
+        [ViewVariables] public readonly List<TileAtmosphere> Tiles = new(100);
 
-        [ViewVariables]
-        private GridAtmosphereComponent _gridAtmosphereComponent = default!;
+        [ViewVariables] public int DismantleCooldown { get; set; } = 0;
 
-        [ViewVariables]
-        public int DismantleCooldown { get; set; }
-
-        [ViewVariables]
-        public int BreakdownCooldown { get; set; }
-
-        public void AddTile(TileAtmosphere tile)
-        {
-            _tiles.Add(tile);
-            tile.ExcitedGroup = this;
-            ResetCooldowns();
-        }
-
-        public bool RemoveTile(TileAtmosphere tile)
-        {
-            tile.ExcitedGroup = null;
-            return _tiles.Remove(tile);
-        }
-
-        public void MergeGroups(ExcitedGroup other)
-        {
-            var ourSize = _tiles.Count;
-            var otherSize = other._tiles.Count;
-
-            if (ourSize > otherSize)
-            {
-                foreach (var tile in other._tiles)
-                {
-                    tile.ExcitedGroup = this;
-                    _tiles.Add(tile);
-                }
-                other._tiles.Clear();
-                other.Dispose();
-                ResetCooldowns();
-            }
-            else
-            {
-                foreach (var tile in _tiles)
-                {
-                    tile.ExcitedGroup = other;
-                    other._tiles.Add(tile);
-                }
-                _tiles.Clear();
-                Dispose();
-                other.ResetCooldowns();
-            }
-        }
-
-        ~ExcitedGroup()
-        {
-            Dispose();
-        }
-
-        public void Initialize(GridAtmosphereComponent gridAtmosphereComponent)
-        {
-            _gridAtmosphereComponent = gridAtmosphereComponent;
-            _gridAtmosphereComponent.AddExcitedGroup(this);
-        }
-
-        public void ResetCooldowns()
-        {
-            BreakdownCooldown = 0;
-            DismantleCooldown = 0;
-        }
-
-        public void SelfBreakdown(AtmosphereSystem atmosphereSystem, bool spaceIsAllConsuming = false)
-        {
-            var combined = new GasMixture(Atmospherics.CellVolume);
-
-            var tileSize = _tiles.Count;
-
-            if (_disposed) return;
-
-            if (tileSize == 0)
-            {
-                Dispose();
-                return;
-            }
-
-            foreach (var tile in _tiles)
-            {
-                if (tile?.Air == null) continue;
-                atmosphereSystem.Merge(combined, tile.Air);
-                if (!spaceIsAllConsuming || !tile.Air.Immutable) continue;
-                combined.Clear();
-                break;
-            }
-
-            combined.Multiply(1 / (float)tileSize);
-
-            foreach (var tile in _tiles)
-            {
-                if (tile?.Air == null) continue;
-                tile.Air.CopyFromMutable(combined);
-                tile.UpdateVisuals();
-            }
-
-            BreakdownCooldown = 0;
-        }
-
-        public void Dismantle(bool unexcite = true)
-        {
-            foreach (var tile in _tiles)
-            {
-                if (tile == null) continue;
-                tile.ExcitedGroup = null;
-                if (!unexcite) continue;
-                tile.Excited = false;
-                _gridAtmosphereComponent.RemoveActiveTile(tile);
-            }
-
-            _tiles.Clear();
-        }
-
-        public void Dispose()
-        {
-            if (_disposed) return;
-            _disposed = true;
-            _gridAtmosphereComponent.RemoveExcitedGroup(this);
-
-            Dismantle(false);
-
-            _gridAtmosphereComponent = null!;
-        }
+        [ViewVariables] public int BreakdownCooldown { get; set; } = 0;
     }
 }
diff --git a/Content.Server/Atmos/GasMixture.cs b/Content.Server/Atmos/GasMixture.cs
index 31d609b579..dddad7366f 100644
--- a/Content.Server/Atmos/GasMixture.cs
+++ b/Content.Server/Atmos/GasMixture.cs
@@ -1,11 +1,9 @@
-#nullable enable
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.CompilerServices;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Atmos.Reactions;
-using Content.Server.Interfaces;
 using Content.Shared.Atmos;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
diff --git a/Content.Server/Interfaces/IGasMixtureHolder.cs b/Content.Server/Atmos/IGasMixtureHolder.cs
similarity index 82%
rename from Content.Server/Interfaces/IGasMixtureHolder.cs
rename to Content.Server/Atmos/IGasMixtureHolder.cs
index bd34555949..c8bcb60391 100644
--- a/Content.Server/Interfaces/IGasMixtureHolder.cs
+++ b/Content.Server/Atmos/IGasMixtureHolder.cs
@@ -1,8 +1,7 @@
-using Content.Server.Atmos;
-using Content.Server.Atmos.EntitySystems;
+using Content.Server.Atmos.EntitySystems;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.Interfaces
+namespace Content.Server.Atmos
 {
     public interface IGasMixtureHolder
     {
diff --git a/Content.Server/Interfaces/IGasReactionEffect.cs b/Content.Server/Atmos/IGasReactionEffect.cs
similarity index 68%
rename from Content.Server/Interfaces/IGasReactionEffect.cs
rename to Content.Server/Atmos/IGasReactionEffect.cs
index 7268b8654e..3431897920 100644
--- a/Content.Server/Interfaces/IGasReactionEffect.cs
+++ b/Content.Server/Atmos/IGasReactionEffect.cs
@@ -1,10 +1,7 @@
-#nullable enable
-using Content.Server.Atmos;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Atmos.Reactions;
-using Robust.Server.GameObjects;
 
-namespace Content.Server.Interfaces
+namespace Content.Server.Atmos
 {
     public interface IGasReactionEffect
     {
diff --git a/Content.Server/Atmos/ITemperatureExpose.cs b/Content.Server/Atmos/ITemperatureExpose.cs
deleted file mode 100644
index bb53294c77..0000000000
--- a/Content.Server/Atmos/ITemperatureExpose.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Content.Server.Atmos
-{
-    public interface ITemperatureExpose
-    {
-        void TemperatureExpose(GasMixture air, float exposedTemperature, float exposedVolume);
-    }
-}
diff --git a/Content.Server/Atmos/TileAtmosInfo.cs b/Content.Server/Atmos/MonstermosInfo.cs
similarity index 97%
rename from Content.Server/Atmos/TileAtmosInfo.cs
rename to Content.Server/Atmos/MonstermosInfo.cs
index 68a6dcfea1..cfb1ad7b4b 100644
--- a/Content.Server/Atmos/TileAtmosInfo.cs
+++ b/Content.Server/Atmos/MonstermosInfo.cs
@@ -4,7 +4,7 @@ using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Atmos
 {
-    public struct TileAtmosInfo
+    public struct MonstermosInfo
     {
         [ViewVariables]
         public int LastCycle;
@@ -30,6 +30,15 @@ namespace Content.Server.Atmos
         [ViewVariables]
         public float TransferDirectionSouth;
 
+        [ViewVariables]
+        public float CurrentTransferAmount;
+
+        [ViewVariables]
+        public AtmosDirection CurrentTransferDirection;
+
+        [ViewVariables]
+        public bool FastDone;
+
         public float this[AtmosDirection direction]
         {
             get =>
@@ -69,13 +78,5 @@ namespace Content.Server.Atmos
             get => this[(AtmosDirection) (1 << index)];
             set => this[(AtmosDirection) (1 << index)] = value;
         }
-
-        [ViewVariables]
-        public float CurrentTransferAmount;
-
-        public AtmosDirection CurrentTransferDirection;
-
-        [ViewVariables]
-        public bool FastDone;
     }
 }
diff --git a/Content.Server/Atmos/Piping/Binary/Components/GasDualPortVentPumpComponent.cs b/Content.Server/Atmos/Piping/Binary/Components/GasDualPortVentPumpComponent.cs
new file mode 100644
index 0000000000..eda13dc175
--- /dev/null
+++ b/Content.Server/Atmos/Piping/Binary/Components/GasDualPortVentPumpComponent.cs
@@ -0,0 +1,52 @@
+using System;
+using Content.Server.Atmos.Piping.Unary.Components;
+using Content.Shared.Atmos;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Serialization.Manager.Attributes;
+using Robust.Shared.ViewVariables;
+
+namespace Content.Server.Atmos.Piping.Binary.Components
+{
+    [RegisterComponent]
+    public class GasDualPortVentPumpComponent : Component
+    {
+        public override string Name => "GasDualPortVentPump";
+
+        [ViewVariables(VVAccess.ReadWrite)]
+        public bool Enabled { get; set; } = true;
+
+        [ViewVariables(VVAccess.ReadWrite)]
+        public bool Welded { get; set; } = false;
+
+        [ViewVariables(VVAccess.ReadWrite)]
+        [DataField("inlet")]
+        public string InletName { get; set; } = "inlet";
+
+        [ViewVariables(VVAccess.ReadWrite)]
+        [DataField("outlet")]
+        public string OutletName { get; set; } = "outlet";
+
+        [ViewVariables(VVAccess.ReadWrite)]
+        public VentPumpDirection PumpDirection { get; set; } = VentPumpDirection.Releasing;
+
+        [ViewVariables(VVAccess.ReadWrite)]
+        public DualPortVentPressureBound PressureChecks { get; set; } = DualPortVentPressureBound.ExternalBound;
+
+        [ViewVariables(VVAccess.ReadWrite)]
+        public float ExternalPressureBound { get; set; } = Atmospherics.OneAtmosphere;
+
+        [ViewVariables(VVAccess.ReadWrite)]
+        public float InputPressureMin { get; set; } = 0f;
+
+        [ViewVariables(VVAccess.ReadWrite)]
+        public float OutputPressureMax { get; set; } = 0f;
+    }
+
+    [Flags]
+    public enum DualPortVentPressureBound : sbyte
+    {
+        NoBound       = 0,
+        ExternalBound = 1,
+        InputMinimum = 2,
+    }
+}
diff --git a/Content.Server/Atmos/Piping/Binary/Components/GasValveComponent.cs b/Content.Server/Atmos/Piping/Binary/Components/GasValveComponent.cs
index 7a20b63509..61fccc8877 100644
--- a/Content.Server/Atmos/Piping/Binary/Components/GasValveComponent.cs
+++ b/Content.Server/Atmos/Piping/Binary/Components/GasValveComponent.cs
@@ -1,55 +1,21 @@
-using Content.Server.NodeContainer;
-using Content.Server.NodeContainer.Nodes;
-using Content.Shared.ActionBlocker;
 using Content.Shared.Interaction;
-using Content.Shared.Interaction.Helpers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Atmos.Piping.Binary.Components
 {
-    // TODO ATMOS: Make ECS.
-    [ComponentReference(typeof(IActivate))]
     [RegisterComponent]
-    public class GasValveComponent : Component, IActivate
+    public class GasValveComponent : Component
     {
         public override string Name => "GasValve";
 
         [ViewVariables]
         [DataField("open")]
-        private bool _open = true;
+        public bool Open { get; set; } = true;
 
         [DataField("pipe")]
         [ViewVariables(VVAccess.ReadWrite)]
-        private string _pipeName = "pipe";
-
-        protected override void Startup()
-        {
-            base.Startup();
-
-            Set();
-        }
-
-        private void Set()
-        {
-            if (Owner.TryGetComponent(out NodeContainerComponent? nodeContainer)
-                && nodeContainer.TryGetNode(_pipeName, out PipeNode? pipe))
-            {
-                pipe.ConnectionsEnabled = _open;
-            }
-        }
-
-        private void Toggle()
-        {
-            _open = !_open;
-            Set();
-        }
-
-        void IActivate.Activate(ActivateEventArgs eventArgs)
-        {
-            if(eventArgs.InRangeUnobstructed() && EntitySystem.Get<ActionBlockerSystem>().CanInteract(eventArgs.User))
-                Toggle();
-        }
+        public string PipeName { get; } = "pipe";
     }
 }
diff --git a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasDualPortVentPumpSystem.cs b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasDualPortVentPumpSystem.cs
new file mode 100644
index 0000000000..0782523559
--- /dev/null
+++ b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasDualPortVentPumpSystem.cs
@@ -0,0 +1,105 @@
+using System;
+using Content.Server.Atmos.EntitySystems;
+using Content.Server.Atmos.Piping.Binary.Components;
+using Content.Server.Atmos.Piping.Components;
+using Content.Server.Atmos.Piping.Unary.Components;
+using Content.Server.NodeContainer;
+using Content.Server.NodeContainer.Nodes;
+using Content.Shared.Atmos;
+using Content.Shared.Atmos.Visuals;
+using JetBrains.Annotations;
+using Robust.Server.GameObjects;
+using Robust.Shared.GameObjects;
+
+namespace Content.Server.Atmos.Piping.Binary.EntitySystems
+{
+    [UsedImplicitly]
+    public class GasDualPortVentPumpSystem : EntitySystem
+    {
+        public override void Initialize()
+        {
+            base.Initialize();
+
+            SubscribeLocalEvent<GasDualPortVentPumpComponent, AtmosDeviceUpdateEvent>(OnGasDualPortVentPumpUpdated);
+            SubscribeLocalEvent<GasDualPortVentPumpComponent, AtmosDeviceDisabledEvent>(OnGasDualPortVentPumpDisabled);
+        }
+
+        private void OnGasDualPortVentPumpUpdated(EntityUid uid, GasDualPortVentPumpComponent vent, AtmosDeviceUpdateEvent args)
+        {
+            var appearance = vent.Owner.GetComponentOrNull<AppearanceComponent>();
+
+            if (vent.Welded)
+            {
+                appearance?.SetData(VentPumpVisuals.State, VentPumpState.Welded);
+                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)
+            || !nodeContainer.TryGetNode(vent.OutletName, out PipeNode? outlet))
+                return;
+
+            var atmosphereSystem = Get<AtmosphereSystem>();
+            var environment = atmosphereSystem.GetTileMixture(vent.Owner.Transform.Coordinates, true);
+
+            // We're in an air-blocked tile... Do nothing.
+            if (environment == null)
+                return;
+
+            if (vent.PumpDirection == VentPumpDirection.Releasing)
+            {
+                appearance?.SetData(VentPumpVisuals.State, VentPumpState.Out);
+                var pressureDelta = 10000f;
+
+                if ((vent.PressureChecks & DualPortVentPressureBound.ExternalBound) != 0)
+                    pressureDelta = MathF.Min(pressureDelta, (vent.ExternalPressureBound - environment.Pressure));
+
+                if ((vent.PressureChecks & DualPortVentPressureBound.InputMinimum) != 0)
+                    pressureDelta = MathF.Min(pressureDelta, (inlet.Air.Pressure - vent.InputPressureMin));
+
+                if (pressureDelta > 0 && inlet.Air.Temperature > 0)
+                {
+                    var transferMoles = pressureDelta * environment.Volume / inlet.Air.Temperature * Atmospherics.R;
+                    var removed = inlet.Air.Remove(transferMoles);
+                    atmosphereSystem.Merge(environment, removed);
+                }
+            }
+            else if (vent.PumpDirection == VentPumpDirection.Siphoning && environment.Pressure > 0f)
+            {
+                appearance?.SetData(VentPumpVisuals.State, VentPumpState.In);
+                var ourMultiplier = outlet.Air.Volume / environment.Temperature * Atmospherics.R;
+                var molesDelta = 10000 * ourMultiplier;
+
+                if ((vent.PressureChecks & DualPortVentPressureBound.ExternalBound) != 0)
+                    molesDelta =
+                        MathF.Min(molesDelta,
+                            (environment.Pressure - vent.OutputPressureMax) * environment.Volume / (environment.Temperature * Atmospherics.R));
+
+                if ((vent.PressureChecks &DualPortVentPressureBound.InputMinimum) != 0)
+                    molesDelta = MathF.Min(molesDelta, (vent.InputPressureMin - outlet.Air.Pressure) * ourMultiplier);
+
+                if (molesDelta > 0)
+                {
+                    var removed = environment.Remove(molesDelta);
+
+                    Get<AtmosphereSystem>().Merge(outlet.Air, removed);
+                }
+            }
+        }
+
+        private void OnGasDualPortVentPumpDisabled(EntityUid uid, GasDualPortVentPumpComponent vent, AtmosDeviceDisabledEvent args)
+        {
+            if (ComponentManager.TryGetComponent(uid, out AppearanceComponent? appearance))
+            {
+                appearance.SetData(VentPumpVisuals.State, VentPumpState.Off);
+            }
+        }
+    }
+}
diff --git a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasValveSystem.cs b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasValveSystem.cs
new file mode 100644
index 0000000000..69c1ef362c
--- /dev/null
+++ b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasValveSystem.cs
@@ -0,0 +1,53 @@
+using Content.Server.Atmos.Piping.Binary.Components;
+using Content.Server.NodeContainer;
+using Content.Server.NodeContainer.Nodes;
+using Content.Shared.ActionBlocker;
+using Content.Shared.Atmos.Piping;
+using Content.Shared.Interaction;
+using Content.Shared.Interaction.Helpers;
+using JetBrains.Annotations;
+using Robust.Server.GameObjects;
+using Robust.Shared.GameObjects;
+
+namespace Content.Server.Atmos.Piping.Binary.EntitySystems
+{
+    [UsedImplicitly]
+    public class GasValveSystem : EntitySystem
+    {
+        public override void Initialize()
+        {
+            base.Initialize();
+
+            SubscribeLocalEvent<GasValveComponent, ComponentStartup>(OnStartup);
+            SubscribeLocalEvent<GasValveComponent, ActivateInWorldEvent>(OnActivate);
+        }
+
+        private void OnStartup(EntityUid uid, GasValveComponent component, ComponentStartup args)
+        {
+            // We call set in startup so it sets the appearance, node state, etc.
+            Set(uid, component, component.Open);
+        }
+
+        private void OnActivate(EntityUid uid, GasValveComponent component, ActivateInWorldEvent args)
+        {
+            if(args.User.InRangeUnobstructed(args.Target) && Get<ActionBlockerSystem>().CanInteract(args.User))
+                Toggle(uid, component);
+        }
+
+        public void Set(EntityUid uid, GasValveComponent component, bool value)
+        {
+            component.Open = value;
+
+            if (ComponentManager.TryGetComponent(uid, out NodeContainerComponent? nodeContainer)
+                && nodeContainer.TryGetNode(component.PipeName, out PipeNode? pipe))
+            {
+                pipe.ConnectionsEnabled = component.Open;
+            }
+        }
+
+        public void Toggle(EntityUid uid, GasValveComponent component)
+        {
+            Set(uid, component, !component.Open);
+        }
+    }
+}
diff --git a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs
index 48e253167b..ba4fd92866 100644
--- a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs
+++ b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs
@@ -1,3 +1,4 @@
+using Content.Server.Atmos.EntitySystems;
 using Content.Server.Atmos.Piping.Binary.Components;
 using Content.Server.Atmos.Piping.Components;
 using Content.Server.NodeContainer;
@@ -55,12 +56,13 @@ namespace Content.Server.Atmos.Piping.Binary.EntitySystems
             // Some of the gas from the mixture leaks when overclocked.
             if (pump.Overclocked)
             {
-                var tile = args.Atmosphere.GetTile(pump.Owner.Transform.Coordinates);
+                var atmosphereSystem = Get<AtmosphereSystem>();
+                var tile = atmosphereSystem.GetTileMixture(pump.Owner.Transform.Coordinates, true);
 
                 if (tile != null)
                 {
                     var leaked = removed.RemoveRatio(pump.LeakRatio);
-                    tile.AssumeAir(leaked);
+                    atmosphereSystem.Merge(tile, leaked);
                 }
             }
 
diff --git a/Content.Server/Atmos/Piping/Components/AtmosDeviceComponent.cs b/Content.Server/Atmos/Piping/Components/AtmosDeviceComponent.cs
index 20637de79d..9b535e7e01 100644
--- a/Content.Server/Atmos/Piping/Components/AtmosDeviceComponent.cs
+++ b/Content.Server/Atmos/Piping/Components/AtmosDeviceComponent.cs
@@ -1,7 +1,7 @@
-#nullable enable
 using System;
 using Content.Server.Atmos.Components;
 using Robust.Shared.GameObjects;
+using Robust.Shared.Map;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
@@ -22,40 +22,18 @@ namespace Content.Server.Atmos.Piping.Components
         [DataField("requireAnchored")]
         public bool RequireAnchored { get; private set; } = true;
 
-        public IGridAtmosphereComponent? Atmosphere { get; set; }
-
         [ViewVariables]
         public TimeSpan LastProcess { get; set; } = TimeSpan.Zero;
+
+        public GridId? JoinedGrid { get; set; }
     }
 
-    public abstract class BaseAtmosDeviceEvent : EntityEventArgs
-    {
-        public IGridAtmosphereComponent Atmosphere { get; }
+    public sealed class AtmosDeviceUpdateEvent : EntityEventArgs
+    {}
 
-        public BaseAtmosDeviceEvent(IGridAtmosphereComponent atmosphere)
-        {
-            Atmosphere = atmosphere;
-        }
-    }
+    public sealed class AtmosDeviceEnabledEvent : EntityEventArgs
+    {}
 
-    public sealed class AtmosDeviceUpdateEvent : BaseAtmosDeviceEvent
-    {
-        public AtmosDeviceUpdateEvent(IGridAtmosphereComponent atmosphere) : base(atmosphere)
-        {
-        }
-    }
-
-    public sealed class AtmosDeviceEnabledEvent : BaseAtmosDeviceEvent
-    {
-        public AtmosDeviceEnabledEvent(IGridAtmosphereComponent atmosphere) : base(atmosphere)
-        {
-        }
-    }
-
-    public sealed class AtmosDeviceDisabledEvent : BaseAtmosDeviceEvent
-    {
-        public AtmosDeviceDisabledEvent(IGridAtmosphereComponent atmosphere) : base(atmosphere)
-        {
-        }
-    }
+    public sealed class AtmosDeviceDisabledEvent : EntityEventArgs
+    {}
 }
diff --git a/Content.Server/Atmos/Piping/Components/AtmosPipeColorComponent.cs b/Content.Server/Atmos/Piping/Components/AtmosPipeColorComponent.cs
new file mode 100644
index 0000000000..87439345f5
--- /dev/null
+++ b/Content.Server/Atmos/Piping/Components/AtmosPipeColorComponent.cs
@@ -0,0 +1,25 @@
+using Content.Server.Atmos.Piping.EntitySystems;
+using JetBrains.Annotations;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Maths;
+using Robust.Shared.Serialization.Manager.Attributes;
+using Robust.Shared.ViewVariables;
+
+namespace Content.Server.Atmos.Piping.Components
+{
+    [RegisterComponent]
+    public class AtmosPipeColorComponent : Component
+    {
+        public override string Name => "AtmosPipeColor";
+
+        [DataField("color")]
+        public Color Color { get; set; } = Color.White;
+
+        [ViewVariables(VVAccess.ReadWrite), UsedImplicitly]
+        public Color ColorVV
+        {
+            get => Color;
+            set => EntitySystem.Get<AtmosPipeColorSystem>().SetColor(Owner.Uid, this, value);
+        }
+    }
+}
diff --git a/Content.Server/Atmos/Piping/EntitySystems/AtmosDeviceSystem.cs b/Content.Server/Atmos/Piping/EntitySystems/AtmosDeviceSystem.cs
index 60f8fd3ead..5c0d7826c6 100644
--- a/Content.Server/Atmos/Piping/EntitySystems/AtmosDeviceSystem.cs
+++ b/Content.Server/Atmos/Piping/EntitySystems/AtmosDeviceSystem.cs
@@ -20,13 +20,13 @@ namespace Content.Server.Atmos.Piping.EntitySystems
 
             SubscribeLocalEvent<AtmosDeviceComponent, ComponentInit>(OnDeviceInitialize);
             SubscribeLocalEvent<AtmosDeviceComponent, ComponentShutdown>(OnDeviceShutdown);
-            SubscribeLocalEvent<AtmosDeviceComponent, PhysicsBodyTypeChangedEvent>(OnDeviceBodyTypeChanged);
             SubscribeLocalEvent<AtmosDeviceComponent, EntParentChangedMessage>(OnDeviceParentChanged);
+            SubscribeLocalEvent<AtmosDeviceComponent, AnchorStateChangedEvent>(OnDeviceAnchorChanged);
         }
 
         private bool CanJoinAtmosphere(AtmosDeviceComponent component)
         {
-            return !component.RequireAnchored || !component.Owner.TryGetComponent(out PhysicsComponent? physics) || physics.BodyType == BodyType.Static;
+            return !component.RequireAnchored || !component.Owner.Transform.Anchored;
         }
 
         public void JoinAtmosphere(AtmosDeviceComponent component)
@@ -34,26 +34,22 @@ namespace Content.Server.Atmos.Piping.EntitySystems
             if (!CanJoinAtmosphere(component))
                 return;
 
-            // We try to get a valid, simulated atmosphere.
-            if (!Get<AtmosphereSystem>().TryGetSimulatedGridAtmosphere(component.Owner.Transform.MapPosition, out var atmosphere))
+            // We try to add the device to a valid atmosphere.
+            if (!Get<AtmosphereSystem>().AddAtmosDevice(component))
                 return;
 
             component.LastProcess = _gameTiming.CurTime;
-            component.Atmosphere = atmosphere;
-            atmosphere.AddAtmosDevice(component);
 
-            RaiseLocalEvent(component.Owner.Uid, new AtmosDeviceEnabledEvent(atmosphere), false);
+            RaiseLocalEvent(component.Owner.Uid, new AtmosDeviceEnabledEvent(), false);
         }
 
         public void LeaveAtmosphere(AtmosDeviceComponent component)
         {
-            var atmosphere = component.Atmosphere;
-            atmosphere?.RemoveAtmosDevice(component);
-            component.Atmosphere = null;
-            component.LastProcess = TimeSpan.Zero;
+            if (!Get<AtmosphereSystem>().RemoveAtmosDevice(component))
+                return;
 
-            if(atmosphere != null)
-                RaiseLocalEvent(component.Owner.Uid, new AtmosDeviceDisabledEvent(atmosphere), false);
+            component.LastProcess = TimeSpan.Zero;
+            RaiseLocalEvent(component.Owner.Uid, new AtmosDeviceDisabledEvent(), false);
         }
 
         public void RejoinAtmosphere(AtmosDeviceComponent component)
@@ -72,13 +68,13 @@ namespace Content.Server.Atmos.Piping.EntitySystems
             LeaveAtmosphere(component);
         }
 
-        private void OnDeviceBodyTypeChanged(EntityUid uid, AtmosDeviceComponent component, PhysicsBodyTypeChangedEvent args)
+        private void OnDeviceAnchorChanged(EntityUid uid, AtmosDeviceComponent component, AnchorStateChangedEvent args)
         {
             // Do nothing if the component doesn't require being anchored to function.
             if (!component.RequireAnchored)
                 return;
 
-            if (args.New == BodyType.Static)
+            if(component.Owner.Transform.Anchored)
                 JoinAtmosphere(component);
             else
                 LeaveAtmosphere(component);
diff --git a/Content.Server/Atmos/Piping/EntitySystems/AtmosPipeColorSystem.cs b/Content.Server/Atmos/Piping/EntitySystems/AtmosPipeColorSystem.cs
new file mode 100644
index 0000000000..828cfdfe9c
--- /dev/null
+++ b/Content.Server/Atmos/Piping/EntitySystems/AtmosPipeColorSystem.cs
@@ -0,0 +1,45 @@
+using Content.Server.Atmos.Piping.Components;
+using Content.Shared.Atmos.Piping;
+using Robust.Server.GameObjects;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Maths;
+
+namespace Content.Server.Atmos.Piping.EntitySystems
+{
+    public class AtmosPipeColorSystem : EntitySystem
+    {
+        public override void Initialize()
+        {
+            base.Initialize();
+
+            SubscribeLocalEvent<AtmosPipeColorComponent, ComponentStartup>(OnStartup);
+            SubscribeLocalEvent<AtmosPipeColorComponent, ComponentShutdown>(OnShutdown);
+        }
+
+        private void OnStartup(EntityUid uid, AtmosPipeColorComponent component, ComponentStartup args)
+        {
+            if (!ComponentManager.TryGetComponent(uid, out AppearanceComponent? appearance))
+                return;
+
+            appearance.SetData(PipeColorVisuals.Color, component.Color);
+        }
+
+        private void OnShutdown(EntityUid uid, AtmosPipeColorComponent component, ComponentShutdown args)
+        {
+            if (!ComponentManager.TryGetComponent(uid, out AppearanceComponent? appearance))
+                return;
+
+            appearance.SetData(PipeColorVisuals.Color, Color.White);
+        }
+
+        public void SetColor(EntityUid uid, AtmosPipeColorComponent component, Color color)
+        {
+            component.Color = color;
+
+            if (!ComponentManager.TryGetComponent(uid, out AppearanceComponent? appearance))
+                return;
+
+            appearance.SetData(PipeColorVisuals.Color, color);
+        }
+    }
+}
diff --git a/Content.Server/Atmos/Piping/EntitySystems/AtmosUnsafeUnanchorSystem.cs b/Content.Server/Atmos/Piping/EntitySystems/AtmosUnsafeUnanchorSystem.cs
index 2f63c28b59..c14fc7dafa 100644
--- a/Content.Server/Atmos/Piping/EntitySystems/AtmosUnsafeUnanchorSystem.cs
+++ b/Content.Server/Atmos/Piping/EntitySystems/AtmosUnsafeUnanchorSystem.cs
@@ -1,3 +1,4 @@
+using System.Buffers;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Atmos.Piping.Components;
 using Content.Server.Construction.Components;
@@ -25,7 +26,7 @@ namespace Content.Server.Atmos.Piping.EntitySystems
             if (!component.Enabled || !ComponentManager.TryGetComponent(uid, out NodeContainerComponent? nodes))
                 return;
 
-            if (!component.Owner.Transform.Coordinates.TryGetTileAir(out var environment, EntityManager))
+            if (Get<AtmosphereSystem>().GetTileMixture(component.Owner.Transform.Coordinates) is not {} environment)
                 return;
 
             foreach (var node in nodes.Nodes.Values)
@@ -46,12 +47,10 @@ namespace Content.Server.Atmos.Piping.EntitySystems
             if (!component.Enabled || !ComponentManager.TryGetComponent(uid, out NodeContainerComponent? nodes))
                 return;
 
-            if (!component.Owner.Transform.Coordinates.TryGetTileAtmosphere(out var environment))
-                environment = null;
+            var atmosphereSystem = Get<AtmosphereSystem>();
 
-            var environmentPressure = environment?.Air?.Pressure ?? 0f;
-            var environmentVolume = environment?.Air?.Volume ?? Atmospherics.CellVolume;
-            var environmentTemperature = environment?.Air?.Volume ?? Atmospherics.TCMB;
+            if (atmosphereSystem.GetTileMixture(component.Owner.Transform.Coordinates, true) is not {} environment)
+                environment = GasMixture.SpaceGas;
 
             var lost = 0f;
             var timesLost = 0;
@@ -60,16 +59,14 @@ namespace Content.Server.Atmos.Piping.EntitySystems
             {
                 if (node is not PipeNode pipe) continue;
 
-                var difference = pipe.Air.Pressure - environmentPressure;
-                lost += difference * environmentVolume / (environmentTemperature * Atmospherics.R);
+                var difference = pipe.Air.Pressure - environment.Pressure;
+                lost += difference * environment.Volume / (environment.Temperature * Atmospherics.R);
                 timesLost++;
             }
 
             var sharedLoss = lost / timesLost;
             var buffer = new GasMixture();
 
-            var atmosphereSystem = Get<AtmosphereSystem>();
-
             foreach (var node in nodes.Nodes.Values)
             {
                 if (node is not PipeNode pipe) continue;
@@ -77,7 +74,7 @@ namespace Content.Server.Atmos.Piping.EntitySystems
                 atmosphereSystem.Merge(buffer, pipe.Air.Remove(sharedLoss));
             }
 
-            environment?.AssumeAir(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 142a929de8..d1e61c7b98 100644
--- a/Content.Server/Atmos/Piping/Other/EntitySystems/GasMinerSystem.cs
+++ b/Content.Server/Atmos/Piping/Other/EntitySystems/GasMinerSystem.cs
@@ -1,5 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using Content.Server.Atmos.Components;
+using Content.Server.Atmos.EntitySystems;
 using Content.Server.Atmos.Piping.Components;
 using Content.Server.Atmos.Piping.Other.Components;
 using Content.Shared.Atmos;
@@ -20,7 +21,9 @@ namespace Content.Server.Atmos.Piping.Other.EntitySystems
 
         private void OnMinerUpdated(EntityUid uid, GasMinerComponent miner, AtmosDeviceUpdateEvent args)
         {
-            if (!CheckMinerOperation(args.Atmosphere, miner, out var tile) || !miner.Enabled || !miner.SpawnGas.HasValue || miner.SpawnAmount <= 0f)
+            var atmosphereSystem = Get<AtmosphereSystem>();
+
+            if (!CheckMinerOperation(atmosphereSystem, miner, out var environment) || !miner.Enabled || !miner.SpawnGas.HasValue || miner.SpawnAmount <= 0f)
                 return;
 
             // Time to mine some gas.
@@ -28,22 +31,22 @@ namespace Content.Server.Atmos.Piping.Other.EntitySystems
             var merger = new GasMixture(1) { Temperature = miner.SpawnTemperature };
             merger.SetMoles(miner.SpawnGas.Value, miner.SpawnAmount);
 
-            tile.AssumeAir(merger);
+            atmosphereSystem.Merge(environment, merger);
         }
 
-        private bool CheckMinerOperation(IGridAtmosphereComponent atmosphere, GasMinerComponent miner, [NotNullWhen(true)] out TileAtmosphere? tile)
+        private bool CheckMinerOperation(AtmosphereSystem atmosphereSystem, GasMinerComponent miner, [NotNullWhen(true)] out GasMixture? environment)
         {
-            tile = atmosphere.GetTile(miner.Owner.Transform.Coordinates)!;
+            environment = atmosphereSystem.GetTileMixture(miner.Owner.Transform.Coordinates, true);
 
             // Space.
-            if (atmosphere.IsSpace(tile.GridIndices))
+            if (atmosphereSystem.IsTileSpace(miner.Owner.Transform.Coordinates))
             {
                 miner.Broken = true;
                 return false;
             }
 
-            // Airblocked location.
-            if (tile.Air == null)
+            // Air-blocked location.
+            if (environment == null)
             {
                 miner.Broken = true;
                 return false;
@@ -51,14 +54,14 @@ namespace Content.Server.Atmos.Piping.Other.EntitySystems
 
             // External pressure above threshold.
             if (!float.IsInfinity(miner.MaxExternalPressure) &&
-                tile.Air.Pressure > miner.MaxExternalPressure - miner.SpawnAmount * miner.SpawnTemperature * Atmospherics.R / tile.Air.Volume)
+                environment.Pressure > miner.MaxExternalPressure - miner.SpawnAmount * miner.SpawnTemperature * Atmospherics.R / environment.Volume)
             {
                 miner.Broken = true;
                 return false;
             }
 
             // External gas amount above threshold.
-            if (!float.IsInfinity(miner.MaxExternalAmount) && tile.Air.TotalMoles > miner.MaxExternalAmount)
+            if (!float.IsInfinity(miner.MaxExternalAmount) && environment.TotalMoles > miner.MaxExternalAmount)
             {
                 miner.Broken = true;
                 return false;
diff --git a/Content.Server/Atmos/Piping/Trinary/Components/GasFilterComponent.cs b/Content.Server/Atmos/Piping/Trinary/Components/GasFilterComponent.cs
index ab5a4cc264..4c547215f4 100644
--- a/Content.Server/Atmos/Piping/Trinary/Components/GasFilterComponent.cs
+++ b/Content.Server/Atmos/Piping/Trinary/Components/GasFilterComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Shared.Atmos;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
diff --git a/Content.Server/Atmos/Piping/Unary/Components/GasCanisterComponent.cs b/Content.Server/Atmos/Piping/Unary/Components/GasCanisterComponent.cs
index d8999b09b2..5f2379b1e4 100644
--- a/Content.Server/Atmos/Piping/Unary/Components/GasCanisterComponent.cs
+++ b/Content.Server/Atmos/Piping/Unary/Components/GasCanisterComponent.cs
@@ -23,12 +23,11 @@ namespace Content.Server.Atmos.Piping.Unary.Components
 
         [ViewVariables(VVAccess.ReadWrite)]
         [DataField("gasMixture")]
-        public GasMixture InitialMixture { get; } = new();
+        public GasMixture Air { get; } = new();
 
         /// <summary>
-        ///     Stores the last pressure the tank had, for appearance-updating purposes.
+        ///     Last recorded pressure, for appearance-updating purposes.
         /// </summary>
-        [ViewVariables]
         public float LastPressure { get; set; } = 0f;
 
         /// <summary>
diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs
index d12a363475..afc56ec96c 100644
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs
@@ -1,4 +1,5 @@
 using System;
+using System.CodeDom;
 using Content.Server.Atmos.Components;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Atmos.Piping.Binary.Components;
@@ -6,6 +7,7 @@ using Content.Server.Atmos.Piping.Components;
 using Content.Server.Atmos.Piping.Unary.Components;
 using Content.Server.Hands.Components;
 using Content.Server.NodeContainer;
+using Content.Server.NodeContainer.NodeGroups;
 using Content.Server.NodeContainer.Nodes;
 using Content.Server.UserInterface;
 using Content.Shared.ActionBlocker;
@@ -54,18 +56,6 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
             {
                 containerManager.MakeContainer<ContainerSlot>(canister.ContainerName);
             }
-
-            if (!ComponentManager.TryGetComponent(uid, out NodeContainerComponent? nodeContainer))
-                return;
-
-            if (!nodeContainer.TryGetNode(canister.PortName, out PipeNode? portNode))
-                return;
-
-            // Create a pipenet if we don't have one already.
-            portNode.CreateSingleNetImmediate();
-            Get<AtmosphereSystem>().Merge(portNode.Air, canister.InitialMixture);
-            portNode.Air.Temperature = canister.InitialMixture.Temperature;
-            portNode.Volume = canister.InitialMixture.Volume;
         }
 
         private void DirtyUI(EntityUid uid)
@@ -81,7 +71,9 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
             string? tankLabel = null;
             var tankPressure = 0f;
 
-            if (ComponentManager.TryGetComponent(uid, out ContainerManagerComponent? containerManager) && containerManager.TryGetContainer(canister.ContainerName, out var tankContainer) && tankContainer.ContainedEntities.Count > 0)
+            if (ComponentManager.TryGetComponent(uid, out ContainerManagerComponent? containerManager)
+                && containerManager.TryGetContainer(canister.ContainerName, out var tankContainer)
+                && tankContainer.ContainedEntities.Count > 0)
             {
                 var tank = tankContainer.ContainedEntities[0];
                 var tankComponent = tank.GetComponent<GasTankComponent>();
@@ -89,8 +81,8 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
                 tankPressure = tankComponent.Air.Pressure;
             }
 
-            ui.SetState(new GasCanisterBoundUserInterfaceState(metadata.EntityName, portNode.Air.Pressure,
-                portNode.NodeGroup!.Nodes.Count > 1, tankLabel, tankPressure,
+            ui.SetState(new GasCanisterBoundUserInterfaceState(metadata.EntityName, canister.Air.Pressure,
+                portNode.NodeGroup?.Nodes.Count > 1, tankLabel, tankPressure,
                 canister.ReleasePressure, canister.ReleaseValve,
                 canister.MinReleasePressure, canister.MaxReleasePressure));
         }
@@ -136,9 +128,29 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
                 || !ComponentManager.TryGetComponent(uid, out AppearanceComponent? appearance))
                 return;
 
-            if (!nodeContainer.TryGetNode(canister.PortName, out PipeNode? portNode))
+            if (!nodeContainer.TryGetNode(canister.PortName, out PortablePipeNode? portNode))
                 return;
 
+            var atmosphereSystem = Get<AtmosphereSystem>();
+
+            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);
+
+                net.Air.Clear();
+                atmosphereSystem.Merge(net.Air, buffer);
+                net.Air.Multiply(net.Air.Volume / buffer.Volume);
+
+                canister.Air.Clear();
+                atmosphereSystem.Merge(canister.Air, buffer);
+                canister.Air.Multiply(canister.Air.Volume / buffer.Volume);
+            }
+
             // Release valve is open, release gas.
             if (canister.ReleaseValve)
             {
@@ -146,38 +158,35 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
                     || !containerManager.TryGetContainer(canister.ContainerName, out var container))
                     return;
 
-                var atmosphereSystem = Get<AtmosphereSystem>();
-
                 if (container.ContainedEntities.Count > 0)
                 {
                     var gasTank = container.ContainedEntities[0].GetComponent<GasTankComponent>();
-                    atmosphereSystem.ReleaseGasTo(portNode.Air, gasTank.Air, canister.ReleasePressure);
+                    atmosphereSystem.ReleaseGasTo(canister.Air, gasTank.Air, canister.ReleasePressure);
                 }
                 else
                 {
-                    var tileAtmosphere = canister.Owner.Transform.Coordinates.GetTileAtmosphere();
-                    atmosphereSystem.ReleaseGasTo(portNode.Air, tileAtmosphere?.Air, canister.ReleasePressure);
-                    tileAtmosphere?.Invalidate();
+                    var environment = atmosphereSystem.GetTileMixture(canister.Owner.Transform.Coordinates, true);
+                    atmosphereSystem.ReleaseGasTo(canister.Air, environment, canister.ReleasePressure);
                 }
             }
 
             DirtyUI(uid);
 
-            // Nothing to do here.
-            if (MathHelper.CloseTo(portNode.Air.Pressure, canister.LastPressure))
+            // If last pressure is very close to the current pressure, do nothing.
+            if (MathHelper.CloseTo(canister.Air.Pressure, canister.LastPressure))
                 return;
 
-            canister.LastPressure = portNode.Air.Pressure;
+            canister.LastPressure = canister.Air.Pressure;
 
-            if (portNode.Air.Pressure < 10)
+            if (canister.Air.Pressure < 10)
             {
                 appearance.SetData(GasCanisterVisuals.PressureState, 0);
             }
-            else if (portNode.Air.Pressure < Atmospherics.OneAtmosphere)
+            else if (canister.Air.Pressure < Atmospherics.OneAtmosphere)
             {
                 appearance.SetData(GasCanisterVisuals.PressureState, 1);
             }
-            else if (portNode.Air.Pressure < (15 * Atmospherics.OneAtmosphere))
+            else if (canister.Air.Pressure < (15 * Atmospherics.OneAtmosphere))
             {
                 appearance.SetData(GasCanisterVisuals.PressureState, 2);
             }
diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasOutletInjectorSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasOutletInjectorSystem.cs
index 1d275837ea..63f9665d44 100644
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasOutletInjectorSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasOutletInjectorSystem.cs
@@ -1,3 +1,4 @@
+using Content.Server.Atmos.EntitySystems;
 using Content.Server.Atmos.Piping.Components;
 using Content.Server.Atmos.Piping.Unary.Components;
 using Content.Server.NodeContainer;
@@ -31,9 +32,10 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
             if (!nodeContainer.TryGetNode(injector.InletName, out PipeNode? inlet))
                 return;
 
-            var environment = args.Atmosphere.GetTile(injector.Owner.Transform.Coordinates)!;
+            var atmosphereSystem = Get<AtmosphereSystem>();
+            var environment = atmosphereSystem.GetTileMixture(injector.Owner.Transform.Coordinates, true);
 
-            if (environment.Air == null)
+            if (environment == null)
                 return;
 
             if (inlet.Air.Temperature > 0)
@@ -42,8 +44,7 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
 
                 var removed = inlet.Air.Remove(transferMoles);
 
-                environment.AssumeAir(removed);
-                environment.Invalidate();
+                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 e984bd3515..5a61cbc350 100644
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasPassiveVentSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasPassiveVentSystem.cs
@@ -1,4 +1,5 @@
 using System;
+using Content.Server.Atmos.EntitySystems;
 using Content.Server.Atmos.Piping.Components;
 using Content.Server.Atmos.Piping.Unary.Components;
 using Content.Server.NodeContainer;
@@ -21,9 +22,10 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
 
         private void OnPassiveVentUpdated(EntityUid uid, GasPassiveVentComponent vent, AtmosDeviceUpdateEvent args)
         {
-            var environment = args.Atmosphere.GetTile(vent.Owner.Transform.Coordinates)!;
+            var atmosphereSystem = Get<AtmosphereSystem>();
+            var environment = atmosphereSystem.GetTileMixture(vent.Owner.Transform.Coordinates, true);
 
-            if (environment.Air == null)
+            if (environment == null)
                 return;
 
             if (!ComponentManager.TryGetComponent(uid, out NodeContainerComponent? nodeContainer))
@@ -32,27 +34,26 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
             if (!nodeContainer.TryGetNode(vent.InletName, out PipeNode? inlet))
                 return;
 
-            var environmentPressure = environment.Air.Pressure;
+            var environmentPressure = environment.Pressure;
             var pressureDelta = MathF.Abs(environmentPressure - inlet.Air.Pressure);
 
-            if ((environment.Air.Temperature > 0 || inlet.Air.Temperature > 0) && pressureDelta > 0.5f)
+            if ((environment.Temperature > 0 || inlet.Air.Temperature > 0) && pressureDelta > 0.5f)
             {
                 if (environmentPressure < inlet.Air.Pressure)
                 {
                     var airTemperature = environment.Temperature > 0 ? environment.Temperature : inlet.Air.Temperature;
-                    var transferMoles = pressureDelta * environment.Air.Volume / (airTemperature * Atmospherics.R);
+                    var transferMoles = pressureDelta * environment.Volume / (airTemperature * Atmospherics.R);
                     var removed = inlet.Air.Remove(transferMoles);
-                    environment.AssumeAir(removed);
+                    atmosphereSystem.Merge(environment, removed);
                 }
                 else
                 {
                     var airTemperature = inlet.Air.Temperature > 0 ? inlet.Air.Temperature : environment.Temperature;
                     var outputVolume = inlet.Air.Volume;
                     var transferMoles = (pressureDelta * outputVolume) / (airTemperature * Atmospherics.R);
-                    transferMoles = MathF.Min(transferMoles, environment.Air.TotalMoles * inlet.Air.Volume / environment.Air.Volume);
-                    var removed = environment.Air.Remove(transferMoles);
+                    transferMoles = MathF.Min(transferMoles, environment.TotalMoles * inlet.Air.Volume / environment.Volume);
+                    var removed = environment.Remove(transferMoles);
                     inlet.AssumeAir(removed);
-                    environment.Invalidate();
                 }
             }
 
diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs
index 16046fd61e..5e69a4f3b4 100644
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs
@@ -1,4 +1,5 @@
 using System;
+using Content.Server.Atmos.EntitySystems;
 using Content.Server.Atmos.Piping.Components;
 using Content.Server.Atmos.Piping.Unary.Components;
 using Content.Server.NodeContainer;
@@ -43,10 +44,11 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
             if (!nodeContainer.TryGetNode(vent.InletName, out PipeNode? pipe))
                 return;
 
-            var environment = args.Atmosphere.GetTile(vent.Owner.Transform.Coordinates)!;
+            var atmosphereSystem = Get<AtmosphereSystem>();
+            var environment = atmosphereSystem.GetTileMixture(vent.Owner.Transform.Coordinates, true);
 
             // We're in an air-blocked tile... Do nothing.
-            if (environment.Air == null)
+            if (environment == null)
                 return;
 
             if (vent.PumpDirection == VentPumpDirection.Releasing)
@@ -55,37 +57,36 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
                 var pressureDelta = 10000f;
 
                 if ((vent.PressureChecks & VentPressureBound.ExternalBound) != 0)
-                    pressureDelta = MathF.Min(pressureDelta, vent.ExternalPressureBound - environment.Air.Pressure);
+                    pressureDelta = MathF.Min(pressureDelta, vent.ExternalPressureBound - environment.Pressure);
 
                 if ((vent.PressureChecks & VentPressureBound.InternalBound) != 0)
                     pressureDelta = MathF.Min(pressureDelta, pipe.Air.Pressure - vent.InternalPressureBound);
 
                 if (pressureDelta > 0 && pipe.Air.Temperature > 0)
                 {
-                    var transferMoles = pressureDelta * environment.Air.Volume / (pipe.Air.Temperature * Atmospherics.R);
+                    var transferMoles = pressureDelta * environment.Volume / (pipe.Air.Temperature * Atmospherics.R);
 
-                    environment.AssumeAir(pipe.Air.Remove(transferMoles));
+                    atmosphereSystem.Merge(environment, pipe.Air.Remove(transferMoles));
                 }
             }
-            else if (vent.PumpDirection == VentPumpDirection.Siphoning && environment.Air.Pressure > 0)
+            else if (vent.PumpDirection == VentPumpDirection.Siphoning && environment.Pressure > 0)
             {
                 appearance?.SetData(VentPumpVisuals.State, VentPumpState.In);
-                var ourMultiplier = pipe.Air.Volume / (environment.Air.Temperature * Atmospherics.R);
+                var ourMultiplier = pipe.Air.Volume / (environment.Temperature * Atmospherics.R);
                 var molesDelta = 10000f * ourMultiplier;
 
                 if ((vent.PressureChecks & VentPressureBound.ExternalBound) != 0)
                     molesDelta = MathF.Min(molesDelta,
-                        (environment.Air.Pressure - vent.ExternalPressureBound) * environment.Air.Volume /
-                        (environment.Air.Temperature * Atmospherics.R));
+                        (environment.Pressure - vent.ExternalPressureBound) * environment.Volume /
+                        (environment.Temperature * Atmospherics.R));
 
                 if ((vent.PressureChecks & VentPressureBound.InternalBound) != 0)
                     molesDelta = MathF.Min(molesDelta, (vent.InternalPressureBound - pipe.Air.Pressure) * ourMultiplier);
 
                 if (molesDelta > 0)
                 {
-                    var removed = environment.Air.Remove(molesDelta);
+                    var removed = environment.Remove(molesDelta);
                     pipe.AssumeAir(removed);
-                    environment.Invalidate();
                 }
             }
         }
diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs
index 262924c2b6..399ba29a38 100644
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs
@@ -45,17 +45,17 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
             if (!nodeContainer.TryGetNode(scrubber.OutletName, out PipeNode? outlet))
                 return;
 
-            var environment = args.Atmosphere.GetTile(scrubber.Owner.Transform.Coordinates)!;
+            var atmosphereSystem = Get<AtmosphereSystem>();
+            var environment = atmosphereSystem.GetTileMixture(scrubber.Owner.Transform.Coordinates, true);
 
-            Scrub(scrubber, appearance, environment, outlet);
+            Scrub(atmosphereSystem, scrubber, appearance, environment, outlet);
 
             if (!scrubber.WideNet) return;
 
             // Scrub adjacent tiles too.
-            foreach (var adjacent in environment.AdjacentTiles)
+            foreach (var adjacent in atmosphereSystem.GetAdjacentTileMixtures(scrubber.Owner.Transform.Coordinates, false, true))
             {
-                // Pass null appearance, we don't need to set it there.
-                Scrub(scrubber, null, adjacent, outlet);
+                Scrub(atmosphereSystem, scrubber, null, adjacent, outlet);
             }
         }
 
@@ -67,10 +67,10 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
             }
         }
 
-        private void Scrub(GasVentScrubberComponent scrubber, AppearanceComponent? appearance, TileAtmosphere? tile, PipeNode outlet)
+        private void Scrub(AtmosphereSystem atmosphereSystem, GasVentScrubberComponent scrubber, AppearanceComponent? appearance, GasMixture? tile, PipeNode outlet)
         {
             // Cannot scrub if tile is null or air-blocked.
-            if (tile?.Air == null)
+            if (tile == null)
                 return;
 
             // Cannot scrub if pressure too high.
@@ -80,30 +80,28 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
             if (scrubber.PumpDirection == ScrubberPumpDirection.Scrubbing)
             {
                 appearance?.SetData(ScrubberVisuals.State, scrubber.WideNet ? ScrubberState.WideScrub : ScrubberState.Scrub);
-                var transferMoles = MathF.Min(1f, (scrubber.VolumeRate / tile.Air.Volume) * tile.Air.TotalMoles);
+                var transferMoles = MathF.Min(1f, (scrubber.VolumeRate / tile.Volume) * tile.TotalMoles);
 
                 // Take a gas sample.
-                var removed = tile.Air.Remove(transferMoles);
+                var removed = tile.Remove(transferMoles);
 
                 // Nothing left to remove from the tile.
                 if (MathHelper.CloseTo(removed.TotalMoles, 0f))
                     return;
 
-                // TODO: Entity system dependency
-                Get<AtmosphereSystem>().ScrubInto(removed, outlet.Air, scrubber.FilterGases);
+                atmosphereSystem.ScrubInto(removed, outlet.Air, scrubber.FilterGases);
 
                 // Remix the gases.
-                tile.AssumeAir(removed);
+                atmosphereSystem.Merge(tile, removed);
             }
             else if (scrubber.PumpDirection == ScrubberPumpDirection.Siphoning)
             {
                 appearance?.SetData(ScrubberVisuals.State, ScrubberState.Siphon);
-                var transferMoles = tile.Air.TotalMoles * (scrubber.VolumeRate / tile.Air.Volume);
+                var transferMoles = tile.TotalMoles * (scrubber.VolumeRate / tile.Volume);
 
-                var removed = tile.Air.Remove(transferMoles);
+                var removed = tile.Remove(transferMoles);
 
                 outlet.AssumeAir(removed);
-                tile.Invalidate();
             }
         }
     }
diff --git a/Content.Server/Atmos/Reactions/GasReactionPrototype.cs b/Content.Server/Atmos/Reactions/GasReactionPrototype.cs
index 1005f2d49a..c782ca6ac6 100644
--- a/Content.Server/Atmos/Reactions/GasReactionPrototype.cs
+++ b/Content.Server/Atmos/Reactions/GasReactionPrototype.cs
@@ -1,8 +1,6 @@
-#nullable enable
-using System;
+using System;
 using System.Collections.Generic;
 using Content.Server.Atmos.EntitySystems;
-using Content.Server.Interfaces;
 using Content.Shared.Atmos;
 using Robust.Server.GameObjects;
 using Robust.Shared.Prototypes;
@@ -67,7 +65,7 @@ namespace Content.Server.Atmos.Reactions
         /// </summary>
         [DataField("effects")] private List<IGasReactionEffect> _effects = new();
 
-        public ReactionResult React(GasMixture mixture, IGasMixtureHolder holder, AtmosphereSystem atmosphereSystem)
+        public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, AtmosphereSystem atmosphereSystem)
         {
             var result = ReactionResult.NoReaction;
 
diff --git a/Content.Server/Atmos/Reactions/PlasmaFireReaction.cs b/Content.Server/Atmos/Reactions/PlasmaFireReaction.cs
index 4d34cd33cd..b43000e8a1 100644
--- a/Content.Server/Atmos/Reactions/PlasmaFireReaction.cs
+++ b/Content.Server/Atmos/Reactions/PlasmaFireReaction.cs
@@ -1,8 +1,6 @@
-#nullable enable
 using System;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Coordinates.Helpers;
-using Content.Server.Interfaces;
 using Content.Shared.Atmos;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
@@ -22,9 +20,8 @@ namespace Content.Server.Atmos.Reactions
             var location = holder as TileAtmosphere;
             mixture.ReactionResults[GasReaction.Fire] = 0;
 
-            // More plasma released at higher temperatures
+            // More plasma released at higher temperatures.
             var temperatureScale = 0f;
-            var superSaturation = false;
 
             if (temperature > Atmospherics.PlasmaUpperTemperature)
                 temperatureScale = 1f;
@@ -32,33 +29,31 @@ namespace Content.Server.Atmos.Reactions
                 temperatureScale = (temperature - Atmospherics.PlasmaMinimumBurnTemperature) /
                                    (Atmospherics.PlasmaUpperTemperature - Atmospherics.PlasmaMinimumBurnTemperature);
 
-            if (temperatureScale > 0f)
+            if (temperatureScale > 0)
             {
-                var plasmaBurnRate = 0f;
                 var oxygenBurnRate = Atmospherics.OxygenBurnRateBase - temperatureScale;
+                var plasmaBurnRate = 0f;
 
-                if (mixture.GetMoles(Gas.Oxygen) / mixture.GetMoles(Gas.Plasma) >
-                    Atmospherics.SuperSaturationThreshold)
-                    superSaturation = true;
+                var initialOxygenMoles = mixture.GetMoles(Gas.Oxygen);
+                var initialPlasmaMoles = mixture.GetMoles(Gas.Plasma);
 
-                if (mixture.GetMoles(Gas.Oxygen) >
-                    mixture.GetMoles(Gas.Plasma) * Atmospherics.PlasmaOxygenFullburn)
-                    plasmaBurnRate = (mixture.GetMoles(Gas.Plasma) * temperatureScale) /
-                                     Atmospherics.PlasmaBurnRateDelta;
+                // Supersaturation makes tritium.
+                var supersaturation = initialOxygenMoles / initialPlasmaMoles > Atmospherics.SuperSaturationThreshold;
+
+                if (initialOxygenMoles > initialPlasmaMoles * Atmospherics.PlasmaOxygenFullburn)
+                    plasmaBurnRate = initialPlasmaMoles * temperatureScale / Atmospherics.PlasmaBurnRateDelta;
                 else
-                    plasmaBurnRate = (temperatureScale * (mixture.GetMoles(Gas.Oxygen) / Atmospherics.PlasmaOxygenFullburn)) / Atmospherics.PlasmaBurnRateDelta;
+                    plasmaBurnRate = temperatureScale * (initialOxygenMoles / Atmospherics.PlasmaOxygenFullburn) / Atmospherics.PlasmaBurnRateDelta;
 
                 if (plasmaBurnRate > Atmospherics.MinimumHeatCapacity)
                 {
-                    plasmaBurnRate = MathF.Min(MathF.Min(plasmaBurnRate, mixture.GetMoles(Gas.Plasma)), mixture.GetMoles(Gas.Oxygen)/oxygenBurnRate);
-                    mixture.SetMoles(Gas.Plasma, mixture.GetMoles(Gas.Plasma) - plasmaBurnRate);
-                    mixture.SetMoles(Gas.Oxygen, mixture.GetMoles(Gas.Oxygen) - (plasmaBurnRate * oxygenBurnRate));
+                    plasmaBurnRate = MathF.Min(plasmaBurnRate, MathF.Min(initialPlasmaMoles, initialOxygenMoles / oxygenBurnRate));
+                    mixture.SetMoles(Gas.Plasma, initialPlasmaMoles - plasmaBurnRate);
+                    mixture.SetMoles(Gas.Oxygen, initialOxygenMoles - plasmaBurnRate * oxygenBurnRate);
+                    mixture.AdjustMoles(supersaturation ? Gas.Tritium : Gas.CarbonDioxide, plasmaBurnRate);
 
-                    mixture.AdjustMoles(superSaturation ? Gas.Tritium : Gas.CarbonDioxide, plasmaBurnRate);
-
-                    energyReleased += Atmospherics.FirePlasmaEnergyReleased * (plasmaBurnRate);
-
-                    mixture.ReactionResults[GasReaction.Fire] += (plasmaBurnRate) * (1 + oxygenBurnRate);
+                    energyReleased += Atmospherics.FirePlasmaEnergyReleased * plasmaBurnRate;
+                    mixture.ReactionResults[GasReaction.Fire] += plasmaBurnRate * (1 + oxygenBurnRate);
                 }
             }
 
@@ -66,25 +61,15 @@ namespace Content.Server.Atmos.Reactions
             {
                 var newHeatCapacity = atmosphereSystem.GetHeatCapacity(mixture);
                 if (newHeatCapacity > Atmospherics.MinimumHeatCapacity)
-                    mixture.Temperature = ((temperature * oldHeatCapacity + energyReleased) / newHeatCapacity);
+                    mixture.Temperature = (temperature * oldHeatCapacity + energyReleased) / newHeatCapacity;
             }
 
             if (location != null)
             {
-                temperature = mixture.Temperature;
-                if (temperature > Atmospherics.FireMinimumTemperatureToExist)
+                var mixTemperature = mixture.Temperature;
+                if (mixTemperature > Atmospherics.FireMinimumTemperatureToExist)
                 {
-                    location.HotspotExpose(temperature, mixture.Volume);
-
-                    foreach (var entity in location.GridIndices.GetEntitiesInTileFast(location.GridIndex))
-                    {
-                        foreach (var temperatureExpose in entity.GetAllComponents<ITemperatureExpose>())
-                        {
-                            temperatureExpose.TemperatureExpose(mixture, temperature, mixture.Volume);
-                        }
-                    }
-
-                    location.TemperatureExpose(mixture, temperature, mixture.Volume);
+                    atmosphereSystem.HotspotExpose(location.GridIndex, location.GridIndices, mixTemperature, mixture.Volume);
                 }
             }
 
diff --git a/Content.Server/Atmos/Reactions/TritiumFireReaction.cs b/Content.Server/Atmos/Reactions/TritiumFireReaction.cs
index 3c71b26c15..57d46d9863 100644
--- a/Content.Server/Atmos/Reactions/TritiumFireReaction.cs
+++ b/Content.Server/Atmos/Reactions/TritiumFireReaction.cs
@@ -1,7 +1,5 @@
-#nullable enable
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Coordinates.Helpers;
-using Content.Server.Interfaces;
 using Content.Shared.Atmos;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
@@ -64,17 +62,7 @@ namespace Content.Server.Atmos.Reactions
                 temperature = mixture.Temperature;
                 if (temperature > Atmospherics.FireMinimumTemperatureToExist)
                 {
-                    location.HotspotExpose(temperature, mixture.Volume);
-
-                    foreach (var entity in location.GridIndices.GetEntitiesInTileFast(location.GridIndex))
-                    {
-                        foreach (var temperatureExpose in entity.GetAllComponents<ITemperatureExpose>())
-                        {
-                            temperatureExpose.TemperatureExpose(mixture, temperature, mixture.Volume);
-                        }
-                    }
-
-                    location.TemperatureExpose(mixture, temperature, mixture.Volume);
+                    atmosphereSystem.HotspotExpose(location.GridIndex, location.GridIndices, temperature, mixture.Volume);
                 }
             }
 
diff --git a/Content.Server/Atmos/Reactions/WaterVaporReaction.cs b/Content.Server/Atmos/Reactions/WaterVaporReaction.cs
index 6f2c98d16c..7e19ffafce 100644
--- a/Content.Server/Atmos/Reactions/WaterVaporReaction.cs
+++ b/Content.Server/Atmos/Reactions/WaterVaporReaction.cs
@@ -1,7 +1,5 @@
-#nullable enable
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Fluids.Components;
-using Content.Server.Interfaces;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Chemistry.Solution;
 using Content.Shared.Maps;
diff --git a/Content.Server/Atmos/TileAtmosphere.cs b/Content.Server/Atmos/TileAtmosphere.cs
index d3328ce7fb..5bcfc710b4 100644
--- a/Content.Server/Atmos/TileAtmosphere.cs
+++ b/Content.Server/Atmos/TileAtmosphere.cs
@@ -1,54 +1,29 @@
 #nullable disable warnings
 #nullable enable annotations
-using System;
-using System.Buffers;
-using System.Collections.Generic;
-using System.Runtime.CompilerServices;
-using Content.Server.Atmos.Components;
-using Content.Server.Atmos.EntitySystems;
-using Content.Server.Atmos.Reactions;
-using Content.Server.Coordinates.Helpers;
-using Content.Server.Interfaces;
 using Content.Shared.Atmos;
-using Content.Shared.Audio;
 using Content.Shared.Maps;
-using JetBrains.Annotations;
-using Microsoft.EntityFrameworkCore.Metadata.Builders;
-using Robust.Server.GameObjects;
-using Robust.Shared.Audio;
-using Robust.Shared.Containers;
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
-using Robust.Shared.Physics;
-using Robust.Shared.Player;
-using Robust.Shared.Random;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Atmos
 {
+    /// <summary>
+    ///     Internal Atmos class that stores data about the atmosphere in a grid.
+    /// </summary>
     public class TileAtmosphere : IGasMixtureHolder
     {
-        [Robust.Shared.IoC.Dependency] private readonly IRobustRandom _robustRandom = default!;
-        [Robust.Shared.IoC.Dependency] private readonly IEntityManager _entityManager = default!;
-        [Robust.Shared.IoC.Dependency] private readonly IMapManager _mapManager = default!;
-        private readonly GridTileLookupSystem _gridTileLookupSystem = default!;
-
-
-        private static readonly TileAtmosphereComparer Comparer = new();
-
-        [ViewVariables] private int _archivedCycle;
-        [ViewVariables] private int _currentCycle;
+        [ViewVariables]
+        public int ArchivedCycle;
 
         [ViewVariables]
-        public float Temperature { get; private set; } = Atmospherics.T20C;
+        public int CurrentCycle;
 
         [ViewVariables]
-        private float _temperatureArchived = Atmospherics.T20C;
+        public float Temperature { get; set; } = Atmospherics.T20C;
 
-        // I know this being static is evil, but I seriously can't come up with a better solution to sound spam.
-        private static int _soundCooldown;
+        [ViewVariables]
+        public float TemperatureArchived { get; set; } = Atmospherics.T20C;
 
         [ViewVariables]
         public TileAtmosphere? PressureSpecificTarget { get; set; }
@@ -65,35 +40,23 @@ namespace Content.Server.Atmos
         [ViewVariables]
         public bool Excited { get; set; }
 
-        [ViewVariables]
-        private readonly GridAtmosphereComponent _gridAtmosphereComponent;
-
         /// <summary>
         ///     Adjacent tiles in the same order as <see cref="AtmosDirection"/>. (NSEW)
         /// </summary>
         [ViewVariables]
-        private readonly TileAtmosphere[] _adjacentTiles = new TileAtmosphere[Atmospherics.Directions];
-
-        public IReadOnlyList<TileAtmosphere> AdjacentTiles => _adjacentTiles;
-
-        private AtmosDirection _adjacentBits = AtmosDirection.Invalid;
-
-        [ViewVariables, UsedImplicitly]
-        private int AdjacentBitsInt => (int)_adjacentBits;
+        public readonly TileAtmosphere?[] AdjacentTiles = new TileAtmosphere[Atmospherics.Directions];
 
         [ViewVariables]
-        private TileAtmosInfo _tileAtmosInfo;
+        public AtmosDirection AdjacentBits = AtmosDirection.Invalid;
+
+        [ViewVariables]
+        public MonstermosInfo MonstermosInfo;
 
         [ViewVariables]
         public Hotspot Hotspot;
 
-        private AtmosDirection _pressureDirection;
-
-        // I'm assuming there's a good reason the original variable was made private, but this information is also important.
-        public AtmosDirection PressureDirectionForDebugOverlay => _pressureDirection;
-
-        [ViewVariables, UsedImplicitly]
-        private int PressureDirectionInt => (int)_pressureDirection;
+        [ViewVariables]
+        public AtmosDirection PressureDirection;
 
         [ViewVariables]
         public GridId GridIndex { get; }
@@ -108,25 +71,20 @@ namespace Content.Server.Atmos
         public ExcitedGroup? ExcitedGroup { get; set; }
 
         /// <summary>
-        /// The air in this tile. If null, this tile is completely airblocked.
+        /// The air in this tile. If null, this tile is completely air-blocked.
         /// This can be immutable if the tile is spaced.
         /// </summary>
         [ViewVariables]
         public GasMixture? Air { get; set; }
 
-        [ViewVariables, UsedImplicitly]
-        private int _blockedAirflow => (int)BlockedAirflow;
-
-        public AtmosDirection BlockedAirflow { get; set; } = AtmosDirection.Invalid;
+        [ViewVariables]
+        public float MaxFireTemperatureSustained { get; set; }
 
         [ViewVariables]
-        public bool BlocksAllAir => BlockedAirflow == AtmosDirection.All;
+        public AtmosDirection BlockedAirflow { get; set; } = AtmosDirection.Invalid;
 
-        public TileAtmosphere(GridAtmosphereComponent atmosphereComponent, GridId gridIndex, Vector2i gridIndices, GasMixture? mixture = null, bool immutable = false)
+        public TileAtmosphere(GridId gridIndex, Vector2i gridIndices, GasMixture? mixture = null, bool immutable = false)
         {
-            IoCManager.InjectDependencies(this);
-            _gridAtmosphereComponent = atmosphereComponent;
-            _gridTileLookupSystem = _entityManager.EntitySysManager.GetEntitySystem<GridTileLookupSystem>();
             GridIndex = gridIndex;
             GridIndices = gridIndices;
             Air = mixture;
@@ -134,1074 +92,5 @@ namespace Content.Server.Atmos
             if(immutable)
                 Air?.MarkImmutable();
         }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void Archive(int fireCount)
-        {
-            Air?.Archive();
-            _archivedCycle = fireCount;
-            _temperatureArchived = Temperature;
-        }
-
-        public void HighPressureMovements()
-        {
-            // TODO ATMOS finish this
-
-            if(PressureDifference > 15)
-            {
-                if(_soundCooldown == 0)
-                {
-                    var coordinates = GridIndices.ToEntityCoordinates(GridIndex, _mapManager);
-                    SoundSystem.Play(Filter.Pvs(coordinates), "/Audio/Effects/space_wind.ogg",
-                        coordinates, AudioHelpers.WithVariation(0.125f).WithVolume(MathHelper.Clamp(PressureDifference / 10, 10, 100)));
-                }
-            }
-
-            foreach (var entity in _gridTileLookupSystem.GetEntitiesIntersecting(GridIndex, GridIndices))
-            {
-                if (!entity.TryGetComponent(out IPhysBody physics)
-                    || !entity.IsMovedByPressure(out var pressure)
-                    || entity.IsInContainer())
-                    continue;
-
-                var pressureMovements = physics.Owner.EnsureComponent<MovedByPressureComponent>();
-                if (pressure.LastHighPressureMovementAirCycle < _gridAtmosphereComponent.UpdateCounter)
-                {
-                    pressureMovements.ExperiencePressureDifference(_gridAtmosphereComponent.UpdateCounter, PressureDifference, _pressureDirection, 0, PressureSpecificTarget?.GridIndices.ToEntityCoordinates(GridIndex, _mapManager) ?? EntityCoordinates.Invalid);
-                }
-
-            }
-
-            if (PressureDifference > 100)
-            {
-                // TODO ATMOS Do space wind graphics here!
-            }
-
-            _soundCooldown++;
-            if (_soundCooldown > 75)
-                _soundCooldown = 0;
-        }
-
-        private class TileAtmosphereComparer : IComparer<TileAtmosphere>
-        {
-            public int Compare(TileAtmosphere a, TileAtmosphere b)
-            {
-                if (a == null && b == null)
-                    return 0;
-
-                if (a == null)
-                    return -1;
-
-                if (b == null)
-                    return 1;
-
-                return a._tileAtmosInfo.MoleDelta.CompareTo(b._tileAtmosInfo.MoleDelta);
-            }
-        }
-
-        public void EqualizePressureInZone(AtmosphereSystem atmosphereSystem, int cycleNum)
-        {
-            if (Air == null || (_tileAtmosInfo.LastCycle >= cycleNum)) return; // Already done.
-
-            _tileAtmosInfo = new TileAtmosInfo();
-
-            var startingMoles = Air.TotalMoles;
-            var runAtmos = false;
-
-            // We need to figure if this is necessary
-            for (var i = 0; i < Atmospherics.Directions; i++)
-            {
-                var direction = (AtmosDirection) (1 << i);
-                if (!_adjacentBits.IsFlagSet(direction)) continue;
-                var other = _adjacentTiles[i];
-                if (other?.Air == null) continue;
-                var comparisonMoles = other.Air.TotalMoles;
-                if (!(MathF.Abs(comparisonMoles - startingMoles) > Atmospherics.MinimumMolesDeltaToMove)) continue;
-                runAtmos = true;
-                break;
-            }
-
-            if (!runAtmos) // There's no need so we don't bother.
-            {
-                _tileAtmosInfo.LastCycle = cycleNum;
-                return;
-            }
-
-            var queueCycle = ++_gridAtmosphereComponent.EqualizationQueueCycleControl;
-            var totalMoles = 0f;
-            var tiles = ArrayPool<TileAtmosphere>.Shared.Rent(Atmospherics.ZumosHardTileLimit);
-            tiles[0] = this;
-            _tileAtmosInfo.LastQueueCycle = queueCycle;
-            var tileCount = 1;
-            for (var i = 0; i < tileCount; i++)
-            {
-                if (i > Atmospherics.ZumosHardTileLimit) break;
-                var exploring = tiles[i];
-
-                if (i < Atmospherics.ZumosTileLimit)
-                {
-                    var tileMoles = exploring.Air.TotalMoles;
-                    exploring._tileAtmosInfo.MoleDelta = tileMoles;
-                    totalMoles += tileMoles;
-                }
-
-                for (var j = 0; j < Atmospherics.Directions; j++)
-                {
-                    var direction = (AtmosDirection) (1 << j);
-                    if (!exploring._adjacentBits.IsFlagSet(direction)) continue;
-                    var adj = exploring._adjacentTiles[j];
-                    if (adj?.Air == null) continue;
-                    if(adj._tileAtmosInfo.LastQueueCycle == queueCycle) continue;
-                    adj._tileAtmosInfo = new TileAtmosInfo {LastQueueCycle = queueCycle};
-
-                    if(tileCount < Atmospherics.ZumosHardTileLimit)
-                        tiles[tileCount++] = adj;
-                    if (adj.Air.Immutable)
-                    {
-                        // Looks like someone opened an airlock to space!
-                        ExplosivelyDepressurize(cycleNum);
-                        return;
-                    }
-                }
-            }
-
-            if (tileCount > Atmospherics.ZumosTileLimit)
-            {
-                for (var i = Atmospherics.ZumosTileLimit; i < tileCount; i++)
-                {
-                    //We unmark them. We shouldn't be pushing/pulling gases to/from them.
-                    var tile = tiles[i];
-                    if (tile == null) continue;
-                    tiles[i]._tileAtmosInfo.LastQueueCycle = 0;
-                }
-
-                tileCount = Atmospherics.ZumosTileLimit;
-            }
-
-            //tiles = tiles.AsSpan().Slice(0, tileCount).ToArray(); // According to my benchmarks, this is much slower.
-            //Array.Resize(ref tiles, tileCount);
-
-            var averageMoles = totalMoles / (tileCount);
-            var giverTiles = ArrayPool<TileAtmosphere>.Shared.Rent(tileCount);
-            var takerTiles = ArrayPool<TileAtmosphere>.Shared.Rent(tileCount);
-            var giverTilesLength = 0;
-            var takerTilesLength = 0;
-
-            for (var i = 0; i < tileCount; i++)
-            {
-                var tile = tiles[i];
-                tile._tileAtmosInfo.LastCycle = cycleNum;
-                tile._tileAtmosInfo.MoleDelta -= averageMoles;
-                if (tile._tileAtmosInfo.MoleDelta > 0)
-                {
-                    giverTiles[giverTilesLength++] = tile;
-                }
-                else
-                {
-                    takerTiles[takerTilesLength++] = tile;
-                }
-            }
-
-            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)
-            if (giverTilesLength > logN && takerTilesLength > logN)
-            {
-                // Even if it fails, it will speed up the next part.
-                Array.Sort(tiles, 0, tileCount, Comparer);
-
-                for (var i = 0; i < tileCount; i++)
-                {
-                    var tile = tiles[i];
-                    tile._tileAtmosInfo.FastDone = true;
-                    if (!(tile._tileAtmosInfo.MoleDelta > 0)) continue;
-                    var eligibleDirections = AtmosDirection.Invalid;
-                    var eligibleDirectionCount = 0;
-                    for (var j = 0; j < Atmospherics.Directions; j++)
-                    {
-                        var direction = (AtmosDirection) (1 << j);
-                        if (!tile._adjacentBits.IsFlagSet(direction)) continue;
-                        var tile2 = tile._adjacentTiles[j];
-
-                        // skip anything that isn't part of our current processing block.
-                        if (tile2._tileAtmosInfo.FastDone || tile2._tileAtmosInfo.LastQueueCycle != queueCycle)
-                            continue;
-
-                        eligibleDirections |= direction;
-                        eligibleDirectionCount++;
-                    }
-
-                    if (eligibleDirectionCount <= 0)
-                        continue; // Oof we've painted ourselves into a corner. Bad luck. Next part will handle this.
-
-                    var molesToMove = tile._tileAtmosInfo.MoleDelta / eligibleDirectionCount;
-                    for (var j = 0; j < Atmospherics.Directions; j++)
-                    {
-                        var direction = (AtmosDirection) (1 << j);
-                        if (!eligibleDirections.IsFlagSet(direction)) continue;
-
-                        tile.AdjustEqMovement(direction, molesToMove);
-                        tile._tileAtmosInfo.MoleDelta -= molesToMove;
-                        tile._adjacentTiles[j]._tileAtmosInfo.MoleDelta += molesToMove;
-                    }
-                }
-
-                giverTilesLength = 0;
-                takerTilesLength = 0;
-
-                for (var i = 0; i < tileCount; i++)
-                {
-                    var tile = tiles[i];
-                    if (tile._tileAtmosInfo.MoleDelta > 0)
-                    {
-                        giverTiles[giverTilesLength++] = tile;
-                    }
-                    else
-                    {
-                        takerTiles[takerTilesLength++] = tile;
-                    }
-                }
-            }
-
-            // This is the part that can become O(n^2).
-            if (giverTilesLength < takerTilesLength)
-            {
-                // as an optimization, we choose one of two methods based on which list is smaller. We really want to avoid O(n^2) if we can.
-                var queue = ArrayPool<TileAtmosphere>.Shared.Rent(tileCount);
-                for (var j = 0; j < giverTilesLength; j++)
-                {
-                    var giver = giverTiles[j];
-                    giver._tileAtmosInfo.CurrentTransferDirection = AtmosDirection.Invalid;
-                    giver._tileAtmosInfo.CurrentTransferAmount = 0;
-                    var queueCycleSlow = ++_gridAtmosphereComponent.EqualizationQueueCycleControl;
-                    var queueLength = 0;
-                    queue[queueLength++] = giver;
-                    giver._tileAtmosInfo.LastSlowQueueCycle = queueCycleSlow;
-                    for (var i = 0; i < queueLength; i++)
-                    {
-                        if (giver._tileAtmosInfo.MoleDelta <= 0)
-                            break; // We're done here now. Let's not do more work than needed.
-
-                        var tile = queue[i];
-                        for (var k = 0; k < Atmospherics.Directions; k++)
-                        {
-                            var direction = (AtmosDirection) (1 << k);
-                            if (!tile._adjacentBits.IsFlagSet(direction)) continue;
-                            var tile2 = tile._adjacentTiles[k];
-                            if (giver._tileAtmosInfo.MoleDelta <= 0) break; // We're done here now. Let's not do more work than needed.
-                            if (tile2 == null || tile2._tileAtmosInfo.LastQueueCycle != queueCycle) continue;
-                            if (tile2._tileAtmosInfo.LastSlowQueueCycle == queueCycleSlow) continue;
-
-                            queue[queueLength++] = tile2;
-                            tile2._tileAtmosInfo.LastSlowQueueCycle = queueCycleSlow;
-                            tile2._tileAtmosInfo.CurrentTransferDirection = direction.GetOpposite();
-                            tile2._tileAtmosInfo.CurrentTransferAmount = 0;
-                            if (tile2._tileAtmosInfo.MoleDelta < 0)
-                            {
-                                // This tile needs gas. Let's give it to 'em.
-                                if (-tile2._tileAtmosInfo.MoleDelta > giver._tileAtmosInfo.MoleDelta)
-                                {
-                                    // We don't have enough gas!
-                                    tile2._tileAtmosInfo.CurrentTransferAmount -= giver._tileAtmosInfo.MoleDelta;
-                                    tile2._tileAtmosInfo.MoleDelta += giver._tileAtmosInfo.MoleDelta;
-                                    giver._tileAtmosInfo.MoleDelta = 0;
-                                }
-                                else
-                                {
-                                    // We have enough gas.
-                                    tile2._tileAtmosInfo.CurrentTransferAmount += tile2._tileAtmosInfo.MoleDelta;
-                                    giver._tileAtmosInfo.MoleDelta += tile2._tileAtmosInfo.MoleDelta;
-                                    tile2._tileAtmosInfo.MoleDelta = 0;
-                                }
-                            }
-                        }
-                    }
-
-                    // Putting this loop here helps make it O(n^2) over O(n^3)
-                    for (var i = queueLength - 1; i >= 0; i--)
-                    {
-                        var tile = queue[i];
-                        if (tile._tileAtmosInfo.CurrentTransferAmount != 0 && tile._tileAtmosInfo.CurrentTransferDirection != AtmosDirection.Invalid)
-                        {
-                            tile.AdjustEqMovement(tile._tileAtmosInfo.CurrentTransferDirection, tile._tileAtmosInfo.CurrentTransferAmount);
-                            tile._adjacentTiles[tile._tileAtmosInfo.CurrentTransferDirection.ToIndex()]
-                                ._tileAtmosInfo.CurrentTransferAmount += tile._tileAtmosInfo.CurrentTransferAmount;
-                            tile._tileAtmosInfo.CurrentTransferAmount = 0;
-                        }
-                    }
-                }
-
-                ArrayPool<TileAtmosphere>.Shared.Return(queue);
-            }
-            else
-            {
-                var queue = ArrayPool<TileAtmosphere>.Shared.Rent(tileCount);
-                for (var j = 0; j < takerTilesLength; j++)
-                {
-                    var taker = takerTiles[j];
-                    taker._tileAtmosInfo.CurrentTransferDirection = AtmosDirection.Invalid;
-                    taker._tileAtmosInfo.CurrentTransferAmount = 0;
-                    var queueCycleSlow = ++_gridAtmosphereComponent.EqualizationQueueCycleControl;
-                    var queueLength = 0;
-                    queue[queueLength++] = taker;
-                    taker._tileAtmosInfo.LastSlowQueueCycle = queueCycleSlow;
-                    for (var i = 0; i < queueLength; i++)
-                    {
-                        if (taker._tileAtmosInfo.MoleDelta >= 0)
-                            break; // We're done here now. Let's not do more work than needed.
-
-                        var tile = queue[i];
-                        for (var k = 0; k < Atmospherics.Directions; k++)
-                        {
-                            var direction = (AtmosDirection) (1 << k);
-                            if (!tile._adjacentBits.IsFlagSet(direction)) continue;
-                            var tile2 = tile._adjacentTiles[k];
-
-                            if (taker._tileAtmosInfo.MoleDelta >= 0) break; // We're done here now. Let's not do more work than needed.
-                            if (tile2 == null || tile2._tileAtmosInfo.LastQueueCycle != queueCycle) continue;
-                            if (tile2._tileAtmosInfo.LastSlowQueueCycle == queueCycleSlow) continue;
-                            queue[queueLength++] = tile2;
-                            tile2._tileAtmosInfo.LastSlowQueueCycle = queueCycleSlow;
-                            tile2._tileAtmosInfo.CurrentTransferDirection = direction.GetOpposite();
-                            tile2._tileAtmosInfo.CurrentTransferAmount = 0;
-
-                            if (tile2._tileAtmosInfo.MoleDelta > 0)
-                            {
-                                // This tile has gas we can suck, so let's
-                                if (tile2._tileAtmosInfo.MoleDelta > -taker._tileAtmosInfo.MoleDelta)
-                                {
-                                    // They have enough gas
-                                    tile2._tileAtmosInfo.CurrentTransferAmount -= taker._tileAtmosInfo.MoleDelta;
-                                    tile2._tileAtmosInfo.MoleDelta += taker._tileAtmosInfo.MoleDelta;
-                                    taker._tileAtmosInfo.MoleDelta = 0;
-                                }
-                                else
-                                {
-                                    // They don't have enough gas!
-                                    tile2._tileAtmosInfo.CurrentTransferAmount += tile2._tileAtmosInfo.MoleDelta;
-                                    taker._tileAtmosInfo.MoleDelta += tile2._tileAtmosInfo.MoleDelta;
-                                    tile2._tileAtmosInfo.MoleDelta = 0;
-                                }
-                            }
-                        }
-                    }
-
-                    for (var i = queueLength - 1; i >= 0; i--)
-                    {
-                        var tile = queue[i];
-                        if (tile._tileAtmosInfo.CurrentTransferAmount == 0 || tile._tileAtmosInfo.CurrentTransferDirection == AtmosDirection.Invalid)
-                            continue;
-
-                        tile.AdjustEqMovement(tile._tileAtmosInfo.CurrentTransferDirection, tile._tileAtmosInfo.CurrentTransferAmount);
-
-                        tile._adjacentTiles[tile._tileAtmosInfo.CurrentTransferDirection.ToIndex()]
-                            ._tileAtmosInfo.CurrentTransferAmount += tile._tileAtmosInfo.CurrentTransferAmount;
-                        tile._tileAtmosInfo.CurrentTransferAmount = 0;
-                    }
-                }
-
-                ArrayPool<TileAtmosphere>.Shared.Return(queue);
-            }
-
-            for (var i = 0; i < tileCount; i++)
-            {
-                var tile = tiles[i];
-                tile.FinalizeEq(atmosphereSystem);
-            }
-
-            for (var i = 0; i < tileCount; i++)
-            {
-                var tile = tiles[i];
-                for (var j = 0; j < Atmospherics.Directions; j++)
-                {
-                    var direction = (AtmosDirection) (1 << j);
-                    if (!tile._adjacentBits.IsFlagSet(direction)) continue;
-                    var tile2 = tile._adjacentTiles[j];
-                    if (tile2?.Air?.Compare(Air) == GasMixture.GasCompareResult.NoExchange) continue;
-                    _gridAtmosphereComponent.AddActiveTile(tile2);
-                    break;
-                }
-            }
-
-            ArrayPool<TileAtmosphere>.Shared.Return(tiles);
-            ArrayPool<TileAtmosphere>.Shared.Return(giverTiles);
-            ArrayPool<TileAtmosphere>.Shared.Return(takerTiles);
-        }
-
-        private void FinalizeEq(AtmosphereSystem atmosphereSystem)
-        {
-            Span<float> transferDirections = stackalloc float[Atmospherics.Directions];
-            var hasTransferDirs = false;
-            for (var i = 0; i < Atmospherics.Directions; i++)
-            {
-                var amount = _tileAtmosInfo[i];
-                if (amount == 0) continue;
-                transferDirections[i] = amount;
-                _tileAtmosInfo[i] = 0; // Set them to 0 to prevent infinite recursion.
-                hasTransferDirs = true;
-            }
-
-            if (!hasTransferDirs) return;
-
-            for(var i = 0; i < Atmospherics.Directions; i++)
-            {
-                var direction = (AtmosDirection) (1 << i);
-                if (!_adjacentBits.IsFlagSet(direction)) continue;
-                var amount = transferDirections[i];
-                var tile = _adjacentTiles[i];
-                if (tile?.Air == null) continue;
-                if (amount > 0)
-                {
-                    if (Air.TotalMoles < amount)
-                        FinalizeEqNeighbors(atmosphereSystem, transferDirections);
-
-                    tile._tileAtmosInfo[direction.GetOpposite()] = 0;
-                    atmosphereSystem.Merge(tile.Air, Air.Remove(amount));
-                    UpdateVisuals();
-                    tile.UpdateVisuals();
-                    ConsiderPressureDifference(tile, amount);
-                }
-            }
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void FinalizeEqNeighbors(AtmosphereSystem atmosphereSystem, ReadOnlySpan<float> transferDirs)
-        {
-            for (var i = 0; i < Atmospherics.Directions; i++)
-            {
-                var direction = (AtmosDirection) (1 << i);
-                var amount = transferDirs[i];
-                if(amount < 0 && _adjacentBits.IsFlagSet(direction))
-                    _adjacentTiles[i].FinalizeEq(atmosphereSystem);  // A bit of recursion if needed.
-            }
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void ConsiderPressureDifference(TileAtmosphere other, float difference)
-        {
-            _gridAtmosphereComponent.AddHighPressureDelta(this);
-            if (difference > PressureDifference)
-            {
-                PressureDifference = difference;
-                _pressureDirection = ((Vector2i)(GridIndices - other.GridIndices)).GetDir().ToAtmosDirection();
-            }
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void AdjustEqMovement(AtmosDirection direction, float amount)
-        {
-            _tileAtmosInfo[direction] += amount;
-            _adjacentTiles[direction.ToIndex()]._tileAtmosInfo[direction.GetOpposite()] -= amount;
-        }
-
-        public void ProcessCell(AtmosphereSystem atmosphereSystem, int fireCount, bool spaceWind = true)
-        {
-            // Can't process a tile without air
-            if (Air == null)
-            {
-                _gridAtmosphereComponent.RemoveActiveTile(this);
-                return;
-            }
-
-            if (_archivedCycle < fireCount)
-                Archive(fireCount);
-
-            _currentCycle = fireCount;
-            var adjacentTileLength = 0;
-
-            for (var i = 0; i < Atmospherics.Directions; i++)
-            {
-                var direction = (AtmosDirection) (1 << i);
-                if(_adjacentBits.IsFlagSet(direction))
-                    adjacentTileLength++;
-            }
-
-            for(var i = 0; i < Atmospherics.Directions; i++)
-            {
-                var direction = (AtmosDirection) (1 << i);
-                if (!_adjacentBits.IsFlagSet(direction)) continue;
-                var enemyTile = _adjacentTiles[i];
-
-                // 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;
-                enemyTile.Archive(fireCount);
-
-                var shouldShareAir = false;
-
-                if (ExcitedGroup != null && enemyTile.ExcitedGroup != null)
-                {
-                    if (ExcitedGroup != enemyTile.ExcitedGroup)
-                    {
-                        ExcitedGroup.MergeGroups(enemyTile.ExcitedGroup);
-                    }
-
-                    shouldShareAir = true;
-                } else if (Air.Compare(enemyTile.Air) != GasMixture.GasCompareResult.NoExchange)
-                {
-                    if (!enemyTile.Excited)
-                    {
-                        _gridAtmosphereComponent.AddActiveTile(enemyTile);
-                    }
-
-                    var excitedGroup = ExcitedGroup;
-                    excitedGroup ??= enemyTile.ExcitedGroup;
-
-                    if (excitedGroup == null)
-                    {
-                        excitedGroup = new ExcitedGroup();
-                        excitedGroup.Initialize(_gridAtmosphereComponent);
-                    }
-
-                    if (ExcitedGroup == null)
-                        excitedGroup.AddTile(this);
-
-                    if(enemyTile.ExcitedGroup == null)
-                        excitedGroup.AddTile(enemyTile);
-
-                    shouldShareAir = true;
-                }
-
-                if (shouldShareAir)
-                {
-                    var difference = atmosphereSystem.Share(Air, enemyTile.Air, adjacentTileLength);
-
-                    if (spaceWind)
-                    {
-                        if (difference > 0)
-                        {
-                            ConsiderPressureDifference(enemyTile, difference);
-                        }
-                        else
-                        {
-                            enemyTile.ConsiderPressureDifference(this, -difference);
-                        }
-                    }
-
-                    LastShareCheck();
-                }
-            }
-
-            if(Air != null)
-                _gridAtmosphereComponent.AtmosphereSystem.React(Air, this);
-            UpdateVisuals();
-
-            var remove = true;
-
-            if(Air.Temperature > Atmospherics.MinimumTemperatureStartSuperConduction)
-                if (ConsiderSuperconductivity(true))
-                    remove = false;
-
-            if(ExcitedGroup == null && remove)
-                _gridAtmosphereComponent.RemoveActiveTile(this);
-        }
-
-        public void ProcessHotspot()
-        {
-            if (!Hotspot.Valid)
-            {
-                _gridAtmosphereComponent.RemoveHotspotTile(this);
-                return;
-            }
-
-            if (!Excited)
-            {
-                _gridAtmosphereComponent.AddActiveTile(this);
-            }
-
-            if (!Hotspot.SkippedFirstProcess)
-            {
-                Hotspot.SkippedFirstProcess = true;
-                return;
-            }
-
-            ExcitedGroup?.ResetCooldowns();
-
-            if ((Hotspot.Temperature < Atmospherics.FireMinimumTemperatureToExist) || (Hotspot.Volume <= 1f)
-                || Air == null || Air.GetMoles(Gas.Oxygen) < 0.5f || (Air.GetMoles(Gas.Plasma) < 0.5f && Air.GetMoles(Gas.Tritium) < 0.5f))
-            {
-                Hotspot = new Hotspot();
-                UpdateVisuals();
-                return;
-            }
-
-            PerformHotspotExposure();
-
-            if (Hotspot.Bypassing)
-            {
-                Hotspot.State = 3;
-                _gridAtmosphereComponent.BurnTile(GridIndices);
-
-                if (Air.Temperature > Atmospherics.FireMinimumTemperatureToSpread)
-                {
-                    var radiatedTemperature = Air.Temperature * Atmospherics.FireSpreadRadiosityScale;
-                    foreach (var tile in _adjacentTiles)
-                    {
-                        if(!tile.Hotspot.Valid)
-                            tile.HotspotExpose(radiatedTemperature, Atmospherics.CellVolume/4);
-                    }
-                }
-            }
-            else
-            {
-                Hotspot.State = (byte) (Hotspot.Volume > Atmospherics.CellVolume * 0.4f ? 2 : 1);
-            }
-
-            if (Hotspot.Temperature > MaxFireTemperatureSustained)
-                MaxFireTemperatureSustained = Hotspot.Temperature;
-
-            // TODO ATMOS Maybe destroy location here?
-        }
-
-        public float MaxFireTemperatureSustained { get; private set; }
-
-        private void PerformHotspotExposure()
-        {
-            if (Air == null || !Hotspot.Valid) return;
-
-            Hotspot.Bypassing = Hotspot.SkippedFirstProcess && Hotspot.Volume > Air.Volume*0.95f;
-
-            if (Hotspot.Bypassing)
-            {
-                Hotspot.Volume = Air.ReactionResults[GasReaction.Fire] * Atmospherics.FireGrowthRate;
-                Hotspot.Temperature = Air.Temperature;
-            }
-            else
-            {
-                var affected = Air.RemoveRatio(Hotspot.Volume / Air.Volume);
-                affected.Temperature = Hotspot.Temperature;
-                _gridAtmosphereComponent.AtmosphereSystem.React(affected, this);
-                Hotspot.Temperature = affected.Temperature;
-                Hotspot.Volume = affected.ReactionResults[GasReaction.Fire] * Atmospherics.FireGrowthRate;
-                AssumeAir(affected);
-            }
-
-            var tileRef = GridIndices.GetTileRef(GridIndex);
-
-            foreach (var entity in tileRef.GetEntitiesInTileFast(_gridTileLookupSystem))
-            {
-                foreach (var fireAct in entity.GetAllComponents<IFireAct>())
-                {
-
-                    fireAct.FireAct(Hotspot.Temperature, Hotspot.Volume);
-                }
-            }
-        }
-
-        public void HotspotExpose(float exposedTemperature, float exposedVolume, bool soh = false)
-        {
-            if (Air == null)
-                return;
-
-            var oxygen = Air.GetMoles(Gas.Oxygen);
-
-            if (oxygen < 0.5f)
-                return;
-
-            var plasma = Air.GetMoles(Gas.Plasma);
-            var tritium = Air.GetMoles(Gas.Tritium);
-
-            if (Hotspot.Valid)
-            {
-                if (soh)
-                {
-                    if (plasma > 0.5f || tritium > 0.5f)
-                    {
-                        if (Hotspot.Temperature < exposedTemperature)
-                            Hotspot.Temperature = exposedTemperature;
-                        if (Hotspot.Volume < exposedVolume)
-                            Hotspot.Volume = exposedVolume;
-                    }
-                }
-
-                return;
-            }
-
-            if ((exposedTemperature > Atmospherics.PlasmaMinimumBurnTemperature) && (plasma > 0.5f || tritium > 0.5f))
-            {
-                Hotspot = new Hotspot
-                {
-                    Volume = exposedVolume * 25f,
-                    Temperature = exposedTemperature,
-                    SkippedFirstProcess = _currentCycle > _gridAtmosphereComponent.UpdateCounter
-                };
-
-                Hotspot.Start();
-
-                _gridAtmosphereComponent.AddActiveTile(this);
-                _gridAtmosphereComponent.AddHotspotTile(this);
-            }
-        }
-
-        private bool ConsiderSuperconductivity()
-        {
-            if (ThermalConductivity == 0f)
-                return false;
-
-            _gridAtmosphereComponent.AddSuperconductivityTile(this);
-            return true;
-        }
-
-        private bool ConsiderSuperconductivity(bool starting)
-        {
-            if (Air.Temperature < (starting
-                ? Atmospherics.MinimumTemperatureStartSuperConduction
-                : Atmospherics.MinimumTemperatureForSuperconduction))
-                return false;
-
-            return !(_gridAtmosphereComponent.AtmosphereSystem.GetHeatCapacity(Air) < Atmospherics.MCellWithRatio) && ConsiderSuperconductivity();
-        }
-
-        public void Superconduct(AtmosphereSystem atmosphereSystem)
-        {
-            var directions = ConductivityDirections();
-
-            for(var i = 0; i < Atmospherics.Directions; i++)
-            {
-                var direction = (AtmosDirection) (1 << i);
-                if (!directions.IsFlagSet(direction)) continue;
-
-                var adjacent = _adjacentTiles[direction.ToIndex()];
-
-                // TODO ATMOS handle adjacent being null.
-                if (adjacent == null || adjacent.ThermalConductivity == 0f)
-                    continue;
-
-                if(adjacent._archivedCycle < _gridAtmosphereComponent.UpdateCounter)
-                    adjacent.Archive(_gridAtmosphereComponent.UpdateCounter);
-
-                adjacent.NeighborConductWithSource(atmosphereSystem, this);
-
-                adjacent.ConsiderSuperconductivity();
-            }
-
-            RadiateToSpace();
-
-            FinishSuperconduction(atmosphereSystem);
-        }
-
-        private void FinishSuperconduction(AtmosphereSystem atmosphereSystem)
-        {
-            // Conduct with air on my tile if I have it
-            if (!BlocksAllAir)
-            {
-                Temperature = atmosphereSystem.TemperatureShare(Air, ThermalConductivity, Temperature, HeatCapacity);
-            }
-
-            FinishSuperconduction(BlocksAllAir ? Temperature : Air.Temperature);
-        }
-
-        private void FinishSuperconduction(float temperature)
-        {
-            // Make sure it's still hot enough to continue conducting.
-            if (temperature < Atmospherics.MinimumTemperatureForSuperconduction)
-            {
-                _gridAtmosphereComponent.RemoveSuperconductivityTile(this);
-            }
-        }
-
-        private void NeighborConductWithSource(AtmosphereSystem atmosphereSystem, TileAtmosphere other)
-        {
-            if (BlocksAllAir)
-            {
-                if (!other.BlocksAllAir)
-                {
-                    other.TemperatureShareOpenToSolid(atmosphereSystem, this);
-                }
-                else
-                {
-                    other.TemperatureShareMutualSolid(this, ThermalConductivity);
-                }
-
-                TemperatureExpose(null, Temperature, _gridAtmosphereComponent.GetVolumeForCells(1));
-                return;
-            }
-
-            if (!other.BlocksAllAir)
-            {
-                atmosphereSystem.TemperatureShare(other.Air, Air, Atmospherics.WindowHeatTransferCoefficient);
-            }
-            else
-            {
-                TemperatureShareOpenToSolid(atmosphereSystem, other);
-            }
-
-            _gridAtmosphereComponent.AddActiveTile(this);
-        }
-
-        private void TemperatureShareOpenToSolid(AtmosphereSystem atmosphereSystem, TileAtmosphere other)
-        {
-            other.Temperature = atmosphereSystem.TemperatureShare(Air, other.ThermalConductivity, other.Temperature, other.HeatCapacity);
-        }
-
-        private void TemperatureShareMutualSolid(TileAtmosphere other, float conductionCoefficient)
-        {
-            var deltaTemperature = (_temperatureArchived - other._temperatureArchived);
-            if (MathF.Abs(deltaTemperature) > Atmospherics.MinimumTemperatureDeltaToConsider
-                && HeatCapacity != 0f && other.HeatCapacity != 0f)
-            {
-                var heat = conductionCoefficient * deltaTemperature *
-                           (HeatCapacity * other.HeatCapacity / (HeatCapacity + other.HeatCapacity));
-
-                Temperature -= heat / HeatCapacity;
-                other.Temperature += heat / other.HeatCapacity;
-            }
-        }
-
-        public void RadiateToSpace()
-        {
-            // Considering 0ºC as the break even point for radiation in and out.
-            if (Temperature > Atmospherics.T0C)
-            {
-                // Hardcoded space temperature.
-                var deltaTemperature = (_temperatureArchived - Atmospherics.TCMB);
-                if ((HeatCapacity > 0) && (MathF.Abs(deltaTemperature) > Atmospherics.MinimumTemperatureDeltaToConsider))
-                {
-                    var heat = ThermalConductivity * deltaTemperature * (HeatCapacity *
-                        Atmospherics.HeatCapacityVacuum / (HeatCapacity + Atmospherics.HeatCapacityVacuum));
-
-                    Temperature -= heat;
-                }
-            }
-        }
-
-        public AtmosDirection ConductivityDirections()
-        {
-            if(BlocksAllAir)
-            {
-                if(_archivedCycle < _gridAtmosphereComponent.UpdateCounter)
-                    Archive(_gridAtmosphereComponent.UpdateCounter);
-                return AtmosDirection.All;
-            }
-
-            // TODO ATMOS check if this is correct
-            return AtmosDirection.All;
-        }
-
-        public void ExplosivelyDepressurize(int cycleNum)
-        {
-            if (Air == null) return;
-
-            const int limit = Atmospherics.ZumosHardTileLimit;
-
-            var totalGasesRemoved = 0f;
-            var queueCycle = ++_gridAtmosphereComponent.EqualizationQueueCycleControl;
-            var tiles = ArrayPool<TileAtmosphere>.Shared.Rent(limit);
-            var spaceTiles = ArrayPool<TileAtmosphere>.Shared.Rent(limit);
-
-            var tileCount = 0;
-            var spaceTileCount = 0;
-
-            tiles[tileCount++] = this;
-
-            _tileAtmosInfo = new TileAtmosInfo {LastQueueCycle = queueCycle};
-
-            for (var i = 0; i < tileCount; i++)
-            {
-                var tile = tiles[i];
-                tile._tileAtmosInfo.LastCycle = cycleNum;
-                tile._tileAtmosInfo.CurrentTransferDirection = AtmosDirection.Invalid;
-                if (tile.Air.Immutable)
-                {
-                    spaceTiles[spaceTileCount++] = tile;
-                    tile.PressureSpecificTarget = tile;
-                }
-                else
-                {
-                    for (var j = 0; j < Atmospherics.Directions; j++)
-                    {
-                        var direction = (AtmosDirection) (1 << j);
-                        if (!tile._adjacentBits.IsFlagSet(direction)) continue;
-                        var tile2 = tile._adjacentTiles[j];
-                        if (tile2.Air == null) continue;
-                        if (tile2._tileAtmosInfo.LastQueueCycle == queueCycle) continue;
-
-                        tile.ConsiderFirelocks(tile2);
-
-                        // The firelocks might have closed on us.
-                        if (!tile._adjacentBits.IsFlagSet(direction)) continue;
-                        tile2._tileAtmosInfo = new TileAtmosInfo {LastQueueCycle = queueCycle};
-                        tiles[tileCount++] = tile2;
-                    }
-                }
-
-                if (tileCount >= limit || spaceTileCount >= limit)
-                    break;
-            }
-
-            var queueCycleSlow = ++_gridAtmosphereComponent.EqualizationQueueCycleControl;
-            var progressionOrder = ArrayPool<TileAtmosphere>.Shared.Rent(limit * 2);
-            var progressionCount = 0;
-
-            for (var i = 0; i < spaceTileCount; i++)
-            {
-                var tile = spaceTiles[i];
-                progressionOrder[progressionCount++] = tile;
-                tile._tileAtmosInfo.LastSlowQueueCycle = queueCycleSlow;
-                tile._tileAtmosInfo.CurrentTransferDirection = AtmosDirection.Invalid;
-            }
-
-            for (var i = 0; i < progressionCount; i++)
-            {
-                var tile = progressionOrder[i];
-                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 (!tile._adjacentBits.IsFlagSet(direction) && !tile.Air.Immutable) continue;
-                    var tile2 = tile._adjacentTiles[j];
-                    if (tile2?._tileAtmosInfo.LastQueueCycle != queueCycle) continue;
-                    if (tile2._tileAtmosInfo.LastSlowQueueCycle == queueCycleSlow) continue;
-                    if(tile2.Air?.Immutable ?? false) continue;
-                    tile2._tileAtmosInfo.CurrentTransferDirection = direction.GetOpposite();
-                    tile2._tileAtmosInfo.CurrentTransferAmount = 0;
-                    tile2.PressureSpecificTarget = tile.PressureSpecificTarget;
-                    tile2._tileAtmosInfo.LastSlowQueueCycle = queueCycleSlow;
-                    progressionOrder[progressionCount++] = tile2;
-                }
-            }
-
-            for (var i = progressionCount - 1; i >= 0; i--)
-            {
-                var tile = progressionOrder[i];
-                if (tile._tileAtmosInfo.CurrentTransferDirection == AtmosDirection.Invalid) continue;
-                _gridAtmosphereComponent.AddHighPressureDelta(tile);
-                _gridAtmosphereComponent.AddActiveTile(tile);
-                var tile2 = tile._adjacentTiles[tile._tileAtmosInfo.CurrentTransferDirection.ToIndex()];
-                if (tile2?.Air == null) continue;
-                var sum = tile2.Air.TotalMoles;
-                totalGasesRemoved += sum;
-                tile._tileAtmosInfo.CurrentTransferAmount += sum;
-                tile2._tileAtmosInfo.CurrentTransferAmount += tile._tileAtmosInfo.CurrentTransferAmount;
-                tile.PressureDifference = tile._tileAtmosInfo.CurrentTransferAmount;
-                tile._pressureDirection = tile._tileAtmosInfo.CurrentTransferDirection;
-
-                if (tile2._tileAtmosInfo.CurrentTransferDirection == AtmosDirection.Invalid)
-                {
-                    tile2.PressureDifference = tile2._tileAtmosInfo.CurrentTransferAmount;
-                    tile2._pressureDirection = tile._tileAtmosInfo.CurrentTransferDirection;
-                }
-
-                tile.Air.Clear();
-                tile.UpdateVisuals();
-                tile.HandleDecompressionFloorRip(sum);
-            }
-
-            ArrayPool<TileAtmosphere>.Shared.Return(tiles);
-            ArrayPool<TileAtmosphere>.Shared.Return(spaceTiles);
-            ArrayPool<TileAtmosphere>.Shared.Return(progressionOrder);
-        }
-
-        private void HandleDecompressionFloorRip(float sum)
-        {
-            var chance = MathHelper.Clamp(sum / 500, 0.005f, 0.5f);
-            if (sum > 20 && _robustRandom.Prob(chance))
-                _gridAtmosphereComponent.PryTile(GridIndices);
-        }
-
-        private void ConsiderFirelocks(TileAtmosphere other)
-        {
-            var reconsiderAdjacent = false;
-
-            foreach (var entity in GridIndices.GetEntitiesInTileFast(GridIndex, _gridAtmosphereComponent.GridTileLookupSystem))
-            {
-                if (!entity.TryGetComponent(out FirelockComponent firelock)) continue;
-                reconsiderAdjacent |= firelock.EmergencyPressureStop();
-            }
-
-            foreach (var entity in other.GridIndices.GetEntitiesInTileFast(other.GridIndex, _gridAtmosphereComponent.GridTileLookupSystem))
-            {
-                if (!entity.TryGetComponent(out FirelockComponent firelock)) continue;
-                reconsiderAdjacent |= firelock.EmergencyPressureStop();
-            }
-
-            if (reconsiderAdjacent)
-            {
-                UpdateAdjacent();
-                other.UpdateAdjacent();
-            }
-        }
-
-        public bool AssumeAir(GasMixture giver)
-        {
-            if (Air == null) return false;
-
-            EntitySystem.Get<AtmosphereSystem>().Merge(Air, giver);
-
-            UpdateVisuals();
-
-            if (!Excited)
-            {
-                _gridAtmosphereComponent.AddActiveTile(this);
-            }
-            return true;
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public void UpdateVisuals()
-        {
-            if (Air == null) return;
-
-            _gridAtmosphereComponent.GasTileOverlaySystem.Invalidate(GridIndex, GridIndices);
-        }
-
-        public void UpdateAdjacent()
-        {
-            for (var i = 0; i < Atmospherics.Directions; i++)
-            {
-                var direction = (AtmosDirection) (1 << i);
-
-                var otherIndices = GridIndices.Offset(direction.ToDirection());
-
-                var isSpace = _gridAtmosphereComponent.IsSpace(GridIndices);
-                var adjacent = _gridAtmosphereComponent.GetTile(otherIndices, !isSpace);
-                _adjacentTiles[direction.ToIndex()] = adjacent;
-                adjacent?.UpdateAdjacent(direction.GetOpposite());
-
-                if (adjacent != null && !BlockedAirflow.IsFlagSet(direction) && !_gridAtmosphereComponent.IsAirBlocked(adjacent.GridIndices, direction.GetOpposite()))
-                {
-                    _adjacentBits |= direction;
-                }
-            }
-        }
-
-        public void UpdateAdjacent(AtmosDirection direction)
-        {
-            _adjacentTiles[direction.ToIndex()] = _gridAtmosphereComponent.GetTile(GridIndices.Offset(direction.ToDirection()));
-
-            if (!BlockedAirflow.IsFlagSet(direction) && !_gridAtmosphereComponent.IsAirBlocked(GridIndices.Offset(direction.ToDirection()), direction.GetOpposite()))
-            {
-                _adjacentBits |= direction;
-            }
-            else
-            {
-                _adjacentBits &= ~direction;
-            }
-        }
-
-        /// <summary>
-        ///     Calls <see cref="GridAtmosphereComponent.Invalidate"/> on this tile atmosphere's position.
-        /// </summary>
-        public void Invalidate()
-        {
-            _gridAtmosphereComponent.Invalidate(GridIndices);
-        }
-
-        private void LastShareCheck()
-        {
-            var lastShare = Air.LastShare;
-            if (lastShare > Atmospherics.MinimumAirToSuspend)
-            {
-                ExcitedGroup.ResetCooldowns();
-            } else if (lastShare > Atmospherics.MinimumMolesDeltaToMove)
-            {
-                ExcitedGroup.DismantleCooldown = 0;
-            }
-        }
-
-        public void TemperatureExpose(GasMixture air, float temperature, float volume)
-        {
-            // TODO ATMOS do this
-        }
     }
 }
diff --git a/Content.Server/BarSign/BarSignComponent.cs b/Content.Server/BarSign/BarSignComponent.cs
index a0b953dc22..b6a1a6ec57 100644
--- a/Content.Server/BarSign/BarSignComponent.cs
+++ b/Content.Server/BarSign/BarSignComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Linq;
 using Content.Server.Power.Components;
 using Robust.Server.GameObjects;
@@ -14,103 +13,11 @@ using Robust.Shared.ViewVariables;
 namespace Content.Server.BarSign
 {
     [RegisterComponent]
-    public class BarSignComponent : Component, IMapInit
+    public class BarSignComponent : Component
     {
         public override string Name => "BarSign";
 
-        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-        [Dependency] private readonly IRobustRandom _robustRandom = default!;
-
-        [DataField("current")]
-        private string? _currentSign;
-
-        [ViewVariables(VVAccess.ReadWrite)]
-        public string? CurrentSign
-        {
-            get => _currentSign;
-            set
-            {
-                _currentSign = value;
-                UpdateSignInfo();
-            }
-        }
-
-        private bool Powered => !Owner.TryGetComponent(out ApcPowerReceiverComponent? receiver) || receiver.Powered;
-
-        private void UpdateSignInfo()
-        {
-            if (_currentSign == null)
-            {
-                return;
-            }
-
-            if (!_prototypeManager.TryIndex(_currentSign, out BarSignPrototype? prototype))
-            {
-                Logger.ErrorS("barSign", $"Invalid bar sign prototype: \"{_currentSign}\"");
-                return;
-            }
-
-            if (Owner.TryGetComponent(out SpriteComponent? sprite))
-            {
-                if (!Powered)
-                {
-                    sprite.LayerSetState(0, "empty");
-                    sprite.LayerSetShader(0, "shaded");
-                }
-                else
-                {
-                    sprite.LayerSetState(0, prototype.Icon);
-                    sprite.LayerSetShader(0, "unshaded");
-                }
-            }
-
-            if (!string.IsNullOrEmpty(prototype.Name))
-            {
-                Owner.Name = prototype.Name;
-            }
-            else
-            {
-                Owner.Name = Loc.GetString("barsign-component-name");
-            }
-
-            Owner.Description = prototype.Description;
-        }
-
-        protected override void Initialize()
-        {
-            base.Initialize();
-
-            UpdateSignInfo();
-        }
-
-        public override void HandleMessage(ComponentMessage message, IComponent? component)
-        {
-            base.HandleMessage(message, component);
-            switch (message)
-            {
-                case PowerChangedMessage powerChanged:
-                    PowerOnOnPowerStateChanged(powerChanged);
-                    break;
-            }
-        }
-
-        private void PowerOnOnPowerStateChanged(PowerChangedMessage e)
-        {
-            UpdateSignInfo();
-        }
-
-        public void MapInit()
-        {
-            if (_currentSign != null)
-            {
-                return;
-            }
-
-            var prototypes = _prototypeManager.EnumeratePrototypes<BarSignPrototype>().Where(p => !p.Hidden)
-                .ToList();
-            var prototype = _robustRandom.Pick(prototypes);
-
-            CurrentSign = prototype.ID;
-        }
+        [DataField("current")] [ViewVariables(VVAccess.ReadOnly)]
+        public string? CurrentSign;
     }
 }
diff --git a/Content.Server/BarSign/BarSignPrototype.cs b/Content.Server/BarSign/BarSignPrototype.cs
index 456c7ca38a..99e32cafec 100644
--- a/Content.Server/BarSign/BarSignPrototype.cs
+++ b/Content.Server/BarSign/BarSignPrototype.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Robust.Shared.Localization;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager.Attributes;
diff --git a/Content.Server/BarSign/Systems/BarSignSystem.cs b/Content.Server/BarSign/Systems/BarSignSystem.cs
new file mode 100644
index 0000000000..9d3c957bb0
--- /dev/null
+++ b/Content.Server/BarSign/Systems/BarSignSystem.cs
@@ -0,0 +1,96 @@
+using System.Linq;
+using Content.Server.Power.Components;
+using Robust.Server.GameObjects;
+using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
+using Robust.Shared.Localization;
+using Robust.Shared.Log;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+
+namespace Content.Server.BarSign.Systems
+{
+    public class BarSignSystem : EntitySystem
+    {
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+        [Dependency] private readonly IRobustRandom _random = default!;
+
+        public override void Initialize()
+        {
+            base.Initialize();
+
+            SubscribeLocalEvent<BarSignComponent, ComponentInit>(OnComponentInit);
+            SubscribeLocalEvent<BarSignComponent, MapInitEvent>(OnMapInit);
+            SubscribeLocalEvent<BarSignComponent, PowerChangedEvent>(OnPowerChanged);
+        }
+
+        public void SetBarSign(BarSignComponent component, string barSign)
+        {
+            component.CurrentSign = barSign;
+            UpdateBarSignVisuals(component);
+        }
+
+        private void OnComponentInit(EntityUid uid, BarSignComponent component, ComponentInit args)
+        {
+            UpdateBarSignVisuals(component);
+        }
+
+        private void OnMapInit(EntityUid uid, BarSignComponent component, MapInitEvent args)
+        {
+            if (component.CurrentSign != null)
+            {
+                return;
+            }
+
+            var prototypes = _prototypeManager.EnumeratePrototypes<BarSignPrototype>().Where(p => !p.Hidden)
+                .ToList();
+            var prototype = _random.Pick(prototypes);
+
+            component.CurrentSign = prototype.ID;
+        }
+
+        private void OnPowerChanged(EntityUid uid, BarSignComponent component, PowerChangedEvent args)
+        {
+            UpdateBarSignVisuals(component);
+        }
+
+        private void UpdateBarSignVisuals(BarSignComponent component)
+        {
+            if (component.CurrentSign == null)
+            {
+                return;
+            }
+
+            if (!_prototypeManager.TryIndex(component.CurrentSign, out BarSignPrototype? prototype))
+            {
+                Logger.ErrorS("barSign", $"Invalid bar sign prototype: \"{component.CurrentSign}\"");
+                return;
+            }
+
+            if (component.Owner.TryGetComponent(out SpriteComponent? sprite))
+            {
+                if (!component.Owner.TryGetComponent(out ApcPowerReceiverComponent? receiver) || receiver.Powered)
+                {
+                    sprite.LayerSetState(0, "empty");
+                    sprite.LayerSetShader(0, "shaded");
+                }
+                else
+                {
+                    sprite.LayerSetState(0, prototype.Icon);
+                    sprite.LayerSetShader(0, "unshaded");
+                }
+            }
+
+            if (!string.IsNullOrEmpty(prototype.Name))
+            {
+                component.Owner.Name = prototype.Name;
+            }
+            else
+            {
+                component.Owner.Name = Loc.GetString("barsign-component-name");
+            }
+
+            component.Owner.Description = prototype.Description;
+        }
+    }
+}
diff --git a/Content.Server/Body/Behavior/BrainBehavior.cs b/Content.Server/Body/Behavior/BrainBehavior.cs
index a939c70fdc..e7f869bf03 100644
--- a/Content.Server/Body/Behavior/BrainBehavior.cs
+++ b/Content.Server/Body/Behavior/BrainBehavior.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Server.Ghost;
+using Content.Server.Ghost;
 using Content.Server.Ghost.Components;
 using Content.Server.Mind.Components;
 using Content.Shared.Body.Components;
diff --git a/Content.Server/Body/Behavior/LiverBehavior.cs b/Content.Server/Body/Behavior/LiverBehavior.cs
index 83360b8edd..82e12b29ce 100644
--- a/Content.Server/Body/Behavior/LiverBehavior.cs
+++ b/Content.Server/Body/Behavior/LiverBehavior.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Linq;
 using Content.Server.Body.Circulatory;
 using Content.Shared.Body.Networks;
diff --git a/Content.Server/Body/Behavior/LungBehavior.cs b/Content.Server/Body/Behavior/LungBehavior.cs
index 51130d9790..8616817612 100644
--- a/Content.Server/Body/Behavior/LungBehavior.cs
+++ b/Content.Server/Body/Behavior/LungBehavior.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Content.Server.Atmos;
 using Content.Server.Atmos.Components;
@@ -149,7 +148,7 @@ namespace Content.Server.Body.Behavior
                 return;
             }
 
-            if (!Owner.Transform.Coordinates.TryGetTileAir(out var tileAir))
+            if (EntitySystem.Get<AtmosphereSystem>().GetTileMixture(Owner.Transform.Coordinates, true) is not {} tileAir)
             {
                 return;
             }
@@ -167,7 +166,7 @@ namespace Content.Server.Body.Behavior
 
         public void Exhale(float frameTime)
         {
-            if (!Owner.Transform.Coordinates.TryGetTileAir(out var tileAir))
+            if (EntitySystem.Get<AtmosphereSystem>().GetTileMixture(Owner.Transform.Coordinates, true) is not {} tileAir)
             {
                 return;
             }
diff --git a/Content.Server/Body/Behavior/MechanismBehavior.cs b/Content.Server/Body/Behavior/MechanismBehavior.cs
index 4446b991ec..ff5c468126 100644
--- a/Content.Server/Body/Behavior/MechanismBehavior.cs
+++ b/Content.Server/Body/Behavior/MechanismBehavior.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Shared.Body.Behavior;
+using Content.Shared.Body.Behavior;
 using Content.Shared.Body.Components;
 using Content.Shared.Body.Mechanism;
 using Content.Shared.Body.Part;
diff --git a/Content.Server/Body/Behavior/StomachBehavior.cs b/Content.Server/Body/Behavior/StomachBehavior.cs
index 6383a00eff..a6c903efe9 100644
--- a/Content.Server/Body/Behavior/StomachBehavior.cs
+++ b/Content.Server/Body/Behavior/StomachBehavior.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Collections.Generic;
 using System.Linq;
 using Content.Server.Body.Circulatory;
diff --git a/Content.Server/Body/BodyComponent.cs b/Content.Server/Body/BodyComponent.cs
index 5c4b81a6d5..87d14a05c3 100644
--- a/Content.Server/Body/BodyComponent.cs
+++ b/Content.Server/Body/BodyComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.GameTicking;
 using Content.Server.Ghost;
 using Content.Server.Mind.Components;
diff --git a/Content.Server/Body/Circulatory/BloodstreamComponent.cs b/Content.Server/Body/Circulatory/BloodstreamComponent.cs
index 2b50d039a5..df90cd6fc6 100644
--- a/Content.Server/Body/Circulatory/BloodstreamComponent.cs
+++ b/Content.Server/Body/Circulatory/BloodstreamComponent.cs
@@ -3,7 +3,6 @@ using System.Linq;
 using Content.Server.Atmos;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Chemistry.Components;
-using Content.Server.Interfaces;
 using Content.Server.Metabolism;
 using Content.Shared.Atmos;
 using Content.Shared.Body.Networks;
diff --git a/Content.Server/Body/Commands/AddHandCommand.cs b/Content.Server/Body/Commands/AddHandCommand.cs
index bcba8d8f6f..ae8381c38e 100644
--- a/Content.Server/Body/Commands/AddHandCommand.cs
+++ b/Content.Server/Body/Commands/AddHandCommand.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Administration;
 using Content.Shared.Administration;
 using Content.Shared.Body.Components;
diff --git a/Content.Server/Body/Commands/AttachBodyPartCommand.cs b/Content.Server/Body/Commands/AttachBodyPartCommand.cs
index 337ff4cd83..ba7e35c9d8 100644
--- a/Content.Server/Body/Commands/AttachBodyPartCommand.cs
+++ b/Content.Server/Body/Commands/AttachBodyPartCommand.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Administration;
 using Content.Shared.Administration;
 using Content.Shared.Body.Components;
diff --git a/Content.Server/Body/Commands/DestroyMechanismCommand.cs b/Content.Server/Body/Commands/DestroyMechanismCommand.cs
index 4b13951a86..657e5f3459 100644
--- a/Content.Server/Body/Commands/DestroyMechanismCommand.cs
+++ b/Content.Server/Body/Commands/DestroyMechanismCommand.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Administration;
 using Content.Shared.Administration;
 using Content.Shared.Body.Components;
diff --git a/Content.Server/Body/Commands/RemoveHandCommand.cs b/Content.Server/Body/Commands/RemoveHandCommand.cs
index 9668889628..184cf7141f 100644
--- a/Content.Server/Body/Commands/RemoveHandCommand.cs
+++ b/Content.Server/Body/Commands/RemoveHandCommand.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Linq;
 using Content.Server.Administration;
 using Content.Shared.Administration;
diff --git a/Content.Server/Body/Mechanism/MechanismComponent.cs b/Content.Server/Body/Mechanism/MechanismComponent.cs
index 3795cd15b9..de9c1c476f 100644
--- a/Content.Server/Body/Mechanism/MechanismComponent.cs
+++ b/Content.Server/Body/Mechanism/MechanismComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Content.Server.UserInterface;
diff --git a/Content.Server/Body/Part/BodyPartComponent.cs b/Content.Server/Body/Part/BodyPartComponent.cs
index 38393f00a9..c3939acf98 100644
--- a/Content.Server/Body/Part/BodyPartComponent.cs
+++ b/Content.Server/Body/Part/BodyPartComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Content.Server.UserInterface;
diff --git a/Content.Server/Body/Respiratory/InternalsComponent.cs b/Content.Server/Body/Respiratory/InternalsComponent.cs
index 85eba65e31..87ec4d7b6d 100644
--- a/Content.Server/Body/Respiratory/InternalsComponent.cs
+++ b/Content.Server/Body/Respiratory/InternalsComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Server.Atmos.Components;
+using Content.Server.Atmos.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.ViewVariables;
 
diff --git a/Content.Server/Body/Scanner/BodyScannerComponent.cs b/Content.Server/Body/Scanner/BodyScannerComponent.cs
index b9a3b668e3..c0363699e2 100644
--- a/Content.Server/Body/Scanner/BodyScannerComponent.cs
+++ b/Content.Server/Body/Scanner/BodyScannerComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Server.UserInterface;
+using Content.Server.UserInterface;
 using Content.Shared.Body.Components;
 using Content.Shared.Body.Scanner;
 using Content.Shared.Interaction;
diff --git a/Content.Server/Body/Surgery/BiologicalSurgeryDataComponent.cs b/Content.Server/Body/Surgery/BiologicalSurgeryDataComponent.cs
index 5d932a611f..870f0cd670 100644
--- a/Content.Server/Body/Surgery/BiologicalSurgeryDataComponent.cs
+++ b/Content.Server/Body/Surgery/BiologicalSurgeryDataComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
diff --git a/Content.Server/Body/Surgery/Components/SurgeryToolComponent.cs b/Content.Server/Body/Surgery/Components/SurgeryToolComponent.cs
index da11f79a34..50115a2b47 100644
--- a/Content.Server/Body/Surgery/Components/SurgeryToolComponent.cs
+++ b/Content.Server/Body/Surgery/Components/SurgeryToolComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
@@ -10,8 +9,6 @@ using Content.Shared.Body.Mechanism;
 using Content.Shared.Body.Part;
 using Content.Shared.Body.Surgery;
 using Content.Shared.Interaction;
-using Content.Shared.NetIDs;
-using Content.Shared.Notification;
 using Content.Shared.Notification.Managers;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
@@ -31,7 +28,6 @@ namespace Content.Server.Body.Surgery.Components
     public class SurgeryToolComponent : Component, ISurgeon, IAfterInteract
     {
         public override string Name => "SurgeryTool";
-        public override uint? NetID => ContentNetIDs.SURGERY;
 
         private readonly Dictionary<int, object> _optionsCache = new();
 
diff --git a/Content.Server/Botany/Components/PlantHolderComponent.cs b/Content.Server/Botany/Components/PlantHolderComponent.cs
index 6c283dc626..3ee1a289ad 100644
--- a/Content.Server/Botany/Components/PlantHolderComponent.cs
+++ b/Content.Server/Botany/Components/PlantHolderComponent.cs
@@ -1,8 +1,8 @@
-#nullable enable
 using System;
 using System.Linq;
 using System.Threading.Tasks;
 using Content.Server.Atmos;
+using Content.Server.Atmos.EntitySystems;
 using Content.Server.Chemistry.Components;
 using Content.Server.Fluids.Components;
 using Content.Server.Hands.Components;
@@ -248,8 +248,7 @@ namespace Content.Server.Botany.Components
                     _updateSpriteAfterUpdate = true;
             }
 
-            var tileAtmos = Owner.Transform.Coordinates.GetTileAtmosphere();
-            var environment = tileAtmos?.Air ?? GasMixture.SpaceGas;
+            var environment = EntitySystem.Get<AtmosphereSystem>().GetTileMixture(Owner.Transform.Coordinates, true)?? GasMixture.SpaceGas;
 
             if (Seed.ConsumeGasses.Count > 0)
             {
diff --git a/Content.Server/Botany/Components/ProduceComponent.cs b/Content.Server/Botany/Components/ProduceComponent.cs
index 0a6cf284cb..88e456bb7c 100644
--- a/Content.Server/Botany/Components/ProduceComponent.cs
+++ b/Content.Server/Botany/Components/ProduceComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Chemistry.Components;
 using Content.Shared.Chemistry.Reagent;
 using Robust.Server.GameObjects;
diff --git a/Content.Server/Botany/Components/SeedComponent.cs b/Content.Server/Botany/Components/SeedComponent.cs
index 9c2728e313..b535d28583 100644
--- a/Content.Server/Botany/Components/SeedComponent.cs
+++ b/Content.Server/Botany/Components/SeedComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Shared.Examine;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
diff --git a/Content.Server/Botany/Components/SeedExtractorComponent.cs b/Content.Server/Botany/Components/SeedExtractorComponent.cs
index c195c4f869..6863e72d90 100644
--- a/Content.Server/Botany/Components/SeedExtractorComponent.cs
+++ b/Content.Server/Botany/Components/SeedExtractorComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Threading.Tasks;
 using Content.Server.Power.Components;
 using Content.Shared.Interaction;
diff --git a/Content.Server/Botany/Seed.cs b/Content.Server/Botany/Seed.cs
index 24cdafd1f1..de011031e8 100644
--- a/Content.Server/Botany/Seed.cs
+++ b/Content.Server/Botany/Seed.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -265,7 +264,7 @@ namespace Content.Server.Botany
                 sprite.LayerSetSprite(0, new SpriteSpecifier.Rsi(PlantRsi, "seed"));
             }
 
-            seed.Name = Loc.GetString("botany-seed-packet-name", ("seedName", SeedName), ("seedNount", SeedNoun));
+            seed.Name = Loc.GetString("botany-seed-packet-name", ("seedName", SeedName), ("seedNoun", SeedNoun));
 
             return seed;
         }
diff --git a/Content.Server/Buckle/BuckleSystem.cs b/Content.Server/Buckle/BuckleSystem.cs
index c53cd503b5..4f262f7e18 100644
--- a/Content.Server/Buckle/BuckleSystem.cs
+++ b/Content.Server/Buckle/BuckleSystem.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Buckle.Components;
 using Content.Server.Interaction;
 using Content.Shared.Buckle;
diff --git a/Content.Server/Buckle/Components/BuckleComponent.cs b/Content.Server/Buckle/Components/BuckleComponent.cs
index fce20fc6f8..a3c4c705c0 100644
--- a/Content.Server/Buckle/Components/BuckleComponent.cs
+++ b/Content.Server/Buckle/Components/BuckleComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Diagnostics.CodeAnalysis;
 using Content.Server.Alert;
diff --git a/Content.Server/Buckle/Components/StrapComponent.cs b/Content.Server/Buckle/Components/StrapComponent.cs
index 699523a0f2..cf7622ea67 100644
--- a/Content.Server/Buckle/Components/StrapComponent.cs
+++ b/Content.Server/Buckle/Components/StrapComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Collections.Generic;
 using System.Linq;
 using Content.Shared.ActionBlocker;
diff --git a/Content.Server/Cargo/Components/CargoConsoleComponent.cs b/Content.Server/Cargo/Components/CargoConsoleComponent.cs
index d975e159fa..77b31ab890 100644
--- a/Content.Server/Cargo/Components/CargoConsoleComponent.cs
+++ b/Content.Server/Cargo/Components/CargoConsoleComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Collections.Generic;
 using Content.Server.Coordinates.Helpers;
 using Content.Server.Power.Components;
diff --git a/Content.Server/Cargo/Components/CargoTelepadComponent.cs b/Content.Server/Cargo/Components/CargoTelepadComponent.cs
index 099ec71451..d26d0834e6 100644
--- a/Content.Server/Cargo/Components/CargoTelepadComponent.cs
+++ b/Content.Server/Cargo/Components/CargoTelepadComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Collections.Generic;
 using Content.Server.Power.Components;
 using Content.Shared.Cargo;
diff --git a/Content.Server/CharacterAppearance/Components/MagicMirrorComponent.cs b/Content.Server/CharacterAppearance/Components/MagicMirrorComponent.cs
index 39dcc61096..bdccf0cacb 100644
--- a/Content.Server/CharacterAppearance/Components/MagicMirrorComponent.cs
+++ b/Content.Server/CharacterAppearance/Components/MagicMirrorComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.UserInterface;
 using Content.Shared.CharacterAppearance;
 using Content.Shared.CharacterAppearance.Components;
diff --git a/Content.Server/CharacterInfo/CharacterInfoComponent.cs b/Content.Server/CharacterInfo/CharacterInfoComponent.cs
index f5ff7e976e..ca63dbee07 100644
--- a/Content.Server/CharacterInfo/CharacterInfoComponent.cs
+++ b/Content.Server/CharacterInfo/CharacterInfoComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Content.Server.Mind.Components;
 using Content.Server.Roles;
 using Content.Shared.CharacterInfo;
diff --git a/Content.Server/Chat/Commands/AdminChatCommand.cs b/Content.Server/Chat/Commands/AdminChatCommand.cs
index 0af611733d..50a4f207e2 100644
--- a/Content.Server/Chat/Commands/AdminChatCommand.cs
+++ b/Content.Server/Chat/Commands/AdminChatCommand.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Administration;
 using Content.Server.Chat.Managers;
 using Content.Shared.Administration;
diff --git a/Content.Server/Chat/Commands/MeCommand.cs b/Content.Server/Chat/Commands/MeCommand.cs
index 6aa2f05ab3..e19c8d2879 100644
--- a/Content.Server/Chat/Commands/MeCommand.cs
+++ b/Content.Server/Chat/Commands/MeCommand.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Administration;
 using Content.Server.Chat.Managers;
 using Content.Server.Players;
diff --git a/Content.Server/Chat/Commands/OOCCommand.cs b/Content.Server/Chat/Commands/OOCCommand.cs
index 22f72d10f1..440e1f8b5f 100644
--- a/Content.Server/Chat/Commands/OOCCommand.cs
+++ b/Content.Server/Chat/Commands/OOCCommand.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Administration;
 using Content.Server.Chat.Managers;
 using Robust.Server.Player;
diff --git a/Content.Server/Chat/Commands/SayCommand.cs b/Content.Server/Chat/Commands/SayCommand.cs
index 193798a976..f53302fb75 100644
--- a/Content.Server/Chat/Commands/SayCommand.cs
+++ b/Content.Server/Chat/Commands/SayCommand.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Administration;
 using Content.Server.Chat.Managers;
 using Content.Server.Ghost.Components;
diff --git a/Content.Server/Chat/Commands/SuicideCommand.cs b/Content.Server/Chat/Commands/SuicideCommand.cs
index a1bad9de9b..86686b6d99 100644
--- a/Content.Server/Chat/Commands/SuicideCommand.cs
+++ b/Content.Server/Chat/Commands/SuicideCommand.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Linq;
 using Content.Server.Act;
 using Content.Server.Administration;
diff --git a/Content.Server/Chat/Managers/ChatManager.cs b/Content.Server/Chat/Managers/ChatManager.cs
index 17e24a7078..9ea60b2a35 100644
--- a/Content.Server/Chat/Managers/ChatManager.cs
+++ b/Content.Server/Chat/Managers/ChatManager.cs
@@ -12,10 +12,8 @@ using Content.Shared.ActionBlocker;
 using Content.Shared.Administration;
 using Content.Shared.CCVar;
 using Content.Shared.Chat;
-using Content.Shared.Emoting;
 using Content.Shared.Inventory;
 using Content.Shared.Notification.Managers;
-using Content.Shared.Speech;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.Configuration;
@@ -52,7 +50,7 @@ namespace Content.Server.Chat.Managers
         /// <summary>
         /// The maximum length a player-sent message can be sent
         /// </summary>
-        public const int MaxMessageLength = 1000;
+        public int MaxMessageLength => _configurationManager.GetCVar(CCVars.ChatMaxMessageLength);
 
         private const int VoiceRange = 7; // how far voice goes in world units
 
@@ -64,12 +62,6 @@ namespace Content.Server.Chat.Managers
         public void Initialize()
         {
             _netManager.RegisterNetMessage<MsgChatMessage>();
-            _netManager.RegisterNetMessage<ChatMaxMsgLengthMessage>(OnMaxLengthRequest);
-
-            // Tell all the connected players the chat's character limit
-            var msg = _netManager.CreateNetMessage<ChatMaxMsgLengthMessage>();
-            msg.MaxMessageLength = MaxMessageLength;
-            _netManager.ServerSendToAll(msg);
 
             _configurationManager.OnValueChanged(CCVars.OocEnabled, OnOocEnabledChanged, true);
             _configurationManager.OnValueChanged(CCVars.AdminOocEnabled, OnAdminOocEnabledChanged, true);
@@ -333,7 +325,7 @@ namespace Content.Server.Chat.Managers
 
             var msg = _netManager.CreateNetMessage<MsgChatMessage>();
 
-            msg.Channel = ChatChannel.AdminChat;
+            msg.Channel = ChatChannel.Admin;
             msg.Message = message;
             msg.MessageWrap = Loc.GetString("chat-manager-send-admin-chat-wrap-message",
                                             ("adminChannelName", Loc.GetString("chat-manager-admin-channel-name")),
@@ -349,7 +341,7 @@ namespace Content.Server.Chat.Managers
 
             var msg = _netManager.CreateNetMessage<MsgChatMessage>();
 
-            msg.Channel = ChatChannel.AdminChat;
+            msg.Channel = ChatChannel.Admin;
             msg.Message = message;
             msg.MessageWrap = Loc.GetString("chat-manager-send-admin-announcement-wrap-message",
                                             ("adminChannelName", Loc.GetString("chat-manager-admin-channel-name")));
@@ -368,13 +360,6 @@ namespace Content.Server.Chat.Managers
             _netManager.ServerSendToAll(msg);
         }
 
-        private void OnMaxLengthRequest(ChatMaxMsgLengthMessage msg)
-        {
-            var response = _netManager.CreateNetMessage<ChatMaxMsgLengthMessage>();
-            response.MaxMessageLength = MaxMessageLength;
-            _netManager.ServerSendMessage(response, msg.MsgChannel);
-        }
-
         public void RegisterChatTransform(TransformChat handler)
         {
             _chatTransformHandlers.Add(handler);
diff --git a/Content.Server/Chemistry/Components/ChemMasterComponent.cs b/Content.Server/Chemistry/Components/ChemMasterComponent.cs
index e67d231ae8..9f4ca18bc5 100644
--- a/Content.Server/Chemistry/Components/ChemMasterComponent.cs
+++ b/Content.Server/Chemistry/Components/ChemMasterComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
diff --git a/Content.Server/Chemistry/Components/ChemicalInjectionProjectileComponent.cs b/Content.Server/Chemistry/Components/ChemicalInjectionProjectileComponent.cs
deleted file mode 100644
index 89ccf14f7c..0000000000
--- a/Content.Server/Chemistry/Components/ChemicalInjectionProjectileComponent.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System;
-using Content.Server.Body.Circulatory;
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Physics.Collision;
-using Robust.Shared.Physics.Dynamics;
-using Robust.Shared.Serialization.Manager.Attributes;
-using Robust.Shared.ViewVariables;
-
-namespace Content.Server.Chemistry.Components
-{
-    [RegisterComponent]
-    public class ChemicalInjectionProjectileComponent : Component, IStartCollide
-    {
-        public override string Name => "ChemicalInjectionProjectile";
-
-        [ViewVariables]
-        private SolutionContainerComponent _solutionContainer = default!;
-
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("transferAmount")]
-        public ReagentUnit TransferAmount { get; set; } = ReagentUnit.New(1);
-
-        [ViewVariables(VVAccess.ReadWrite)]
-        public float TransferEfficiency { get => _transferEfficiency; set => _transferEfficiency = Math.Clamp(value, 0, 1); }
-        [DataField("transferEfficiency")]
-        private float _transferEfficiency = 1f;
-
-        protected override void Initialize()
-        {
-            base.Initialize();
-            _solutionContainer = Owner.EnsureComponent<SolutionContainerComponent>();
-        }
-
-        void IStartCollide.CollideWith(Fixture ourFixture, Fixture otherFixture, in Manifold manifold)
-        {
-            if (!otherFixture.Body.Owner.TryGetComponent<BloodstreamComponent>(out var bloodstream))
-                return;
-
-            var solution = _solutionContainer.Solution;
-            var solRemoved = solution.SplitSolution(TransferAmount);
-            var solRemovedVol = solRemoved.TotalVolume;
-
-            var solToInject = solRemoved.SplitSolution(solRemovedVol * TransferEfficiency);
-
-            bloodstream.TryTransferSolution(solToInject);
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/Components/FoamSolutionAreaEffectComponent.cs b/Content.Server/Chemistry/Components/FoamSolutionAreaEffectComponent.cs
index c668d06a6f..ad3d1d821b 100644
--- a/Content.Server/Chemistry/Components/FoamSolutionAreaEffectComponent.cs
+++ b/Content.Server/Chemistry/Components/FoamSolutionAreaEffectComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Server.Body.Circulatory;
+using Content.Server.Body.Circulatory;
 using Content.Server.Inventory.Components;
 using Content.Server.Items;
 using Content.Shared.Chemistry.Reagent;
diff --git a/Content.Server/Chemistry/Components/InjectorComponent.cs b/Content.Server/Chemistry/Components/InjectorComponent.cs
index 2d41190eff..cd404aaa0d 100644
--- a/Content.Server/Chemistry/Components/InjectorComponent.cs
+++ b/Content.Server/Chemistry/Components/InjectorComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Threading.Tasks;
 using Content.Server.Body.Circulatory;
diff --git a/Content.Server/Chemistry/Components/ReagentDispenserComponent.cs b/Content.Server/Chemistry/Components/ReagentDispenserComponent.cs
index eb090d63e0..74b316f315 100644
--- a/Content.Server/Chemistry/Components/ReagentDispenserComponent.cs
+++ b/Content.Server/Chemistry/Components/ReagentDispenserComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/Content.Server/Chemistry/Components/ReagentTankComponent.cs b/Content.Server/Chemistry/Components/ReagentTankComponent.cs
index acd9480802..7d55f43d15 100644
--- a/Content.Server/Chemistry/Components/ReagentTankComponent.cs
+++ b/Content.Server/Chemistry/Components/ReagentTankComponent.cs
@@ -3,7 +3,6 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-#nullable enable
 
 namespace Content.Server.Chemistry.Components
 {
diff --git a/Content.Server/Chemistry/Components/RehydratableComponent.cs b/Content.Server/Chemistry/Components/RehydratableComponent.cs
index 91cf6853dd..6d900b26a5 100644
--- a/Content.Server/Chemistry/Components/RehydratableComponent.cs
+++ b/Content.Server/Chemistry/Components/RehydratableComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Notification;
 using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Reagent;
diff --git a/Content.Server/Chemistry/Components/SmokeSolutionAreaEffectComponent.cs b/Content.Server/Chemistry/Components/SmokeSolutionAreaEffectComponent.cs
index 0e04210ba4..461b9b25c1 100644
--- a/Content.Server/Chemistry/Components/SmokeSolutionAreaEffectComponent.cs
+++ b/Content.Server/Chemistry/Components/SmokeSolutionAreaEffectComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Linq;
+using System.Linq;
 using Content.Server.Body.Circulatory;
 using Content.Server.Body.Respiratory;
 using Content.Shared.Chemistry;
diff --git a/Content.Server/Chemistry/Components/SolutionAreaEffectComponent.cs b/Content.Server/Chemistry/Components/SolutionAreaEffectComponent.cs
index a68230ddd1..2932c2d1b0 100644
--- a/Content.Server/Chemistry/Components/SolutionAreaEffectComponent.cs
+++ b/Content.Server/Chemistry/Components/SolutionAreaEffectComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Linq;
 using Content.Server.Atmos.Components;
diff --git a/Content.Server/Chemistry/Components/SolutionAreaEffectInceptionComponent.cs b/Content.Server/Chemistry/Components/SolutionAreaEffectInceptionComponent.cs
index 0d5a31304b..ff38721a16 100644
--- a/Content.Server/Chemistry/Components/SolutionAreaEffectInceptionComponent.cs
+++ b/Content.Server/Chemistry/Components/SolutionAreaEffectInceptionComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using Robust.Shared.GameObjects;
 using Robust.Shared.ViewVariables;
diff --git a/Content.Server/Chemistry/Components/SolutionContainerComponent.cs b/Content.Server/Chemistry/Components/SolutionContainerComponent.cs
index b9944a28fc..33adde72b2 100644
--- a/Content.Server/Chemistry/Components/SolutionContainerComponent.cs
+++ b/Content.Server/Chemistry/Components/SolutionContainerComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Shared.Chemistry.Solution.Components;
+using Content.Shared.Chemistry.Solution.Components;
 using Robust.Shared.GameObjects;
 
 namespace Content.Server.Chemistry.Components
diff --git a/Content.Server/Chemistry/Components/SolutionInjectOnCollideComponent.cs b/Content.Server/Chemistry/Components/SolutionInjectOnCollideComponent.cs
new file mode 100644
index 0000000000..85efc832bb
--- /dev/null
+++ b/Content.Server/Chemistry/Components/SolutionInjectOnCollideComponent.cs
@@ -0,0 +1,27 @@
+using System;
+using Content.Shared.Chemistry.Reagent;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Serialization.Manager.Attributes;
+using Robust.Shared.ViewVariables;
+
+namespace Content.Server.Chemistry.Components
+{
+    /// <summary>
+    /// On colliding with an entity that has a bloodstream will dump its solution onto them.
+    /// </summary>
+    [RegisterComponent]
+    internal sealed class SolutionInjectOnCollideComponent : Component
+    {
+        public override string Name => "SolutionInjectOnCollide";
+
+        [ViewVariables(VVAccess.ReadWrite)]
+        [DataField("transferAmount")]
+        public ReagentUnit TransferAmount { get; set; } = ReagentUnit.New(1);
+
+        [ViewVariables(VVAccess.ReadWrite)]
+        public float TransferEfficiency { get => _transferEfficiency; set => _transferEfficiency = Math.Clamp(value, 0, 1); }
+
+        [DataField("transferEfficiency")]
+        private float _transferEfficiency = 1f;
+    }
+}
diff --git a/Content.Server/Chemistry/Components/SolutionTransferComponent.cs b/Content.Server/Chemistry/Components/SolutionTransferComponent.cs
index 38238299d7..74fca84068 100644
--- a/Content.Server/Chemistry/Components/SolutionTransferComponent.cs
+++ b/Content.Server/Chemistry/Components/SolutionTransferComponent.cs
@@ -1,10 +1,15 @@
-#nullable enable
+using System;
 using System.Threading.Tasks;
+using Content.Server.UserInterface;
+using Content.Shared.ActionBlocker;
+using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Chemistry.Solution.Components;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Helpers;
 using Content.Shared.Notification.Managers;
+using Content.Shared.Verbs;
+using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 using Robust.Shared.Serialization.Manager.Attributes;
@@ -32,6 +37,35 @@ namespace Content.Server.Chemistry.Components
         [ViewVariables(VVAccess.ReadWrite)]
         public ReagentUnit TransferAmount { get; set; } = ReagentUnit.New(5);
 
+        /// <summary>
+        ///     The minimum amount of solution that can be transferred at once from this solution.
+        /// </summary>
+        [DataField("minTransferAmount")]
+        [ViewVariables(VVAccess.ReadWrite)]
+        public ReagentUnit MinimumTransferAmount { get; set; } = ReagentUnit.New(5);
+
+        /// <summary>
+        ///     The maximum amount of solution that can be transferred at once from this solution.
+        /// </summary>
+        [DataField("maxTransferAmount")]
+        [ViewVariables(VVAccess.ReadWrite)]
+        public ReagentUnit MaximumTransferAmount { get; set; } = ReagentUnit.New(50);
+
+        /// <summary>
+        ///     Subjectively, which transfer amount would be best for most activities given the maximum
+        ///     transfer amount.
+        /// </summary>
+        public ReagentUnit SubjectiveBestTransferAmount() =>
+            MaximumTransferAmount.Int() switch
+            {
+                <= 5 => ReagentUnit.New(1),
+                (> 5) and (<= 25) => ReagentUnit.New(5),
+                (> 25) and (<= 50) => ReagentUnit.New(10),
+                (> 50) and (<= 100) => ReagentUnit.New(20),
+                (> 100) and (<= 500) => ReagentUnit.New(50),
+                (> 500) => ReagentUnit.New(100)
+            };
+
         /// <summary>
         ///     Can this entity take reagent from reagent tanks?
         /// </summary>
@@ -46,6 +80,46 @@ namespace Content.Server.Chemistry.Components
         [ViewVariables(VVAccess.ReadWrite)]
         public bool CanSend { get; set; } = true;
 
+        /// <summary>
+        /// Whether you're allowed to change the transfer amount.
+        /// </summary>
+        [DataField("canChangeTransferAmount")]
+        [ViewVariables(VVAccess.ReadWrite)]
+        public bool CanChangeTransferAmount { get; set; } = false;
+
+        [ViewVariables] private BoundUserInterface? UserInterface => Owner.GetUIOrNull(TransferAmountUiKey.Key);
+
+        protected override void Initialize()
+        {
+            base.Initialize();
+
+            if (UserInterface != null)
+            {
+                UserInterface.OnReceiveMessage += UserInterfaceOnReceiveMessage;
+            }
+        }
+
+        public void UserInterfaceOnReceiveMessage(ServerBoundUserInterfaceMessage serverMsg)
+        {
+            switch (serverMsg.Message)
+            {
+                case TransferAmountSetValueMessage svm:
+                    var sval = svm.Value.Float();
+                    var amount = Math.Clamp(sval, MinimumTransferAmount.Float(),
+                        MaximumTransferAmount.Float());
+
+                    serverMsg.Session.AttachedEntity?.PopupMessage(Loc.GetString("comp-solution-transfer-set-amount", ("amount", amount)));
+                    SetTransferAmount(ReagentUnit.New(amount));
+                    break;
+            }
+        }
+
+        public void SetTransferAmount(ReagentUnit amount)
+        {
+            amount = ReagentUnit.New(Math.Clamp(amount.Int(), MinimumTransferAmount.Int(), MaximumTransferAmount.Int()));
+            TransferAmount = amount;
+        }
+
         async Task<bool> IAfterInteract.AfterInteract(AfterInteractEventArgs eventArgs)
         {
             if (!eventArgs.InRangeUnobstructed() || eventArgs.Target == null)
@@ -68,8 +142,8 @@ namespace Content.Server.Chemistry.Components
                 {
                     var toTheBrim = ownerSolution.RefillSpaceAvailable == 0;
                     var msg = toTheBrim
-                        ? "solution-transfer-component-fill-to-brim-message"
-                        : "solution-transfer-component-fill--message";
+                        ? "comp-solution-transfer-fill-fully"
+                        : "comp-solution-transfer-fill-normal";
 
                     target.PopupMessage(eventArgs.User, Loc.GetString(msg,("owner", Owner),("amount", transferred),("target", target)));
                     return true;
@@ -83,7 +157,7 @@ namespace Content.Server.Chemistry.Components
                 if (transferred > 0)
                 {
                     Owner.PopupMessage(eventArgs.User,
-                                       Loc.GetString("solution-transfer-component-transfer-success-message",
+                                       Loc.GetString("comp-solution-transfer-transfer-solution",
                                                      ("amount",transferred),
                                                      ("target",target)));
 
@@ -103,13 +177,13 @@ namespace Content.Server.Chemistry.Components
         {
             if (source.DrainAvailable == 0)
             {
-                source.Owner.PopupMessage(user, Loc.GetString("solution-transfer-component-do-transfer-component-is-empty", ("entity",source.Owner)));
+                source.Owner.PopupMessage(user, Loc.GetString("comp-solution-transfer-is-empty", ("target", source.Owner)));
                 return ReagentUnit.Zero;
             }
 
             if (target.RefillSpaceAvailable == 0)
             {
-                target.Owner.PopupMessage(user, Loc.GetString("solution-transfer-component-do-transfer-component-is-full", ("entity", target.Owner)));
+                target.Owner.PopupMessage(user, Loc.GetString("comp-solution-transfer-is-full", ("target", target.Owner)));
                 return ReagentUnit.Zero;
             }
 
@@ -121,5 +195,114 @@ namespace Content.Server.Chemistry.Components
 
             return actualAmount;
         }
+
+        // TODO refactor when dynamic verbs are a thing
+
+        [Verb]
+        public sealed class MinimumTransferVerb : Verb<SolutionTransferComponent>
+        {
+            protected override void GetData(IEntity user, SolutionTransferComponent component, VerbData data)
+            {
+                if (!EntitySystem.Get<ActionBlockerSystem>().CanInteract(user) || !component.CanChangeTransferAmount)
+                {
+                    data.Visibility = VerbVisibility.Invisible;
+                    return;
+                }
+
+                data.Visibility = VerbVisibility.Visible;
+                data.Text = Loc.GetString("comp-solution-transfer-verb-transfer-amount-min",
+                    ("amount", component.MinimumTransferAmount.Int()));
+                data.CategoryData = VerbCategories.SetTransferAmount;
+            }
+
+            protected override void Activate(IEntity user, SolutionTransferComponent component)
+            {
+                component.TransferAmount = component.MinimumTransferAmount;
+                user.PopupMessage(Loc.GetString("comp-solution-transfer-set-amount",
+                    ("amount", component.TransferAmount.Int())));
+            }
+        }
+
+        [Verb]
+        public sealed class DefaultTransferVerb : Verb<SolutionTransferComponent>
+        {
+            protected override void GetData(IEntity user, SolutionTransferComponent component, VerbData data)
+            {
+                if (!EntitySystem.Get<ActionBlockerSystem>().CanInteract(user) || !component.CanChangeTransferAmount)
+                {
+                    data.Visibility = VerbVisibility.Invisible;
+                    return;
+                }
+
+                var amt = component.SubjectiveBestTransferAmount();
+                if (amt > component.MinimumTransferAmount && amt < component.MaximumTransferAmount)
+                {
+                    data.Visibility = VerbVisibility.Visible;
+                    data.Text = Loc.GetString("comp-solution-transfer-verb-transfer-amount-ideal",
+                        ("amount", amt.Int()));
+                    data.CategoryData = VerbCategories.SetTransferAmount;
+                }
+                else
+                {
+                    data.Visibility = VerbVisibility.Invisible;
+                }
+            }
+
+            protected override void Activate(IEntity user, SolutionTransferComponent component)
+            {
+                component.TransferAmount = component.SubjectiveBestTransferAmount();
+                user.PopupMessage(Loc.GetString("comp-solution-transfer-set-amount", ("amount", component.TransferAmount.Int())));
+            }
+        }
+
+        [Verb]
+        public sealed class MaximumTransferVerb : Verb<SolutionTransferComponent>
+        {
+            protected override void GetData(IEntity user, SolutionTransferComponent component, VerbData data)
+            {
+                if (!EntitySystem.Get<ActionBlockerSystem>().CanInteract(user) || !component.CanChangeTransferAmount)
+                {
+                    data.Visibility = VerbVisibility.Invisible;
+                    return;
+                }
+
+                data.Visibility = VerbVisibility.Visible;
+                data.Text = Loc.GetString("comp-solution-transfer-verb-transfer-amount-max",
+                    ("amount", component.MaximumTransferAmount));
+                data.CategoryData = VerbCategories.SetTransferAmount;
+            }
+
+            protected override void Activate(IEntity user, SolutionTransferComponent component)
+            {
+                component.TransferAmount = component.MaximumTransferAmount;
+                user.PopupMessage(Loc.GetString("comp-solution-transfer-set-amount", ("amount", component.TransferAmount.Int())));
+            }
+        }
+
+        [Verb]
+        public sealed class CustomTransferVerb : Verb<SolutionTransferComponent>
+        {
+            protected override void GetData(IEntity user, SolutionTransferComponent component, VerbData data)
+            {
+                if (!EntitySystem.Get<ActionBlockerSystem>().CanInteract(user) || !component.CanChangeTransferAmount)
+                {
+                    data.Visibility = VerbVisibility.Invisible;
+                    return;
+                }
+
+                data.Visibility = VerbVisibility.Visible;
+                data.Text = Loc.GetString("comp-solution-transfer-verb-transfer-amount-custom");
+                data.CategoryData = VerbCategories.SetTransferAmount;
+            }
+
+            protected override void Activate(IEntity user, SolutionTransferComponent component)
+            {
+                if (!user.TryGetComponent<ActorComponent>(out var actor))
+                {
+                    return;
+                }
+                component.UserInterface?.Open(actor.PlayerSession);
+            }
+        }
     }
 }
diff --git a/Content.Server/Chemistry/Components/TransformableContainerComponent.cs b/Content.Server/Chemistry/Components/TransformableContainerComponent.cs
index fc55f861c5..ad01057a58 100644
--- a/Content.Server/Chemistry/Components/TransformableContainerComponent.cs
+++ b/Content.Server/Chemistry/Components/TransformableContainerComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Chemistry.Solution;
diff --git a/Content.Server/Chemistry/Components/VaporComponent.cs b/Content.Server/Chemistry/Components/VaporComponent.cs
index f9b9197066..7eda0be87f 100644
--- a/Content.Server/Chemistry/Components/VaporComponent.cs
+++ b/Content.Server/Chemistry/Components/VaporComponent.cs
@@ -1,131 +1,24 @@
-using System.Linq;
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Chemistry.Solution;
-using Content.Shared.Physics;
+using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Vapor;
 using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
 using Robust.Shared.Map;
-using Robust.Shared.Maths;
-using Robust.Shared.Physics.Collision;
-using Robust.Shared.Physics.Dynamics;
-using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Chemistry.Components
 {
     [RegisterComponent]
-    class VaporComponent : SharedVaporComponent, IStartCollide
+    internal sealed class VaporComponent : SharedVaporComponent
     {
-        public const float ReactTime = 0.125f;
-
-        [Dependency] private readonly IMapManager _mapManager = default!;
-        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-
         [ViewVariables]
         [DataField("transferAmount")]
-        private ReagentUnit _transferAmount = ReagentUnit.New(0.5);
+        internal ReagentUnit TransferAmount = ReagentUnit.New(0.5);
 
-        private bool _reached;
-        private float _reactTimer;
-        private float _timer;
-        private EntityCoordinates _target;
-        private bool _running;
-        private float _aliveTime;
-
-        protected override void Initialize()
-        {
-            base.Initialize();
-
-            Owner.EnsureComponentWarn(out SolutionContainerComponent _);
-        }
-
-        public void Start(Vector2 dir, float speed, EntityCoordinates target, float aliveTime)
-        {
-            _running = true;
-            _target = target;
-            _aliveTime = aliveTime;
-            // Set Move
-            if (Owner.TryGetComponent(out PhysicsComponent? physics))
-            {
-                physics.BodyStatus = BodyStatus.InAir;
-                physics.ApplyLinearImpulse(dir * speed);
-            }
-        }
-
-        public void Update(float frameTime)
-        {
-            if (!Owner.TryGetComponent(out SolutionContainerComponent? contents))
-                return;
-
-            if (!_running)
-                return;
-
-            _timer += frameTime;
-            _reactTimer += frameTime;
-
-            if (_reactTimer >= ReactTime && Owner.Transform.GridID.IsValid())
-            {
-                _reactTimer = 0;
-                var mapGrid = _mapManager.GetGrid(Owner.Transform.GridID);
-
-                var tile = mapGrid.GetTileRef(Owner.Transform.Coordinates.ToVector2i(Owner.EntityManager, _mapManager));
-                foreach (var reagentQuantity in contents.ReagentList.ToArray())
-                {
-                    if (reagentQuantity.Quantity == ReagentUnit.Zero) continue;
-                    var reagent = _prototypeManager.Index<ReagentPrototype>(reagentQuantity.ReagentId);
-                    contents.TryRemoveReagent(reagentQuantity.ReagentId, reagent.ReactionTile(tile, (reagentQuantity.Quantity / _transferAmount) * 0.25f));
-                }
-            }
-
-            // Check if we've reached our target.
-            if(!_reached && _target.TryDistance(Owner.EntityManager, Owner.Transform.Coordinates, out var distance) && distance <= 0.5f)
-            {
-                _reached = true;
-            }
-
-            if (contents.CurrentVolume == 0 || _timer > _aliveTime)
-            {
-                // Delete this
-                Owner.Delete();
-            }
-        }
-
-        internal bool TryAddSolution(Solution solution)
-        {
-            if (solution.TotalVolume == 0)
-            {
-                return false;
-            }
-
-            if (!Owner.TryGetComponent(out SolutionContainerComponent? contents))
-            {
-                return false;
-            }
-
-            var result = contents.TryAddSolution(solution);
-
-            if (!result)
-            {
-                return false;
-            }
-
-            return true;
-        }
-
-        void IStartCollide.CollideWith(Fixture ourFixture, Fixture otherFixture, in Manifold manifold)
-        {
-            if (!Owner.TryGetComponent(out SolutionContainerComponent? contents))
-                return;
-
-            contents.Solution.DoEntityReaction(otherFixture.Body.Owner, ReactionMethod.Touch);
-
-            // Check for collision with a impassable object (e.g. wall) and stop
-            if ((otherFixture.CollisionLayer & (int) CollisionGroup.Impassable) != 0 && otherFixture.Hard)
-            {
-                Owner.QueueDelete();
-            }
-        }
+        internal bool Reached;
+        internal float ReactTimer;
+        internal float Timer;
+        internal EntityCoordinates Target;
+        internal bool Active;
+        internal float AliveTime;
     }
 }
diff --git a/Content.Server/Chemistry/EntitySystems/ChemicalReactionSystem.cs b/Content.Server/Chemistry/EntitySystems/ChemicalReactionSystem.cs
index b95ffa1207..d9dfd5d502 100644
--- a/Content.Server/Chemistry/EntitySystems/ChemicalReactionSystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/ChemicalReactionSystem.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Shared.Chemistry.Reaction;
 using Content.Shared.Chemistry.Reagent;
 using Robust.Shared.Audio;
diff --git a/Content.Server/Chemistry/EntitySystems/SolutionAreaEffectSystem.cs b/Content.Server/Chemistry/EntitySystems/SolutionAreaEffectSystem.cs
index cacd3a5d6b..a647007644 100644
--- a/Content.Server/Chemistry/EntitySystems/SolutionAreaEffectSystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/SolutionAreaEffectSystem.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Linq;
 using Content.Server.Chemistry.Components;
 using JetBrains.Annotations;
diff --git a/Content.Server/Chemistry/EntitySystems/SolutionInjectOnCollideSystem.cs b/Content.Server/Chemistry/EntitySystems/SolutionInjectOnCollideSystem.cs
new file mode 100644
index 0000000000..aa00ab6ac6
--- /dev/null
+++ b/Content.Server/Chemistry/EntitySystems/SolutionInjectOnCollideSystem.cs
@@ -0,0 +1,38 @@
+using Content.Server.Body.Circulatory;
+using Content.Server.Chemistry.Components;
+using JetBrains.Annotations;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Physics.Dynamics;
+
+namespace Content.Server.Chemistry.EntitySystems
+{
+    [UsedImplicitly]
+    internal sealed class SolutionInjectOnCollideSystem : EntitySystem
+    {
+        public override void Initialize()
+        {
+            base.Initialize();
+            SubscribeLocalEvent<SolutionInjectOnCollideComponent, ComponentInit>(HandleInit);
+            SubscribeLocalEvent<SolutionInjectOnCollideComponent, StartCollideEvent>(HandleInjection);
+        }
+
+        private void HandleInit(EntityUid uid, SolutionInjectOnCollideComponent component, ComponentInit args)
+        {
+            component.Owner.EnsureComponentWarn<SolutionContainerComponent>($"{nameof(SolutionInjectOnCollideComponent)} requires a SolutionContainer on {component.Owner}!");
+        }
+
+        private void HandleInjection(EntityUid uid, SolutionInjectOnCollideComponent component, StartCollideEvent args)
+        {
+            if (!args.OtherFixture.Body.Owner.TryGetComponent<BloodstreamComponent>(out var bloodstream) ||
+                !ComponentManager.TryGetComponent(uid, out SolutionContainerComponent? solutionContainer)) return;
+
+            var solution = solutionContainer.Solution;
+            var solRemoved = solution.SplitSolution(component.TransferAmount);
+            var solRemovedVol = solRemoved.TotalVolume;
+
+            var solToInject = solRemoved.SplitSolution(solRemovedVol * component.TransferEfficiency);
+
+            bloodstream.TryTransferSolution(solToInject);
+        }
+    }
+}
diff --git a/Content.Server/Chemistry/EntitySystems/VaporSystem.cs b/Content.Server/Chemistry/EntitySystems/VaporSystem.cs
index 14203c5dbb..f5e21c4adc 100644
--- a/Content.Server/Chemistry/EntitySystems/VaporSystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/VaporSystem.cs
@@ -1,17 +1,122 @@
-using Content.Server.Chemistry.Components;
+using System.Linq;
+using Content.Server.Chemistry.Components;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Chemistry.Solution;
+using Content.Shared.Physics;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
+using Robust.Shared.Map;
+using Robust.Shared.Maths;
+using Robust.Shared.Physics.Dynamics;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Chemistry.EntitySystems
 {
     [UsedImplicitly]
-    public class VaporSystem : EntitySystem
+    internal sealed class VaporSystem : EntitySystem
     {
+        [Dependency] private readonly IMapManager _mapManager = default!;
+        [Dependency] private readonly IPrototypeManager _protoManager = default!;
+
+        private const float ReactTime = 0.125f;
+
+        public override void Initialize()
+        {
+            base.Initialize();
+            SubscribeLocalEvent<VaporComponent, StartCollideEvent>(HandleCollide);
+        }
+
+        private void HandleCollide(EntityUid uid, VaporComponent component, StartCollideEvent args)
+        {
+            if (!ComponentManager.TryGetComponent(uid, out SolutionContainerComponent? contents)) return;
+
+            contents.Solution.DoEntityReaction(args.OtherFixture.Body.Owner, ReactionMethod.Touch);
+
+            // Check for collision with a impassable object (e.g. wall) and stop
+            if ((args.OtherFixture.CollisionLayer & (int) CollisionGroup.Impassable) != 0 && args.OtherFixture.Hard)
+            {
+               EntityManager.QueueDeleteEntity(uid);
+            }
+        }
+
+        public void Start(VaporComponent vapor, Vector2 dir, float speed, EntityCoordinates target, float aliveTime)
+        {
+            vapor.Active = true;
+            vapor.Target = target;
+            vapor.AliveTime = aliveTime;
+            // Set Move
+            if (vapor.Owner.TryGetComponent(out PhysicsComponent? physics))
+            {
+                physics.BodyStatus = BodyStatus.InAir;
+                physics.ApplyLinearImpulse(dir * speed);
+            }
+        }
+
+        internal bool TryAddSolution(VaporComponent vapor, Solution solution)
+        {
+            if (solution.TotalVolume == 0)
+            {
+                return false;
+            }
+
+            if (!vapor.Owner.TryGetComponent(out SolutionContainerComponent? contents))
+            {
+                return false;
+            }
+
+            var result = contents.TryAddSolution(solution);
+
+            if (!result)
+            {
+                return false;
+            }
+
+            return true;
+        }
+
         public override void Update(float frameTime)
         {
-            foreach (var vaporComp in ComponentManager.EntityQuery<VaporComponent>(true))
+            foreach (var (vaporComp, solution) in ComponentManager.EntityQuery<VaporComponent, SolutionContainerComponent>(true))
             {
-                vaporComp.Update(frameTime);
+                Update(frameTime, vaporComp, solution);
+            }
+        }
+
+        private void Update(float frameTime, VaporComponent vapor, SolutionContainerComponent contents)
+        {
+            if (!vapor.Active)
+                return;
+
+            var entity = vapor.Owner;
+
+            vapor.Timer += frameTime;
+            vapor.ReactTimer += frameTime;
+
+            if (vapor.ReactTimer >= ReactTime && vapor.Owner.Transform.GridID.IsValid())
+            {
+                vapor.ReactTimer = 0;
+                var mapGrid = _mapManager.GetGrid(entity.Transform.GridID);
+
+                var tile = mapGrid.GetTileRef(entity.Transform.Coordinates.ToVector2i(EntityManager, _mapManager));
+                foreach (var reagentQuantity in contents.ReagentList.ToArray())
+                {
+                    if (reagentQuantity.Quantity == ReagentUnit.Zero) continue;
+                    var reagent = _protoManager.Index<ReagentPrototype>(reagentQuantity.ReagentId);
+                    contents.TryRemoveReagent(reagentQuantity.ReagentId, reagent.ReactionTile(tile, (reagentQuantity.Quantity / vapor.TransferAmount) * 0.25f));
+                }
+            }
+
+            // Check if we've reached our target.
+            if(!vapor.Reached && vapor.Target.TryDistance(EntityManager, entity.Transform.Coordinates, out var distance) && distance <= 0.5f)
+            {
+                vapor.Reached = true;
+            }
+
+            if (contents.CurrentVolume == 0 || vapor.Timer > vapor.AliveTime)
+            {
+                // Delete this
+                entity.QueueDelete();
             }
         }
     }
diff --git a/Content.Server/Chemistry/PlantMetabolism/AdjustAttribute.cs b/Content.Server/Chemistry/PlantMetabolism/AdjustAttribute.cs
index c0f7a742a8..7a718650e1 100644
--- a/Content.Server/Chemistry/PlantMetabolism/AdjustAttribute.cs
+++ b/Content.Server/Chemistry/PlantMetabolism/AdjustAttribute.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using Content.Server.Botany.Components;
 using Content.Shared.Botany;
 using Robust.Shared.GameObjects;
diff --git a/Content.Server/Chemistry/PlantMetabolism/AdjustHealth.cs b/Content.Server/Chemistry/PlantMetabolism/AdjustHealth.cs
index 960742d25b..9e3d539e2d 100644
--- a/Content.Server/Chemistry/PlantMetabolism/AdjustHealth.cs
+++ b/Content.Server/Chemistry/PlantMetabolism/AdjustHealth.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
 namespace Content.Server.Chemistry.PlantMetabolism
diff --git a/Content.Server/Chemistry/PlantMetabolism/AdjustMutationLevel.cs b/Content.Server/Chemistry/PlantMetabolism/AdjustMutationLevel.cs
index 6437b0b39c..55501c86d7 100644
--- a/Content.Server/Chemistry/PlantMetabolism/AdjustMutationLevel.cs
+++ b/Content.Server/Chemistry/PlantMetabolism/AdjustMutationLevel.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
 namespace Content.Server.Chemistry.PlantMetabolism
diff --git a/Content.Server/Chemistry/PlantMetabolism/AdjustMutationMod.cs b/Content.Server/Chemistry/PlantMetabolism/AdjustMutationMod.cs
index 0461aa9c5a..501932c885 100644
--- a/Content.Server/Chemistry/PlantMetabolism/AdjustMutationMod.cs
+++ b/Content.Server/Chemistry/PlantMetabolism/AdjustMutationMod.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
 namespace Content.Server.Chemistry.PlantMetabolism
diff --git a/Content.Server/Chemistry/PlantMetabolism/AdjustNutrition.cs b/Content.Server/Chemistry/PlantMetabolism/AdjustNutrition.cs
index 2a2e00783d..22764fbcee 100644
--- a/Content.Server/Chemistry/PlantMetabolism/AdjustNutrition.cs
+++ b/Content.Server/Chemistry/PlantMetabolism/AdjustNutrition.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
 namespace Content.Server.Chemistry.PlantMetabolism
diff --git a/Content.Server/Chemistry/PlantMetabolism/AdjustPests.cs b/Content.Server/Chemistry/PlantMetabolism/AdjustPests.cs
index 0245ba335c..c31a5d7138 100644
--- a/Content.Server/Chemistry/PlantMetabolism/AdjustPests.cs
+++ b/Content.Server/Chemistry/PlantMetabolism/AdjustPests.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
 namespace Content.Server.Chemistry.PlantMetabolism
diff --git a/Content.Server/Chemistry/PlantMetabolism/AdjustToxins.cs b/Content.Server/Chemistry/PlantMetabolism/AdjustToxins.cs
index 544bb63b99..f9d281c0e4 100644
--- a/Content.Server/Chemistry/PlantMetabolism/AdjustToxins.cs
+++ b/Content.Server/Chemistry/PlantMetabolism/AdjustToxins.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
 namespace Content.Server.Chemistry.PlantMetabolism
diff --git a/Content.Server/Chemistry/PlantMetabolism/AdjustWater.cs b/Content.Server/Chemistry/PlantMetabolism/AdjustWater.cs
index 9314506b05..f9b39b041d 100644
--- a/Content.Server/Chemistry/PlantMetabolism/AdjustWater.cs
+++ b/Content.Server/Chemistry/PlantMetabolism/AdjustWater.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
 namespace Content.Server.Chemistry.PlantMetabolism
diff --git a/Content.Server/Chemistry/PlantMetabolism/AdjustWeeds.cs b/Content.Server/Chemistry/PlantMetabolism/AdjustWeeds.cs
index 66a0f8f480..e78c0cfe36 100644
--- a/Content.Server/Chemistry/PlantMetabolism/AdjustWeeds.cs
+++ b/Content.Server/Chemistry/PlantMetabolism/AdjustWeeds.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
 namespace Content.Server.Chemistry.PlantMetabolism
diff --git a/Content.Server/Chemistry/PlantMetabolism/AffectGrowth.cs b/Content.Server/Chemistry/PlantMetabolism/AffectGrowth.cs
index 6962eabb94..5fc534b7ba 100644
--- a/Content.Server/Chemistry/PlantMetabolism/AffectGrowth.cs
+++ b/Content.Server/Chemistry/PlantMetabolism/AffectGrowth.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
 namespace Content.Server.Chemistry.PlantMetabolism
diff --git a/Content.Server/Chemistry/PlantMetabolism/Clonexadone.cs b/Content.Server/Chemistry/PlantMetabolism/Clonexadone.cs
index 0320f8dc84..69eb5ddddd 100644
--- a/Content.Server/Chemistry/PlantMetabolism/Clonexadone.cs
+++ b/Content.Server/Chemistry/PlantMetabolism/Clonexadone.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Content.Server.Botany.Components;
 using Content.Shared.Botany;
 using JetBrains.Annotations;
diff --git a/Content.Server/Chemistry/PlantMetabolism/Diethylamine.cs b/Content.Server/Chemistry/PlantMetabolism/Diethylamine.cs
index 0a476a90e1..efecce3a79 100644
--- a/Content.Server/Chemistry/PlantMetabolism/Diethylamine.cs
+++ b/Content.Server/Chemistry/PlantMetabolism/Diethylamine.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Server.Botany.Components;
+using Content.Server.Botany.Components;
 using Content.Shared.Botany;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
diff --git a/Content.Server/Chemistry/PlantMetabolism/RobustHarvest.cs b/Content.Server/Chemistry/PlantMetabolism/RobustHarvest.cs
index f91877acd2..854310479b 100644
--- a/Content.Server/Chemistry/PlantMetabolism/RobustHarvest.cs
+++ b/Content.Server/Chemistry/PlantMetabolism/RobustHarvest.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Server.Botany.Components;
+using Content.Server.Botany.Components;
 using Content.Shared.Botany;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
diff --git a/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs b/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs
index bf4ba13e66..2b08dabbda 100644
--- a/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs
+++ b/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Content.Server.Chemistry.Components;
 using Content.Server.Coordinates.Helpers;
diff --git a/Content.Server/Chemistry/ReactionEffects/FoamAreaReactionEffect.cs b/Content.Server/Chemistry/ReactionEffects/FoamAreaReactionEffect.cs
index 29f496fedc..76f250dced 100644
--- a/Content.Server/Chemistry/ReactionEffects/FoamAreaReactionEffect.cs
+++ b/Content.Server/Chemistry/ReactionEffects/FoamAreaReactionEffect.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Server.Chemistry.Components;
+using Content.Server.Chemistry.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
diff --git a/Content.Server/Chemistry/ReactionEffects/SmokeAreaReactionEffect.cs b/Content.Server/Chemistry/ReactionEffects/SmokeAreaReactionEffect.cs
index ce575a619a..08032d183e 100644
--- a/Content.Server/Chemistry/ReactionEffects/SmokeAreaReactionEffect.cs
+++ b/Content.Server/Chemistry/ReactionEffects/SmokeAreaReactionEffect.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Server.Chemistry.Components;
+using Content.Server.Chemistry.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
diff --git a/Content.Server/Chemistry/TileReactions/ExtinguishTileReaction.cs b/Content.Server/Chemistry/TileReactions/ExtinguishTileReaction.cs
index 699ce8dfaf..5a1cdb877b 100644
--- a/Content.Server/Chemistry/TileReactions/ExtinguishTileReaction.cs
+++ b/Content.Server/Chemistry/TileReactions/ExtinguishTileReaction.cs
@@ -21,16 +21,23 @@ namespace Content.Server.Chemistry.TileReactions
 
         public ReagentUnit TileReact(TileRef tile, ReagentPrototype reagent, ReagentUnit reactVolume)
         {
-            if (reactVolume <= ReagentUnit.Zero || tile.Tile.IsEmpty) return ReagentUnit.Zero;
-            var tileAtmos = tile.GridPosition().GetTileAtmosphere();
-            if (tileAtmos == null || !tileAtmos.Hotspot.Valid || tileAtmos.Air == null) return ReagentUnit.Zero;
-            tileAtmos.Air.Temperature =
-                MathF.Max(MathF.Min(tileAtmos.Air.Temperature - (_coolingTemperature * 1000f),
-                        tileAtmos.Air.Temperature / _coolingTemperature),
-                    Atmospherics.TCMB);
-            EntitySystem.Get<AtmosphereSystem>().React(tileAtmos.Air, tileAtmos);
-            tileAtmos.Hotspot = new Hotspot();
-            tileAtmos.UpdateVisuals();
+            if (reactVolume <= ReagentUnit.Zero || tile.Tile.IsEmpty)
+                return ReagentUnit.Zero;
+
+            var atmosphereSystem = EntitySystem.Get<AtmosphereSystem>();
+
+            var environment = atmosphereSystem.GetTileMixture(tile.GridIndex, tile.GridIndices, true);
+
+            if (environment == null || !atmosphereSystem.IsHotspotActive(tile.GridIndex, tile.GridIndices))
+                return ReagentUnit.Zero;
+
+            environment.Temperature =
+                MathF.Max(MathF.Min(environment.Temperature - (_coolingTemperature * 1000f),
+                        environment.Temperature / _coolingTemperature), Atmospherics.TCMB);
+
+            atmosphereSystem.React(tile.GridIndex, tile.GridIndices);
+            atmosphereSystem.HotspotExtinguish(tile.GridIndex, tile.GridIndices);
+
             return ReagentUnit.Zero;
         }
     }
diff --git a/Content.Server/Chemistry/TileReactions/FlammableTileReaction.cs b/Content.Server/Chemistry/TileReactions/FlammableTileReaction.cs
index da0b9f54be..b82c9288e6 100644
--- a/Content.Server/Chemistry/TileReactions/FlammableTileReaction.cs
+++ b/Content.Server/Chemistry/TileReactions/FlammableTileReaction.cs
@@ -20,11 +20,18 @@ namespace Content.Server.Chemistry.TileReactions
 
         public ReagentUnit TileReact(TileRef tile, ReagentPrototype reagent, ReagentUnit reactVolume)
         {
-            if (reactVolume <= ReagentUnit.Zero || tile.Tile.IsEmpty) return ReagentUnit.Zero;
-            var tileAtmos = tile.GridPosition().GetTileAtmosphere();
-            if (tileAtmos?.Air == null || !tileAtmos.Hotspot.Valid) return ReagentUnit.Zero;
-            tileAtmos.Air.Temperature *= MathF.Max(_temperatureMultiplier * reactVolume.Float(), 1f);
-            EntitySystem.Get<AtmosphereSystem>().React(tileAtmos.Air, tileAtmos);
+            if (reactVolume <= ReagentUnit.Zero || tile.Tile.IsEmpty)
+                return ReagentUnit.Zero;
+
+            var atmosphereSystem = EntitySystem.Get<AtmosphereSystem>();
+
+            var environment = atmosphereSystem.GetTileMixture(tile.GridIndex, tile.GridIndices, true);
+            if (environment == null || !atmosphereSystem.IsHotspotActive(tile.GridIndex, tile.GridIndices))
+                return ReagentUnit.Zero;
+
+            environment.Temperature *= MathF.Max(_temperatureMultiplier * reactVolume.Float(), 1f);
+            atmosphereSystem.React(tile.GridIndex, tile.GridIndices);
+
             return reactVolume;
         }
     }
diff --git a/Content.Server/Climbing/Components/ClimbingComponent.cs b/Content.Server/Climbing/Components/ClimbingComponent.cs
index 00c871b125..8d06859605 100644
--- a/Content.Server/Climbing/Components/ClimbingComponent.cs
+++ b/Content.Server/Climbing/Components/ClimbingComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Content.Shared.Buckle.Components;
 using Content.Shared.Climbing;
 using Robust.Shared.GameObjects;
diff --git a/Content.Server/Cloning/CloningSystem.cs b/Content.Server/Cloning/CloningSystem.cs
index 4622ae660b..0d0c37da75 100644
--- a/Content.Server/Cloning/CloningSystem.cs
+++ b/Content.Server/Cloning/CloningSystem.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Collections.Generic;
 using System.Linq;
 using Content.Server.Cloning.Components;
diff --git a/Content.Server/Clothing/Components/ClothingComponent.cs b/Content.Server/Clothing/Components/ClothingComponent.cs
index 04f8520538..7e29bfd9bf 100644
--- a/Content.Server/Clothing/Components/ClothingComponent.cs
+++ b/Content.Server/Clothing/Components/ClothingComponent.cs
@@ -4,9 +4,9 @@ using Content.Server.Items;
 using Content.Shared.Clothing;
 using Content.Shared.Interaction;
 using Content.Shared.Item;
-using Content.Shared.NetIDs;
 using Content.Shared.Notification.Managers;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Players;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
@@ -17,10 +17,10 @@ namespace Content.Server.Clothing.Components
     [RegisterComponent]
     [ComponentReference(typeof(SharedItemComponent))]
     [ComponentReference(typeof(ItemComponent))]
+    [NetworkedComponent()]
     public class ClothingComponent : ItemComponent, IUse
     {
         public override string Name => "Clothing";
-        public override uint? NetID => ContentNetIDs.CLOTHING;
 
         [ViewVariables]
         [DataField("Slots")]
diff --git a/Content.Server/Clothing/Components/MagbootsComponent.cs b/Content.Server/Clothing/Components/MagbootsComponent.cs
index 10b4cae51b..decec5873e 100644
--- a/Content.Server/Clothing/Components/MagbootsComponent.cs
+++ b/Content.Server/Clothing/Components/MagbootsComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Alert;
 using Content.Server.Atmos.Components;
 using Content.Server.Inventory.Components;
diff --git a/Content.Server/Commands/Atmos/AddGasCommand.cs b/Content.Server/Commands/Atmos/AddGasCommand.cs
deleted file mode 100644
index b745caf81a..0000000000
--- a/Content.Server/Commands/Atmos/AddGasCommand.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-#nullable enable
-using Content.Server.Administration;
-using Content.Server.Atmos.Components;
-using Content.Shared.Administration;
-using Content.Shared.Atmos;
-using Robust.Shared.Console;
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-using Robust.Shared.Map;
-using Robust.Shared.Maths;
-
-namespace Content.Server.Commands.Atmos
-{
-    [AdminCommand(AdminFlags.Debug)]
-    public class AddGasCommand : IConsoleCommand
-    {
-        public string Command => "addgas";
-        public string Description => "Adds gas at a certain position.";
-        public string Help => "addgas <X> <Y> <GridId> <Gas> <moles>";
-
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
-        {
-            if (args.Length < 5) return;
-            if(!int.TryParse(args[0], out var x)
-               || !int.TryParse(args[1], out var y)
-               || !int.TryParse(args[2], out var id)
-               || !(AtmosCommandUtils.TryParseGasID(args[3], out var gasId))
-               || !float.TryParse(args[4], out var moles)) return;
-
-            var gridId = new GridId(id);
-
-            var mapMan = IoCManager.Resolve<IMapManager>();
-
-            if (!gridId.IsValid() || !mapMan.TryGetGrid(gridId, out var gridComp))
-            {
-                shell.WriteLine("Invalid grid ID.");
-                return;
-            }
-
-            var entMan = IoCManager.Resolve<IEntityManager>();
-
-            if (!entMan.TryGetEntity(gridComp.GridEntityId, out var grid))
-            {
-                shell.WriteLine("Failed to get grid entity.");
-                return;
-            }
-
-            if (!grid.HasComponent<GridAtmosphereComponent>())
-            {
-                shell.WriteLine("Grid doesn't have an atmosphere.");
-                return;
-            }
-
-            var gam = grid.GetComponent<GridAtmosphereComponent>();
-            var indices = new Vector2i(x, y);
-            var tile = gam.GetTile(indices);
-
-            if (tile == null)
-            {
-                shell.WriteLine("Invalid coordinates.");
-                return;
-            }
-
-            if (tile.Air == null)
-            {
-                shell.WriteLine("Can't add gas to that tile.");
-                return;
-            }
-
-            tile.Air.AdjustMoles(gasId, moles);
-            tile.Invalidate();
-        }
-    }
-}
diff --git a/Content.Server/Commands/Atmos/RemoveGasCommand.cs b/Content.Server/Commands/Atmos/RemoveGasCommand.cs
deleted file mode 100644
index a421bf0f35..0000000000
--- a/Content.Server/Commands/Atmos/RemoveGasCommand.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-#nullable enable
-using Content.Server.Administration;
-using Content.Server.Atmos.Components;
-using Content.Shared.Administration;
-using Robust.Shared.Console;
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-using Robust.Shared.Map;
-using Robust.Shared.Maths;
-
-namespace Content.Server.Commands.Atmos
-{
-    [AdminCommand(AdminFlags.Debug)]
-    public class RemoveGasCommand : IConsoleCommand
-    {
-        public string Command => "removegas";
-        public string Description => "Removes an amount of gases.";
-        public string Help => "removegas <X> <Y> <GridId> <amount> <ratio>\nIf <ratio> is true, amount will be treated as the ratio of gas to be removed.";
-
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
-        {
-            if (args.Length < 5) return;
-            if(!int.TryParse(args[0], out var x)
-               || !int.TryParse(args[1], out var y)
-               || !int.TryParse(args[2], out var id)
-               || !float.TryParse(args[3], out var amount)
-               || !bool.TryParse(args[4], out var ratio)) return;
-
-            var gridId = new GridId(id);
-
-            var mapMan = IoCManager.Resolve<IMapManager>();
-
-            if (!gridId.IsValid() || !mapMan.TryGetGrid(gridId, out var gridComp))
-            {
-                shell.WriteLine("Invalid grid ID.");
-                return;
-            }
-
-            var entMan = IoCManager.Resolve<IEntityManager>();
-
-            if (!entMan.TryGetEntity(gridComp.GridEntityId, out var grid))
-            {
-                shell.WriteLine("Failed to get grid entity.");
-                return;
-            }
-
-            if (!grid.HasComponent<GridAtmosphereComponent>())
-            {
-                shell.WriteLine("Grid doesn't have an atmosphere.");
-                return;
-            }
-
-            var gam = grid.GetComponent<GridAtmosphereComponent>();
-            var indices = new Vector2i(x, y);
-            var tile = gam.GetTile(indices);
-
-            if (tile == null)
-            {
-                shell.WriteLine("Invalid coordinates.");
-                return;
-            }
-
-            if (tile.Air == null)
-            {
-                shell.WriteLine("Can't remove gas from that tile.");
-                return;
-            }
-
-            if (ratio)
-                tile.Air.RemoveRatio(amount);
-            else
-                tile.Air.Remove(amount);
-
-            tile.Invalidate();
-        }
-    }
-
-}
diff --git a/Content.Server/Commands/Atmos/SetTemperatureCommand.cs b/Content.Server/Commands/Atmos/SetTemperatureCommand.cs
deleted file mode 100644
index 792ea8c9ce..0000000000
--- a/Content.Server/Commands/Atmos/SetTemperatureCommand.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-#nullable enable
-using Content.Server.Administration;
-using Content.Server.Atmos.Components;
-using Content.Shared.Administration;
-using Content.Shared.Atmos;
-using Robust.Shared.Console;
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-using Robust.Shared.Map;
-using Robust.Shared.Maths;
-
-namespace Content.Server.Commands.Atmos
-{
-    [AdminCommand(AdminFlags.Debug)]
-    public class SetTemperatureCommand : IConsoleCommand
-    {
-        public string Command => "settemp";
-        public string Description => "Sets a tile's temperature (in kelvin).";
-        public string Help => "Usage: settemp <X> <Y> <GridId> <Temperature>";
-
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
-        {
-            if (args.Length < 4) return;
-            if(!int.TryParse(args[0], out var x)
-               || !int.TryParse(args[1], out var y)
-               || !int.TryParse(args[2], out var id)
-               || !float.TryParse(args[3], out var temperature)) return;
-
-            var gridId = new GridId(id);
-
-            var mapMan = IoCManager.Resolve<IMapManager>();
-
-            if (temperature < Atmospherics.TCMB)
-            {
-                shell.WriteLine("Invalid temperature.");
-                return;
-            }
-
-            if (!gridId.IsValid() || !mapMan.TryGetGrid(gridId, out var gridComp))
-            {
-                shell.WriteLine("Invalid grid ID.");
-                return;
-            }
-
-            var entMan = IoCManager.Resolve<IEntityManager>();
-
-            if (!entMan.TryGetEntity(gridComp.GridEntityId, out var grid))
-            {
-                shell.WriteLine("Failed to get grid entity.");
-                return;
-            }
-
-            if (!grid.HasComponent<GridAtmosphereComponent>())
-            {
-                shell.WriteLine("Grid doesn't have an atmosphere.");
-                return;
-            }
-
-            var gam = grid.GetComponent<GridAtmosphereComponent>();
-            var indices = new Vector2i(x, y);
-            var tile = gam.GetTile(indices);
-
-            if (tile == null)
-            {
-                shell.WriteLine("Invalid coordinates.");
-                return;
-            }
-
-            if (tile.Air == null)
-            {
-                shell.WriteLine("Can't change that tile's temperature.");
-                return;
-            }
-
-            tile.Air.Temperature = temperature;
-            tile.Invalidate();
-        }
-    }
-}
diff --git a/Content.Server/Commands/CommandUtils.cs b/Content.Server/Commands/CommandUtils.cs
index e5d8ce6b2a..29951dbce6 100644
--- a/Content.Server/Commands/CommandUtils.cs
+++ b/Content.Server/Commands/CommandUtils.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using System.Diagnostics.CodeAnalysis;
 using Robust.Server.Player;
 using Robust.Shared.Console;
diff --git a/Content.Server/Commands/DONT_PUT_NEW_COMMANDS_HERE_ATMOS_LEFTOVER b/Content.Server/Commands/DONT_PUT_NEW_COMMANDS_HERE_ATMOS_LEFTOVER
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/Content.Server/Communications/CommunicationsConsoleComponent.cs b/Content.Server/Communications/CommunicationsConsoleComponent.cs
index cf0b768e78..e8a47ea2c4 100644
--- a/Content.Server/Communications/CommunicationsConsoleComponent.cs
+++ b/Content.Server/Communications/CommunicationsConsoleComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Globalization;
 using System.Threading;
diff --git a/Content.Server/Connection/ConnectionManager.cs b/Content.Server/Connection/ConnectionManager.cs
index bbc1382935..db0b1e1684 100644
--- a/Content.Server/Connection/ConnectionManager.cs
+++ b/Content.Server/Connection/ConnectionManager.cs
@@ -9,7 +9,6 @@ using Robust.Shared.Configuration;
 using Robust.Shared.IoC;
 using Robust.Shared.Network;
 
-#nullable enable
 
 namespace Content.Server.Connection
 {
diff --git a/Content.Server/Construction/Completions/AddContainer.cs b/Content.Server/Construction/Completions/AddContainer.cs
index 426937a3c1..529b2f46a9 100644
--- a/Content.Server/Construction/Completions/AddContainer.cs
+++ b/Content.Server/Construction/Completions/AddContainer.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Content.Server.Construction.Components;
 using Content.Shared.Construction;
 using JetBrains.Annotations;
diff --git a/Content.Server/Construction/Completions/BuildComputer.cs b/Content.Server/Construction/Completions/BuildComputer.cs
index f3e0da8f02..8ea09c332a 100644
--- a/Content.Server/Construction/Completions/BuildComputer.cs
+++ b/Content.Server/Construction/Completions/BuildComputer.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Linq;
 using System.Threading.Tasks;
 using Content.Server.Construction.Components;
diff --git a/Content.Server/Construction/Completions/BuildMachine.cs b/Content.Server/Construction/Completions/BuildMachine.cs
index 06874641c0..7828200220 100644
--- a/Content.Server/Construction/Completions/BuildMachine.cs
+++ b/Content.Server/Construction/Completions/BuildMachine.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Linq;
 using System.Threading.Tasks;
 using Content.Server.Construction.Components;
diff --git a/Content.Server/Construction/Completions/ConditionalAction.cs b/Content.Server/Construction/Completions/ConditionalAction.cs
index da7fd719dd..24b5956664 100644
--- a/Content.Server/Construction/Completions/ConditionalAction.cs
+++ b/Content.Server/Construction/Completions/ConditionalAction.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Threading.Tasks;
 using Content.Shared.Construction;
 using JetBrains.Annotations;
diff --git a/Content.Server/Construction/Completions/DeleteEntitiesInContainer.cs b/Content.Server/Construction/Completions/DeleteEntitiesInContainer.cs
index 8cfbd93953..ac3890d7dc 100644
--- a/Content.Server/Construction/Completions/DeleteEntitiesInContainer.cs
+++ b/Content.Server/Construction/Completions/DeleteEntitiesInContainer.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Linq;
 using System.Threading.Tasks;
 using Content.Shared.Construction;
diff --git a/Content.Server/Construction/Completions/DeleteEntity.cs b/Content.Server/Construction/Completions/DeleteEntity.cs
index cf21ebf322..762a8d68d2 100644
--- a/Content.Server/Construction/Completions/DeleteEntity.cs
+++ b/Content.Server/Construction/Completions/DeleteEntity.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Content.Shared.Construction;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
diff --git a/Content.Server/Construction/Completions/DestroyEntity.cs b/Content.Server/Construction/Completions/DestroyEntity.cs
index bce60a667a..82018dac97 100644
--- a/Content.Server/Construction/Completions/DestroyEntity.cs
+++ b/Content.Server/Construction/Completions/DestroyEntity.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Shared.Construction;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
diff --git a/Content.Server/Construction/Completions/EmptyAllContainers.cs b/Content.Server/Construction/Completions/EmptyAllContainers.cs
index f18ec92397..799c21d9ab 100644
--- a/Content.Server/Construction/Completions/EmptyAllContainers.cs
+++ b/Content.Server/Construction/Completions/EmptyAllContainers.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Content.Shared.Construction;
 using JetBrains.Annotations;
 using Robust.Shared.Containers;
diff --git a/Content.Server/Construction/Completions/EmptyContainer.cs b/Content.Server/Construction/Completions/EmptyContainer.cs
index 6d76d7f713..3099e1dbff 100644
--- a/Content.Server/Construction/Completions/EmptyContainer.cs
+++ b/Content.Server/Construction/Completions/EmptyContainer.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Linq;
+using System.Linq;
 using System.Threading.Tasks;
 using Content.Shared.Construction;
 using JetBrains.Annotations;
diff --git a/Content.Server/Construction/Completions/MachineFrameRegenerateProgress.cs b/Content.Server/Construction/Completions/MachineFrameRegenerateProgress.cs
index 0d5e580af0..c43dfee278 100644
--- a/Content.Server/Construction/Completions/MachineFrameRegenerateProgress.cs
+++ b/Content.Server/Construction/Completions/MachineFrameRegenerateProgress.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Content.Server.Construction.Components;
 using Content.Shared.Construction;
 using JetBrains.Annotations;
diff --git a/Content.Server/Construction/Completions/MoveContainer.cs b/Content.Server/Construction/Completions/MoveContainer.cs
index 9676273bc8..47a7fd0ae1 100644
--- a/Content.Server/Construction/Completions/MoveContainer.cs
+++ b/Content.Server/Construction/Completions/MoveContainer.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Linq;
 using System.Threading.Tasks;
 using Content.Shared.Construction;
diff --git a/Content.Server/Construction/Completions/PlaySound.cs b/Content.Server/Construction/Completions/PlaySound.cs
index 8386d08678..a336d70827 100644
--- a/Content.Server/Construction/Completions/PlaySound.cs
+++ b/Content.Server/Construction/Completions/PlaySound.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Threading.Tasks;
 using Content.Shared.Audio;
 using Content.Shared.Construction;
diff --git a/Content.Server/Construction/Completions/PopupEveryone.cs b/Content.Server/Construction/Completions/PopupEveryone.cs
index b1f17c54e1..7c9132bfa2 100644
--- a/Content.Server/Construction/Completions/PopupEveryone.cs
+++ b/Content.Server/Construction/Completions/PopupEveryone.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Threading.Tasks;
 using Content.Server.Notification;
 using Content.Shared.Construction;
diff --git a/Content.Server/Construction/Completions/PopupUser.cs b/Content.Server/Construction/Completions/PopupUser.cs
index 026de3f7b0..f7d620e734 100644
--- a/Content.Server/Construction/Completions/PopupUser.cs
+++ b/Content.Server/Construction/Completions/PopupUser.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Content.Shared.Construction;
 using Content.Shared.Notification;
 using Content.Shared.Notification.Managers;
diff --git a/Content.Server/Construction/Completions/SetAnchor.cs b/Content.Server/Construction/Completions/SetAnchor.cs
index 54bdf62b88..7c9b781abe 100644
--- a/Content.Server/Construction/Completions/SetAnchor.cs
+++ b/Content.Server/Construction/Completions/SetAnchor.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Content.Shared.Construction;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
diff --git a/Content.Server/Construction/Completions/SetStackCount.cs b/Content.Server/Construction/Completions/SetStackCount.cs
index 7934d6c967..1d25b42748 100644
--- a/Content.Server/Construction/Completions/SetStackCount.cs
+++ b/Content.Server/Construction/Completions/SetStackCount.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Content.Server.Stack;
 using Content.Shared.Construction;
 using JetBrains.Annotations;
diff --git a/Content.Server/Construction/Completions/SnapToGrid.cs b/Content.Server/Construction/Completions/SnapToGrid.cs
index 6f61665b24..5b5f7be369 100644
--- a/Content.Server/Construction/Completions/SnapToGrid.cs
+++ b/Content.Server/Construction/Completions/SnapToGrid.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Threading.Tasks;
 using Content.Server.Coordinates.Helpers;
 using Content.Shared.Construction;
diff --git a/Content.Server/Construction/Completions/SpawnPrototype.cs b/Content.Server/Construction/Completions/SpawnPrototype.cs
index e490b73ea6..caeeb7124a 100644
--- a/Content.Server/Construction/Completions/SpawnPrototype.cs
+++ b/Content.Server/Construction/Completions/SpawnPrototype.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Content.Server.Stack;
 using Content.Shared.Construction;
 using Content.Shared.Prototypes;
diff --git a/Content.Server/Construction/Completions/SpawnPrototypeAtContainer.cs b/Content.Server/Construction/Completions/SpawnPrototypeAtContainer.cs
index 489c4e7b77..10ef46f30c 100644
--- a/Content.Server/Construction/Completions/SpawnPrototypeAtContainer.cs
+++ b/Content.Server/Construction/Completions/SpawnPrototypeAtContainer.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Threading.Tasks;
 using Content.Shared.Construction;
 using JetBrains.Annotations;
diff --git a/Content.Server/Construction/Completions/SpriteChange.cs b/Content.Server/Construction/Completions/SpriteChange.cs
index bf62c52b27..1628c3d913 100644
--- a/Content.Server/Construction/Completions/SpriteChange.cs
+++ b/Content.Server/Construction/Completions/SpriteChange.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Content.Shared.Construction;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
diff --git a/Content.Server/Construction/Completions/SpriteStateChange.cs b/Content.Server/Construction/Completions/SpriteStateChange.cs
index bef8330d92..ed94cec220 100644
--- a/Content.Server/Construction/Completions/SpriteStateChange.cs
+++ b/Content.Server/Construction/Completions/SpriteStateChange.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Content.Shared.Construction;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
diff --git a/Content.Server/Construction/Completions/VisualizerDataInt.cs b/Content.Server/Construction/Completions/VisualizerDataInt.cs
index 59ddaf7579..f9b5145b68 100644
--- a/Content.Server/Construction/Completions/VisualizerDataInt.cs
+++ b/Content.Server/Construction/Completions/VisualizerDataInt.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Content.Shared.Construction;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
diff --git a/Content.Server/Construction/Components/AnchorableComponent.cs b/Content.Server/Construction/Components/AnchorableComponent.cs
index bb8f86074c..e813f18abc 100644
--- a/Content.Server/Construction/Components/AnchorableComponent.cs
+++ b/Content.Server/Construction/Components/AnchorableComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Threading.Tasks;
 using Content.Server.Coordinates.Helpers;
diff --git a/Content.Server/Construction/Components/ConstructionComponent.cs b/Content.Server/Construction/Components/ConstructionComponent.cs
index a4de447e4c..08da52c2a4 100644
--- a/Content.Server/Construction/Components/ConstructionComponent.cs
+++ b/Content.Server/Construction/Components/ConstructionComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -446,7 +445,7 @@ namespace Content.Server.Construction.Components
                 otherPhysics.BodyType = physics.BodyType;
             }
 
-            Owner.Delete();
+            Owner.QueueDelete();
 
             foreach (var action in node.Actions)
             {
diff --git a/Content.Server/Construction/Components/WelderRefinableComponent.cs b/Content.Server/Construction/Components/WelderRefinableComponent.cs
index 8c76a1755c..eb2042a29a 100644
--- a/Content.Server/Construction/Components/WelderRefinableComponent.cs
+++ b/Content.Server/Construction/Components/WelderRefinableComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Content.Server.Stack;
diff --git a/Content.Server/Construction/Conditions/AirlockBolted.cs b/Content.Server/Construction/Conditions/AirlockBolted.cs
index e0aa3972ae..7da5dc5073 100644
--- a/Content.Server/Construction/Conditions/AirlockBolted.cs
+++ b/Content.Server/Construction/Conditions/AirlockBolted.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Shared.Construction;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
diff --git a/Content.Server/Construction/Conditions/ContainerEmpty.cs b/Content.Server/Construction/Conditions/ContainerEmpty.cs
index 8b0518ab5f..88ca0ba042 100644
--- a/Content.Server/Construction/Conditions/ContainerEmpty.cs
+++ b/Content.Server/Construction/Conditions/ContainerEmpty.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Content.Shared.Construction;
 using JetBrains.Annotations;
 using Robust.Shared.Containers;
diff --git a/Content.Server/Construction/Conditions/ContainerNotEmpty.cs b/Content.Server/Construction/Conditions/ContainerNotEmpty.cs
index 9224b977dd..13c129fdf7 100644
--- a/Content.Server/Construction/Conditions/ContainerNotEmpty.cs
+++ b/Content.Server/Construction/Conditions/ContainerNotEmpty.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Threading.Tasks;
 using Content.Shared.Construction;
 using JetBrains.Annotations;
diff --git a/Content.Server/Construction/Conditions/DoorWelded.cs b/Content.Server/Construction/Conditions/DoorWelded.cs
index 85aa328982..6d51f2d3b1 100644
--- a/Content.Server/Construction/Conditions/DoorWelded.cs
+++ b/Content.Server/Construction/Conditions/DoorWelded.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Threading.Tasks;
 using Content.Server.Doors.Components;
 using Content.Shared.Construction;
diff --git a/Content.Server/Construction/Conditions/ToiletLidClosed.cs b/Content.Server/Construction/Conditions/ToiletLidClosed.cs
index 7fb338aebf..2f9cba7506 100644
--- a/Content.Server/Construction/Conditions/ToiletLidClosed.cs
+++ b/Content.Server/Construction/Conditions/ToiletLidClosed.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Threading.Tasks;
 using Content.Server.Toilet;
 using Content.Shared.Construction;
diff --git a/Content.Server/Construction/ConstructionSystem.cs b/Content.Server/Construction/ConstructionSystem.cs
index 4b4bcaab3c..11e7c41f72 100644
--- a/Content.Server/Construction/ConstructionSystem.cs
+++ b/Content.Server/Construction/ConstructionSystem.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
diff --git a/Content.Server/Containers/Commands/HideContainedContextCommand.cs b/Content.Server/Containers/Commands/HideContainedContextCommand.cs
index f150d2bbad..8ec47ad4bf 100644
--- a/Content.Server/Containers/Commands/HideContainedContextCommand.cs
+++ b/Content.Server/Containers/Commands/HideContainedContextCommand.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Administration;
 using Content.Server.Verbs;
 using Content.Shared.Administration;
diff --git a/Content.Server/Containers/Commands/ShowContainedContextCommand.cs b/Content.Server/Containers/Commands/ShowContainedContextCommand.cs
index 5a556d4142..0780861d56 100644
--- a/Content.Server/Containers/Commands/ShowContainedContextCommand.cs
+++ b/Content.Server/Containers/Commands/ShowContainedContextCommand.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Administration;
 using Content.Server.Verbs;
 using Content.Shared.Administration;
diff --git a/Content.Server/Conveyor/ConveyorComponent.cs b/Content.Server/Conveyor/ConveyorComponent.cs
index 31983f36ef..6109ea9cdc 100644
--- a/Content.Server/Conveyor/ConveyorComponent.cs
+++ b/Content.Server/Conveyor/ConveyorComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Items;
 using Content.Server.MachineLinking.Components;
 using Content.Server.Power.Components;
diff --git a/Content.Server/Coordinates/Helpers/GridTileLookupHelpers.cs b/Content.Server/Coordinates/Helpers/GridTileLookupHelpers.cs
index 5f1c7263be..41587963d4 100644
--- a/Content.Server/Coordinates/Helpers/GridTileLookupHelpers.cs
+++ b/Content.Server/Coordinates/Helpers/GridTileLookupHelpers.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 using Robust.Server.GameObjects;
diff --git a/Content.Server/Crayon/CrayonComponent.cs b/Content.Server/Crayon/CrayonComponent.cs
index c06457ef13..d942a08a21 100644
--- a/Content.Server/Crayon/CrayonComponent.cs
+++ b/Content.Server/Crayon/CrayonComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Linq;
 using System.Threading.Tasks;
 using Content.Server.UserInterface;
@@ -126,9 +125,13 @@ namespace Content.Server.Crayon
                 return true;
             }
 
-            var entityManager = IoCManager.Resolve<IServerEntityManager>();
+            if (!eventArgs.ClickLocation.IsValid(Owner.EntityManager))
+            {
+                eventArgs.User.PopupMessage(Loc.GetString("crayon-interact-invalid-location"));
+                return true;
+            }
 
-            var entity = entityManager.SpawnEntity("CrayonDecal", eventArgs.ClickLocation);
+            var entity = Owner.EntityManager.SpawnEntity("CrayonDecal", eventArgs.ClickLocation);
             if (entity.TryGetComponent(out AppearanceComponent? appearance))
             {
                 appearance.SetData(CrayonVisuals.State, SelectedState);
diff --git a/Content.Server/Cuffs/Components/CuffableComponent.cs b/Content.Server/Cuffs/Components/CuffableComponent.cs
index 6ed45b2cd1..2bdb62c3e8 100644
--- a/Content.Server/Cuffs/Components/CuffableComponent.cs
+++ b/Content.Server/Cuffs/Components/CuffableComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/Content.Server/Cuffs/Components/HandcuffComponent.cs b/Content.Server/Cuffs/Components/HandcuffComponent.cs
index f93bb55d6b..036c289af4 100644
--- a/Content.Server/Cuffs/Components/HandcuffComponent.cs
+++ b/Content.Server/Cuffs/Components/HandcuffComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Threading.Tasks;
 using Content.Server.DoAfter;
diff --git a/Content.Server/Cuffs/CuffableSystem.cs b/Content.Server/Cuffs/CuffableSystem.cs
index 66f374ea34..8b74b16e11 100644
--- a/Content.Server/Cuffs/CuffableSystem.cs
+++ b/Content.Server/Cuffs/CuffableSystem.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Cuffs.Components;
 using Content.Server.Hands.Components;
 using Content.Shared.Hands.Components;
diff --git a/Content.Server/Damage/Commands/GodModeCommand.cs b/Content.Server/Damage/Commands/GodModeCommand.cs
index bbb58323d4..84dbb22128 100644
--- a/Content.Server/Damage/Commands/GodModeCommand.cs
+++ b/Content.Server/Damage/Commands/GodModeCommand.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Administration;
 using Content.Shared.Administration;
 using Robust.Server.Player;
diff --git a/Content.Server/Damage/Commands/HurtCommand.cs b/Content.Server/Damage/Commands/HurtCommand.cs
index ccc9753be4..0184c18c7e 100644
--- a/Content.Server/Damage/Commands/HurtCommand.cs
+++ b/Content.Server/Damage/Commands/HurtCommand.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Text;
diff --git a/Content.Server/Damage/Components/DamageOnHighSpeedImpactComponent.cs b/Content.Server/Damage/Components/DamageOnHighSpeedImpactComponent.cs
index 83a5ca51be..aca43b5425 100644
--- a/Content.Server/Damage/Components/DamageOnHighSpeedImpactComponent.cs
+++ b/Content.Server/Damage/Components/DamageOnHighSpeedImpactComponent.cs
@@ -1,27 +1,17 @@
 using System;
-using Content.Server.Stunnable.Components;
-using Content.Shared.Audio;
 using Content.Shared.Damage;
-using Content.Shared.Damage.Components;
 using Content.Shared.Sound;
-using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-using Robust.Shared.Physics.Collision;
-using Robust.Shared.Physics.Dynamics;
-using Robust.Shared.Player;
-using Robust.Shared.Random;
 using Robust.Shared.Serialization.Manager.Attributes;
-using Robust.Shared.Timing;
 
 namespace Content.Server.Damage.Components
 {
+    /// <summary>
+    /// Should the entity take damage / be stunned if colliding at a speed above MinimumSpeed?
+    /// </summary>
     [RegisterComponent]
-    public class DamageOnHighSpeedImpactComponent : Component, IStartCollide
+    internal sealed class DamageOnHighSpeedImpactComponent : Component
     {
-        [Dependency] private readonly IRobustRandom _robustRandom = default!;
-        [Dependency] private readonly IGameTiming _gameTiming = default!;
-
         public override string Name => "DamageOnHighSpeedImpact";
 
         [DataField("damage")]
@@ -42,30 +32,7 @@ namespace Content.Server.Damage.Components
         public float StunSeconds { get; set; } = 1f;
         [DataField("damageCooldown")]
         public float DamageCooldown { get; set; } = 2f;
-        private TimeSpan _lastHit = TimeSpan.Zero;
 
-        void IStartCollide.CollideWith(Fixture ourFixture, Fixture otherFixture, in Manifold manifold)
-        {
-            if (!Owner.TryGetComponent(out IDamageableComponent? damageable)) return;
-
-            var speed = ourFixture.Body.LinearVelocity.Length;
-
-            if (speed < MinimumSpeed) return;
-
-            if (SoundHit.TryGetSound(out var soundHit))
-                SoundSystem.Play(Filter.Pvs(otherFixture.Body.Owner), soundHit, otherFixture.Body.Owner, AudioHelpers.WithVariation(0.125f).WithVolume(-0.125f));
-
-            if ((_gameTiming.CurTime - _lastHit).TotalSeconds < DamageCooldown)
-                return;
-
-            _lastHit = _gameTiming.CurTime;
-
-            var damage = (int) (BaseDamage * (speed / MinimumSpeed) * Factor);
-
-            if (Owner.TryGetComponent(out StunnableComponent? stun) && _robustRandom.Prob(StunChance))
-                stun.Stun(StunSeconds);
-
-            damageable.ChangeDamage(Damage, damage, false, otherFixture.Body.Owner);
-        }
+        internal TimeSpan LastHit = TimeSpan.Zero;
     }
 }
diff --git a/Content.Server/Damage/DamageOnHighSpeedImpactSystem.cs b/Content.Server/Damage/DamageOnHighSpeedImpactSystem.cs
new file mode 100644
index 0000000000..db2ea230aa
--- /dev/null
+++ b/Content.Server/Damage/DamageOnHighSpeedImpactSystem.cs
@@ -0,0 +1,53 @@
+using Content.Server.Damage.Components;
+using Content.Server.Stunnable.Components;
+using Content.Shared.Audio;
+using Content.Shared.Damage.Components;
+using JetBrains.Annotations;
+using Robust.Shared.Audio;
+using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
+using Robust.Shared.Physics.Dynamics;
+using Robust.Shared.Player;
+using Robust.Shared.Random;
+using Robust.Shared.Timing;
+
+namespace Content.Server.Damage
+{
+    [UsedImplicitly]
+    internal sealed class DamageOnHighSpeedImpactSystem: EntitySystem
+    {
+        [Dependency] private readonly IRobustRandom _robustRandom = default!;
+        [Dependency] private readonly IGameTiming _gameTiming = default!;
+
+        public override void Initialize()
+        {
+            base.Initialize();
+            SubscribeLocalEvent<DamageOnHighSpeedImpactComponent, StartCollideEvent>(HandleCollide);
+        }
+
+        private void HandleCollide(EntityUid uid, DamageOnHighSpeedImpactComponent component, StartCollideEvent args)
+        {
+            if (!ComponentManager.TryGetComponent(uid, out IDamageableComponent? damageable)) return;
+
+            var otherBody = args.OtherFixture.Body.Owner;
+            var speed = args.OurFixture.Body.LinearVelocity.Length;
+
+            if (speed < component.MinimumSpeed) return;
+
+            if (component.SoundHit.TryGetSound(out var soundHit))
+                SoundSystem.Play(Filter.Pvs(otherBody), soundHit, otherBody, AudioHelpers.WithVariation(0.125f).WithVolume(-0.125f));
+
+            if ((_gameTiming.CurTime - component.LastHit).TotalSeconds < component.DamageCooldown)
+                return;
+
+            component.LastHit = _gameTiming.CurTime;
+
+            var damage = (int) (component.BaseDamage * (speed / component.MinimumSpeed) * component.Factor);
+
+            if (ComponentManager.TryGetComponent(uid, out StunnableComponent? stun) && _robustRandom.Prob(component.StunChance))
+                stun.Stun(component.StunSeconds);
+
+            damageable.ChangeDamage(component.Damage, damage, false, args.OtherFixture.Body.Owner);
+        }
+    }
+}
diff --git a/Content.Server/Damage/GodmodeSystem.cs b/Content.Server/Damage/GodmodeSystem.cs
index 788fe4bca7..823c155fae 100644
--- a/Content.Server/Damage/GodmodeSystem.cs
+++ b/Content.Server/Damage/GodmodeSystem.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Content.Server.Atmos.Components;
 using System.Linq;
 using Content.Shared.Damage;
diff --git a/Content.Server/Database/ServerBanDef.cs b/Content.Server/Database/ServerBanDef.cs
index c1c1b32f8c..663f3e1135 100644
--- a/Content.Server/Database/ServerBanDef.cs
+++ b/Content.Server/Database/ServerBanDef.cs
@@ -3,7 +3,6 @@ using System.Collections.Immutable;
 using System.Net;
 using Robust.Shared.Network;
 
-#nullable enable
 
 namespace Content.Server.Database
 {
diff --git a/Content.Server/Database/ServerDbBase.cs b/Content.Server/Database/ServerDbBase.cs
index a79ce19338..5e9f67707a 100644
--- a/Content.Server/Database/ServerDbBase.cs
+++ b/Content.Server/Database/ServerDbBase.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
diff --git a/Content.Server/Database/ServerDbManager.cs b/Content.Server/Database/ServerDbManager.cs
index 3618aec44e..b0d2d032e9 100644
--- a/Content.Server/Database/ServerDbManager.cs
+++ b/Content.Server/Database/ServerDbManager.cs
@@ -21,7 +21,6 @@ using Robust.Shared.Network;
 using LogLevel = Robust.Shared.Log.LogLevel;
 using MSLogLevel = Microsoft.Extensions.Logging.LogLevel;
 
-#nullable enable
 
 namespace Content.Server.Database
 {
diff --git a/Content.Server/Database/ServerDbPostgres.cs b/Content.Server/Database/ServerDbPostgres.cs
index 7198c01edd..328cdb7796 100644
--- a/Content.Server/Database/ServerDbPostgres.cs
+++ b/Content.Server/Database/ServerDbPostgres.cs
@@ -9,7 +9,6 @@ using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 using Robust.Shared.Network;
 
-#nullable enable
 
 namespace Content.Server.Database
 {
diff --git a/Content.Server/Database/ServerDbSqlite.cs b/Content.Server/Database/ServerDbSqlite.cs
index 6cc58614ac..bd840db20d 100644
--- a/Content.Server/Database/ServerDbSqlite.cs
+++ b/Content.Server/Database/ServerDbSqlite.cs
@@ -16,7 +16,6 @@ using Robust.Shared.Configuration;
 using Robust.Shared.IoC;
 using Robust.Shared.Network;
 
-#nullable enable
 
 namespace Content.Server.Database
 {
diff --git a/Content.Server/Destructible/DestructibleComponent.cs b/Content.Server/Destructible/DestructibleComponent.cs
index d0383cb804..c7bdd18f9f 100644
--- a/Content.Server/Destructible/DestructibleComponent.cs
+++ b/Content.Server/Destructible/DestructibleComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Content.Server.Destructible.Thresholds;
 using Content.Shared.Damage;
 using Robust.Shared.GameObjects;
diff --git a/Content.Server/Destructible/Thresholds/Behaviors/ChangeConstructionNodeBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/ChangeConstructionNodeBehavior.cs
index 6aab46c822..fbf65bd941 100644
--- a/Content.Server/Destructible/Thresholds/Behaviors/ChangeConstructionNodeBehavior.cs
+++ b/Content.Server/Destructible/Thresholds/Behaviors/ChangeConstructionNodeBehavior.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Content.Server.Construction.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
diff --git a/Content.Server/Destructible/Thresholds/Behaviors/EmptyAllContainersBehaviour.cs b/Content.Server/Destructible/Thresholds/Behaviors/EmptyAllContainersBehaviour.cs
index 7ade5c290d..f62489b985 100644
--- a/Content.Server/Destructible/Thresholds/Behaviors/EmptyAllContainersBehaviour.cs
+++ b/Content.Server/Destructible/Thresholds/Behaviors/EmptyAllContainersBehaviour.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
diff --git a/Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs
index 43c9ccbe15..6cbbc49b07 100644
--- a/Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs
+++ b/Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using Content.Server.Stack;
diff --git a/Content.Server/Destructible/Thresholds/Behaviors/SpillBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/SpillBehavior.cs
index a8d6ae0f36..6840c36188 100644
--- a/Content.Server/Destructible/Thresholds/Behaviors/SpillBehavior.cs
+++ b/Content.Server/Destructible/Thresholds/Behaviors/SpillBehavior.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Chemistry.Components;
 using Content.Server.Fluids.Components;
 using JetBrains.Annotations;
diff --git a/Content.Server/Destructible/Thresholds/Threshold.cs b/Content.Server/Destructible/Thresholds/Threshold.cs
index 886d0b44b8..27c4a557af 100644
--- a/Content.Server/Destructible/Thresholds/Threshold.cs
+++ b/Content.Server/Destructible/Thresholds/Threshold.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Content.Server.Destructible.Thresholds.Behaviors;
 using Content.Server.Destructible.Thresholds.Triggers;
 using Content.Shared.Damage.Components;
diff --git a/Content.Server/Destructible/Thresholds/Triggers/AndTrigger.cs b/Content.Server/Destructible/Thresholds/Triggers/AndTrigger.cs
index da293e7f90..55818309b5 100644
--- a/Content.Server/Destructible/Thresholds/Triggers/AndTrigger.cs
+++ b/Content.Server/Destructible/Thresholds/Triggers/AndTrigger.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using System.Collections.Generic;
 using Content.Shared.Damage.Components;
 using Robust.Shared.Serialization.Manager.Attributes;
diff --git a/Content.Server/Destructible/Thresholds/Triggers/DamageClassTrigger.cs b/Content.Server/Destructible/Thresholds/Triggers/DamageClassTrigger.cs
index 43a4d595ac..606f99cc3b 100644
--- a/Content.Server/Destructible/Thresholds/Triggers/DamageClassTrigger.cs
+++ b/Content.Server/Destructible/Thresholds/Triggers/DamageClassTrigger.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Components;
 using Robust.Shared.Serialization.Manager.Attributes;
diff --git a/Content.Server/Destructible/Thresholds/Triggers/DamageTrigger.cs b/Content.Server/Destructible/Thresholds/Triggers/DamageTrigger.cs
index ab2b10a7eb..a0ea9d10ea 100644
--- a/Content.Server/Destructible/Thresholds/Triggers/DamageTrigger.cs
+++ b/Content.Server/Destructible/Thresholds/Triggers/DamageTrigger.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Content.Shared.Damage.Components;
 using Robust.Shared.Serialization.Manager.Attributes;
 
diff --git a/Content.Server/Destructible/Thresholds/Triggers/DamageTypeTrigger.cs b/Content.Server/Destructible/Thresholds/Triggers/DamageTypeTrigger.cs
index f46cf7e615..80451c0ae7 100644
--- a/Content.Server/Destructible/Thresholds/Triggers/DamageTypeTrigger.cs
+++ b/Content.Server/Destructible/Thresholds/Triggers/DamageTypeTrigger.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Components;
 using Robust.Shared.Serialization.Manager.Attributes;
diff --git a/Content.Server/Destructible/Thresholds/Triggers/IThresholdTrigger.cs b/Content.Server/Destructible/Thresholds/Triggers/IThresholdTrigger.cs
index bc5ada7752..88d9a6d66a 100644
--- a/Content.Server/Destructible/Thresholds/Triggers/IThresholdTrigger.cs
+++ b/Content.Server/Destructible/Thresholds/Triggers/IThresholdTrigger.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Shared.Damage.Components;
+using Content.Shared.Damage.Components;
 
 namespace Content.Server.Destructible.Thresholds.Triggers
 {
diff --git a/Content.Server/Destructible/Thresholds/Triggers/OrTrigger.cs b/Content.Server/Destructible/Thresholds/Triggers/OrTrigger.cs
index 016529f1ea..b19df41e51 100644
--- a/Content.Server/Destructible/Thresholds/Triggers/OrTrigger.cs
+++ b/Content.Server/Destructible/Thresholds/Triggers/OrTrigger.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using System.Collections.Generic;
 using Content.Shared.Damage.Components;
 using Robust.Shared.Serialization.Manager.Attributes;
diff --git a/Content.Server/Disposal/Mailing/DisposalMailingUnitComponent.cs b/Content.Server/Disposal/Mailing/DisposalMailingUnitComponent.cs
index 9059ba2aa9..c0e0eb8be1 100644
--- a/Content.Server/Disposal/Mailing/DisposalMailingUnitComponent.cs
+++ b/Content.Server/Disposal/Mailing/DisposalMailingUnitComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/Content.Server/Disposal/Tube/Components/DisposalRouterComponent.cs b/Content.Server/Disposal/Tube/Components/DisposalRouterComponent.cs
index 2f25c091d1..a8cca2dbf4 100644
--- a/Content.Server/Disposal/Tube/Components/DisposalRouterComponent.cs
+++ b/Content.Server/Disposal/Tube/Components/DisposalRouterComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using System.Text;
diff --git a/Content.Server/Disposal/Tube/Components/DisposalTaggerComponent.cs b/Content.Server/Disposal/Tube/Components/DisposalTaggerComponent.cs
index d2e9b19b9c..d5bb6e2098 100644
--- a/Content.Server/Disposal/Tube/Components/DisposalTaggerComponent.cs
+++ b/Content.Server/Disposal/Tube/Components/DisposalTaggerComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Disposal.Unit.Components;
 using Content.Server.Hands.Components;
 using Content.Server.UserInterface;
diff --git a/Content.Server/Disposal/Tube/Components/DisposalTubeComponent.cs b/Content.Server/Disposal/Tube/Components/DisposalTubeComponent.cs
index d247e01323..00a92f09f8 100644
--- a/Content.Server/Disposal/Tube/Components/DisposalTubeComponent.cs
+++ b/Content.Server/Disposal/Tube/Components/DisposalTubeComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Linq;
 using Content.Server.Construction.Components;
diff --git a/Content.Server/Disposal/Tube/Components/IDisposalTubeComponent.cs b/Content.Server/Disposal/Tube/Components/IDisposalTubeComponent.cs
index d615cf154a..31794739c6 100644
--- a/Content.Server/Disposal/Tube/Components/IDisposalTubeComponent.cs
+++ b/Content.Server/Disposal/Tube/Components/IDisposalTubeComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Disposal.Unit.Components;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
diff --git a/Content.Server/Disposal/TubeConnectionsCommand.cs b/Content.Server/Disposal/TubeConnectionsCommand.cs
index a442e8af95..ba56e48582 100644
--- a/Content.Server/Disposal/TubeConnectionsCommand.cs
+++ b/Content.Server/Disposal/TubeConnectionsCommand.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Administration;
 using Content.Server.Disposal.Tube.Components;
 using Content.Shared.Administration;
diff --git a/Content.Server/Disposal/Unit/Components/DisposalHolderComponent.cs b/Content.Server/Disposal/Unit/Components/DisposalHolderComponent.cs
index 331b11675c..241dc48324 100644
--- a/Content.Server/Disposal/Unit/Components/DisposalHolderComponent.cs
+++ b/Content.Server/Disposal/Unit/Components/DisposalHolderComponent.cs
@@ -1,10 +1,9 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using Content.Server.Atmos;
+using Content.Server.Atmos.EntitySystems;
 using Content.Server.Disposal.Tube.Components;
-using Content.Server.Interfaces;
 using Content.Server.Items;
 using Content.Shared.Atmos;
 using Content.Shared.Body.Components;
@@ -136,10 +135,11 @@ namespace Content.Server.Disposal.Unit.Components
                 }
             }
 
-            if (Owner.Transform.Coordinates.TryGetTileAtmosphere(out var tileAtmos) &&
-                tileAtmos.Air != null)
+            var atmosphereSystem = EntitySystem.Get<AtmosphereSystem>();
+
+            if (atmosphereSystem.GetTileMixture(Owner.Transform.Coordinates, true) is {} environment)
             {
-                tileAtmos.AssumeAir(Air);
+                atmosphereSystem.Merge(environment, Air);
                 Air.Clear();
             }
 
diff --git a/Content.Server/Disposal/Unit/Components/DisposalUnitComponent.cs b/Content.Server/Disposal/Unit/Components/DisposalUnitComponent.cs
index a6ec72f33f..14c3c502f3 100644
--- a/Content.Server/Disposal/Unit/Components/DisposalUnitComponent.cs
+++ b/Content.Server/Disposal/Unit/Components/DisposalUnitComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -10,10 +9,10 @@ using Content.Server.Construction.Components;
 using Content.Server.Disposal.Tube.Components;
 using Content.Server.DoAfter;
 using Content.Server.Hands.Components;
-using Content.Server.Interfaces;
 using Content.Server.Power.Components;
 using Content.Server.UserInterface;
 using Content.Shared.ActionBlocker;
+using Content.Shared.Acts;
 using Content.Shared.Atmos;
 using Content.Shared.Disposal.Components;
 using Content.Shared.DragDrop;
@@ -43,7 +42,7 @@ namespace Content.Server.Disposal.Unit.Components
     [ComponentReference(typeof(SharedDisposalUnitComponent))]
     [ComponentReference(typeof(IActivate))]
     [ComponentReference(typeof(IInteractUsing))]
-    public class DisposalUnitComponent : SharedDisposalUnitComponent, IInteractHand, IActivate, IInteractUsing, IThrowCollide, IGasMixtureHolder
+    public class DisposalUnitComponent : SharedDisposalUnitComponent, IInteractHand, IActivate, IInteractUsing, IThrowCollide, IGasMixtureHolder, IDestroyAct
     {
         [Dependency] private readonly IGameTiming _gameTiming = default!;
         [Dependency] private readonly IMapManager _mapManager = default!;
@@ -277,19 +276,13 @@ namespace Content.Server.Disposal.Unit.Components
 
             var entryComponent = Owner.EntityManager.ComponentManager.GetComponent<DisposalEntryComponent>(entry);
 
-            if (Owner.Transform.Coordinates.TryGetTileAtmosphere(out var tileAtmos) &&
-                tileAtmos.Air != null &&
-                tileAtmos.Air.Temperature > 0)
+            var atmosphereSystem = EntitySystem.Get<AtmosphereSystem>();
+
+            if (atmosphereSystem.GetTileMixture(Owner.Transform.Coordinates, true) is {Temperature: > 0} environment)
             {
-                var tileAir = tileAtmos.Air;
-                var transferMoles = 0.1f * (0.05f * Atmospherics.OneAtmosphere * 1.01f - Air.Pressure) * Air.Volume / (tileAir.Temperature * Atmospherics.R);
+                var transferMoles = 0.1f * (0.05f * Atmospherics.OneAtmosphere * 1.01f - Air.Pressure) * Air.Volume / (environment.Temperature * Atmospherics.R);
 
-                Air = tileAir.Remove(transferMoles);
-
-                var atmosSystem = EntitySystem.Get<AtmosphereSystem>();
-                atmosSystem
-                    .GetGridAtmosphere(Owner.Transform.Coordinates)?
-                    .Invalidate(tileAtmos.GridIndices);
+                Air = environment.Remove(transferMoles);
             }
 
             entryComponent.TryInsert(this);
@@ -307,7 +300,7 @@ namespace Content.Server.Disposal.Unit.Components
             return true;
         }
 
-        private void TryEjectContents()
+        public void TryEjectContents()
         {
             foreach (var entity in _container.ContainedEntities.ToArray())
             {
@@ -694,5 +687,10 @@ namespace Content.Server.Disposal.Unit.Components
                 component.TryFlush();
             }
         }
+
+        void IDestroyAct.OnDestroy(DestructionEventArgs eventArgs)
+        {
+            TryEjectContents();
+        }
     }
 }
diff --git a/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs b/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
index c60b6ad165..a4c51a9784 100644
--- a/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
+++ b/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
@@ -1,4 +1,5 @@
-using Content.Server.Disposal.Unit.Components;
+using Content.Server.Disposal.Unit.Components;
+using Content.Server.Construction.Components;
 using Robust.Shared.GameObjects;
 
 namespace Content.Server.Disposal.Unit.EntitySystems
@@ -9,15 +10,19 @@ namespace Content.Server.Disposal.Unit.EntitySystems
         {
             base.Initialize();
 
-            SubscribeLocalEvent<DisposalUnitComponent, PhysicsBodyTypeChangedEvent>(BodyTypeChanged);
+            SubscribeLocalEvent<DisposalUnitComponent, AnchoredEvent>(OnAnchored);
+            SubscribeLocalEvent<DisposalUnitComponent, UnanchoredEvent>(OnUnanchored);
         }
 
-        private static void BodyTypeChanged(
-            EntityUid uid,
-            DisposalUnitComponent component,
-            PhysicsBodyTypeChangedEvent args)
+        private static void OnAnchored(EntityUid uid, DisposalUnitComponent component, AnchoredEvent args)
         {
             component.UpdateVisualState();
         }
+
+        private static void OnUnanchored(EntityUid uid, DisposalUnitComponent component, UnanchoredEvent args)
+        {
+            component.UpdateVisualState();
+            component.TryEjectContents();
+        }
     }
 }
diff --git a/Content.Server/DoAfter/DoAfter.cs b/Content.Server/DoAfter/DoAfter.cs
index 4b929a060b..040db67654 100644
--- a/Content.Server/DoAfter/DoAfter.cs
+++ b/Content.Server/DoAfter/DoAfter.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using System.Threading.Tasks;
 using Content.Server.Hands.Components;
 using Content.Server.Items;
diff --git a/Content.Server/DoAfter/DoAfterComponent.cs b/Content.Server/DoAfter/DoAfterComponent.cs
index 053b741d6a..c1136ab853 100644
--- a/Content.Server/DoAfter/DoAfterComponent.cs
+++ b/Content.Server/DoAfter/DoAfterComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Content.Shared.Damage;
 using Content.Shared.DoAfter;
 using Robust.Shared.GameObjects;
diff --git a/Content.Server/DoAfter/DoAfterEventArgs.cs b/Content.Server/DoAfter/DoAfterEventArgs.cs
index c4291fdc9c..8c1e9e4717 100644
--- a/Content.Server/DoAfter/DoAfterEventArgs.cs
+++ b/Content.Server/DoAfter/DoAfterEventArgs.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using System.Threading;
 using Content.Shared.Interaction.Helpers;
 using Content.Shared.Physics;
@@ -92,12 +91,12 @@ namespace Content.Server.DoAfter
         public EntityEventArgs? UserFinishedEvent { get; set; }
 
         /// <summary>
-        ///     Event to be raised directed to the <see cref="User"/> entity when the DoAfter is cancelled.
+        ///     Event to be raised directed to the <see cref="Target"/> entity when the DoAfter is cancelled.
         /// </summary>
         public EntityEventArgs? TargetCancelledEvent { get; set; }
 
         /// <summary>
-        ///     Event to be raised directed to the <see cref="User"/> entity when the DoAfter is finished successfully.
+        ///     Event to be raised directed to the <see cref="Target"/> entity when the DoAfter is finished successfully.
         /// </summary>
         public EntityEventArgs? TargetFinishedEvent { get; set; }
 
diff --git a/Content.Server/DoAfter/DoAfterSystem.cs b/Content.Server/DoAfter/DoAfterSystem.cs
index 6934a93c61..13978df78e 100644
--- a/Content.Server/DoAfter/DoAfterSystem.cs
+++ b/Content.Server/DoAfter/DoAfterSystem.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/Content.Server/Doors/Components/AirlockComponent.cs b/Content.Server/Doors/Components/AirlockComponent.cs
index 22df7199f9..93fd5fba36 100644
--- a/Content.Server/Doors/Components/AirlockComponent.cs
+++ b/Content.Server/Doors/Components/AirlockComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Threading;
 using Content.Server.Power.Components;
diff --git a/Content.Server/Doors/Components/ServerDoorComponent.cs b/Content.Server/Doors/Components/ServerDoorComponent.cs
index b6890bed14..dfa0e8e448 100644
--- a/Content.Server/Doors/Components/ServerDoorComponent.cs
+++ b/Content.Server/Doors/Components/ServerDoorComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Linq;
 using System.Threading;
@@ -6,6 +5,7 @@ using System.Threading.Tasks;
 using Content.Server.Access;
 using Content.Server.Access.Components;
 using Content.Server.Atmos.Components;
+using Content.Server.Atmos.EntitySystems;
 using Content.Server.Construction.Components;
 using Content.Server.Hands.Components;
 using Content.Server.Stunnable.Components;
@@ -21,6 +21,7 @@ using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Log;
 using Robust.Shared.Maths;
+using Robust.Shared.Physics;
 using Robust.Shared.Physics.Broadphase;
 using Robust.Shared.Physics.Collision;
 using Robust.Shared.Physics.Dynamics;
@@ -35,7 +36,7 @@ namespace Content.Server.Doors.Components
     [RegisterComponent]
     [ComponentReference(typeof(IActivate))]
     [ComponentReference(typeof(SharedDoorComponent))]
-    public class ServerDoorComponent : SharedDoorComponent, IActivate, IStartCollide, IInteractUsing, IMapInit
+    public class ServerDoorComponent : SharedDoorComponent, IActivate, IInteractUsing, IMapInit
     {
         [ComponentDependency]
         private readonly IDoorCheck? _doorCheck = null;
@@ -101,7 +102,7 @@ namespace Content.Server.Doors.Components
         /// Whether the door will open when it is bumped into.
         /// </summary>
         [ViewVariables(VVAccess.ReadWrite)] [DataField("bumpOpen")]
-        private bool _bumpOpen = true;
+        public bool BumpOpen = true;
 
         /// <summary>
         /// Whether the door starts open when it's first loaded from prototype. A door won't start open if its prototype is also welded shut.
@@ -213,24 +214,6 @@ namespace Content.Server.Doors.Components
             }
         }
 
-        void IStartCollide.CollideWith(Fixture ourFixture, Fixture otherFixture, in Manifold manifold)
-        {
-            if (State != DoorState.Closed)
-            {
-                return;
-            }
-
-            if (!_bumpOpen)
-            {
-                return;
-            }
-
-            // Disabled because it makes it suck hard to walk through double doors.
-
-                TryOpen(otherFixture.Body.Owner);
-
-        }
-
         #region Opening
 
         public void TryOpen(IEntity user)
@@ -335,7 +318,7 @@ namespace Content.Server.Doors.Components
         {
             if (Owner.TryGetComponent(out AirtightComponent? airtight))
             {
-                airtight.AirBlocked = false;
+                EntitySystem.Get<AirtightSystem>().SetAirblocked(airtight, false);
             }
             base.OnPartialOpen();
             Owner.EntityManager.EventBus.RaiseEvent(EventSource.Local, new AccessReaderChangeMessage(Owner, false));
@@ -410,7 +393,7 @@ namespace Content.Server.Doors.Components
 
             if (safety && Owner.TryGetComponent(out PhysicsComponent? physicsComponent))
             {
-                var broadPhaseSystem = EntitySystem.Get<SharedBroadPhaseSystem>();
+                var broadPhaseSystem = EntitySystem.Get<SharedBroadphaseSystem>();
 
                 // Use this version so we can ignore the CanCollide being false
                 foreach(var e in broadPhaseSystem.GetCollidingEntities(physicsComponent.Owner.Transform.MapID, physicsComponent.GetWorldAABB()))
@@ -463,7 +446,7 @@ namespace Content.Server.Doors.Components
 
             if (becomeairtight && Owner.TryGetComponent(out AirtightComponent? airtight))
             {
-                airtight.AirBlocked = true;
+                EntitySystem.Get<AirtightSystem>().SetAirblocked(airtight, true);
             }
 
             Owner.EntityManager.EventBus.RaiseEvent(EventSource.Local, new AccessReaderChangeMessage(Owner, true));
diff --git a/Content.Server/Doors/DoorSystem.cs b/Content.Server/Doors/DoorSystem.cs
index e6467f2b6b..286caf371d 100644
--- a/Content.Server/Doors/DoorSystem.cs
+++ b/Content.Server/Doors/DoorSystem.cs
@@ -1,5 +1,7 @@
-#nullable enable
+using Content.Server.Doors.Components;
 using Content.Shared.Doors;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Physics.Dynamics;
 
 namespace Content.Server.Doors
 {
@@ -38,6 +40,24 @@ namespace Content.Server.Doors
             base.Initialize();
 
             AccessType = AccessTypes.Id;
+            SubscribeLocalEvent<ServerDoorComponent, StartCollideEvent>(HandleCollide);
+        }
+
+        private void HandleCollide(EntityUid uid, ServerDoorComponent component, StartCollideEvent args)
+        {
+            if (component.State != SharedDoorComponent.DoorState.Closed)
+            {
+                return;
+            }
+
+            if (!component.BumpOpen)
+            {
+                return;
+            }
+
+            // Disabled because it makes it suck hard to walk through double doors.
+
+            component.TryOpen(args.OtherFixture.Body.Owner);
         }
     }
 }
diff --git a/Content.Server/Doors/IDoorCheck.cs b/Content.Server/Doors/IDoorCheck.cs
index dfa5810458..3c5989a5d8 100644
--- a/Content.Server/Doors/IDoorCheck.cs
+++ b/Content.Server/Doors/IDoorCheck.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Content.Shared.Doors;
 using Content.Shared.Interaction;
diff --git a/Content.Server/EUI/BaseEui.cs b/Content.Server/EUI/BaseEui.cs
index 0126a0f40f..097fbaa975 100644
--- a/Content.Server/EUI/BaseEui.cs
+++ b/Content.Server/EUI/BaseEui.cs
@@ -4,7 +4,6 @@ using Robust.Server.Player;
 using Robust.Shared.IoC;
 using Robust.Shared.Network;
 
-#nullable enable
 
 namespace Content.Server.EUI
 {
diff --git a/Content.Server/EUI/EuiManager.cs b/Content.Server/EUI/EuiManager.cs
index 51b20f02c4..703d1f6216 100644
--- a/Content.Server/EUI/EuiManager.cs
+++ b/Content.Server/EUI/EuiManager.cs
@@ -8,7 +8,6 @@ using Robust.Shared.Log;
 using Robust.Shared.Network;
 using Robust.Shared.Utility;
 
-#nullable enable
 
 namespace Content.Server.EUI
 {
diff --git a/Content.Server/Engineering/Components/DisassembleOnActivateComponent.cs b/Content.Server/Engineering/Components/DisassembleOnActivateComponent.cs
index 214f22a46b..723def1b4a 100644
--- a/Content.Server/Engineering/Components/DisassembleOnActivateComponent.cs
+++ b/Content.Server/Engineering/Components/DisassembleOnActivateComponent.cs
@@ -1,6 +1,4 @@
-#nullable enable
 using System.Threading;
-using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager.Attributes;
@@ -8,12 +6,11 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototy
 using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Engineering.Components
-    {
-        [RegisterComponent]
-        public class DisassembleOnActivateComponent : Component
+{
+    [RegisterComponent]
+    public class DisassembleOnActivateComponent : Component
     {
         public override string Name => "DisassembleOnActivate";
-        public override uint? NetID => ContentNetIDs.DISASSEMBLE_ON_ACTIVATE;
 
         [ViewVariables]
         [DataField("prototype", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
diff --git a/Content.Server/Engineering/Components/SpawnAfterInteractComponent.cs b/Content.Server/Engineering/Components/SpawnAfterInteractComponent.cs
index 64958de3a5..3a57414f4b 100644
--- a/Content.Server/Engineering/Components/SpawnAfterInteractComponent.cs
+++ b/Content.Server/Engineering/Components/SpawnAfterInteractComponent.cs
@@ -1,5 +1,3 @@
-#nullable enable
-using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager.Attributes;
@@ -12,7 +10,6 @@ namespace Content.Server.Engineering.Components
     public class SpawnAfterInteractComponent : Component
     {
         public override string Name => "SpawnAfterInteract";
-        public override uint? NetID => ContentNetIDs.SPAWN_AFTER_INTERACT;
 
         [ViewVariables]
         [DataField("prototype", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
diff --git a/Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs b/Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs
index ef71b16e43..fcf4bb1d85 100644
--- a/Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs
+++ b/Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Coordinates.Helpers;
 using Content.Server.DoAfter;
 using Content.Server.Engineering.Components;
diff --git a/Content.Server/Entry/EntryPoint.cs b/Content.Server/Entry/EntryPoint.cs
index 42b3130724..621801dc93 100644
--- a/Content.Server/Entry/EntryPoint.cs
+++ b/Content.Server/Entry/EntryPoint.cs
@@ -1,4 +1,5 @@
-using Content.Server.Administration.Managers;
+using Content.Server.Administration.Managers;
+using Content.Server.Afk;
 using Content.Server.AI.Utility;
 using Content.Server.AI.Utility.Considerations;
 using Content.Server.AI.WorldState;
@@ -56,6 +57,7 @@ namespace Content.Server.Entry
             }
 
             IoCManager.BuildGraph();
+            factory.GenerateNetIds();
 
             _euiManager = IoCManager.Resolve<EuiManager>();
             _voteManager = IoCManager.Resolve<IVoteManager>();
@@ -91,6 +93,7 @@ namespace Content.Server.Entry
             IoCManager.Resolve<IPDAUplinkManager>().Initialize();
             IoCManager.Resolve<IAdminManager>().Initialize();
             IoCManager.Resolve<INpcBehaviorManager>().Initialize();
+            IoCManager.Resolve<IAfkManager>().Initialize();
             _euiManager.Initialize();
 
             IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<GameTicker>().PostInitialize();
diff --git a/Content.Server/Explosion/Components/ClusterFlashComponent.cs b/Content.Server/Explosion/Components/ClusterFlashComponent.cs
index 30ed16254d..47f7c6b98e 100644
--- a/Content.Server/Explosion/Components/ClusterFlashComponent.cs
+++ b/Content.Server/Explosion/Components/ClusterFlashComponent.cs
@@ -1,7 +1,7 @@
-#nullable enable
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
+using Content.Server.Flash.Components;
 using Content.Server.Throwing;
 using Content.Shared.Explosion;
 using Content.Shared.Interaction;
@@ -59,7 +59,8 @@ namespace Content.Server.Explosion.Components
 
         async Task<bool> IInteractUsing.InteractUsing(InteractUsingEventArgs args)
         {
-            if (_grenadesContainer.ContainedEntities.Count >= _maxGrenades || !args.Using.HasComponent<FlashExplosiveComponent>())
+            if (_grenadesContainer.ContainedEntities.Count >= _maxGrenades ||
+                !args.Using.HasComponent<FlashOnTriggerComponent>())
                 return false;
 
             _grenadesContainer.Insert(args.Using);
@@ -71,7 +72,7 @@ namespace Content.Server.Explosion.Components
         {
             base.Initialize();
 
-            _grenadesContainer = ContainerHelpers.EnsureContainer<Container>(Owner, "cluster-flash");
+            _grenadesContainer = Owner.EnsureContainer<Container>("cluster-flash");
 
         }
 
@@ -118,10 +119,7 @@ namespace Content.Server.Explosion.Components
                         if (grenade.Deleted)
                             return;
 
-                        if (grenade.TryGetComponent(out OnUseTimerTriggerComponent? useTimer))
-                        {
-                            useTimer.Trigger(eventArgs.User);
-                        }
+                        EntitySystem.Get<TriggerSystem>().Trigger(grenade, eventArgs.User);
                     });
                 }
 
diff --git a/Content.Server/Explosion/Components/DeleteOnTriggerComponent.cs b/Content.Server/Explosion/Components/DeleteOnTriggerComponent.cs
new file mode 100644
index 0000000000..22ea289926
--- /dev/null
+++ b/Content.Server/Explosion/Components/DeleteOnTriggerComponent.cs
@@ -0,0 +1,13 @@
+using Robust.Shared.GameObjects;
+
+namespace Content.Server.Explosion.Components
+{
+    /// <summary>
+    /// Will delete the attached entity upon a <see cref="TriggerEvent"/>.
+    /// </summary>
+    [RegisterComponent]
+    public class DeleteOnTriggerComponent : Component
+    {
+        public override string Name => "DeleteOnTrigger";
+    }
+}
diff --git a/Content.Server/Explosion/Components/ExplodeOnTriggerComponent.cs b/Content.Server/Explosion/Components/ExplodeOnTriggerComponent.cs
new file mode 100644
index 0000000000..9390886a79
--- /dev/null
+++ b/Content.Server/Explosion/Components/ExplodeOnTriggerComponent.cs
@@ -0,0 +1,13 @@
+using Robust.Shared.GameObjects;
+
+namespace Content.Server.Explosion.Components
+{
+    /// <summary>
+    /// Explode using the entity's <see cref="ExplosiveComponent"/> if Triggered.
+    /// </summary>
+    [RegisterComponent]
+    public class ExplodeOnTriggerComponent : Component
+    {
+        public override string Name => "ExplodeOnTrigger";
+    }
+}
diff --git a/Content.Server/Explosion/Components/ExplosionLaunchedComponent.cs b/Content.Server/Explosion/Components/ExplosionLaunchedComponent.cs
index b48507ef4c..59c3f726fc 100644
--- a/Content.Server/Explosion/Components/ExplosionLaunchedComponent.cs
+++ b/Content.Server/Explosion/Components/ExplosionLaunchedComponent.cs
@@ -16,6 +16,9 @@ namespace Content.Server.Explosion.Components
 
             var sourceLocation = eventArgs.Source;
             var targetLocation = eventArgs.Target.Transform.Coordinates;
+
+            if (sourceLocation.Equals(targetLocation)) return;
+
             var direction = (targetLocation.ToMapPos(Owner.EntityManager) - sourceLocation.ToMapPos(Owner.EntityManager)).Normalized;
 
             var throwForce = eventArgs.Severity switch
@@ -24,7 +27,8 @@ namespace Content.Server.Explosion.Components
                 ExplosionSeverity.Light => 20,
                 _ => 0,
             };
-            Owner.TryThrow(direction * throwForce);
+            
+            Owner.TryThrow(direction, throwForce);
         }
     }
 }
diff --git a/Content.Server/Explosion/Components/ExplosiveComponent.cs b/Content.Server/Explosion/Components/ExplosiveComponent.cs
index 721dcc0fc6..0fc47e991c 100644
--- a/Content.Server/Explosion/Components/ExplosiveComponent.cs
+++ b/Content.Server/Explosion/Components/ExplosiveComponent.cs
@@ -1,11 +1,13 @@
-using Content.Shared.Acts;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
 namespace Content.Server.Explosion.Components
 {
+    /// <summary>
+    /// Specifies an explosion range should this entity be exploded.
+    /// </summary>
     [RegisterComponent]
-    public class ExplosiveComponent : Component, ITimerTrigger, IDestroyAct
+    public class ExplosiveComponent : Component
     {
         public override string Name => "Explosive";
 
@@ -18,31 +20,6 @@ namespace Content.Server.Explosion.Components
         [DataField("flashRange")]
         public int FlashRange;
 
-        public bool Exploding { get; private set; } = false;
-
-        public bool Explosion()
-        {
-            if (Exploding)
-            {
-                return false;
-            }
-            else
-            {
-                Exploding = true;
-                Owner.SpawnExplosion(DevastationRange, HeavyImpactRange, LightImpactRange, FlashRange);
-                Owner.QueueDelete();
-                return true;
-            }
-        }
-
-        bool ITimerTrigger.Trigger(TimerTriggerEventArgs eventArgs)
-        {
-            return Explosion();
-        }
-
-        void IDestroyAct.OnDestroy(DestructionEventArgs eventArgs)
-        {
-            Explosion();
-        }
+        public bool Exploding { get; set; } = false;
     }
 }
diff --git a/Content.Server/Explosion/Components/ExplosiveProjectileComponent.cs b/Content.Server/Explosion/Components/ExplosiveProjectileComponent.cs
deleted file mode 100644
index 2023e7638b..0000000000
--- a/Content.Server/Explosion/Components/ExplosiveProjectileComponent.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using Robust.Shared.GameObjects;
-using Robust.Shared.Physics.Collision;
-using Robust.Shared.Physics.Dynamics;
-
-namespace Content.Server.Explosion.Components
-{
-    [RegisterComponent]
-    public class ExplosiveProjectileComponent : Component, IStartCollide
-    {
-        public override string Name => "ExplosiveProjectile";
-
-        protected override void Initialize()
-        {
-            base.Initialize();
-
-            Owner.EnsureComponent<ExplosiveComponent>();
-        }
-
-        void IStartCollide.CollideWith(Fixture ourFixture, Fixture otherFixture, in Manifold manifold)
-        {
-            if (Owner.TryGetComponent(out ExplosiveComponent? explosive))
-            {
-                explosive.Explosion();
-            }
-        }
-    }
-}
diff --git a/Content.Server/Explosion/Components/FlashExplosiveComponent.cs b/Content.Server/Explosion/Components/FlashExplosiveComponent.cs
deleted file mode 100644
index 5c0cff4dc8..0000000000
--- a/Content.Server/Explosion/Components/FlashExplosiveComponent.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using Content.Server.Flash.Components;
-using Content.Server.Storage.Components;
-using Content.Shared.Acts;
-using Content.Shared.Sound;
-using Robust.Shared.Audio;
-using Robust.Shared.Containers;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Player;
-using Robust.Shared.Serialization.Manager.Attributes;
-
-namespace Content.Server.Explosion.Components
-{
-    /// <summary>
-    /// When triggered will flash in an area around the object and destroy itself
-    /// </summary>
-    [RegisterComponent]
-    public class FlashExplosiveComponent : Component, ITimerTrigger, IDestroyAct
-    {
-        public override string Name => "FlashExplosive";
-
-        [DataField("range")]
-        private float _range = 7.0f;
-        [DataField("duration")]
-        private float _duration = 8.0f;
-        [DataField("sound")]
-        private SoundSpecifier _sound = new SoundPathSpecifier("/Audio/Effects/flash_bang.ogg");
-        [DataField("deleteOnFlash")]
-        private bool _deleteOnFlash = true;
-
-        public bool Explode()
-        {
-            // If we're in a locker or whatever then can't flash anything
-            Owner.TryGetContainer(out var container);
-            if (container == null || !container.Owner.HasComponent<EntityStorageComponent>())
-            {
-                FlashableComponent.FlashAreaHelper(Owner, _range, _duration);
-            }
-
-            if (_sound.TryGetSound(out var sound))
-            {
-                SoundSystem.Play(Filter.Pvs(Owner), sound, Owner.Transform.Coordinates);
-            }
-
-            if (_deleteOnFlash && !Owner.Deleted)
-            {
-                Owner.Delete();
-            }
-
-            return true;
-        }
-
-        bool ITimerTrigger.Trigger(TimerTriggerEventArgs eventArgs)
-        {
-            return Explode();
-        }
-
-        void IDestroyAct.OnDestroy(DestructionEventArgs eventArgs)
-        {
-            Explode();
-        }
-    }
-}
diff --git a/Content.Server/Explosion/Components/OnUseTimerTriggerComponent.cs b/Content.Server/Explosion/Components/OnUseTimerTriggerComponent.cs
index eb428ed043..84931ed26d 100644
--- a/Content.Server/Explosion/Components/OnUseTimerTriggerComponent.cs
+++ b/Content.Server/Explosion/Components/OnUseTimerTriggerComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Content.Shared.Interaction;
 using Content.Shared.Trigger;
 using Robust.Server.GameObjects;
@@ -16,12 +15,13 @@ namespace Content.Server.Explosion.Components
         [DataField("delay")]
         private float _delay = 0f;
 
+        // TODO: Need to split this out so it's a generic "OnUseTimerTrigger" component.
         public void Trigger(IEntity user)
         {
             if (Owner.TryGetComponent(out AppearanceComponent? appearance))
                 appearance.SetData(TriggerVisuals.VisualState, TriggerVisualState.Primed);
 
-            EntitySystem.Get<TriggerSystem>().HandleTimerTrigger(TimeSpan.FromSeconds(_delay), user, Owner);
+            EntitySystem.Get<TriggerSystem>().HandleTimerTrigger(TimeSpan.FromSeconds(_delay), Owner, user);
         }
 
         bool IUse.UseEntity(UseEntityEventArgs eventArgs)
diff --git a/Content.Server/Explosion/Components/SoundOnTriggerComponent.cs b/Content.Server/Explosion/Components/SoundOnTriggerComponent.cs
new file mode 100644
index 0000000000..d1acbe4087
--- /dev/null
+++ b/Content.Server/Explosion/Components/SoundOnTriggerComponent.cs
@@ -0,0 +1,20 @@
+using Content.Shared.Sound;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Serialization.Manager.Attributes;
+using Robust.Shared.ViewVariables;
+
+namespace Content.Server.Explosion.Components
+{
+    /// <summary>
+    /// Whenever a <see cref="TriggerEvent"/> is run play a sound in PVS range.
+    /// </summary>
+    [RegisterComponent]
+    public sealed class SoundOnTriggerComponent : Component
+    {
+        public override string Name => "SoundOnTrigger";
+
+        [ViewVariables(VVAccess.ReadWrite)]
+        [DataField("sound")]
+        public SoundSpecifier? Sound { get; set; } = null;
+    }
+}
diff --git a/Content.Server/Explosion/Components/TriggerOnCollideComponent.cs b/Content.Server/Explosion/Components/TriggerOnCollideComponent.cs
new file mode 100644
index 0000000000..0c15a9a207
--- /dev/null
+++ b/Content.Server/Explosion/Components/TriggerOnCollideComponent.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.GameObjects;
+
+namespace Content.Server.Explosion.Components
+{
+    [RegisterComponent]
+    public class TriggerOnCollideComponent : Component
+    {
+        public override string Name => "TriggerOnCollide";
+    }
+}
diff --git a/Content.Server/Explosion/ExplosionHelper.cs b/Content.Server/Explosion/ExplosionHelper.cs
index 7f5e35e899..234415799f 100644
--- a/Content.Server/Explosion/ExplosionHelper.cs
+++ b/Content.Server/Explosion/ExplosionHelper.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -277,10 +276,12 @@ namespace Content.Server.Explosion
         public static void SpawnExplosion(this IEntity entity, int devastationRange = 0, int heavyImpactRange = 0,
             int lightImpactRange = 0, int flashRange = 0)
         {
+            // TODO: Need to refactor this stufferino
+
             // If you want to directly set off the explosive
             if (!entity.Deleted && entity.TryGetComponent(out ExplosiveComponent? explosive) && !explosive.Exploding)
             {
-                explosive.Explosion();
+                EntitySystem.Get<TriggerSystem>().Explode(entity.Uid, explosive);
             }
             else
             {
diff --git a/Content.Server/Explosion/TriggerSystem.cs b/Content.Server/Explosion/TriggerSystem.cs
index 1dce4012ea..8f1a03fef9 100644
--- a/Content.Server/Explosion/TriggerSystem.cs
+++ b/Content.Server/Explosion/TriggerSystem.cs
@@ -1,53 +1,118 @@
 using System;
-using System.Linq;
+using Content.Server.Explosion.Components;
+using Content.Server.Flash.Components;
+using Content.Shared.Acts;
+using Content.Shared.Audio;
 using JetBrains.Annotations;
+using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
+using Robust.Shared.Physics.Dynamics;
+using Robust.Shared.Player;
 using Robust.Shared.Timing;
 
 namespace Content.Server.Explosion
 {
     /// <summary>
-    /// This interface gives components behavior when being "triggered" by timer or other conditions
+    /// Raised whenever something is Triggered on the entity.
     /// </summary>
-    public interface ITimerTrigger
+    public class TriggerEvent : HandledEntityEventArgs
     {
-        /// <summary>
-        /// Called when one object is triggering some event
-        /// </summary>
-        bool Trigger(TimerTriggerEventArgs eventArgs);
-    }
+        public IEntity Triggered { get; }
+        public IEntity? User { get; }
 
-    public class TimerTriggerEventArgs : EventArgs
-    {
-        public TimerTriggerEventArgs(IEntity user, IEntity source)
+        public TriggerEvent(IEntity triggered, IEntity? user = null)
         {
+            Triggered = triggered;
             User = user;
-            Source = source;
         }
-
-        public IEntity User { get; set; }
-        public IEntity Source { get; set; }
     }
 
     [UsedImplicitly]
     public sealed class TriggerSystem : EntitySystem
     {
-        public void HandleTimerTrigger(TimeSpan delay, IEntity user, IEntity trigger)
+        public override void Initialize()
         {
+            base.Initialize();
+            SubscribeLocalEvent<TriggerOnCollideComponent, StartCollideEvent>(HandleCollide);
+
+            SubscribeLocalEvent<DeleteOnTriggerComponent, TriggerEvent>(HandleDeleteTrigger);
+            SubscribeLocalEvent<SoundOnTriggerComponent, TriggerEvent>(HandleSoundTrigger);
+            SubscribeLocalEvent<ExplodeOnTriggerComponent, TriggerEvent>(HandleExplodeTrigger);
+            SubscribeLocalEvent<FlashOnTriggerComponent, TriggerEvent>(HandleFlashTrigger);
+
+            SubscribeLocalEvent<ExplosiveComponent, DestructionEventArgs>(HandleDestruction);
+        }
+
+        #region Explosions
+        private void HandleDestruction(EntityUid uid, ExplosiveComponent component, DestructionEventArgs args)
+        {
+            Explode(uid, component);
+        }
+
+        private void HandleExplodeTrigger(EntityUid uid, ExplodeOnTriggerComponent component, TriggerEvent args)
+        {
+            if (!ComponentManager.TryGetComponent(uid, out ExplosiveComponent? explosiveComponent)) return;
+
+            Explode(uid, explosiveComponent);
+        }
+
+        // You really shouldn't call this directly (TODO Change that when ExplosionHelper gets changed).
+        public void Explode(EntityUid uid, ExplosiveComponent component)
+        {
+            if (component.Exploding)
+            {
+                return;
+            }
+
+            component.Exploding = true;
+            component.Owner.SpawnExplosion(component.DevastationRange, component.HeavyImpactRange, component.LightImpactRange, component.FlashRange);
+            EntityManager.QueueDeleteEntity(uid);
+        }
+        #endregion
+
+        #region Flash
+        private void HandleFlashTrigger(EntityUid uid, FlashOnTriggerComponent component, TriggerEvent args)
+                {
+                    if (component.Flashed) return;
+
+                    FlashableComponent.FlashAreaHelper(component.Owner, component.Range, component.Duration);
+                    component.Flashed = true;
+                }
+        #endregion
+
+        private void HandleSoundTrigger(EntityUid uid, SoundOnTriggerComponent component, TriggerEvent args)
+        {
+            if (component.Sound == null) return;
+            SoundSystem.Play(Filter.Pvs(component.Owner), component.Sound.GetSound(), AudioHelpers.WithVariation(0.01f));
+        }
+
+        private void HandleDeleteTrigger(EntityUid uid, DeleteOnTriggerComponent component, TriggerEvent args)
+        {
+            EntityManager.QueueDeleteEntity(uid);
+        }
+
+        private void HandleCollide(EntityUid uid, TriggerOnCollideComponent component, StartCollideEvent args)
+        {
+            Trigger(component.Owner);
+        }
+
+        public void Trigger(IEntity trigger, IEntity? user = null)
+        {
+            var triggerEvent = new TriggerEvent(trigger, user);
+            EntityManager.EventBus.RaiseLocalEvent(trigger.Uid, triggerEvent);
+        }
+
+        public void HandleTimerTrigger(TimeSpan delay, IEntity triggered, IEntity? user = null)
+        {
+            if (delay.TotalSeconds <= 0)
+            {
+                Trigger(triggered, user);
+                return;
+            }
 
             Timer.Spawn(delay, () =>
             {
-                var timerTriggerEventArgs = new TimerTriggerEventArgs(user, trigger);
-                var timerTriggers = trigger.GetAllComponents<ITimerTrigger>().ToList();
-
-                foreach (var timerTrigger in timerTriggers)
-                {
-                    if (timerTrigger.Trigger(timerTriggerEventArgs))
-                    {
-                        // If an IOnTimerTrigger returns a status completion we finish our trigger
-                        return;
-                    }
-                }
+                Trigger(triggered, user);
             });
         }
     }
diff --git a/Content.Server/Extinguisher/FireExtinguisherComponent.cs b/Content.Server/Extinguisher/FireExtinguisherComponent.cs
index 19f573d3ba..8b87152686 100644
--- a/Content.Server/Extinguisher/FireExtinguisherComponent.cs
+++ b/Content.Server/Extinguisher/FireExtinguisherComponent.cs
@@ -12,7 +12,6 @@ using Robust.Shared.Localization;
 using Robust.Shared.Player;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-#nullable enable
 
 namespace Content.Server.Extinguisher
 {
diff --git a/Content.Server/Flash/Components/FlashOnTriggerComponent.cs b/Content.Server/Flash/Components/FlashOnTriggerComponent.cs
new file mode 100644
index 0000000000..fca5898c34
--- /dev/null
+++ b/Content.Server/Flash/Components/FlashOnTriggerComponent.cs
@@ -0,0 +1,19 @@
+using Robust.Shared.GameObjects;
+using Robust.Shared.Serialization.Manager.Attributes;
+
+namespace Content.Server.Flash.Components
+{
+    /// <summary>
+    /// Upon being triggered will flash in an area around it.
+    /// </summary>
+    [RegisterComponent]
+    internal sealed class FlashOnTriggerComponent : Component
+    {
+        public override string Name => "FlashOnTrigger";
+
+        [DataField("range")] internal float Range = 1.0f;
+        [DataField("duration")] internal float Duration = 8.0f;
+
+        internal bool Flashed;
+    }
+}
diff --git a/Content.Server/Flash/Components/FlashProjectileComponent.cs b/Content.Server/Flash/Components/FlashProjectileComponent.cs
deleted file mode 100644
index 75be83afb4..0000000000
--- a/Content.Server/Flash/Components/FlashProjectileComponent.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using Content.Server.Projectiles.Components;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Physics.Collision;
-using Robust.Shared.Physics.Dynamics;
-using Robust.Shared.Serialization.Manager.Attributes;
-
-namespace Content.Server.Flash.Components
-{
-    /// <summary>
-    /// Upon colliding with an object this will flash in an area around it
-    /// </summary>
-    [RegisterComponent]
-    public class FlashProjectileComponent : Component, IStartCollide
-    {
-        public override string Name => "FlashProjectile";
-
-        [DataField("range")]
-        private float _range = 1.0f;
-        [DataField("duration")]
-        private float _duration = 8.0f;
-
-        private bool _flashed;
-
-        protected override void Initialize()
-        {
-            base.Initialize();
-            // Shouldn't be using this without a ProjectileComponent because it will just immediately collide with thrower
-            Owner.EnsureComponent<ProjectileComponent>();
-        }
-
-        void IStartCollide.CollideWith(Fixture ourFixture, Fixture otherFixture, in Manifold manifold)
-        {
-            if (_flashed) return;
-
-            FlashableComponent.FlashAreaHelper(Owner, _range, _duration);
-            _flashed = true;
-        }
-    }
-}
diff --git a/Content.Server/Flash/FlashSystem.cs b/Content.Server/Flash/FlashSystem.cs
index bb8746def1..1e223aaed9 100644
--- a/Content.Server/Flash/FlashSystem.cs
+++ b/Content.Server/Flash/FlashSystem.cs
@@ -3,7 +3,6 @@ using Content.Server.Stunnable.Components;
 using Content.Server.Weapon.Melee;
 using Content.Shared.Examine;
 using Content.Shared.Interaction;
-using Content.Shared.Notification;
 using Content.Shared.Notification.Managers;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
@@ -14,7 +13,7 @@ using Robust.Shared.Player;
 
 namespace Content.Server.Flash
 {
-    public class FlashSystem : EntitySystem
+    internal sealed class FlashSystem : EntitySystem
     {
         public override void Initialize()
         {
diff --git a/Content.Server/Fluids/Components/BucketComponent.cs b/Content.Server/Fluids/Components/BucketComponent.cs
index 2f3521ab17..87709c52a8 100644
--- a/Content.Server/Fluids/Components/BucketComponent.cs
+++ b/Content.Server/Fluids/Components/BucketComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Content.Server.Chemistry.Components;
diff --git a/Content.Server/Fluids/Components/MopComponent.cs b/Content.Server/Fluids/Components/MopComponent.cs
index 52c45cb1ad..615bc5552a 100644
--- a/Content.Server/Fluids/Components/MopComponent.cs
+++ b/Content.Server/Fluids/Components/MopComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Threading.Tasks;
 using Content.Server.Chemistry.Components;
 using Content.Server.DoAfter;
diff --git a/Content.Server/Fluids/Components/SpillExtensions.cs b/Content.Server/Fluids/Components/SpillExtensions.cs
index 85f8725961..2a7a354362 100644
--- a/Content.Server/Fluids/Components/SpillExtensions.cs
+++ b/Content.Server/Fluids/Components/SpillExtensions.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Server.Coordinates.Helpers;
diff --git a/Content.Server/Fluids/Components/SprayComponent.cs b/Content.Server/Fluids/Components/SprayComponent.cs
index 105f4537e2..1057df52d6 100644
--- a/Content.Server/Fluids/Components/SprayComponent.cs
+++ b/Content.Server/Fluids/Components/SprayComponent.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Threading.Tasks;
 using Content.Server.Chemistry.Components;
+using Content.Server.Chemistry.EntitySystems;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Audio;
 using Content.Shared.Chemistry.Reagent;
@@ -8,7 +9,6 @@ using Content.Shared.Cooldown;
 using Content.Shared.DragDrop;
 using Content.Shared.Fluids;
 using Content.Shared.Interaction;
-using Content.Shared.Interaction.Events;
 using Content.Shared.Notification.Managers;
 using Content.Shared.Sound;
 using Content.Shared.Vapor;
@@ -27,12 +27,11 @@ using Robust.Shared.ViewVariables;
 namespace Content.Server.Fluids.Components
 {
     [RegisterComponent]
-    class SprayComponent : SharedSprayComponent, IAfterInteract, IUse, IActivate, IDropped
+    internal sealed class SprayComponent : SharedSprayComponent, IAfterInteract, IUse, IActivate, IDropped
     {
         public const float SprayDistance = 3f;
 
         [Dependency] private readonly IGameTiming _gameTiming = default!;
-        [Dependency] private readonly IServerEntityManager _serverEntityManager = default!;
 
         [DataField("transferAmount")]
         private ReagentUnit _transferAmount = ReagentUnit.New(10);
@@ -117,7 +116,9 @@ namespace Content.Server.Fluids.Components
                 return true;
 
             var playerPos = eventArgs.User.Transform.Coordinates;
-            if (eventArgs.ClickLocation.GetGridId(_serverEntityManager) != playerPos.GetGridId(_serverEntityManager))
+            var entManager = Owner.EntityManager;
+
+            if (eventArgs.ClickLocation.GetGridId(entManager) != playerPos.GetGridId(entManager))
                 return true;
 
             if (!Owner.TryGetComponent(out SolutionContainerComponent? contents))
@@ -149,21 +150,22 @@ namespace Content.Server.Fluids.Components
                 if (solution.TotalVolume <= ReagentUnit.Zero)
                     break;
 
-                var vapor = _serverEntityManager.SpawnEntity(_vaporPrototype, playerPos.Offset(distance < 1 ? quarter : threeQuarters));
+                var vapor = entManager.SpawnEntity(_vaporPrototype, playerPos.Offset(distance < 1 ? quarter : threeQuarters));
                 vapor.Transform.LocalRotation = rotation;
 
                 if (vapor.TryGetComponent(out AppearanceComponent? appearance)) // Vapor sprite should face down.
                 {
-                    appearance.SetData(VaporVisuals.Rotation, -Angle.South + rotation);
+                    appearance.SetData(VaporVisuals.Rotation, -Angle.Zero + rotation);
                     appearance.SetData(VaporVisuals.Color, contents.Color.WithAlpha(1f));
                     appearance.SetData(VaporVisuals.State, true);
                 }
 
                 // Add the solution to the vapor and actually send the thing
                 var vaporComponent = vapor.GetComponent<VaporComponent>();
-                vaporComponent.TryAddSolution(solution);
+                var vaporSystem = EntitySystem.Get<VaporSystem>();
+                vaporSystem.TryAddSolution(vaporComponent, solution);
 
-                vaporComponent.Start(rotation.ToVec(), _sprayVelocity, target, _sprayAliveTime);
+                vaporSystem.Start(vaporComponent, rotation.ToVec(), _sprayVelocity, target, _sprayAliveTime);
 
                 if (_impulse > 0f && eventArgs.User.TryGetComponent(out IPhysBody? body))
                 {
diff --git a/Content.Server/GameTicking/Commands/GoLobbyCommand.cs b/Content.Server/GameTicking/Commands/GoLobbyCommand.cs
index 6659938e40..0ae970f0dc 100644
--- a/Content.Server/GameTicking/Commands/GoLobbyCommand.cs
+++ b/Content.Server/GameTicking/Commands/GoLobbyCommand.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Content.Server.Administration;
 using Content.Shared;
 using Content.Shared.Administration;
diff --git a/Content.Server/GameTicking/Presets/PresetTraitorDeathMatch.cs b/Content.Server/GameTicking/Presets/PresetTraitorDeathMatch.cs
index a4a8bb6e06..6886a01401 100644
--- a/Content.Server/GameTicking/Presets/PresetTraitorDeathMatch.cs
+++ b/Content.Server/GameTicking/Presets/PresetTraitorDeathMatch.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Content.Server.Atmos;
+using Content.Server.Atmos.EntitySystems;
 using Content.Server.Chat.Managers;
 using Content.Server.GameTicking.Rules;
 using Content.Server.Hands.Components;
@@ -162,10 +163,12 @@ namespace Content.Server.GameTicking.Presets
             _robustRandom.Shuffle(ents);
             var foundATarget = false;
             bestTarget = EntityCoordinates.Invalid;
+            var atmosphereSystem = EntitySystem.Get<AtmosphereSystem>();
             foreach (var entity in ents)
             {
-                if (!entity.Transform.Coordinates.IsTileAirProbablySafe())
+                if (!atmosphereSystem.IsTileMixtureProbablySafe(entity.Transform.Coordinates))
                     continue;
+
                 var distanceFromNearest = float.PositiveInfinity;
                 foreach (var existing in existingPlayerPoints)
                 {
diff --git a/Content.Server/GameTicking/Rules/RuleInactivityTimeRestart.cs b/Content.Server/GameTicking/Rules/RuleInactivityTimeRestart.cs
index 746a2b9674..f17bd27c9c 100644
--- a/Content.Server/GameTicking/Rules/RuleInactivityTimeRestart.cs
+++ b/Content.Server/GameTicking/Rules/RuleInactivityTimeRestart.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Threading;
 using Content.Server.Chat.Managers;
diff --git a/Content.Server/Ghost/Components/GhostComponent.cs b/Content.Server/Ghost/Components/GhostComponent.cs
index 84d217b0c6..0a2dcbc3d8 100644
--- a/Content.Server/Ghost/Components/GhostComponent.cs
+++ b/Content.Server/Ghost/Components/GhostComponent.cs
@@ -2,7 +2,6 @@ using System;
 using Content.Shared.Ghost;
 using Robust.Shared.GameObjects;
 
-#nullable enable
 namespace Content.Server.Ghost.Components
 {
     [RegisterComponent]
diff --git a/Content.Server/Ghost/Components/GhostOnMoveComponent.cs b/Content.Server/Ghost/Components/GhostOnMoveComponent.cs
index 3153effde2..1496d0d6bf 100644
--- a/Content.Server/Ghost/Components/GhostOnMoveComponent.cs
+++ b/Content.Server/Ghost/Components/GhostOnMoveComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.GameTicking;
 using Content.Server.Mind.Components;
 using Content.Shared.Movement.Components;
diff --git a/Content.Server/Ghost/Ghost.cs b/Content.Server/Ghost/Ghost.cs
index 60395091a6..8fd698db34 100644
--- a/Content.Server/Ghost/Ghost.cs
+++ b/Content.Server/Ghost/Ghost.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Administration;
 using Content.Server.GameTicking;
 using Content.Server.Players;
diff --git a/Content.Server/Ghost/IGhostBooAffected.cs b/Content.Server/Ghost/IGhostBooAffected.cs
index 339ccd74b6..e797f4b0a7 100644
--- a/Content.Server/Ghost/IGhostBooAffected.cs
+++ b/Content.Server/Ghost/IGhostBooAffected.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Shared.Actions.Behaviors;
 
 namespace Content.Server.Ghost
diff --git a/Content.Server/Ghost/Roles/MakeGhostRoleCommand.cs b/Content.Server/Ghost/Roles/MakeGhostRoleCommand.cs
index ab48146fce..7e6e876156 100644
--- a/Content.Server/Ghost/Roles/MakeGhostRoleCommand.cs
+++ b/Content.Server/Ghost/Roles/MakeGhostRoleCommand.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Server.Administration;
+using Content.Server.Administration;
 using Content.Server.Ghost.Roles.Components;
 using Content.Server.Mind.Components;
 using Content.Shared.Administration;
diff --git a/Content.Server/Ghost/Roles/MakeGhostRoleVerb.cs b/Content.Server/Ghost/Roles/MakeGhostRoleVerb.cs
index 0724db5d74..32b424e9ce 100644
--- a/Content.Server/Ghost/Roles/MakeGhostRoleVerb.cs
+++ b/Content.Server/Ghost/Roles/MakeGhostRoleVerb.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Mind.Components;
 using Content.Shared.Verbs;
 using Robust.Server.Console;
diff --git a/Content.Server/Gravity/GravityGeneratorComponent.cs b/Content.Server/Gravity/GravityGeneratorComponent.cs
index b148562c72..15605cd785 100644
--- a/Content.Server/Gravity/GravityGeneratorComponent.cs
+++ b/Content.Server/Gravity/GravityGeneratorComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Server.Power.Components;
+using Content.Server.Power.Components;
 using Content.Server.UserInterface;
 using Content.Shared.Acts;
 using Content.Shared.Gravity;
diff --git a/Content.Server/Hands/Components/HandsComponent.cs b/Content.Server/Hands/Components/HandsComponent.cs
index 4a322cb525..45eda82c41 100644
--- a/Content.Server/Hands/Components/HandsComponent.cs
+++ b/Content.Server/Hands/Components/HandsComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
diff --git a/Content.Server/Hands/Components/IHandsComponent.cs b/Content.Server/Hands/Components/IHandsComponent.cs
index c0d138742e..6bdda53d93 100644
--- a/Content.Server/Hands/Components/IHandsComponent.cs
+++ b/Content.Server/Hands/Components/IHandsComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
diff --git a/Content.Server/Hands/HandsSystem.cs b/Content.Server/Hands/HandsSystem.cs
index 86c07fa909..712c0867a6 100644
--- a/Content.Server/Hands/HandsSystem.cs
+++ b/Content.Server/Hands/HandsSystem.cs
@@ -132,8 +132,10 @@ namespace Content.Server.Hands
             if (direction == Vector2.Zero)
                 return true;
 
-            var throwVec = direction.Normalized * MathF.Min(direction.Length, hands.ThrowRange) * hands.ThrowForceMultiplier;
-            throwEnt.TryThrow(throwVec, playerEnt);
+            direction = direction.Normalized * Math.Min(direction.Length, hands.ThrowRange);
+
+            var throwStrength = hands.ThrowForceMultiplier;
+            throwEnt.TryThrow(direction, throwStrength, playerEnt);
 
             return true;
         }
@@ -165,7 +167,7 @@ namespace Content.Server.Hands
             if (!inventory.TryGetSlotItem(equipmentSlot, out ItemComponent? equipmentItem) ||
                 !equipmentItem.Owner.TryGetComponent(out ServerStorageComponent? storageComponent))
             {
-                plyEnt.PopupMessage(Loc.GetString("hands-system-missing-equipment-slot", ("equipment", SlotNames[equipmentSlot].ToLower())));
+                plyEnt.PopupMessage(Loc.GetString("hands-system-missing-equipment-slot", ("slotName", SlotNames[equipmentSlot].ToLower())));
                 return;
             }
 
@@ -177,7 +179,7 @@ namespace Content.Server.Hands
             {
                 if (storageComponent.StoredEntities.Count == 0)
                 {
-                    plyEnt.PopupMessage(Loc.GetString("hands-system-empty-equipment-slot", ("equipment", SlotNames[equipmentSlot].ToLower())));
+                    plyEnt.PopupMessage(Loc.GetString("hands-system-empty-equipment-slot", ("slotName", SlotNames[equipmentSlot].ToLower())));
                 }
                 else
                 {
diff --git a/Content.Server/Holiday/HolidayPrototype.cs b/Content.Server/Holiday/HolidayPrototype.cs
index a2462efdfe..fa11bb9492 100644
--- a/Content.Server/Holiday/HolidayPrototype.cs
+++ b/Content.Server/Holiday/HolidayPrototype.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Content.Server.Holiday.Celebrate;
 using Content.Server.Holiday.Greet;
diff --git a/Content.Server/Instruments/InstrumentComponent.cs b/Content.Server/Instruments/InstrumentComponent.cs
index 98fed4906d..499d0a3e6d 100644
--- a/Content.Server/Instruments/InstrumentComponent.cs
+++ b/Content.Server/Instruments/InstrumentComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Linq;
 using Content.Server.Stunnable.Components;
@@ -308,7 +307,9 @@ namespace Content.Server.Instruments
         {
             if (!user.TryGetComponent(out ActorComponent? actor)) return;
 
-            if (InstrumentPlayer != null || !EntitySystem.Get<ActionBlockerSystem>().CanInteract(user)) return;
+            if ((!Handheld && InstrumentPlayer != null)
+                || (Handheld && actor.PlayerSession != InstrumentPlayer)
+                || !EntitySystem.Get<ActionBlockerSystem>().CanInteract(user)) return;
 
             InstrumentPlayer = actor.PlayerSession;
             OpenUserInterface(InstrumentPlayer);
diff --git a/Content.Server/Interaction/Components/ClumsyComponent.cs b/Content.Server/Interaction/Components/ClumsyComponent.cs
index 7e2b8cacd7..bba250447d 100644
--- a/Content.Server/Interaction/Components/ClumsyComponent.cs
+++ b/Content.Server/Interaction/Components/ClumsyComponent.cs
@@ -2,7 +2,6 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Random;
 
-#nullable enable
 
 namespace Content.Server.Interaction.Components
 {
diff --git a/Content.Server/Interaction/InteractionSystem.cs b/Content.Server/Interaction/InteractionSystem.cs
index 8ec860beab..efb01638c4 100644
--- a/Content.Server/Interaction/InteractionSystem.cs
+++ b/Content.Server/Interaction/InteractionSystem.cs
@@ -305,7 +305,7 @@ namespace Content.Server.Interaction
                 if (!await InteractUsingRanged(user, item, target, coordinates, inRangeUnobstructed) &&
                     !inRangeUnobstructed)
                 {
-                    var message = Loc.GetString("You can't reach there!");
+                    var message = Loc.GetString("interaction-system-user-interaction-cannot-reach");
                     user.PopupMessage(message);
                 }
 
diff --git a/Content.Server/Interaction/TilePryCommand.cs b/Content.Server/Interaction/TilePryCommand.cs
index 273799363c..39fa5f8de3 100644
--- a/Content.Server/Interaction/TilePryCommand.cs
+++ b/Content.Server/Interaction/TilePryCommand.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Administration;
 using Content.Server.Tools.Components;
 using Content.Shared.Administration;
diff --git a/Content.Server/Interfaces/DONT_PUT_STUFF_HERE_ATMOS_LEFTOVER b/Content.Server/Interfaces/DONT_PUT_STUFF_HERE_ATMOS_LEFTOVER
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/Content.Server/IoC/ServerContentIoC.cs b/Content.Server/IoC/ServerContentIoC.cs
index e6f5d5238a..4e1fabb0bf 100644
--- a/Content.Server/IoC/ServerContentIoC.cs
+++ b/Content.Server/IoC/ServerContentIoC.cs
@@ -1,5 +1,6 @@
 using Content.Server.Administration;
 using Content.Server.Administration.Managers;
+using Content.Server.Afk;
 using Content.Server.AI.Utility;
 using Content.Server.AI.Utility.Considerations;
 using Content.Server.AI.WorldState;
@@ -62,6 +63,7 @@ namespace Content.Server.IoC
             IoCManager.Register<IVoteManager, VoteManager>();
             IoCManager.Register<INpcBehaviorManager, NpcBehaviorManager>();
             IoCManager.Register<IPlayerLocator, PlayerLocator>();
+            IoCManager.Register<IAfkManager, AfkManager>();
         }
     }
 }
diff --git a/Content.Server/Items/ItemComponent.cs b/Content.Server/Items/ItemComponent.cs
index 853d9ffb61..3b8a17bfb9 100644
--- a/Content.Server/Items/ItemComponent.cs
+++ b/Content.Server/Items/ItemComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Hands.Components;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Interaction.Events;
diff --git a/Content.Server/Jobs/JanitorSpecial.cs b/Content.Server/Jobs/JanitorSpecial.cs
index cd845960ec..6b498fed83 100644
--- a/Content.Server/Jobs/JanitorSpecial.cs
+++ b/Content.Server/Jobs/JanitorSpecial.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Hands.Components;
 using Content.Server.Holiday.Interfaces;
 using Content.Server.Items;
diff --git a/Content.Server/Kitchen/Components/KitchenSpikeComponent.cs b/Content.Server/Kitchen/Components/KitchenSpikeComponent.cs
index 7144e30f2f..eb15186f25 100644
--- a/Content.Server/Kitchen/Components/KitchenSpikeComponent.cs
+++ b/Content.Server/Kitchen/Components/KitchenSpikeComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using Content.Server.Act;
diff --git a/Content.Server/Kitchen/Components/MicrowaveComponent.cs b/Content.Server/Kitchen/Components/MicrowaveComponent.cs
index f6132c1e96..8737ad1159 100644
--- a/Content.Server/Kitchen/Components/MicrowaveComponent.cs
+++ b/Content.Server/Kitchen/Components/MicrowaveComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -231,7 +230,7 @@ namespace Content.Server.Kitchen.Components
 
             if (_broken)
             {
-                Owner.PopupMessage(eventArgs.User, Loc.GetString("It's broken!"));
+                Owner.PopupMessage(eventArgs.User, Loc.GetString("microwave-component-interact-using-broken"));
                 return false;
             }
 
diff --git a/Content.Server/Kitchen/Components/ReagentGrinderComponent.cs b/Content.Server/Kitchen/Components/ReagentGrinderComponent.cs
index c6e202cb63..2f49df1945 100644
--- a/Content.Server/Kitchen/Components/ReagentGrinderComponent.cs
+++ b/Content.Server/Kitchen/Components/ReagentGrinderComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Linq;
 using System.Threading.Tasks;
@@ -10,7 +9,6 @@ using Content.Server.UserInterface;
 using Content.Shared.Chemistry.Solution;
 using Content.Shared.Interaction;
 using Content.Shared.Kitchen.Components;
-using Content.Shared.Notification;
 using Content.Shared.Notification.Managers;
 using Content.Shared.Random.Helpers;
 using Content.Shared.Sound;
diff --git a/Content.Server/Lathe/Components/LatheComponent.cs b/Content.Server/Lathe/Components/LatheComponent.cs
index f5494064b8..df45d4f17f 100644
--- a/Content.Server/Lathe/Components/LatheComponent.cs
+++ b/Content.Server/Lathe/Components/LatheComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/Content.Server/Light/Components/EmergencyLightComponent.cs b/Content.Server/Light/Components/EmergencyLightComponent.cs
index f775c18e52..5d7fd2a933 100644
--- a/Content.Server/Light/Components/EmergencyLightComponent.cs
+++ b/Content.Server/Light/Components/EmergencyLightComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using Content.Server.Power.Components;
diff --git a/Content.Server/Light/Components/HandheldLightComponent.cs b/Content.Server/Light/Components/HandheldLightComponent.cs
index 35dc969031..35f5e43eee 100644
--- a/Content.Server/Light/Components/HandheldLightComponent.cs
+++ b/Content.Server/Light/Components/HandheldLightComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Threading.Tasks;
 using Content.Server.Clothing.Components;
 using Content.Server.Items;
diff --git a/Content.Server/Light/Components/LightBulbComponent.cs b/Content.Server/Light/Components/LightBulbComponent.cs
index a00af4352d..6cc8253324 100644
--- a/Content.Server/Light/Components/LightBulbComponent.cs
+++ b/Content.Server/Light/Components/LightBulbComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Content.Shared.Acts;
 using Content.Shared.Audio;
diff --git a/Content.Server/Light/Components/LightReplacerComponent.cs b/Content.Server/Light/Components/LightReplacerComponent.cs
index a0490b913e..6a1b90bfd3 100644
--- a/Content.Server/Light/Components/LightReplacerComponent.cs
+++ b/Content.Server/Light/Components/LightReplacerComponent.cs
@@ -1,10 +1,7 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using Content.Server.Storage.Components;
-using Content.Shared.NetIDs;
-using Content.Shared.Notification;
 using Content.Shared.Notification.Managers;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
@@ -27,7 +24,6 @@ namespace Content.Server.Light.Components
     public class LightReplacerComponent : Component
     {
         public override string Name => "LightReplacer";
-        public override uint? NetID => ContentNetIDs.LIGHT_REPLACER;
 
         [DataField("sound")] private string _sound = "/Audio/Weapons/click.ogg";
 
diff --git a/Content.Server/Light/Components/MatchstickComponent.cs b/Content.Server/Light/Components/MatchstickComponent.cs
index c3fffae599..3cba208db5 100644
--- a/Content.Server/Light/Components/MatchstickComponent.cs
+++ b/Content.Server/Light/Components/MatchstickComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Threading.Tasks;
 using Content.Shared.Audio;
 using Content.Shared.Interaction;
diff --git a/Content.Server/Light/Components/PoweredLightComponent.cs b/Content.Server/Light/Components/PoweredLightComponent.cs
index c8a2401756..d63f34c093 100644
--- a/Content.Server/Light/Components/PoweredLightComponent.cs
+++ b/Content.Server/Light/Components/PoweredLightComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Threading.Tasks;
 using Content.Server.Ghost;
diff --git a/Content.Server/Light/EntitySystems/LightReplacerSystem.cs b/Content.Server/Light/EntitySystems/LightReplacerSystem.cs
index fa7aa3c5ad..fba3c80ce0 100644
--- a/Content.Server/Light/EntitySystems/LightReplacerSystem.cs
+++ b/Content.Server/Light/EntitySystems/LightReplacerSystem.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Light.Components;
 using Content.Server.Storage.Components;
 using Content.Shared.ActionBlocker;
diff --git a/Content.Server/MachineLinking/Components/SignalTwoWayLeverComponent.cs b/Content.Server/MachineLinking/Components/SignalTwoWayLeverComponent.cs
index 212ab41258..2ddad2d982 100644
--- a/Content.Server/MachineLinking/Components/SignalTwoWayLeverComponent.cs
+++ b/Content.Server/MachineLinking/Components/SignalTwoWayLeverComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Shared.Interaction;
 using Content.Shared.MachineLinking;
 using Content.Shared.Notification;
diff --git a/Content.Server/Medical/Components/MedicalScannerComponent.cs b/Content.Server/Medical/Components/MedicalScannerComponent.cs
index 0ee7e60964..dc1ca68355 100644
--- a/Content.Server/Medical/Components/MedicalScannerComponent.cs
+++ b/Content.Server/Medical/Components/MedicalScannerComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using Content.Server.Cloning;
@@ -237,7 +236,7 @@ namespace Content.Server.Medical.Components
                     return;
                 }
 
-                data.Text = Loc.GetString("eject-verb-get-data-text");
+                data.Text = Loc.GetString("medical-scanner-eject-verb-get-data-text");
                 data.Visibility = component.IsOccupied ? VerbVisibility.Visible : VerbVisibility.Invisible;
             }
 
diff --git a/Content.Server/Metabolism/MetabolismComponent.cs b/Content.Server/Metabolism/MetabolismComponent.cs
index 4499ef387f..4898692ab9 100644
--- a/Content.Server/Metabolism/MetabolismComponent.cs
+++ b/Content.Server/Metabolism/MetabolismComponent.cs
@@ -1,9 +1,9 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using Content.Server.Alert;
 using Content.Server.Atmos;
+using Content.Server.Atmos.EntitySystems;
 using Content.Server.Body.Behavior;
 using Content.Server.Body.Circulatory;
 using Content.Server.Temperature.Components;
@@ -283,7 +283,7 @@ namespace Content.Server.Metabolism
                 }
 
                 // creadth: sweating does not help in airless environment
-                if (Owner.Transform.Coordinates.TryGetTileAir(out _, Owner.EntityManager))
+                if (EntitySystem.Get<AtmosphereSystem>().GetTileMixture(Owner.Transform.Coordinates) is not {})
                 {
                     temperatureComponent.RemoveHeat(Math.Min(targetHeat, SweatHeatRegulation));
                 }
diff --git a/Content.Server/Mind/Commands/MakeSentientCommand.cs b/Content.Server/Mind/Commands/MakeSentientCommand.cs
index d162fab864..0ed288df44 100644
--- a/Content.Server/Mind/Commands/MakeSentientCommand.cs
+++ b/Content.Server/Mind/Commands/MakeSentientCommand.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Administration;
 using Content.Server.AI.Components;
 using Content.Server.Mind.Components;
diff --git a/Content.Server/Mind/Components/MindComponent.cs b/Content.Server/Mind/Components/MindComponent.cs
index 4b27a312a5..b724e8a10c 100644
--- a/Content.Server/Mind/Components/MindComponent.cs
+++ b/Content.Server/Mind/Components/MindComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.GameTicking;
 using Content.Server.Ghost.Components;
 using Content.Shared.Examine;
diff --git a/Content.Server/Mind/Components/VisitingMindComponent.cs b/Content.Server/Mind/Components/VisitingMindComponent.cs
index 11d9bfe2e7..53a5eca43b 100644
--- a/Content.Server/Mind/Components/VisitingMindComponent.cs
+++ b/Content.Server/Mind/Components/VisitingMindComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Robust.Shared.GameObjects;
 using Robust.Shared.ViewVariables;
 
diff --git a/Content.Server/MobState/States/NormalMobState.cs b/Content.Server/MobState/States/NormalMobState.cs
index 780bee0cbf..2238457d5a 100644
--- a/Content.Server/MobState/States/NormalMobState.cs
+++ b/Content.Server/MobState/States/NormalMobState.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Server.Alert;
+using Content.Server.Alert;
 using Content.Shared.Alert;
 using Content.Shared.Damage.Components;
 using Content.Shared.MobState;
diff --git a/Content.Server/Morgue/Components/BodyBagEntityStorageComponent.cs b/Content.Server/Morgue/Components/BodyBagEntityStorageComponent.cs
index e35bcc1fb4..48c5b51efa 100644
--- a/Content.Server/Morgue/Components/BodyBagEntityStorageComponent.cs
+++ b/Content.Server/Morgue/Components/BodyBagEntityStorageComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Threading.Tasks;
 using Content.Server.Hands.Components;
 using Content.Server.Items;
diff --git a/Content.Server/Morgue/Components/CrematoriumEntityStorageComponent.cs b/Content.Server/Morgue/Components/CrematoriumEntityStorageComponent.cs
index 830d70ced8..0366a29034 100644
--- a/Content.Server/Morgue/Components/CrematoriumEntityStorageComponent.cs
+++ b/Content.Server/Morgue/Components/CrematoriumEntityStorageComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Threading;
 using Content.Server.Act;
 using Content.Server.Chat.Managers;
diff --git a/Content.Server/Morgue/Components/MorgueEntityStorageComponent.cs b/Content.Server/Morgue/Components/MorgueEntityStorageComponent.cs
index 50ba5d47c2..b03ef06737 100644
--- a/Content.Server/Morgue/Components/MorgueEntityStorageComponent.cs
+++ b/Content.Server/Morgue/Components/MorgueEntityStorageComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Storage.Components;
 using Content.Shared.Body.Components;
 using Content.Shared.Directions;
diff --git a/Content.Server/NodeContainer/NodeContainerComponent.cs b/Content.Server/NodeContainer/NodeContainerComponent.cs
index b0943f7cb6..83f1836a4a 100644
--- a/Content.Server/NodeContainer/NodeContainerComponent.cs
+++ b/Content.Server/NodeContainer/NodeContainerComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using Content.Server.NodeContainer.NodeGroups;
diff --git a/Content.Server/NodeContainer/NodeGroups/BaseNodeGroup.cs b/Content.Server/NodeContainer/NodeGroups/BaseNodeGroup.cs
index 81edd4e643..b65700b7e7 100644
--- a/Content.Server/NodeContainer/NodeGroups/BaseNodeGroup.cs
+++ b/Content.Server/NodeContainer/NodeGroups/BaseNodeGroup.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Collections.Generic;
 using System.Linq;
 using Content.Server.NodeContainer.EntitySystems;
diff --git a/Content.Server/NodeContainer/NodeGroups/NodeGroupAttribute.cs b/Content.Server/NodeContainer/NodeGroups/NodeGroupAttribute.cs
index 27ef01eafc..109af6f67f 100644
--- a/Content.Server/NodeContainer/NodeGroups/NodeGroupAttribute.cs
+++ b/Content.Server/NodeContainer/NodeGroups/NodeGroupAttribute.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using JetBrains.Annotations;
 
diff --git a/Content.Server/NodeContainer/NodeGroups/NodeGroupFactory.cs b/Content.Server/NodeContainer/NodeGroups/NodeGroupFactory.cs
index 33b81a55d5..0722ea1dc4 100644
--- a/Content.Server/NodeContainer/NodeGroups/NodeGroupFactory.cs
+++ b/Content.Server/NodeContainer/NodeGroups/NodeGroupFactory.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using System.Reflection;
diff --git a/Content.Server/NodeContainer/NodeGroups/PipeNet.cs b/Content.Server/NodeContainer/NodeGroups/PipeNet.cs
index 573694cdd6..a8ffb13814 100644
--- a/Content.Server/NodeContainer/NodeGroups/PipeNet.cs
+++ b/Content.Server/NodeContainer/NodeGroups/PipeNet.cs
@@ -1,15 +1,15 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using Content.Server.Atmos;
 using Content.Server.Atmos.Components;
 using Content.Server.Atmos.EntitySystems;
-using Content.Server.Interfaces;
 using Content.Server.NodeContainer.Nodes;
 using Content.Shared.Atmos;
 using Robust.Shared.GameObjects;
+using Robust.Shared.Map;
 using Robust.Shared.Maths;
+using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Server.NodeContainer.NodeGroups
@@ -31,16 +31,14 @@ namespace Content.Server.NodeContainer.NodeGroups
 
         [ViewVariables] private AtmosphereSystem? _atmosphereSystem;
 
-        [ViewVariables]
-        private IGridAtmosphereComponent? GridAtmos =>
-            _atmosphereSystem?.GetGridAtmosphere(GridId);
+        public GridId Grid => GridId;
 
         public override void Initialize(Node sourceNode)
         {
             base.Initialize(sourceNode);
 
             _atmosphereSystem = EntitySystem.Get<AtmosphereSystem>();
-            GridAtmos?.AddPipeNet(this);
+            _atmosphereSystem.AddPipeNet(this);
         }
 
         public void Update()
@@ -95,7 +93,8 @@ namespace Content.Server.NodeContainer.NodeGroups
 
         private void RemoveFromGridAtmos()
         {
-            GridAtmos?.RemovePipeNet(this);
+            DebugTools.AssertNotNull(_atmosphereSystem);
+            _atmosphereSystem?.RemovePipeNet(this);
         }
     }
 }
diff --git a/Content.Server/NodeContainer/Nodes/AdjacentNode.cs b/Content.Server/NodeContainer/Nodes/AdjacentNode.cs
index c28589aec9..90b3330139 100644
--- a/Content.Server/NodeContainer/Nodes/AdjacentNode.cs
+++ b/Content.Server/NodeContainer/Nodes/AdjacentNode.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Collections.Generic;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
diff --git a/Content.Server/NodeContainer/Nodes/Node.cs b/Content.Server/NodeContainer/Nodes/Node.cs
index 58519e5e23..f544490d7e 100644
--- a/Content.Server/NodeContainer/Nodes/Node.cs
+++ b/Content.Server/NodeContainer/Nodes/Node.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Collections.Generic;
 using Content.Server.NodeContainer.EntitySystems;
 using Content.Server.NodeContainer.NodeGroups;
diff --git a/Content.Server/NodeContainer/Nodes/PipeNode.cs b/Content.Server/NodeContainer/Nodes/PipeNode.cs
index 68d093188c..83495e05de 100644
--- a/Content.Server/NodeContainer/Nodes/PipeNode.cs
+++ b/Content.Server/NodeContainer/Nodes/PipeNode.cs
@@ -1,8 +1,6 @@
-#nullable enable
 using System.Collections.Generic;
 using Content.Server.Atmos;
 using Content.Server.Atmos.EntitySystems;
-using Content.Server.Interfaces;
 using Content.Server.NodeContainer.EntitySystems;
 using Content.Server.NodeContainer.NodeGroups;
 using Content.Shared.Atmos;
@@ -34,10 +32,6 @@ namespace Content.Server.NodeContainer.Nodes
         [DataField("pipeDirection")]
         public PipeDirection PipeDirection { get; private set; }
 
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("connectToContainedEntities")]
-        public bool ConnectToContainedEntities { get; set; } = false;
-
         /// <summary>
         ///     The directions in which this node is connected to other nodes.
         ///     Used by <see cref="PipeVisualState"/>.
@@ -81,20 +75,13 @@ namespace Content.Server.NodeContainer.Nodes
         [ViewVariables]
         private IPipeNet? PipeNet => (IPipeNet?) NodeGroup;
 
-        /// <summary>
-        ///     Whether to ignore the pipenet and return the environment's air.
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("environmentalAir")]
-        public bool EnvironmentalAir { get; set; } = false;
-
         /// <summary>
         ///     The gases in this pipe.
         /// </summary>
         [ViewVariables]
         public GasMixture Air
         {
-            get => (!EnvironmentalAir ? PipeNet?.Air : Owner.Transform.Coordinates.GetTileAir()) ?? GasMixture.SpaceGas;
+            get => PipeNet?.Air ?? GasMixture.SpaceGas;
             set
             {
                 DebugTools.Assert(PipeNet != null);
@@ -104,14 +91,8 @@ namespace Content.Server.NodeContainer.Nodes
 
         public void AssumeAir(GasMixture giver)
         {
-            if (EnvironmentalAir)
-            {
-                var tileAtmosphere = Owner.Transform.Coordinates.GetTileAtmosphere();
-                tileAtmosphere?.AssumeAir(giver);
-                return;
-            }
-
-            EntitySystem.Get<AtmosphereSystem>().Merge(PipeNet!.Air, giver);
+            if(PipeNet != null)
+                EntitySystem.Get<AtmosphereSystem>().Merge(PipeNet.Air, giver);
         }
 
         [ViewVariables]
@@ -163,24 +144,6 @@ namespace Content.Server.NodeContainer.Nodes
                     yield return pipe;
                 }
             }
-
-            if (!ConnectionsEnabled || !ConnectToContainedEntities || !Owner.TryGetComponent(out ContainerManagerComponent? containerManager))
-                yield break;
-
-            // TODO ATMOS Kill it with fire.
-            foreach (var container in containerManager.GetAllContainers())
-            {
-                foreach (var entity in container.ContainedEntities)
-                {
-                    if (!entity.TryGetComponent(out NodeContainerComponent? nodeContainer))
-                        continue;
-
-                    foreach (var node in nodeContainer.Nodes.Values)
-                    {
-                        yield return node;
-                    }
-                }
-            }
         }
 
         /// <summary>
@@ -191,17 +154,6 @@ namespace Content.Server.NodeContainer.Nodes
             if (!Anchored)
                 yield break;
 
-            if (pipeDir is PipeDirection.Port or PipeDirection.Connector)
-            {
-                foreach (var pipe in PipesInTile())
-                {
-                    if (pipe.Anchored && pipe.ConnectionsEnabled && pipe.PipeDirection.HasDirection(pipeDir.GetOpposite()))
-                        yield return pipe;
-                }
-
-                yield break;
-            }
-
             foreach (var pipe in PipesInDirection(pipeDir))
             {
                 if (pipe.ConnectionsEnabled && pipe.PipeDirection.HasDirection(pipeDir.GetOpposite()))
@@ -212,7 +164,7 @@ namespace Content.Server.NodeContainer.Nodes
         /// <summary>
         ///     Gets the pipes from entities on the tile adjacent in a direction.
         /// </summary>
-        private IEnumerable<PipeNode> PipesInDirection(PipeDirection pipeDir)
+        protected IEnumerable<PipeNode> PipesInDirection(PipeDirection pipeDir)
         {
             if (!Owner.Transform.Anchored)
                 yield break;
@@ -233,9 +185,9 @@ namespace Content.Server.NodeContainer.Nodes
         }
 
         /// <summary>
-        ///     Gets the pipes from entities on the tile adjacent in a direction.
+        ///     Gets the pipes from entities on the same tile.
         /// </summary>
-        private IEnumerable<PipeNode> PipesInTile()
+        protected IEnumerable<PipeNode> PipesInTile()
         {
             if (!Owner.Transform.Anchored)
                 yield break;
diff --git a/Content.Server/NodeContainer/Nodes/PortPipeNode.cs b/Content.Server/NodeContainer/Nodes/PortPipeNode.cs
new file mode 100644
index 0000000000..18c65173f8
--- /dev/null
+++ b/Content.Server/NodeContainer/Nodes/PortPipeNode.cs
@@ -0,0 +1,23 @@
+using System.Collections.Generic;
+using Robust.Shared.Serialization.Manager.Attributes;
+
+namespace Content.Server.NodeContainer.Nodes
+{
+    [DataDefinition]
+    public class PortPipeNode : PipeNode
+    {
+        public override IEnumerable<Node> GetReachableNodes()
+        {
+            foreach (var node in PipesInTile())
+            {
+                if (node is PortablePipeNode)
+                    yield return node;
+            }
+
+            foreach (var node in base.GetReachableNodes())
+            {
+                yield return node;
+            }
+        }
+    }
+}
diff --git a/Content.Server/NodeContainer/Nodes/PortablePipeNode.cs b/Content.Server/NodeContainer/Nodes/PortablePipeNode.cs
new file mode 100644
index 0000000000..7f645cb518
--- /dev/null
+++ b/Content.Server/NodeContainer/Nodes/PortablePipeNode.cs
@@ -0,0 +1,23 @@
+using System.Collections.Generic;
+using Robust.Shared.Serialization.Manager.Attributes;
+
+namespace Content.Server.NodeContainer.Nodes
+{
+    [DataDefinition]
+    public class PortablePipeNode : PipeNode
+    {
+        public override IEnumerable<Node> GetReachableNodes()
+        {
+            foreach (var node in PipesInTile())
+            {
+                if (node is PortPipeNode)
+                    yield return node;
+            }
+
+            foreach (var node in base.GetReachableNodes())
+            {
+                yield return node;
+            }
+        }
+    }
+}
diff --git a/Content.Server/Nutrition/Components/DrinkComponent.cs b/Content.Server/Nutrition/Components/DrinkComponent.cs
index b659cbb30e..40f783d299 100644
--- a/Content.Server/Nutrition/Components/DrinkComponent.cs
+++ b/Content.Server/Nutrition/Components/DrinkComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Linq;
 using System.Threading.Tasks;
 using Content.Server.Body.Behavior;
diff --git a/Content.Server/Nutrition/Components/FoodComponent.cs b/Content.Server/Nutrition/Components/FoodComponent.cs
index 00f0fd3fe5..8a6afa4ffc 100644
--- a/Content.Server/Nutrition/Components/FoodComponent.cs
+++ b/Content.Server/Nutrition/Components/FoodComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/Content.Server/Nutrition/Components/SmokingComponent.cs b/Content.Server/Nutrition/Components/SmokingComponent.cs
index f84b8efa74..ee75bc91a9 100644
--- a/Content.Server/Nutrition/Components/SmokingComponent.cs
+++ b/Content.Server/Nutrition/Components/SmokingComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Threading.Tasks;
 using Content.Server.Clothing.Components;
 using Content.Shared.Interaction;
diff --git a/Content.Server/Nutrition/Components/UtensilComponent.cs b/Content.Server/Nutrition/Components/UtensilComponent.cs
index e705e1231a..c31599d193 100644
--- a/Content.Server/Nutrition/Components/UtensilComponent.cs
+++ b/Content.Server/Nutrition/Components/UtensilComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Threading.Tasks;
 using Content.Shared.Interaction;
diff --git a/Content.Server/Nutrition/Hungry.cs b/Content.Server/Nutrition/Hungry.cs
index c84b59b713..c05ca157bb 100644
--- a/Content.Server/Nutrition/Hungry.cs
+++ b/Content.Server/Nutrition/Hungry.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Administration;
 using Content.Server.Nutrition.Components;
 using Content.Shared.Administration;
diff --git a/Content.Server/Objectives/Commands/AddObjectiveCommand.cs b/Content.Server/Objectives/Commands/AddObjectiveCommand.cs
index 68c1f7d001..6345d7351f 100644
--- a/Content.Server/Objectives/Commands/AddObjectiveCommand.cs
+++ b/Content.Server/Objectives/Commands/AddObjectiveCommand.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Server.Administration;
+using Content.Server.Administration;
 using Content.Server.Players;
 using Content.Shared.Administration;
 using Robust.Server.Player;
diff --git a/Content.Server/Objectives/Commands/ListObjectivesCommand.cs b/Content.Server/Objectives/Commands/ListObjectivesCommand.cs
index ba315995f8..ab2f438adf 100644
--- a/Content.Server/Objectives/Commands/ListObjectivesCommand.cs
+++ b/Content.Server/Objectives/Commands/ListObjectivesCommand.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Linq;
 using Content.Server.Administration;
 using Content.Server.Players;
diff --git a/Content.Server/Objectives/Commands/RemoveObjectiveCommand.cs b/Content.Server/Objectives/Commands/RemoveObjectiveCommand.cs
index de3e0d61ce..34bcd3cf76 100644
--- a/Content.Server/Objectives/Commands/RemoveObjectiveCommand.cs
+++ b/Content.Server/Objectives/Commands/RemoveObjectiveCommand.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Server.Administration;
+using Content.Server.Administration;
 using Content.Server.Players;
 using Content.Shared.Administration;
 using Robust.Server.Player;
diff --git a/Content.Server/Objectives/Conditions/DieCondition.cs b/Content.Server/Objectives/Conditions/DieCondition.cs
index c2dcaa97b9..352243b737 100644
--- a/Content.Server/Objectives/Conditions/DieCondition.cs
+++ b/Content.Server/Objectives/Conditions/DieCondition.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Objectives.Interfaces;
 using JetBrains.Annotations;
 using Robust.Shared.Localization;
diff --git a/Content.Server/Objectives/Conditions/KillPersonCondition.cs b/Content.Server/Objectives/Conditions/KillPersonCondition.cs
index 3e75e8ec5d..8f37588b31 100644
--- a/Content.Server/Objectives/Conditions/KillPersonCondition.cs
+++ b/Content.Server/Objectives/Conditions/KillPersonCondition.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Objectives.Interfaces;
 using Robust.Shared.Localization;
 using Robust.Shared.Utility;
diff --git a/Content.Server/Objectives/Conditions/StayAliveCondition.cs b/Content.Server/Objectives/Conditions/StayAliveCondition.cs
index 607e672f63..393853ad74 100644
--- a/Content.Server/Objectives/Conditions/StayAliveCondition.cs
+++ b/Content.Server/Objectives/Conditions/StayAliveCondition.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Objectives.Interfaces;
 using JetBrains.Annotations;
 using Robust.Shared.Localization;
diff --git a/Content.Server/Objectives/Conditions/StealCondition.cs b/Content.Server/Objectives/Conditions/StealCondition.cs
index ea9ec71cf1..93de56b9a0 100644
--- a/Content.Server/Objectives/Conditions/StealCondition.cs
+++ b/Content.Server/Objectives/Conditions/StealCondition.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Content.Server.Containers;
 using Content.Server.GameObjects;
diff --git a/Content.Server/Objectives/Interfaces/IObjectiveCondition.cs b/Content.Server/Objectives/Interfaces/IObjectiveCondition.cs
index a7c2f46e39..2cb0061632 100644
--- a/Content.Server/Objectives/Interfaces/IObjectiveCondition.cs
+++ b/Content.Server/Objectives/Interfaces/IObjectiveCondition.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.Utility;
 
 namespace Content.Server.Objectives.Interfaces
diff --git a/Content.Server/Objectives/ObjectivePrototype.cs b/Content.Server/Objectives/ObjectivePrototype.cs
index 0215013b16..55feadacb8 100644
--- a/Content.Server/Objectives/ObjectivePrototype.cs
+++ b/Content.Server/Objectives/ObjectivePrototype.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using Content.Server.Objectives.Interfaces;
 using Robust.Shared.Prototypes;
diff --git a/Content.Server/Objectives/ObjectivesManager.cs b/Content.Server/Objectives/ObjectivesManager.cs
index 34857ec202..a17e252da3 100644
--- a/Content.Server/Objectives/ObjectivesManager.cs
+++ b/Content.Server/Objectives/ObjectivesManager.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using Content.Server.Objectives.Interfaces;
 using Robust.Shared.IoC;
diff --git a/Content.Server/PDA/Managers/IPDAUplinkManager.cs b/Content.Server/PDA/Managers/IPDAUplinkManager.cs
index 4ecae0c6de..5eb21183e9 100644
--- a/Content.Server/PDA/Managers/IPDAUplinkManager.cs
+++ b/Content.Server/PDA/Managers/IPDAUplinkManager.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using Content.Shared.PDA;
diff --git a/Content.Server/PDA/Managers/PDAUplinkManager.cs b/Content.Server/PDA/Managers/PDAUplinkManager.cs
index 2112ebf40c..83531adeae 100644
--- a/Content.Server/PDA/Managers/PDAUplinkManager.cs
+++ b/Content.Server/PDA/Managers/PDAUplinkManager.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using Content.Server.Mind.Components;
diff --git a/Content.Server/PDA/PDAComponent.cs b/Content.Server/PDA/PDAComponent.cs
index fd3b6864ee..2c392f91a0 100644
--- a/Content.Server/PDA/PDAComponent.cs
+++ b/Content.Server/PDA/PDAComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections;
 using System.Collections.Generic;
diff --git a/Content.Server/PDA/PDAExtensions.cs b/Content.Server/PDA/PDAExtensions.cs
index 13377fb1c6..5a0cbe4262 100644
--- a/Content.Server/PDA/PDAExtensions.cs
+++ b/Content.Server/PDA/PDAExtensions.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using Content.Server.Access.Components;
 using Content.Server.Hands.Components;
 using Content.Server.Inventory.Components;
diff --git a/Content.Server/Paper/PaperComponent.cs b/Content.Server/Paper/PaperComponent.cs
index 709e24f26e..8378e76b4a 100644
--- a/Content.Server/Paper/PaperComponent.cs
+++ b/Content.Server/Paper/PaperComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Threading.Tasks;
 using Content.Server.UserInterface;
 using Content.Shared.Examine;
diff --git a/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorControlBoxComponent.cs b/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorControlBoxComponent.cs
index 8562cccfbe..11cacdd052 100644
--- a/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorControlBoxComponent.cs
+++ b/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorControlBoxComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
diff --git a/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorPartComponent.cs b/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorPartComponent.cs
index 82fb8b9183..17c9a53035 100644
--- a/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorPartComponent.cs
+++ b/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorPartComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Robust.Shared.GameObjects;
 using Robust.Shared.ViewVariables;
 
diff --git a/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorPowerBoxComponent.cs b/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorPowerBoxComponent.cs
index c37486bc81..5517069a65 100644
--- a/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorPowerBoxComponent.cs
+++ b/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorPowerBoxComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Server.Power.Components;
+using Content.Server.Power.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.ViewVariables;
 
diff --git a/Content.Server/ParticleAccelerator/Components/ParticleProjectileComponent.cs b/Content.Server/ParticleAccelerator/Components/ParticleProjectileComponent.cs
index baf2ee7c02..b49a0f2b2a 100644
--- a/Content.Server/ParticleAccelerator/Components/ParticleProjectileComponent.cs
+++ b/Content.Server/ParticleAccelerator/Components/ParticleProjectileComponent.cs
@@ -12,30 +12,14 @@ using Robust.Shared.Timing;
 namespace Content.Server.ParticleAccelerator.Components
 {
     [RegisterComponent]
-    public class ParticleProjectileComponent : Component, IStartCollide
+    public class ParticleProjectileComponent : Component
     {
         public override string Name => "ParticleProjectile";
-        private ParticleAcceleratorPowerState _state;
-        void IStartCollide.CollideWith(Fixture ourFixture, Fixture otherFixture, in Manifold manifold)
-        {
-            if (otherFixture.Body.Owner.TryGetComponent<SingularityGeneratorComponent>(out var singularityGeneratorComponent))
-            {
-                singularityGeneratorComponent.Power += _state switch
-                {
-                    ParticleAcceleratorPowerState.Standby => 0,
-                    ParticleAcceleratorPowerState.Level0 => 1,
-                    ParticleAcceleratorPowerState.Level1 => 2,
-                    ParticleAcceleratorPowerState.Level2 => 4,
-                    ParticleAcceleratorPowerState.Level3 => 8,
-                    _ => 0
-                };
-                Owner.Delete();
-            }
-        }
+        public ParticleAcceleratorPowerState State;
 
         public void Fire(ParticleAcceleratorPowerState state, Angle angle, IEntity firer)
         {
-            _state = state;
+            State = state;
 
             if (!Owner.TryGetComponent<PhysicsComponent>(out var physicsComponent))
             {
@@ -56,7 +40,7 @@ namespace Content.Server.ParticleAccelerator.Components
                 Logger.Error("ParticleProjectile tried firing, but it was spawned without a SinguloFoodComponent");
                 return;
             }
-            var multiplier = _state switch
+            var multiplier = State switch
             {
                 ParticleAcceleratorPowerState.Standby => 0,
                 ParticleAcceleratorPowerState.Level0 => 1,
diff --git a/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorPartSystem.cs b/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorPartSystem.cs
index 79be10ebae..994c9a71b2 100644
--- a/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorPartSystem.cs
+++ b/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorPartSystem.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Server.ParticleAccelerator.Components;
+using Content.Server.ParticleAccelerator.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
diff --git a/Content.Server/Physics/Controllers/ConveyorController.cs b/Content.Server/Physics/Controllers/ConveyorController.cs
index 3c65195aaa..1587e2834c 100644
--- a/Content.Server/Physics/Controllers/ConveyorController.cs
+++ b/Content.Server/Physics/Controllers/ConveyorController.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using Content.Server.Conveyor;
diff --git a/Content.Server/Physics/Controllers/MoverController.cs b/Content.Server/Physics/Controllers/MoverController.cs
index 0ec5a812fe..5c97878c3e 100644
--- a/Content.Server/Physics/Controllers/MoverController.cs
+++ b/Content.Server/Physics/Controllers/MoverController.cs
@@ -1,23 +1,27 @@
-#nullable enable
+using System;
 using System.Collections.Generic;
 using Content.Server.Inventory.Components;
 using Content.Server.Items;
 using Content.Server.Movement.Components;
-using Content.Server.Shuttle;
+using Content.Server.Shuttles;
 using Content.Shared.Audio;
+using Content.Shared.CCVar;
 using Content.Shared.Inventory;
 using Content.Shared.Maps;
 using Content.Shared.Movement;
 using Content.Shared.Movement.Components;
 using Content.Shared.Sound;
+using Content.Shared.Shuttles;
 using Content.Shared.Tag;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
+using Robust.Shared.Configuration;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
+using Robust.Shared.Physics;
 using Robust.Shared.Physics.Collision.Shapes;
 using Robust.Shared.Physics.Dynamics;
 using Robust.Shared.Player;
@@ -39,12 +43,17 @@ namespace Content.Server.Physics.Controllers
         private const float StepSoundMoveDistanceRunning = 2;
         private const float StepSoundMoveDistanceWalking = 1.5f;
 
+        private float _shuttleDockSpeedCap;
+
         private HashSet<EntityUid> _excludedMobs = new();
 
         public override void Initialize()
         {
             base.Initialize();
             _audioSystem = EntitySystem.Get<AudioSystem>();
+
+            var configManager = IoCManager.Resolve<IConfigurationManager>();
+            configManager.OnValueChanged(CCVars.ShuttleDockSpeedCap, value => _shuttleDockSpeedCap = value, true);
         }
 
         public override void UpdateBeforeSolve(bool prediction, float frameTime)
@@ -58,8 +67,9 @@ namespace Content.Server.Physics.Controllers
                 HandleMobMovement(mover, physics, mobMover);
             }
 
-            foreach (var mover in ComponentManager.EntityQuery<ShuttleControllerComponent>())
+            foreach (var (pilot, mover) in ComponentManager.EntityQuery<PilotComponent, SharedPlayerInputMoverComponent>())
             {
+                if (pilot.Console == null) continue;
                 _excludedMobs.Add(mover.Owner.Uid);
                 HandleShuttleMovement(mover);
             }
@@ -78,24 +88,70 @@ namespace Content.Server.Physics.Controllers
          * The reason for this is that vehicles change direction very slowly compared to players so you don't really have the requirement for quick movement anyway
          * As such could probably just look at applying a force / impulse to the shuttle server-side only so it controls like the titanic.
          */
-        private void HandleShuttleMovement(ShuttleControllerComponent mover)
+        private void HandleShuttleMovement(SharedPlayerInputMoverComponent mover)
         {
             var gridId = mover.Owner.Transform.GridID;
 
             if (!_mapManager.TryGetGrid(gridId, out var grid) || !EntityManager.TryGetEntity(grid.GridEntityId, out var gridEntity)) return;
 
-            //TODO: Switch to shuttle component
-            if (!gridEntity.TryGetComponent(out PhysicsComponent? physics))
+            if (!gridEntity.TryGetComponent(out ShuttleComponent? shuttleComponent) ||
+                !gridEntity.TryGetComponent(out PhysicsComponent? physicsComponent))
             {
-                physics = gridEntity.AddComponent<PhysicsComponent>();
-                physics.BodyStatus = BodyStatus.InAir;
-                physics.CanCollide = true;
-                physics.AddFixture(new Fixture(physics, new PhysShapeGrid(grid)));
+                return;
             }
 
-            // TODO: Uhh this probably doesn't work but I still need to rip out the entity tree and make RenderingTreeSystem use grids so I'm not overly concerned about breaking shuttles.
-            physics.ApplyForce(mover.VelocityDir.walking + mover.VelocityDir.sprinting);
-            mover.VelocityDir = (Vector2.Zero, Vector2.Zero);
+            // Depending whether you have "cruise" mode on (tank controls, higher speed) or "docking" mode on (strafing, lower speed)
+            // inputs will do different things.
+            // TODO: Do that
+            float speedCap;
+            // This is comically fast for debugging
+            var angularSpeed = 20000f;
+
+            // ShuttleSystem has already worked out the ratio so we'll just multiply it back by the mass.
+            var movement = (mover.VelocityDir.walking + mover.VelocityDir.sprinting);
+
+            switch (shuttleComponent.Mode)
+            {
+                case ShuttleMode.Docking:
+                    if (movement.Length != 0f)
+                        physicsComponent.ApplyLinearImpulse(physicsComponent.Owner.Transform.WorldRotation.RotateVec(movement) * shuttleComponent.SpeedMultipler * physicsComponent.Mass);
+
+                    speedCap = _shuttleDockSpeedCap;
+                    break;
+                case ShuttleMode.Cruise:
+                    if (movement.Length != 0.0f)
+                    {
+                        // Currently this is slow BUT we'd have a separate multiplier for docking and cruising or whatever.
+                        physicsComponent.ApplyLinearImpulse((physicsComponent.Owner.Transform.WorldRotation + new Angle(MathF.PI / 2)).ToVec() *
+                                                            shuttleComponent.SpeedMultipler *
+                                                            physicsComponent.Mass *
+                                                            movement.Y *
+                                                            10);
+                        physicsComponent.ApplyAngularImpulse(-movement.X * angularSpeed);
+                    }
+
+                    // TODO WHEN THIS ACTUALLY WORKS
+                    speedCap = _shuttleDockSpeedCap * 10;
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException();
+            }
+
+            // Look don't my ride ass on this stuff most of the PR was just getting the thing working, we can
+            // ideaguys the shit out of it later.
+
+            var velocity = physicsComponent.LinearVelocity;
+
+            if (velocity.Length < 0.1f && movement.Length == 0f)
+            {
+                physicsComponent.LinearVelocity = Vector2.Zero;
+                return;
+            }
+
+            if (velocity.Length > speedCap)
+            {
+                physicsComponent.LinearVelocity = velocity.Normalized * speedCap;
+            }
         }
 
         protected override void HandleFootsteps(IMoverComponent mover, IMobMoverComponent mobMover)
diff --git a/Content.Server/Physics/Controllers/PullController.cs b/Content.Server/Physics/Controllers/PullController.cs
index 23a27af383..5ce023f43d 100644
--- a/Content.Server/Physics/Controllers/PullController.cs
+++ b/Content.Server/Physics/Controllers/PullController.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using System.Collections.Generic;
 using Content.Shared.Pulling;
 using Robust.Shared.GameObjects;
diff --git a/Content.Server/Physics/Controllers/SingularityController.cs b/Content.Server/Physics/Controllers/SingularityController.cs
index 4347a194be..934bace7ca 100644
--- a/Content.Server/Physics/Controllers/SingularityController.cs
+++ b/Content.Server/Physics/Controllers/SingularityController.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Ghost.Components;
 using Content.Server.Singularity.Components;
 using Robust.Server.GameObjects;
diff --git a/Content.Server/Physics/TestbedCommand.cs b/Content.Server/Physics/TestbedCommand.cs
index 9dabbd0490..fbc0e37b07 100644
--- a/Content.Server/Physics/TestbedCommand.cs
+++ b/Content.Server/Physics/TestbedCommand.cs
@@ -35,7 +35,6 @@ using Robust.Shared.Physics.Collision.Shapes;
 using Robust.Shared.Physics.Dynamics;
 using Robust.Shared.Timing;
 
-#nullable enable
 
 namespace Content.Server.Physics
 {
@@ -51,7 +50,7 @@ namespace Content.Server.Physics
     public class TestbedCommand : IConsoleCommand
     {
         public string Command => "testbed";
-        public string Description => "Loads a physics testbed and teleports your player there";
+        public string Description => "Loads a physics testbed on the specified map.";
         public string Help => $"{Command} <mapid> <test>";
         public void Execute(IConsoleShell shell, string argStr, string[] args)
         {
@@ -128,7 +127,10 @@ namespace Content.Server.Physics
                 CollisionMask = (int) CollisionGroup.Impassable,
                 Hard = true
             };
-            ground.AddFixture(horizontalFixture);
+
+            var broadphase = EntitySystem.Get<SharedBroadphaseSystem>();
+
+            broadphase.CreateFixture(ground, horizontalFixture);
 
             var vertical = new EdgeShape(new Vector2(10, 0), new Vector2(10, 10));
             var verticalFixture = new Fixture(ground, vertical)
@@ -137,7 +139,8 @@ namespace Content.Server.Physics
                 CollisionMask = (int) CollisionGroup.Impassable,
                 Hard = true
             };
-            ground.AddFixture(verticalFixture);
+
+            broadphase.CreateFixture(ground, verticalFixture);
 
             var xs = new[]
             {
@@ -158,7 +161,6 @@ namespace Content.Server.Physics
                         new MapCoordinates(new Vector2(xs[j] + x, 0.55f + 2.1f * i), mapId)).AddComponent<PhysicsComponent>();
 
                     box.BodyType = BodyType.Dynamic;
-                    box.SleepingAllowed = false;
                     shape = new PolygonShape();
                     shape.SetAsBox(0.5f, 0.5f);
                     box.FixedRotation = false;
@@ -170,7 +172,8 @@ namespace Content.Server.Physics
                         CollisionLayer = (int) CollisionGroup.Impassable,
                         Hard = true,
                     };
-                    box.AddFixture(fixture);
+
+                    broadphase.CreateFixture(box, fixture);
                 }
             }
         }
@@ -188,7 +191,9 @@ namespace Content.Server.Physics
                 CollisionMask = (int) CollisionGroup.Impassable,
                 Hard = true
             };
-            ground.AddFixture(horizontalFixture);
+
+            var broadphase = EntitySystem.Get<SharedBroadphaseSystem>();
+            broadphase.CreateFixture(ground, horizontalFixture);
 
             var vertical = new EdgeShape(new Vector2(10, 0), new Vector2(10, 10));
             var verticalFixture = new Fixture(ground, vertical)
@@ -197,7 +202,8 @@ namespace Content.Server.Physics
                 CollisionMask = (int) CollisionGroup.Impassable,
                 Hard = true
             };
-            ground.AddFixture(verticalFixture);
+
+            broadphase.CreateFixture(ground, verticalFixture);
 
             var xs = new[]
             {
@@ -218,7 +224,6 @@ namespace Content.Server.Physics
                         new MapCoordinates(new Vector2(xs[j] + x, 0.55f + 2.1f * i), mapId)).AddComponent<PhysicsComponent>();
 
                     box.BodyType = BodyType.Dynamic;
-                    box.SleepingAllowed = false;
                     shape = new PhysShapeCircle {Radius = 0.5f};
                     box.FixedRotation = false;
                     // TODO: Need to detect shape and work out if we need to use fixedrotation
@@ -229,7 +234,8 @@ namespace Content.Server.Physics
                         CollisionLayer = (int) CollisionGroup.Impassable,
                         Hard = true,
                     };
-                    box.AddFixture(fixture);
+
+                    broadphase.CreateFixture(box, fixture);
                 }
             }
         }
@@ -250,7 +256,8 @@ namespace Content.Server.Physics
                 Hard = true
             };
 
-            ground.AddFixture(horizontalFixture);
+            var broadphase = EntitySystem.Get<SharedBroadphaseSystem>();
+            broadphase.CreateFixture(ground, horizontalFixture);
 
             // Setup boxes
             float a = 0.5f;
@@ -271,13 +278,13 @@ namespace Content.Server.Physics
                     var box = entityManager.SpawnEntity(null, new MapCoordinates(0, 0, mapId)).AddComponent<PhysicsComponent>();
                     box.BodyType = BodyType.Dynamic;
                     box.Owner.Transform.WorldPosition = y;
-                    box.AddFixture(
+                    broadphase.CreateFixture(box,
                         new Fixture(box, shape) {
-                            CollisionLayer = (int) CollisionGroup.Impassable,
-                            CollisionMask = (int) CollisionGroup.Impassable,
-                            Hard = true,
-                            Mass = 5.0f,
-                        });
+                        CollisionLayer = (int) CollisionGroup.Impassable,
+                        CollisionMask = (int) CollisionGroup.Impassable,
+                        Hard = true,
+                        Mass = 5.0f,
+                    });
                     y += deltaY;
                 }
 
diff --git a/Content.Server/Players/PlayerData.cs b/Content.Server/Players/PlayerData.cs
index cff16ce8e6..d9e363cd8d 100644
--- a/Content.Server/Players/PlayerData.cs
+++ b/Content.Server/Players/PlayerData.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Robust.Server.Player;
 using Robust.Shared.Network;
 using Robust.Shared.ViewVariables;
diff --git a/Content.Server/Pointing/Components/PointingArrowComponent.cs b/Content.Server/Pointing/Components/PointingArrowComponent.cs
index ab39e8f226..832a23bb3b 100644
--- a/Content.Server/Pointing/Components/PointingArrowComponent.cs
+++ b/Content.Server/Pointing/Components/PointingArrowComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Shared.Pointing.Components;
+using Content.Shared.Pointing.Components;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
diff --git a/Content.Server/Pointing/Components/RoguePointingArrowComponent.cs b/Content.Server/Pointing/Components/RoguePointingArrowComponent.cs
index d065e65db6..da3014d516 100644
--- a/Content.Server/Pointing/Components/RoguePointingArrowComponent.cs
+++ b/Content.Server/Pointing/Components/RoguePointingArrowComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Linq;
 using Content.Server.Explosion;
 using Content.Shared.Pointing.Components;
diff --git a/Content.Server/Pointing/EntitySystems/PointingSystem.cs b/Content.Server/Pointing/EntitySystems/PointingSystem.cs
index 0ad51b44dc..f31155ff11 100644
--- a/Content.Server/Pointing/EntitySystems/PointingSystem.cs
+++ b/Content.Server/Pointing/EntitySystems/PointingSystem.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using Content.Server.Ghost.Components;
diff --git a/Content.Server/Portal/Components/PortalComponent.cs b/Content.Server/Portal/Components/PortalComponent.cs
deleted file mode 100644
index a4581eda43..0000000000
--- a/Content.Server/Portal/Components/PortalComponent.cs
+++ /dev/null
@@ -1,169 +0,0 @@
-#nullable enable
-using System;
-using System.Collections.Generic;
-using Content.Shared.Portal.Components;
-using Content.Shared.Sound;
-using Content.Shared.Tag;
-using Robust.Server.GameObjects;
-using Robust.Shared.Audio;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Physics.Collision;
-using Robust.Shared.Physics.Dynamics;
-using Robust.Shared.Player;
-using Robust.Shared.Serialization.Manager.Attributes;
-using Robust.Shared.ViewVariables;
-
-namespace Content.Server.Portal.Components
-{
-    [RegisterComponent]
-    public class PortalComponent : SharedPortalComponent, IStartCollide
-    {
-        // Potential improvements: Different sounds,
-        // Add Gateways
-        // More efficient form of GetEntitiesIntersecting,
-        // Put portal above most other things layer-wise
-        // Add telefragging (get entities on connecting portal and force brute damage)
-
-        private IEntity? _connectingTeleporter;
-        private PortalState _state = PortalState.Pending;
-        [ViewVariables(VVAccess.ReadWrite)] [DataField("individual_cooldown")] private float _individualPortalCooldown = 2.1f;
-        [ViewVariables] [DataField("overall_cooldown")] private float _overallPortalCooldown = 2.0f;
-        [ViewVariables] private bool _onCooldown;
-        [ViewVariables] [DataField("departure_sound")] private SoundSpecifier _departureSound = new SoundPathSpecifier("/Audio/Effects/teleport_departure.ogg");
-        [ViewVariables] [DataField("arrival_sound")] private SoundSpecifier _arrivalSound = new SoundPathSpecifier("/Audio/Effects/teleport_arrival.ogg");
-        public readonly List<IEntity> ImmuneEntities = new(); // K
-        [ViewVariables(VVAccess.ReadWrite)] [DataField("alive_time")] private float _aliveTime = 10f;
-
-        protected override void OnAdd()
-        {
-            // This will blow up an entity it's attached to
-            base.OnAdd();
-
-            _state = PortalState.Pending;
-
-            if (_aliveTime > 0)
-            {
-                Owner.SpawnTimer(TimeSpan.FromSeconds(_aliveTime), () => Owner.Delete());
-            }
-        }
-
-        public bool CanBeConnected()
-        {
-            return _connectingTeleporter == null;
-        }
-
-        public void TryConnectPortal(IEntity otherPortal)
-        {
-            if (otherPortal.TryGetComponent<PortalComponent>(out var connectedPortal) && connectedPortal.CanBeConnected())
-            {
-                _connectingTeleporter = otherPortal;
-                connectedPortal._connectingTeleporter = Owner;
-                TryChangeState(PortalState.Pending);
-            }
-        }
-
-        public void TryChangeState(PortalState targetState)
-        {
-            if (Deleted)
-            {
-                return;
-            }
-
-            _state = targetState;
-
-            if (Owner.TryGetComponent(out AppearanceComponent? appearance))
-            {
-                appearance.SetData(PortalVisuals.State, _state);
-            }
-        }
-
-        private void ReleaseCooldown(IEntity entity)
-        {
-            if (Deleted)
-            {
-                return;
-            }
-
-            if (ImmuneEntities.Contains(entity))
-            {
-                ImmuneEntities.Remove(entity);
-            }
-
-            if (_connectingTeleporter != null &&
-                _connectingTeleporter.TryGetComponent<PortalComponent>(out var otherPortal))
-            {
-                otherPortal.ImmuneEntities.Remove(entity);
-            }
-        }
-
-        private bool IsEntityPortable(IEntity entity)
-        {
-            // TODO: Check if it's slotted etc. Otherwise the slot item itself gets ported.
-            return !ImmuneEntities.Contains(entity) &&
-                   entity.HasTag("Teleportable");
-        }
-
-        public void StartCooldown()
-        {
-            if (_overallPortalCooldown <= 0 || _onCooldown)
-            {
-                // Just in case?
-                _onCooldown = false;
-                return;
-            }
-
-            _onCooldown = true;
-            TryChangeState(PortalState.RecentlyTeleported);
-
-            if (_connectingTeleporter == null ||
-                !_connectingTeleporter.TryGetComponent<PortalComponent>(out var otherPortal))
-            {
-                return;
-            }
-
-            otherPortal.TryChangeState(PortalState.RecentlyTeleported);
-
-            Owner.SpawnTimer(TimeSpan.FromSeconds(_overallPortalCooldown), () =>
-            {
-                _onCooldown = false;
-                TryChangeState(PortalState.Pending);
-                otherPortal.TryChangeState(PortalState.Pending);
-            });
-        }
-
-        public void TryPortalEntity(IEntity entity)
-        {
-            if (ImmuneEntities.Contains(entity) ||
-                _connectingTeleporter == null ||
-                !IsEntityPortable(entity))
-            {
-                return;
-            }
-
-            var position = _connectingTeleporter.Transform.Coordinates;
-
-            // Departure
-            // Do we need to rate-limit sounds to stop ear BLAST?
-            if(_departureSound.TryGetSound(out var departureSound))
-                SoundSystem.Play(Filter.Pvs(entity), departureSound, entity.Transform.Coordinates);
-            entity.Transform.Coordinates = position;
-            if(_arrivalSound.TryGetSound(out var arrivalSound))
-                SoundSystem.Play(Filter.Pvs(entity), arrivalSound, entity.Transform.Coordinates);
-            TryChangeState(PortalState.RecentlyTeleported);
-
-            // To stop spam teleporting. Could potentially look at adding a timer to flush this from the portal
-            ImmuneEntities.Add(entity);
-            _connectingTeleporter.GetComponent<PortalComponent>().ImmuneEntities.Add(entity);
-            Owner.SpawnTimer(TimeSpan.FromSeconds(_individualPortalCooldown), () => ReleaseCooldown(entity));
-            StartCooldown();
-        }
-
-        void IStartCollide.CollideWith(Fixture ourFixture, Fixture otherFixture, in Manifold manifold)
-        {
-            if (_onCooldown == false)
-            {
-                TryPortalEntity(otherFixture.Body.Owner);
-            }
-        }
-    }
-}
diff --git a/Content.Server/Portal/Components/TeleporterComponent.cs b/Content.Server/Portal/Components/TeleporterComponent.cs
deleted file mode 100644
index 7d945943e7..0000000000
--- a/Content.Server/Portal/Components/TeleporterComponent.cs
+++ /dev/null
@@ -1,244 +0,0 @@
-#nullable enable
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using Content.Shared.Interaction;
-using Content.Shared.Portal.Components;
-using Content.Shared.Sound;
-using Robust.Server.GameObjects;
-using Robust.Shared.Audio;
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-using Robust.Shared.Map;
-using Robust.Shared.Maths;
-using Robust.Shared.Physics;
-using Robust.Shared.Player;
-using Robust.Shared.Random;
-using Robust.Shared.Serialization.Manager.Attributes;
-using Robust.Shared.ViewVariables;
-
-namespace Content.Server.Portal.Components
-{
-    [RegisterComponent]
-    public class TeleporterComponent : Component, IAfterInteract
-    {
-        [Dependency] private readonly IServerEntityManager _serverEntityManager = default!;
-        [Dependency] private readonly IRobustRandom _spreadRandom = default!;
-
-        // TODO: Look at MapManager.Map for Beacons to get all entities on grid
-        public ItemTeleporterState State => _state;
-
-        public override string Name => "ItemTeleporter";
-
-        [DataField("charge_time")]
-        [ViewVariables] private float _chargeTime = 0.2f;
-        [DataField("cooldown")]
-        [ViewVariables] private float _cooldown = 2f;
-        [DataField("range")]
-        [ViewVariables] private int _range = 15;
-        [ViewVariables] private ItemTeleporterState _state;
-        [DataField("teleporter_type")]
-        [ViewVariables] private TeleporterType _teleporterType = TeleporterType.Random;
-        [ViewVariables] [DataField("departure_sound")] private SoundSpecifier _departureSound = new SoundPathSpecifier("/Audio/Effects/teleport_departure.ogg");
-        [ViewVariables] [DataField("arrival_sound")] private SoundSpecifier _arrivalSound = new SoundPathSpecifier("/Audio/Effects/teleport_arrival.ogg");
-        [ViewVariables] [DataField("cooldown_sound")] private SoundSpecifier _cooldownSound = default!;
-        // If the direct OR random teleport will try to avoid hitting collidables
-        [DataField("avoid_walls")] [ViewVariables]
-        private bool _avoidCollidable = true;
-        [DataField("portal_alive_time")]
-        [ViewVariables] private float _portalAliveTime = 5f;
-
-        private void SetState(ItemTeleporterState newState)
-        {
-            if (!Owner.TryGetComponent(out AppearanceComponent? appearance))
-            {
-                return;
-            }
-
-            if (newState == ItemTeleporterState.Cooldown)
-            {
-                appearance.SetData(TeleporterVisuals.VisualState, TeleporterVisualState.Charging);
-            }
-            else
-            {
-                appearance.SetData(TeleporterVisuals.VisualState, TeleporterVisualState.Ready);
-            }
-            _state = newState;
-        }
-
-        async Task<bool> IAfterInteract.AfterInteract(AfterInteractEventArgs eventArgs)
-        {
-            if (_teleporterType == TeleporterType.Directed)
-            {
-                TryDirectedTeleport(eventArgs.User, eventArgs.ClickLocation.ToMap(Owner.EntityManager));
-            }
-
-            if (_teleporterType == TeleporterType.Random)
-            {
-                TryRandomTeleport(eventArgs.User);
-            }
-
-            return true;
-        }
-
-        public void TryDirectedTeleport(IEntity user, MapCoordinates mapCoords)
-        {
-            // Checks
-            if ((user.Transform.WorldPosition - mapCoords.Position).LengthSquared > _range * _range)
-            {
-                return;
-            }
-
-            if (_state == ItemTeleporterState.On)
-            {
-                return;
-            }
-            if (_avoidCollidable)
-            {
-                foreach (var entity in IoCManager.Resolve<IEntityLookup>().GetEntitiesIntersecting(mapCoords))
-                {
-                    // Added this component to avoid stacking portals and causing shenanigans
-                    // TODO: Doesn't do a great job of stopping stacking portals for directed
-                    if (entity.HasComponent<IPhysBody>() || entity.HasComponent<TeleporterComponent>())
-                    {
-                        return;
-                    }
-                }
-            }
-            // Start / Continue
-            if (_state == ItemTeleporterState.Off)
-            {
-                SetState(ItemTeleporterState.Charging);
-                // Play charging sound here if you want
-            }
-
-            if (_state != ItemTeleporterState.Charging)
-            {
-                return;
-            }
-
-            Owner.SpawnTimer(TimeSpan.FromSeconds(_chargeTime), () => Teleport(user, mapCoords.Position));
-            StartCooldown();
-        }
-
-        public void StartCooldown()
-        {
-            SetState(ItemTeleporterState.Cooldown);
-            Owner.SpawnTimer(TimeSpan.FromSeconds(_chargeTime + _cooldown), () => SetState(ItemTeleporterState.Off));
-            if (_cooldownSound.TryGetSound(out var cooldownSound))
-            {
-                SoundSystem.Play(Filter.Pvs(Owner), cooldownSound, Owner);
-            }
-        }
-
-        protected override void Initialize()
-        {
-            base.Initialize();
-            _state = ItemTeleporterState.Off;
-        }
-
-        private bool EmptySpace(IEntity user, Vector2 target)
-        {
-            // TODO: Check the user's spot? Upside is no stacking TPs but downside is they can't unstuck themselves from walls.
-            foreach (var entity in IoCManager.Resolve<IEntityLookup>().GetEntitiesIntersecting(user.Transform.MapID, target))
-            {
-                if (entity.HasComponent<IPhysBody>() || entity.HasComponent<PortalComponent>())
-                {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        private Vector2 RandomEmptySpot(IEntity user, int range)
-        {
-            Vector2 targetVector = user.Transform.Coordinates.Position;
-            // Definitely a better way to do this
-            foreach (var i in Enumerable.Range(0, 5))
-            {
-                var randomRange = _spreadRandom.Next(0, range);
-                var angle = Angle.FromDegrees(_spreadRandom.Next(0, 359));
-                targetVector = user.Transform.Coordinates.Position + angle.ToVec() * randomRange;
-                if (EmptySpace(user, targetVector))
-                {
-                    return targetVector;
-                }
-                if (i == 19)
-                {
-                    return targetVector;
-                }
-            }
-
-            return targetVector;
-        }
-
-        public void TryRandomTeleport(IEntity user)
-        {
-            // Checks
-            if (_state == ItemTeleporterState.On)
-            {
-                return;
-            }
-
-            Vector2 targetVector;
-            if (_avoidCollidable)
-            {
-                targetVector = RandomEmptySpot(user, _range);
-            }
-            else
-            {
-               var randomRange = _spreadRandom.Next(0, _range);
-               var angle = Angle.FromDegrees(_spreadRandom.Next(0, 359));
-               targetVector = user.Transform.Coordinates.Position + angle.ToVec() * randomRange;
-            }
-            // Start / Continue
-            if (_state == ItemTeleporterState.Off)
-            {
-                SetState(ItemTeleporterState.Charging);
-            }
-
-            if (_state != ItemTeleporterState.Charging)
-            {
-                return;
-            }
-
-            // Seemed easier to just start the cd timer at the same time
-            Owner.SpawnTimer(TimeSpan.FromSeconds(_chargeTime), () => Teleport(user, targetVector));
-            StartCooldown();
-        }
-
-        public void Teleport(IEntity user, Vector2 vector)
-        {
-            // Messy maybe?
-            var targetGrid = user.Transform.Coordinates.WithPosition(vector);
-
-            // If portals use those, otherwise just move em over
-            if (_portalAliveTime > 0.0f)
-            {
-                // Call Delete here as the teleporter should have control over portal longevity
-                // Departure portal
-                var departurePortal = _serverEntityManager.SpawnEntity("Portal", user.Transform.Coordinates);
-
-                // Arrival portal
-                var arrivalPortal = _serverEntityManager.SpawnEntity("Portal", targetGrid);
-                if (arrivalPortal.TryGetComponent<PortalComponent>(out var arrivalComponent))
-                {
-                    // Connect.
-                    arrivalComponent.TryConnectPortal(departurePortal);
-                }
-            }
-            else
-            {
-                // Departure
-                if(_departureSound.TryGetSound(out var departureSound))
-                    SoundSystem.Play(Filter.Pvs(user), departureSound, user.Transform.Coordinates);
-
-                // Arrival
-                user.Transform.AttachToGridOrMap();
-                user.Transform.WorldPosition = vector;
-                if(_arrivalSound.TryGetSound(out var arrivalSound))
-                    SoundSystem.Play(Filter.Pvs(user), arrivalSound, user.Transform.Coordinates);
-            }
-        }
-    }
-}
diff --git a/Content.Server/Power/Components/ApcComponent.cs b/Content.Server/Power/Components/ApcComponent.cs
index 22a997a8ba..442cdb8756 100644
--- a/Content.Server/Power/Components/ApcComponent.cs
+++ b/Content.Server/Power/Components/ApcComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Content.Server.Access.Components;
 using Content.Server.Power.NodeGroups;
diff --git a/Content.Server/Power/Components/ApcPowerProviderComponent.cs b/Content.Server/Power/Components/ApcPowerProviderComponent.cs
index c87e4b6c54..dd8c3501ce 100644
--- a/Content.Server/Power/Components/ApcPowerProviderComponent.cs
+++ b/Content.Server/Power/Components/ApcPowerProviderComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using Content.Server.Power.NodeGroups;
diff --git a/Content.Server/Power/Components/ApcPowerReceiverComponent.cs b/Content.Server/Power/Components/ApcPowerReceiverComponent.cs
index b95db5cc86..16fa1791c5 100644
--- a/Content.Server/Power/Components/ApcPowerReceiverComponent.cs
+++ b/Content.Server/Power/Components/ApcPowerReceiverComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Diagnostics.CodeAnalysis;
 using Content.Server.Power.NodeGroups;
@@ -175,6 +174,7 @@ namespace Content.Server.Power.Components
         private void OnNewPowerState()
         {
             SendMessage(new PowerChangedMessage(Powered));
+            Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, new PowerChangedEvent(Powered));
 
             if (Owner.TryGetComponent<AppearanceComponent>(out var appearance))
             {
@@ -217,4 +217,17 @@ namespace Content.Server.Power.Components
             Powered = powered;
         }
     }
+
+    /// <summary>
+    /// Raised whenever an ApcPowerReceiver becomes powered / unpowered.
+    /// </summary>
+    public sealed class PowerChangedEvent : EntityEventArgs
+    {
+        public readonly bool Powered;
+
+        public PowerChangedEvent(bool powered)
+        {
+            Powered = powered;
+        }
+    }
 }
diff --git a/Content.Server/Power/Components/BaseApcNetComponent.cs b/Content.Server/Power/Components/BaseApcNetComponent.cs
index e004606107..634653c022 100644
--- a/Content.Server/Power/Components/BaseApcNetComponent.cs
+++ b/Content.Server/Power/Components/BaseApcNetComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Power.NodeGroups;
 
 namespace Content.Server.Power.Components
diff --git a/Content.Server/Power/Components/BaseCharger.cs b/Content.Server/Power/Components/BaseCharger.cs
index 753e5d59e8..7177f9663b 100644
--- a/Content.Server/Power/Components/BaseCharger.cs
+++ b/Content.Server/Power/Components/BaseCharger.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Threading.Tasks;
 using Content.Server.Hands.Components;
diff --git a/Content.Server/Power/Components/BaseNetConnectorComponent.cs b/Content.Server/Power/Components/BaseNetConnectorComponent.cs
index d24fb16191..3cdf243ca2 100644
--- a/Content.Server/Power/Components/BaseNetConnectorComponent.cs
+++ b/Content.Server/Power/Components/BaseNetConnectorComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Server.NodeContainer;
 using Content.Server.NodeContainer.NodeGroups;
diff --git a/Content.Server/Power/Components/BasePowerNetComponent.cs b/Content.Server/Power/Components/BasePowerNetComponent.cs
index c25715abb4..98f24618f5 100644
--- a/Content.Server/Power/Components/BasePowerNetComponent.cs
+++ b/Content.Server/Power/Components/BasePowerNetComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.NodeContainer.NodeGroups;
 using Content.Server.Power.NodeGroups;
 
diff --git a/Content.Server/Power/Components/BatteryComponent.cs b/Content.Server/Power/Components/BatteryComponent.cs
index 480afbde0e..4dd6b805ae 100644
--- a/Content.Server/Power/Components/BatteryComponent.cs
+++ b/Content.Server/Power/Components/BatteryComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
diff --git a/Content.Server/Power/Components/CableComponent.cs b/Content.Server/Power/Components/CableComponent.cs
index b95f790953..4c0623f3cc 100644
--- a/Content.Server/Power/Components/CableComponent.cs
+++ b/Content.Server/Power/Components/CableComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Threading.Tasks;
 using Content.Server.Stack;
 using Content.Server.Tools.Components;
diff --git a/Content.Server/Power/Components/CablePlacerComponent.cs b/Content.Server/Power/Components/CablePlacerComponent.cs
index a2eb805730..9542636d85 100644
--- a/Content.Server/Power/Components/CablePlacerComponent.cs
+++ b/Content.Server/Power/Components/CablePlacerComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Threading.Tasks;
 using Content.Server.Stack;
 using Content.Shared.Interaction;
diff --git a/Content.Server/Power/Components/ExaminableBatteryComponent.cs b/Content.Server/Power/Components/ExaminableBatteryComponent.cs
index e5da57a61c..2327f32527 100644
--- a/Content.Server/Power/Components/ExaminableBatteryComponent.cs
+++ b/Content.Server/Power/Components/ExaminableBatteryComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Shared.Examine;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
diff --git a/Content.Server/Power/Components/PowerConsumerComponent.cs b/Content.Server/Power/Components/PowerConsumerComponent.cs
index a9c44434bd..7e4e24de58 100644
--- a/Content.Server/Power/Components/PowerConsumerComponent.cs
+++ b/Content.Server/Power/Components/PowerConsumerComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Power.NodeGroups;
 using Content.Server.Power.Pow3r;
 using Robust.Shared.GameObjects;
diff --git a/Content.Server/Power/Components/PowerSupplierComponent.cs b/Content.Server/Power/Components/PowerSupplierComponent.cs
index c145cd6803..675bc85246 100644
--- a/Content.Server/Power/Components/PowerSupplierComponent.cs
+++ b/Content.Server/Power/Components/PowerSupplierComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Power.NodeGroups;
 using Content.Server.Power.Pow3r;
 using Robust.Shared.GameObjects;
diff --git a/Content.Server/Power/DrainAllBatteriesCommand.cs b/Content.Server/Power/DrainAllBatteriesCommand.cs
index 431e68c4d8..068a3df89a 100644
--- a/Content.Server/Power/DrainAllBatteriesCommand.cs
+++ b/Content.Server/Power/DrainAllBatteriesCommand.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Administration;
 using Content.Server.Power.Components;
 using Content.Shared.Administration;
diff --git a/Content.Server/Power/EntitySystems/BaseChargerSystem.cs b/Content.Server/Power/EntitySystems/BaseChargerSystem.cs
index c758bf721f..bc2bb26f25 100644
--- a/Content.Server/Power/EntitySystems/BaseChargerSystem.cs
+++ b/Content.Server/Power/EntitySystems/BaseChargerSystem.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Power.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
diff --git a/Content.Server/Power/EntitySystems/BatterySystem.cs b/Content.Server/Power/EntitySystems/BatterySystem.cs
index ce54a7e866..44126d6810 100644
--- a/Content.Server/Power/EntitySystems/BatterySystem.cs
+++ b/Content.Server/Power/EntitySystems/BatterySystem.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Power.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
diff --git a/Content.Server/Power/EntitySystems/PowerApcSystem.cs b/Content.Server/Power/EntitySystems/PowerApcSystem.cs
index e44b66f260..c41a7a4df1 100644
--- a/Content.Server/Power/EntitySystems/PowerApcSystem.cs
+++ b/Content.Server/Power/EntitySystems/PowerApcSystem.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Power.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
diff --git a/Content.Server/Power/EntitySystems/PowerNetSystem.cs b/Content.Server/Power/EntitySystems/PowerNetSystem.cs
index e2b54ac769..3b7f81fb25 100644
--- a/Content.Server/Power/EntitySystems/PowerNetSystem.cs
+++ b/Content.Server/Power/EntitySystems/PowerNetSystem.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Collections.Generic;
 using Content.Server.NodeContainer.EntitySystems;
 using Content.Server.Power.Components;
diff --git a/Content.Server/Power/NodeGroups/ApcNet.cs b/Content.Server/Power/NodeGroups/ApcNet.cs
index a2f77eedb0..142dbff1bd 100644
--- a/Content.Server/Power/NodeGroups/ApcNet.cs
+++ b/Content.Server/Power/NodeGroups/ApcNet.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Collections.Generic;
 using System.Linq;
 using Content.Server.NodeContainer.NodeGroups;
diff --git a/Content.Server/Power/NodeGroups/BaseNetConnectorNodeGroup.cs b/Content.Server/Power/NodeGroups/BaseNetConnectorNodeGroup.cs
index 17785078ef..8b69fd8712 100644
--- a/Content.Server/Power/NodeGroups/BaseNetConnectorNodeGroup.cs
+++ b/Content.Server/Power/NodeGroups/BaseNetConnectorNodeGroup.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Collections.Generic;
 using System.Linq;
 using Content.Server.NodeContainer.NodeGroups;
diff --git a/Content.Server/Power/NodeGroups/PowerNet.cs b/Content.Server/Power/NodeGroups/PowerNet.cs
index 38df0af231..01bae9f93f 100644
--- a/Content.Server/Power/NodeGroups/PowerNet.cs
+++ b/Content.Server/Power/NodeGroups/PowerNet.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Collections.Generic;
 using System.Linq;
 using Content.Server.NodeContainer.NodeGroups;
diff --git a/Content.Server/Power/SMES/PowerSmesSystem.cs b/Content.Server/Power/SMES/PowerSmesSystem.cs
index bf66d9daa0..e0dcc760a2 100644
--- a/Content.Server/Power/SMES/PowerSmesSystem.cs
+++ b/Content.Server/Power/SMES/PowerSmesSystem.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
diff --git a/Content.Server/Power/SMES/SmesComponent.cs b/Content.Server/Power/SMES/SmesComponent.cs
index 903d616011..fbb51b3d3d 100644
--- a/Content.Server/Power/SMES/SmesComponent.cs
+++ b/Content.Server/Power/SMES/SmesComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Content.Server.Power.Components;
 using Content.Shared.Power;
 using Content.Shared.Rounding;
diff --git a/Content.Server/PowerCell/Components/PowerCellChargerComponent.cs b/Content.Server/PowerCell/Components/PowerCellChargerComponent.cs
index 80cfa844ac..a8716e2540 100644
--- a/Content.Server/PowerCell/Components/PowerCellChargerComponent.cs
+++ b/Content.Server/PowerCell/Components/PowerCellChargerComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Power.Components;
 using Content.Shared.Interaction;
 using Robust.Shared.GameObjects;
diff --git a/Content.Server/PowerCell/Components/PowerCellComponent.cs b/Content.Server/PowerCell/Components/PowerCellComponent.cs
index 2ba23bf120..5b0378bea7 100644
--- a/Content.Server/PowerCell/Components/PowerCellComponent.cs
+++ b/Content.Server/PowerCell/Components/PowerCellComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Content.Server.Chemistry.Components;
 using Content.Server.Explosion;
diff --git a/Content.Server/PowerCell/Components/PowerCellSlotComponent.cs b/Content.Server/PowerCell/Components/PowerCellSlotComponent.cs
index 990ffd3695..bf8f694779 100644
--- a/Content.Server/PowerCell/Components/PowerCellSlotComponent.cs
+++ b/Content.Server/PowerCell/Components/PowerCellSlotComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Content.Server.Hands.Components;
 using Content.Server.Items;
diff --git a/Content.Server/Preferences/Managers/ServerPreferencesManager.cs b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
index bfe7fe87f7..a5709b9eb9 100644
--- a/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
+++ b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
@@ -15,7 +15,6 @@ using Robust.Shared.Maths;
 using Robust.Shared.Network;
 using Robust.Shared.Prototypes;
 
-#nullable enable
 
 namespace Content.Server.Preferences.Managers
 {
diff --git a/Content.Server/Projectiles/Components/ProjectileComponent.cs b/Content.Server/Projectiles/Components/ProjectileComponent.cs
index d5bef34248..ca176e9c39 100644
--- a/Content.Server/Projectiles/Components/ProjectileComponent.cs
+++ b/Content.Server/Projectiles/Components/ProjectileComponent.cs
@@ -1,14 +1,8 @@
 using System.Collections.Generic;
-using Content.Server.Camera;
 using Content.Shared.Damage;
-using Content.Shared.Damage.Components;
 using Content.Shared.Projectiles;
 using Content.Shared.Sound;
-using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Physics.Collision;
-using Robust.Shared.Physics.Dynamics;
-using Robust.Shared.Player;
 using Robust.Shared.Players;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
@@ -17,9 +11,8 @@ namespace Content.Server.Projectiles.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedProjectileComponent))]
-    public class ProjectileComponent : SharedProjectileComponent, IStartCollide
+    public class ProjectileComponent : SharedProjectileComponent
     {
-
         [DataField("damages")] private Dictionary<DamageType, int> _damages = new();
 
         [ViewVariables]
@@ -33,10 +26,11 @@ namespace Content.Server.Projectiles.Components
         public bool DeleteOnCollide { get; } = true;
 
         // Get that juicy FPS hit sound
-        [DataField("soundHit")]
+        [DataField("soundHit")] public string? SoundHit = default;
         private SoundSpecifier _soundHit = default!;
+        [DataField("soundHitSpecies")] public string? SoundHitSpecies = default;
 
-        private bool _damagedEntity;
+        public bool DamagedEntity;
 
         public float TimeLeft { get; set; } = 10;
 
@@ -50,47 +44,6 @@ namespace Content.Server.Projectiles.Components
             Dirty();
         }
 
-        /// <summary>
-        ///     Applies the damage when our projectile collides with its victim
-        /// </summary>
-        void IStartCollide.CollideWith(Fixture ourFixture, Fixture otherFixture, in Manifold manifold)
-        {
-            // This is so entities that shouldn't get a collision are ignored.
-            if (!otherFixture.Hard || _damagedEntity)
-            {
-                return;
-            }
-
-            var coordinates = otherFixture.Body.Owner.Transform.Coordinates;
-            var playerFilter = Filter.Pvs(coordinates);
-            if (otherFixture.Body.Owner.TryGetComponent(out IDamageableComponent? damage) && _soundHit.TryGetSound(out var soundHit))
-            {
-                SoundSystem.Play(playerFilter, soundHit, coordinates);
-            }
-
-            if (damage != null)
-            {
-                Owner.EntityManager.TryGetEntity(Shooter, out var shooter);
-
-                foreach (var (damageType, amount) in _damages)
-                {
-                    damage.ChangeDamage(damageType, amount, false, shooter);
-                }
-
-                _damagedEntity = true;
-            }
-
-            // Damaging it can delete it
-            if (!otherFixture.Body.Deleted && otherFixture.Body.Owner.TryGetComponent(out CameraRecoilComponent? recoilComponent))
-            {
-                var direction = ourFixture.Body.LinearVelocity.Normalized;
-                recoilComponent.Kick(direction);
-            }
-
-            if(DeleteOnCollide)
-                Owner.QueueDelete();
-        }
-
         public override ComponentState GetComponentState(ICommonSession player)
         {
             return new ProjectileComponentState(Shooter, IgnoreShooter);
diff --git a/Content.Server/Projectiles/ProjectileSystem.cs b/Content.Server/Projectiles/ProjectileSystem.cs
index 78e492cde5..cb05bcf8aa 100644
--- a/Content.Server/Projectiles/ProjectileSystem.cs
+++ b/Content.Server/Projectiles/ProjectileSystem.cs
@@ -1,17 +1,75 @@
+using Content.Server.Camera;
 using Content.Server.Projectiles.Components;
+using Content.Shared.Body.Components;
+using Content.Shared.Damage.Components;
 using JetBrains.Annotations;
+using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
+using Robust.Shared.Physics.Dynamics;
+using Robust.Shared.Player;
 
 namespace Content.Server.Projectiles
 {
     [UsedImplicitly]
     internal sealed class ProjectileSystem : EntitySystem
     {
+        public override void Initialize()
+        {
+            base.Initialize();
+            SubscribeLocalEvent<ProjectileComponent, StartCollideEvent>(HandleCollide);
+        }
+
+        private void HandleCollide(EntityUid uid, ProjectileComponent component, StartCollideEvent args)
+        {
+            // This is so entities that shouldn't get a collision are ignored.
+            if (!args.OtherFixture.Hard || component.DamagedEntity)
+            {
+                return;
+            }
+
+            var otherEntity = args.OtherFixture.Body.Owner;
+
+            var coordinates = args.OtherFixture.Body.Owner.Transform.Coordinates;
+            var playerFilter = Filter.Pvs(coordinates);
+
+            if (!otherEntity.Deleted &&
+                otherEntity.HasComponent<SharedBodyComponent>() && component.SoundHitSpecies != null)
+            {
+                SoundSystem.Play(playerFilter, component.SoundHitSpecies, coordinates);
+            }
+            else if (component.SoundHit != null)
+            {
+                SoundSystem.Play(playerFilter, component.SoundHit, coordinates);
+            }
+
+            if (!otherEntity.Deleted && otherEntity.TryGetComponent(out IDamageableComponent? damage))
+            {
+                EntityManager.TryGetEntity(component.Shooter, out var shooter);
+
+                foreach (var (damageType, amount) in component.Damages)
+                {
+                    damage.ChangeDamage(damageType, amount, false, shooter);
+                }
+
+                component.DamagedEntity = true;
+            }
+
+            // Damaging it can delete it
+            if (!otherEntity.Deleted && otherEntity.TryGetComponent(out CameraRecoilComponent? recoilComponent))
+            {
+                var direction = args.OurFixture.Body.LinearVelocity.Normalized;
+                recoilComponent.Kick(direction);
+            }
+
+            if (component.DeleteOnCollide)
+                EntityManager.QueueDeleteEntity(uid);
+        }
+
         public override void Update(float frameTime)
         {
             base.Update(frameTime);
 
-            foreach (var component in ComponentManager.EntityQuery<ProjectileComponent>(true))
+            foreach (var component in ComponentManager.EntityQuery<ProjectileComponent>())
             {
                 component.TimeLeft -= frameTime;
 
diff --git a/Content.Server/Pulling/PullableComponent.cs b/Content.Server/Pulling/PullableComponent.cs
index 56074a7072..d6bfcd7bb6 100644
--- a/Content.Server/Pulling/PullableComponent.cs
+++ b/Content.Server/Pulling/PullableComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Shared.Hands.Components;
 using Content.Shared.Interaction;
 using Content.Shared.Pulling.Components;
diff --git a/Content.Server/Radio/Components/HandheldRadioComponent.cs b/Content.Server/Radio/Components/HandheldRadioComponent.cs
index d3ae7c3167..eabd047e9b 100644
--- a/Content.Server/Radio/Components/HandheldRadioComponent.cs
+++ b/Content.Server/Radio/Components/HandheldRadioComponent.cs
@@ -3,6 +3,7 @@ using Content.Server.Chat.Managers;
 using Content.Server.Radio.EntitySystems;
 using Content.Shared.Examine;
 using Content.Shared.Interaction;
+using Content.Shared.Interaction.Helpers;
 using Content.Shared.Notification;
 using Content.Shared.Notification.Managers;
 using Robust.Shared.GameObjects;
@@ -80,8 +81,7 @@ namespace Content.Server.Radio.Components
         public bool CanListen(string message, IEntity source)
         {
             return RadioOn &&
-                   Owner.Transform.Coordinates.TryDistance(Owner.EntityManager, source.Transform.Coordinates, out var distance) &&
-                   distance <= ListenRange;
+                   Owner.InRangeUnobstructed(source.Transform.Coordinates, range: ListenRange);
         }
 
         public void Receive(string message, int channel, IEntity speaker)
diff --git a/Content.Server/Recycling/Components/RecyclableComponent.cs b/Content.Server/Recycling/Components/RecyclableComponent.cs
index 8d86f40706..5e5f3c661b 100644
--- a/Content.Server/Recycling/Components/RecyclableComponent.cs
+++ b/Content.Server/Recycling/Components/RecyclableComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
diff --git a/Content.Server/Recycling/Components/RecyclerComponent.cs b/Content.Server/Recycling/Components/RecyclerComponent.cs
index bf0b04b219..1b321641e6 100644
--- a/Content.Server/Recycling/Components/RecyclerComponent.cs
+++ b/Content.Server/Recycling/Components/RecyclerComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Collections.Generic;
 using Content.Server.Act;
 using Content.Server.Chat.Managers;
@@ -28,7 +27,7 @@ namespace Content.Server.Recycling.Components
 {
     // TODO: Add sound and safe beep
     [RegisterComponent]
-    public class RecyclerComponent : Component, IStartCollide, ISuicideAct
+    public class RecyclerComponent : Component, ISuicideAct
     {
         public override string Name => "Recycler";
 
@@ -38,26 +37,18 @@ namespace Content.Server.Recycling.Components
         ///     Whether or not sentient beings will be recycled
         /// </summary>
         [ViewVariables(VVAccess.ReadWrite)] [DataField("safe")]
-        private bool _safe = true;
+        internal bool Safe = true;
 
         /// <summary>
         ///     The percentage of material that will be recovered
         /// </summary>
         [ViewVariables(VVAccess.ReadWrite)] [DataField("efficiency")]
-        private float _efficiency = 0.25f;
+        internal float Efficiency = 0.25f;
 
-        private bool Powered =>
+        internal bool Powered =>
             !Owner.TryGetComponent(out ApcPowerReceiverComponent? receiver) ||
             receiver.Powered;
 
-        private void Bloodstain()
-        {
-            if (Owner.TryGetComponent(out AppearanceComponent? appearance))
-            {
-                appearance.SetData(RecyclerVisuals.Bloody, true);
-            }
-        }
-
         private void Clean()
         {
             if (Owner.TryGetComponent(out AppearanceComponent? appearance))
@@ -66,35 +57,6 @@ namespace Content.Server.Recycling.Components
             }
         }
 
-        private bool CanGib(IEntity entity)
-        {
-            // We suppose this entity has a Recyclable component.
-            return entity.HasComponent<SharedBodyComponent>() && !_safe && Powered;
-        }
-
-        private void Recycle(IEntity entity)
-        {
-            if (!Intersecting.Contains(entity))
-            {
-                Intersecting.Add(entity);
-            }
-
-            // TODO: Prevent collision with recycled items
-
-            // Can only recycle things that are recyclable... And also check the safety of the thing to recycle.
-            if (!entity.TryGetComponent(out RecyclableComponent? recyclable) || !recyclable.Safe && _safe) return;
-
-            // Mobs are a special case!
-            if (CanGib(entity))
-            {
-                entity.GetComponent<SharedBodyComponent>().Gib(true);
-                Bloodstain();
-                return;
-            }
-
-            recyclable.Recycle(_efficiency);
-        }
-
         public bool CanRun()
         {
             if (Owner.TryGetComponent(out ApcPowerReceiverComponent? receiver) &&
@@ -142,11 +104,6 @@ namespace Content.Server.Recycling.Components
             return true;
         }
 
-        void IStartCollide.CollideWith(Fixture ourFixture, Fixture otherFixture, in Manifold manifold)
-        {
-            Recycle(otherFixture.Body.Owner);
-        }
-
         SuicideKind ISuicideAct.Suicide(IEntity victim, IChatManager chat)
         {
             var mind = victim.PlayerSession()?.ContentData()?.Mind;
@@ -164,7 +121,7 @@ namespace Content.Server.Recycling.Components
                 body.Gib(true);
             }
 
-            Bloodstain();
+            EntitySystem.Get<RecyclerSystem>().Bloodstain(this);
 
             return SuicideKind.Bloodloss;
         }
diff --git a/Content.Server/Recycling/RecyclerSystem.cs b/Content.Server/Recycling/RecyclerSystem.cs
new file mode 100644
index 0000000000..050f09a44c
--- /dev/null
+++ b/Content.Server/Recycling/RecyclerSystem.cs
@@ -0,0 +1,59 @@
+using Content.Server.Recycling.Components;
+using Content.Shared.Body.Components;
+using Content.Shared.Recycling;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Physics.Dynamics;
+
+namespace Content.Server.Recycling
+{
+    internal sealed class RecyclerSystem: EntitySystem
+    {
+        public override void Initialize()
+        {
+            base.Initialize();
+            SubscribeLocalEvent<RecyclerComponent, StartCollideEvent>(HandleCollide);
+        }
+
+        private void HandleCollide(EntityUid uid, RecyclerComponent component, StartCollideEvent args)
+        {
+            Recycle(component, args.OtherFixture.Body.Owner);
+        }
+
+        private void Recycle(RecyclerComponent component, IEntity entity)
+        {
+            if (!component.Intersecting.Contains(entity))
+            {
+                component.Intersecting.Add(entity);
+            }
+
+            // TODO: Prevent collision with recycled items
+
+            // Can only recycle things that are recyclable... And also check the safety of the thing to recycle.
+            if (!entity.TryGetComponent(out RecyclableComponent? recyclable) || !recyclable.Safe && component.Safe) return;
+
+            // Mobs are a special case!
+            if (CanGib(component, entity))
+            {
+                entity.GetComponent<SharedBodyComponent>().Gib(true);
+                Bloodstain(component);
+                return;
+            }
+
+            recyclable.Recycle(component.Efficiency);
+        }
+
+        private bool CanGib(RecyclerComponent component, IEntity entity)
+        {
+            // We suppose this entity has a Recyclable component.
+            return entity.HasComponent<SharedBodyComponent>() && !component.Safe && component.Powered;
+        }
+
+        public void Bloodstain(RecyclerComponent component)
+        {
+            if (component.Owner.TryGetComponent(out SharedAppearanceComponent? appearance))
+            {
+                appearance.SetData(RecyclerVisuals.Bloody, true);
+            }
+        }
+    }
+}
diff --git a/Content.Server/Repairable/RepairableComponent.cs b/Content.Server/Repairable/RepairableComponent.cs
index cc0b28bd25..8c618957d0 100644
--- a/Content.Server/Repairable/RepairableComponent.cs
+++ b/Content.Server/Repairable/RepairableComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Threading.Tasks;
 using Content.Server.Tools.Components;
 using Content.Shared.Damage.Components;
diff --git a/Content.Server/Research/Components/ResearchClientComponent.cs b/Content.Server/Research/Components/ResearchClientComponent.cs
index 946e38c452..cad05ed8f2 100644
--- a/Content.Server/Research/Components/ResearchClientComponent.cs
+++ b/Content.Server/Research/Components/ResearchClientComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Server.UserInterface;
+using Content.Server.UserInterface;
 using Content.Shared.Interaction;
 using Content.Shared.Research.Components;
 using Robust.Server.GameObjects;
diff --git a/Content.Server/Research/Components/ResearchConsoleComponent.cs b/Content.Server/Research/Components/ResearchConsoleComponent.cs
index 5952c07dba..3a94d9a311 100644
--- a/Content.Server/Research/Components/ResearchConsoleComponent.cs
+++ b/Content.Server/Research/Components/ResearchConsoleComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Power.Components;
 using Content.Server.UserInterface;
 using Content.Shared.Audio;
diff --git a/Content.Server/Rotation/Components/FlippableComponent.cs b/Content.Server/Rotation/Components/FlippableComponent.cs
index 007a6652b7..201900244d 100644
--- a/Content.Server/Rotation/Components/FlippableComponent.cs
+++ b/Content.Server/Rotation/Components/FlippableComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Shared.ActionBlocker;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Notification.Managers;
diff --git a/Content.Server/Rotation/Components/RotatableComponent.cs b/Content.Server/Rotation/Components/RotatableComponent.cs
index a3d0541d89..cd490bd2fc 100644
--- a/Content.Server/Rotation/Components/RotatableComponent.cs
+++ b/Content.Server/Rotation/Components/RotatableComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Shared.ActionBlocker;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Notification.Managers;
diff --git a/Content.Server/Shuttle/ShuttleControllerComponent.cs b/Content.Server/Shuttle/ShuttleControllerComponent.cs
deleted file mode 100644
index cf51c63045..0000000000
--- a/Content.Server/Shuttle/ShuttleControllerComponent.cs
+++ /dev/null
@@ -1,198 +0,0 @@
-#nullable enable
-using Content.Server.Alert;
-using Content.Server.Buckle.Components;
-using Content.Server.Mind.Components;
-using Content.Shared.Alert;
-using Content.Shared.Buckle.Components;
-using Content.Shared.Movement.Components;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Log;
-using Robust.Shared.Maths;
-using Robust.Shared.Serialization.Manager.Attributes;
-using Robust.Shared.ViewVariables;
-
-namespace Content.Server.Shuttle
-{
-    [RegisterComponent]
-    [ComponentReference(typeof(IMoverComponent))]
-    internal class ShuttleControllerComponent : Component, IMoverComponent
-    {
-        private bool _movingUp;
-        private bool _movingDown;
-        private bool _movingLeft;
-        private bool _movingRight;
-
-        /// <summary>
-        ///     ID of the alert to show when piloting
-        /// </summary>
-        [DataField("pilotingAlertType")]
-        private AlertType _pilotingAlertType = AlertType.PilotingShuttle;
-
-        /// <summary>
-        ///     The entity that's currently controlling this component.
-        ///     Changed from <see cref="SetController"/> and <see cref="RemoveController"/>
-        /// </summary>
-        private IEntity? _controller;
-
-        public override string Name => "ShuttleController";
-
-        public bool IgnorePaused => false;
-
-        [ViewVariables(VVAccess.ReadWrite)]
-        public float CurrentWalkSpeed { get; } = 8;
-        public float CurrentSprintSpeed => 0;
-
-        public bool Sprinting => false;
-
-        public (Vector2 walking, Vector2 sprinting) VelocityDir { get; set; } = (Vector2.Zero, Vector2.Zero);
-
-        public void SetVelocityDirection(Direction direction, ushort subTick, bool enabled)
-        {
-            VelocityDir = (CalcNewVelocity(direction, enabled), Vector2.Zero);
-        }
-
-        public void SetSprinting(ushort subTick, bool walking)
-        {
-            // Shuttles can't sprint.
-        }
-
-        private Vector2 CalcNewVelocity(Direction direction, bool enabled)
-        {
-            switch (direction)
-            {
-                case Direction.East:
-                    _movingRight = enabled;
-                    break;
-                case Direction.North:
-                    _movingUp = enabled;
-                    break;
-                case Direction.West:
-                    _movingLeft = enabled;
-                    break;
-                case Direction.South:
-                    _movingDown = enabled;
-                    break;
-            }
-
-            // key directions are in screen coordinates
-            // _moveDir is in world coordinates
-            // if the camera is moved, this needs to be changed
-
-            var x = 0;
-            x -= _movingLeft ? 1 : 0;
-            x += _movingRight ? 1 : 0;
-
-            var y = 0;
-            y -= _movingDown ? 1 : 0;
-            y += _movingUp ? 1 : 0;
-
-            var result = new Vector2(x, y);
-
-            // can't normalize zero length vector
-            if (result.LengthSquared > 1.0e-6)
-            {
-                result = result.Normalized;
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        ///     Changes the entity currently controlling this shuttle controller
-        /// </summary>
-        /// <param name="entity">The entity to set</param>
-        private void SetController(IEntity entity)
-        {
-            if (_controller != null ||
-                !entity.TryGetComponent(out MindComponent? mind) ||
-                mind.Mind == null ||
-                !Owner.TryGetComponent(out ServerAlertsComponent? status))
-            {
-                return;
-            }
-
-            mind.Mind.Visit(Owner);
-            _controller = entity;
-
-            status.ShowAlert(_pilotingAlertType);
-        }
-
-        /// <summary>
-        ///     Removes the current controller
-        /// </summary>
-        /// <param name="entity">The entity to remove, or null to force the removal of any current controller</param>
-        public void RemoveController(IEntity? entity = null)
-        {
-            if (_controller == null)
-            {
-                return;
-            }
-
-            // If we are not forcing a controller removal and the entity is not the current controller
-            if (entity != null && entity != _controller)
-            {
-                return;
-            }
-
-            UpdateRemovedEntity(entity ?? _controller);
-
-            _controller = null;
-        }
-
-        /// <summary>
-        ///     Updates the state of an entity that is no longer controlling this shuttle controller.
-        ///     Called from <see cref="RemoveController"/>
-        /// </summary>
-        /// <param name="entity">The entity to update</param>
-        private void UpdateRemovedEntity(IEntity entity)
-        {
-            if (Owner.TryGetComponent(out ServerAlertsComponent? status))
-            {
-                status.ClearAlert(_pilotingAlertType);
-            }
-
-            if (entity.TryGetComponent(out MindComponent? mind))
-            {
-                mind.Mind?.UnVisit();
-            }
-
-            if (entity.TryGetComponent(out BuckleComponent? buckle))
-            {
-                buckle.TryUnbuckle(entity, true);
-            }
-        }
-
-        private void BuckleChanged(IEntity entity, in bool buckled)
-        {
-            Logger.DebugS("shuttle", $"Pilot={entity.Name}, buckled={buckled}");
-
-            if (buckled)
-            {
-                SetController(entity);
-            }
-            else
-            {
-                RemoveController(entity);
-            }
-        }
-
-        protected override void Initialize()
-        {
-            base.Initialize();
-            Owner.EnsureComponent<ServerAlertsComponent>();
-        }
-
-        /// <inheritdoc />
-        public override void HandleMessage(ComponentMessage message, IComponent? component)
-        {
-            base.HandleMessage(message, component);
-
-            switch (message)
-            {
-                case StrapChangeMessage strap:
-                    BuckleChanged(strap.Entity, strap.Buckled);
-                    break;
-            }
-        }
-    }
-}
diff --git a/Content.Server/Shuttles/ShuttleComponent.cs b/Content.Server/Shuttles/ShuttleComponent.cs
new file mode 100644
index 0000000000..5cbf09536d
--- /dev/null
+++ b/Content.Server/Shuttles/ShuttleComponent.cs
@@ -0,0 +1,11 @@
+using Content.Shared.Shuttles;
+using Robust.Shared.GameObjects;
+
+namespace Content.Server.Shuttles
+{
+    [RegisterComponent]
+    public class ShuttleComponent : SharedShuttleComponent
+    {
+
+    }
+}
diff --git a/Content.Server/Shuttles/ShuttleConsoleComponent.cs b/Content.Server/Shuttles/ShuttleConsoleComponent.cs
new file mode 100644
index 0000000000..4a7e1ffc4d
--- /dev/null
+++ b/Content.Server/Shuttles/ShuttleConsoleComponent.cs
@@ -0,0 +1,21 @@
+using System.Collections.Generic;
+using Content.Shared.Shuttles;
+using Robust.Shared.GameObjects;
+using Robust.Shared.ViewVariables;
+
+namespace Content.Server.Shuttles
+{
+    [RegisterComponent]
+    [ComponentReference(typeof(SharedShuttleConsoleComponent))]
+    internal sealed class ShuttleConsoleComponent : SharedShuttleConsoleComponent
+    {
+        [ViewVariables]
+        public List<PilotComponent> SubscribedPilots = new();
+
+        /// <summary>
+        /// Whether the console can be used to pilot. Toggled whenever it gets powered / unpowered.
+        /// </summary>
+        [ViewVariables]
+        public bool Enabled { get; set; } = false;
+    }
+}
diff --git a/Content.Server/Shuttles/ShuttleConsoleSystem.cs b/Content.Server/Shuttles/ShuttleConsoleSystem.cs
new file mode 100644
index 0000000000..d31eaf492a
--- /dev/null
+++ b/Content.Server/Shuttles/ShuttleConsoleSystem.cs
@@ -0,0 +1,169 @@
+using System.Linq;
+using Content.Server.Alert;
+using Content.Server.Power.Components;
+using Content.Shared.ActionBlocker;
+using Content.Shared.Alert;
+using Content.Shared.Interaction;
+using Content.Shared.Notification.Managers;
+using Content.Shared.Shuttles;
+using Content.Shared.Tag;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Localization;
+
+namespace Content.Server.Shuttles
+{
+    internal sealed class ShuttleConsoleSystem : SharedShuttleConsoleSystem
+    {
+        public override void Initialize()
+        {
+            base.Initialize();
+            SubscribeLocalEvent<ShuttleConsoleComponent, ComponentShutdown>(HandleConsoleShutdown);
+            SubscribeLocalEvent<PilotComponent, ComponentShutdown>(HandlePilotShutdown);
+            SubscribeLocalEvent<ShuttleConsoleComponent, ActivateInWorldEvent>(HandleConsoleInteract);
+            SubscribeLocalEvent<PilotComponent, MoveEvent>(HandlePilotMove);
+            SubscribeLocalEvent<ShuttleConsoleComponent, PowerChangedEvent>(HandlePowerChange);
+        }
+
+        public override void Update(float frameTime)
+        {
+            base.Update(frameTime);
+            foreach (var comp in ComponentManager.EntityQuery<PilotComponent>().ToArray())
+            {
+                if (comp.Console == null) continue;
+
+                if (!Get<ActionBlockerSystem>().CanInteract(comp.Owner))
+                {
+                    RemovePilot(comp);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Console requires power to operate.
+        /// </summary>
+        private void HandlePowerChange(EntityUid uid, ShuttleConsoleComponent component, PowerChangedEvent args)
+        {
+            if (!args.Powered)
+            {
+                component.Enabled = false;
+
+                ClearPilots(component);
+            }
+            else
+            {
+                component.Enabled = true;
+            }
+        }
+
+        /// <summary>
+        /// If pilot is moved then we'll stop them from piloting.
+        /// </summary>
+        private void HandlePilotMove(EntityUid uid, PilotComponent component, MoveEvent args)
+        {
+            if (component.Console == null) return;
+            RemovePilot(component);
+        }
+
+        /// <summary>
+        /// For now pilots just interact with the console and can start piloting with wasd.
+        /// </summary>
+        private void HandleConsoleInteract(EntityUid uid, ShuttleConsoleComponent component, ActivateInWorldEvent args)
+        {
+            if (!args.User.HasTag("CanPilot"))
+            {
+                return;
+            }
+
+            var pilotComponent = args.User.EnsureComponent<PilotComponent>();
+
+            if (!component.Enabled)
+            {
+                args.User.PopupMessage($"Console is not powered.");
+                return;
+            }
+
+            args.Handled = true;
+            var console = pilotComponent.Console;
+
+            if (console != null)
+            {
+                RemovePilot(pilotComponent);
+
+                if (console != component)
+                {
+                    return;
+                }
+            }
+
+            AddPilot(args.User, component);
+        }
+
+        private void HandlePilotShutdown(EntityUid uid, PilotComponent component, ComponentShutdown args)
+        {
+            RemovePilot(component);
+        }
+
+        private void HandleConsoleShutdown(EntityUid uid, ShuttleConsoleComponent component, ComponentShutdown args)
+        {
+            ClearPilots(component);
+        }
+
+        public void AddPilot(IEntity entity, ShuttleConsoleComponent component)
+        {
+            if (!Get<ActionBlockerSystem>().CanInteract(entity) ||
+                !entity.TryGetComponent(out PilotComponent? pilotComponent) ||
+                component.SubscribedPilots.Contains(pilotComponent))
+            {
+                return;
+            }
+
+            component.SubscribedPilots.Add(pilotComponent);
+
+            if (entity.TryGetComponent(out ServerAlertsComponent? alertsComponent))
+            {
+                alertsComponent.ShowAlert(AlertType.PilotingShuttle);
+            }
+
+            entity.PopupMessage(Loc.GetString("shuttle-pilot-start"));
+            pilotComponent.Console = component;
+            pilotComponent.Dirty();
+        }
+
+        public void RemovePilot(PilotComponent pilotComponent)
+        {
+            var console = pilotComponent.Console;
+
+            if (console is not ShuttleConsoleComponent helmsman) return;
+
+            pilotComponent.Console = null;
+
+            if (!helmsman.SubscribedPilots.Remove(pilotComponent)) return;
+
+            if (pilotComponent.Owner.TryGetComponent(out ServerAlertsComponent? alertsComponent))
+            {
+                alertsComponent.ClearAlert(AlertType.PilotingShuttle);
+            }
+
+            pilotComponent.Owner.PopupMessage(Loc.GetString("shuttle-pilot-end"));
+            // TODO: RemoveComponent<T> is cooked and doesn't sync to client so this fucks up movement prediction.
+            // ComponentManager.RemoveComponent<PilotComponent>(pilotComponent.Owner.Uid);
+            pilotComponent.Console = null;
+            pilotComponent.Dirty();
+        }
+
+        public void RemovePilot(IEntity entity)
+        {
+            if (!entity.TryGetComponent(out PilotComponent? pilotComponent)) return;
+
+            RemovePilot(pilotComponent);
+        }
+
+        public void ClearPilots(ShuttleConsoleComponent component)
+        {
+            foreach (var pilot in component.SubscribedPilots)
+            {
+                RemovePilot(pilot);
+            }
+        }
+    }
+}
diff --git a/Content.Server/Shuttles/ShuttleSystem.cs b/Content.Server/Shuttles/ShuttleSystem.cs
new file mode 100644
index 0000000000..8479d00148
--- /dev/null
+++ b/Content.Server/Shuttles/ShuttleSystem.cs
@@ -0,0 +1,147 @@
+using System;
+using Content.Shared.Shuttles;
+using JetBrains.Annotations;
+using Robust.Server.Physics;
+using Robust.Shared.Configuration;
+using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
+using Robust.Shared.Physics;
+
+namespace Content.Server.Shuttles
+{
+    [UsedImplicitly]
+    internal sealed class ShuttleSystem : EntitySystem
+    {
+        private const float TileMassMultiplier = 1f;
+
+        public override void Initialize()
+        {
+            base.Initialize();
+            SubscribeLocalEvent<ShuttleComponent, ComponentStartup>(HandleShuttleStartup);
+            SubscribeLocalEvent<ShuttleComponent, ComponentShutdown>(HandleShuttleShutdown);
+
+            SubscribeLocalEvent<GridInitializeEvent>(HandleGridInit);
+            SubscribeLocalEvent<GridFixtureChangeEvent>(HandleGridFixtureChange);
+        }
+
+        private void HandleGridFixtureChange(GridFixtureChangeEvent args)
+        {
+            var fixture = args.NewFixture;
+
+            if (fixture == null) return;
+
+            fixture.Mass = fixture.Area * TileMassMultiplier;
+
+            if (fixture.Body.Owner.TryGetComponent(out ShuttleComponent? shuttleComponent))
+            {
+                RecalculateSpeedMultiplier(shuttleComponent, fixture.Body);
+            }
+        }
+
+        private void HandleGridInit(GridInitializeEvent ev)
+        {
+            EntityManager.GetEntity(ev.EntityUid).EnsureComponent<ShuttleComponent>();
+        }
+
+        /// <summary>
+        /// Cache the thrust available to this shuttle.
+        /// </summary>
+        private void RecalculateSpeedMultiplier(SharedShuttleComponent shuttle, PhysicsComponent physics)
+        {
+            // TODO: Need per direction speed (Never Eat Soggy Weetbix).
+            // TODO: This will need hella tweaking.
+            var thrusters = physics.FixtureCount;
+
+            if (thrusters == 0)
+            {
+                shuttle.SpeedMultipler = 0f;
+            }
+
+            const float ThrustPerThruster = 0.25f;
+            const float MinimumThrustRequired = 0.005f;
+
+            // Just so someone can't slap a single thruster on a station and call it a day; need to hit a minimum amount.
+            var thrustRatio = Math.Max(0, thrusters * ThrustPerThruster / physics.Mass);
+
+            if (thrustRatio < MinimumThrustRequired)
+                shuttle.SpeedMultipler = 0f;
+
+            const float MaxThrust = 10f;
+            // This doesn't need to align with MinimumThrustRequired; if you set this higher it just means the first few additional
+            // thrusters won't do anything.
+            const float MinThrust = MinimumThrustRequired;
+
+            shuttle.SpeedMultipler = MathF.Max(MinThrust, MathF.Min(MaxThrust, thrustRatio));
+        }
+
+        private void HandleShuttleStartup(EntityUid uid, ShuttleComponent component, ComponentStartup args)
+        {
+            if (!component.Owner.HasComponent<IMapGridComponent>())
+            {
+                return;
+            }
+
+            if (!component.Owner.TryGetComponent(out PhysicsComponent? physicsComponent))
+            {
+                return;
+            }
+
+            if (component.Enabled)
+            {
+                Enable(physicsComponent);
+            }
+
+            if (component.Owner.TryGetComponent(out ShuttleComponent? shuttleComponent))
+            {
+                RecalculateSpeedMultiplier(shuttleComponent, physicsComponent);
+            }
+        }
+
+        public void Toggle(ShuttleComponent component)
+        {
+            if (!component.Owner.TryGetComponent(out PhysicsComponent? physicsComponent)) return;
+
+            component.Enabled = !component.Enabled;
+
+            if (component.Enabled)
+            {
+                Enable(physicsComponent);
+            }
+            else
+            {
+                Disable(physicsComponent);
+            }
+        }
+
+        private void Enable(PhysicsComponent component)
+        {
+            component.BodyType = BodyType.Dynamic;
+            component.BodyStatus = BodyStatus.InAir;
+            //component.FixedRotation = false; TODO WHEN ROTATING SHUTTLES FIXED.
+            component.FixedRotation = true;
+            component.LinearDamping = 0.05f;
+        }
+
+        private void Disable(PhysicsComponent component)
+        {
+            component.BodyType = BodyType.Static;
+            component.BodyStatus = BodyStatus.OnGround;
+            component.FixedRotation = true;
+        }
+
+        private void HandleShuttleShutdown(EntityUid uid, ShuttleComponent component, ComponentShutdown args)
+        {
+            if (!component.Owner.TryGetComponent(out PhysicsComponent? physicsComponent))
+            {
+                return;
+            }
+
+            Disable(physicsComponent);
+
+            foreach (var fixture in physicsComponent.Fixtures)
+            {
+                fixture.Mass = 0f;
+            }
+        }
+    }
+}
diff --git a/Content.Server/Singularity/Components/ContainmentFieldComponent.cs b/Content.Server/Singularity/Components/ContainmentFieldComponent.cs
index 0d15e6537f..f40cce21c0 100644
--- a/Content.Server/Singularity/Components/ContainmentFieldComponent.cs
+++ b/Content.Server/Singularity/Components/ContainmentFieldComponent.cs
@@ -1,25 +1,11 @@
-#nullable enable
 using Robust.Shared.GameObjects;
-using Robust.Shared.Physics.Collision;
-using Robust.Shared.Physics.Dynamics;
 
 namespace Content.Server.Singularity.Components
 {
     [RegisterComponent]
-    public class ContainmentFieldComponent : Component, IStartCollide
+    public class ContainmentFieldComponent : Component
     {
         public override string Name => "ContainmentField";
         public ContainmentFieldConnection? Parent;
-
-        void IStartCollide.CollideWith(Fixture ourFixture, Fixture otherFixture, in Manifold manifold)
-        {
-            if (Parent == null)
-            {
-                Owner.QueueDelete();
-                return;
-            }
-
-            Parent.TryRepell(Owner, otherFixture.Body.Owner);
-        }
     }
 }
diff --git a/Content.Server/Singularity/Components/ContainmentFieldGeneratorComponent.cs b/Content.Server/Singularity/Components/ContainmentFieldGeneratorComponent.cs
index 66b89dfdfa..eb5f57d0ee 100644
--- a/Content.Server/Singularity/Components/ContainmentFieldGeneratorComponent.cs
+++ b/Content.Server/Singularity/Components/ContainmentFieldGeneratorComponent.cs
@@ -1,23 +1,19 @@
-#nullable enable
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Shared.Physics;
-using Content.Shared.Tag;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Log;
 using Robust.Shared.Maths;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Broadphase;
-using Robust.Shared.Physics.Collision;
-using Robust.Shared.Physics.Dynamics;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Singularity.Components
 {
     [RegisterComponent]
-    public class ContainmentFieldGeneratorComponent : Component, IStartCollide
+    public class ContainmentFieldGeneratorComponent : Component
     {
         public override string Name => "ContainmentFieldGenerator";
 
@@ -101,7 +97,7 @@ namespace Content.Server.Singularity.Components
 
                 var dirVec = direction.ToVec();
                 var ray = new CollisionRay(Owner.Transform.WorldPosition, dirVec, (int) CollisionGroup.MobMask);
-                var rawRayCastResults = EntitySystem.Get<SharedBroadPhaseSystem>().IntersectRay(Owner.Transform.MapID, ray, 4.5f, Owner, false);
+                var rawRayCastResults = EntitySystem.Get<SharedBroadphaseSystem>().IntersectRay(Owner.Transform.MapID, ray, 4.5f, Owner, false);
 
                 var rayCastResults = rawRayCastResults as RayCastResults[] ?? rawRayCastResults.ToArray();
                 if(!rayCastResults.Any()) continue;
@@ -166,13 +162,6 @@ namespace Content.Server.Singularity.Components
             }
         }
 
-        void IStartCollide.CollideWith(Fixture ourFixture, Fixture otherFixture, in Manifold manifold)
-        {
-            if (otherFixture.Body.Owner.HasTag("EmitterBolt")) {
-                ReceivePower(6);
-            }
-        }
-
         public void UpdateConnectionLights()
         {
             if (_pointLightComponent != null)
diff --git a/Content.Server/Singularity/Components/EmitterComponent.cs b/Content.Server/Singularity/Components/EmitterComponent.cs
index a6867aa84c..5b2b27191f 100644
--- a/Content.Server/Singularity/Components/EmitterComponent.cs
+++ b/Content.Server/Singularity/Components/EmitterComponent.cs
@@ -1,261 +1,47 @@
-#nullable enable
 using System;
 using System.Threading;
-using System.Threading.Tasks;
 using Content.Server.Access.Components;
 using Content.Server.Power.Components;
-using Content.Server.Projectiles.Components;
-using Content.Shared.Audio;
-using Content.Shared.Interaction;
-using Content.Shared.Notification;
-using Content.Shared.Notification.Managers;
-using Content.Shared.Singularity.Components;
 using Content.Shared.Sound;
 using Robust.Server.GameObjects;
-using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-using Robust.Shared.Localization;
-using Robust.Shared.Log;
-using Robust.Shared.Physics;
-using Robust.Shared.Player;
-using Robust.Shared.Random;
 using Robust.Shared.Serialization.Manager.Attributes;
-using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
-using Timer = Robust.Shared.Timing.Timer;
 
-#nullable enable
 
 namespace Content.Server.Singularity.Components
 {
     [RegisterComponent]
-    [ComponentReference(typeof(IActivate))]
-    public class EmitterComponent : Component, IActivate, IInteractUsing
+    public class EmitterComponent : Component
     {
-        [Dependency] private readonly IRobustRandom _robustRandom = default!;
-
-        [ComponentDependency] private readonly AppearanceComponent? _appearance = default;
-        [ComponentDependency] private readonly AccessReader? _accessReader = default;
+        [ComponentDependency] public readonly AppearanceComponent? Appearance = default;
+        [ComponentDependency] public readonly AccessReader? AccessReader = default;
+        [ComponentDependency] public readonly PowerConsumerComponent? PowerConsumer = default;
 
         public override string Name => "Emitter";
 
-        private CancellationTokenSource? _timerCancel;
-
-        private PowerConsumerComponent _powerConsumer = default!;
+        public CancellationTokenSource? TimerCancel;
 
         // whether the power switch is in "on"
-        [ViewVariables] public bool IsOn { get; private set; }
+        [ViewVariables] public bool IsOn;
         // Whether the power switch is on AND the machine has enough power (so is actively firing)
-        [ViewVariables] private bool _isPowered;
-        [ViewVariables] private bool _isLocked;
+        [ViewVariables] public bool IsPowered;
+        [ViewVariables] public bool IsLocked;
 
         // For the "emitter fired" sound
-        private const float Variation = 0.25f;
-        private const float Volume = 0.5f;
-        private const float Distance = 3f;
+        public const float Variation = 0.25f;
+        public const float Volume = 0.5f;
+        public const float Distance = 3f;
 
-        [ViewVariables(VVAccess.ReadWrite)] private int _fireShotCounter;
+        [ViewVariables] public int FireShotCounter;
 
-        [ViewVariables(VVAccess.ReadWrite)] [DataField("fireSound")] private SoundSpecifier _fireSound = new SoundPathSpecifier("/Audio/Weapons/emitter.ogg");
-        [ViewVariables(VVAccess.ReadWrite)] [DataField("boltType")] private string _boltType = "EmitterBolt";
-        [ViewVariables(VVAccess.ReadWrite)] [DataField("powerUseActive")] private int _powerUseActive = 500;
-        [ViewVariables(VVAccess.ReadWrite)] [DataField("fireBurstSize")] private int _fireBurstSize = 3;
-        [ViewVariables(VVAccess.ReadWrite)] [DataField("fireInterval")] private TimeSpan _fireInterval = TimeSpan.FromSeconds(2);
-        [ViewVariables(VVAccess.ReadWrite)] [DataField("fireBurstDelayMin")] private TimeSpan _fireBurstDelayMin = TimeSpan.FromSeconds(2);
-        [ViewVariables(VVAccess.ReadWrite)] [DataField("fireBurstDelayMax")] private TimeSpan _fireBurstDelayMax = TimeSpan.FromSeconds(10);
+        [ViewVariables] [DataField("fireSound")] public string FireSound = "/Audio/Weapons/emitter.ogg";
+        [ViewVariables] [DataField("boltType")] public string BoltType = "EmitterBolt";
+        [ViewVariables] [DataField("powerUseActive")] public int PowerUseActive = 500;
+        [ViewVariables] [DataField("fireBurstSize")] public int FireBurstSize = 3;
+        [ViewVariables] [DataField("fireInterval")] public TimeSpan FireInterval = TimeSpan.FromSeconds(2);
+        [ViewVariables] [DataField("fireBurstDelayMin")] public TimeSpan FireBurstDelayMin = TimeSpan.FromSeconds(2);
+        [ViewVariables] [DataField("fireBurstDelayMax")] public TimeSpan FireBurstDelayMax = TimeSpan.FromSeconds(10);
 
-        void IActivate.Activate(ActivateEventArgs eventArgs)
-        {
-            if (_isLocked)
-            {
-                Owner.PopupMessage(eventArgs.User, Loc.GetString("comp-emitter-access-locked", ("target", Owner)));
-                return;
-            }
-
-            if (Owner.TryGetComponent(out PhysicsComponent? phys) && phys.BodyType == BodyType.Static)
-            {
-                if (!IsOn)
-                {
-                    SwitchOn();
-                    Owner.PopupMessage(eventArgs.User, Loc.GetString("comp-emitter-turned-on", ("target", Owner)));
-                }
-                else
-                {
-                    SwitchOff();
-                    Owner.PopupMessage(eventArgs.User, Loc.GetString("comp-emitter-turned-off", ("target", Owner)));
-                }
-            }
-            else
-            {
-                Owner.PopupMessage(eventArgs.User, Loc.GetString("comp-emitter-not-anchored", ("target", Owner)));
-            }
-        }
-
-        Task<bool> IInteractUsing.InteractUsing(InteractUsingEventArgs eventArgs)
-        {
-            if (_accessReader == null || !eventArgs.Using.TryGetComponent(out IAccess? access))
-            {
-                return Task.FromResult(false);
-            }
-
-            if (_accessReader.IsAllowed(access))
-            {
-                _isLocked ^= true;
-
-                if (_isLocked)
-                {
-                    Owner.PopupMessage(eventArgs.User, Loc.GetString("comp-emitter-lock", ("target", Owner)));
-                }
-                else
-                {
-                    Owner.PopupMessage(eventArgs.User, Loc.GetString("comp-emitter-unlock", ("target", Owner)));
-                }
-
-                UpdateAppearance();
-            }
-            else
-            {
-                Owner.PopupMessage(eventArgs.User, Loc.GetString("comp-emitter-access-denied"));
-            }
-
-            return Task.FromResult(true);
-        }
-
-        public void SwitchOff()
-        {
-            IsOn = false;
-            _powerConsumer.DrawRate = 0;
-            PowerOff();
-            UpdateAppearance();
-        }
-
-        public void SwitchOn()
-        {
-            IsOn = true;
-            _powerConsumer.DrawRate = _powerUseActive;
-            // Do not directly PowerOn().
-            // OnReceivedPowerChanged will get fired due to DrawRate change which will turn it on.
-            UpdateAppearance();
-        }
-
-        public void PowerOff()
-        {
-            if (!_isPowered)
-            {
-                return;
-            }
-
-            _isPowered = false;
-
-            // Must be set while emitter powered.
-            DebugTools.AssertNotNull(_timerCancel);
-            _timerCancel!.Cancel();
-
-            UpdateAppearance();
-        }
-
-        public void PowerOn()
-        {
-            if (_isPowered)
-            {
-                return;
-            }
-
-            _isPowered = true;
-
-            _fireShotCounter = 0;
-            _timerCancel = new CancellationTokenSource();
-
-            Timer.Spawn(_fireBurstDelayMax, ShotTimerCallback, _timerCancel.Token);
-
-            UpdateAppearance();
-        }
-
-        private void ShotTimerCallback()
-        {
-            // Any power-off condition should result in the timer for this method being cancelled
-            // and thus not firing
-            DebugTools.Assert(_isPowered);
-            DebugTools.Assert(IsOn);
-            DebugTools.Assert(_powerConsumer.DrawRate <= _powerConsumer.ReceivedPower);
-
-            Fire();
-
-            TimeSpan delay;
-            if (_fireShotCounter < _fireBurstSize)
-            {
-                _fireShotCounter += 1;
-                delay = _fireInterval;
-            }
-            else
-            {
-                _fireShotCounter = 0;
-                var diff = _fireBurstDelayMax - _fireBurstDelayMin;
-                // TIL you can do TimeSpan * double.
-                delay = _fireBurstDelayMin + _robustRandom.NextFloat() * diff;
-            }
-
-            // Must be set while emitter powered.
-            DebugTools.AssertNotNull(_timerCancel);
-            Timer.Spawn(delay, ShotTimerCallback, _timerCancel!.Token);
-        }
-
-        private void Fire()
-        {
-            var projectile = Owner.EntityManager.SpawnEntity(_boltType, Owner.Transform.Coordinates);
-
-            if (!projectile.TryGetComponent<PhysicsComponent>(out var physicsComponent))
-            {
-                Logger.Error("Emitter tried firing a bolt, but it was spawned without a PhysicsComponent");
-                return;
-            }
-
-            physicsComponent.BodyStatus = BodyStatus.InAir;
-
-            if (!projectile.TryGetComponent<ProjectileComponent>(out var projectileComponent))
-            {
-                Logger.Error("Emitter tried firing a bolt, but it was spawned without a ProjectileComponent");
-                return;
-            }
-
-            projectileComponent.IgnoreEntity(Owner);
-
-            physicsComponent
-                .LinearVelocity = Owner.Transform.WorldRotation.ToWorldVec() * 20f;
-            projectile.Transform.WorldRotation = Owner.Transform.WorldRotation;
-
-            // TODO: Move to projectile's code.
-            Timer.Spawn(3000, () => projectile.Delete());
-
-            if(_fireSound.TryGetSound(out var fireSound))
-                SoundSystem.Play(Filter.Pvs(Owner), fireSound, Owner,
-                    AudioHelpers.WithVariation(Variation).WithVolume(Volume).WithMaxDistance(Distance));
-        }
-
-        private void UpdateAppearance()
-        {
-            if (_appearance == null)
-            {
-                return;
-            }
-
-            EmitterVisualState state;
-            if (_isPowered)
-            {
-                state = EmitterVisualState.On;
-            }
-            else if (IsOn)
-            {
-                state = EmitterVisualState.Underpowered;
-            }
-            else
-            {
-                state = EmitterVisualState.Off;
-            }
-
-            _appearance.SetData(EmitterVisuals.VisualState, state);
-            _appearance.SetData(EmitterVisuals.Locked, _isLocked);
-        }
     }
 }
diff --git a/Content.Server/Singularity/Components/RadiationCollectorComponent.cs b/Content.Server/Singularity/Components/RadiationCollectorComponent.cs
index 84a05b155b..ccb0fd897b 100644
--- a/Content.Server/Singularity/Components/RadiationCollectorComponent.cs
+++ b/Content.Server/Singularity/Components/RadiationCollectorComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Content.Server.Power.Components;
 using Content.Shared.Interaction;
diff --git a/Content.Server/Singularity/Components/ServerSingularityComponent.cs b/Content.Server/Singularity/Components/ServerSingularityComponent.cs
index 3cc65e74e7..9874b82030 100644
--- a/Content.Server/Singularity/Components/ServerSingularityComponent.cs
+++ b/Content.Server/Singularity/Components/ServerSingularityComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Shared.Singularity;
 using Content.Shared.Singularity.Components;
 using Content.Shared.Sound;
@@ -17,7 +16,7 @@ namespace Content.Server.Singularity.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedSingularityComponent))]
-    public class ServerSingularityComponent : SharedSingularityComponent, IStartCollide
+    public class ServerSingularityComponent : SharedSingularityComponent
     {
         private SharedSingularitySystem _singularitySystem = default!;
 
@@ -102,46 +101,6 @@ namespace Content.Server.Singularity.Components
             Energy -= EnergyDrain * seconds;
         }
 
-        void IStartCollide.CollideWith(Fixture ourFixture, Fixture otherFixture, in Manifold manifold)
-        {
-            // If we're being deleted by another singularity, this call is probably for that singularity.
-            // Even if not, just don't bother.
-            if (BeingDeletedByAnotherSingularity)
-                return;
-
-            var otherEntity = otherFixture.Body.Owner;
-
-            if (otherEntity.TryGetComponent<IMapGridComponent>(out var mapGridComponent))
-            {
-                foreach (var tile in mapGridComponent.Grid.GetTilesIntersecting(ourFixture.Body.GetWorldAABB()))
-                {
-                    mapGridComponent.Grid.SetTile(tile.GridIndices, Robust.Shared.Map.Tile.Empty);
-                    Energy++;
-                }
-                return;
-            }
-
-            if (otherEntity.HasComponent<ContainmentFieldComponent>() ||
-                (otherEntity.TryGetComponent<ContainmentFieldGeneratorComponent>(out var component) && component.CanRepell(Owner)))
-            {
-                return;
-            }
-
-            if (otherEntity.IsInContainer())
-                return;
-
-            // Singularity priority management / etc.
-            if (otherEntity.TryGetComponent<ServerSingularityComponent>(out var otherSingulo))
-                otherSingulo.BeingDeletedByAnotherSingularity = true;
-
-            otherEntity.QueueDelete();
-
-            if (otherEntity.TryGetComponent<SinguloFoodComponent>(out var singuloFood))
-                Energy += singuloFood.Energy;
-            else
-                Energy++;
-        }
-
         protected override void OnRemove()
         {
             _playingSound?.Stop();
diff --git a/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs b/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs
index 89660d7548..d553d2e927 100644
--- a/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs
@@ -1,5 +1,9 @@
-using Content.Server.Singularity.Components;
+using Content.Server.ParticleAccelerator.Components;
+using Content.Server.Singularity.Components;
+using Content.Shared.Singularity.Components;
+using Content.Shared.Tag;
 using Robust.Shared.GameObjects;
+using Robust.Shared.Physics.Dynamics;
 
 namespace Content.Server.Singularity.EntitySystems
 {
@@ -10,6 +14,45 @@ namespace Content.Server.Singularity.EntitySystems
             base.Initialize();
 
             SubscribeLocalEvent<ContainmentFieldGeneratorComponent, PhysicsBodyTypeChangedEvent>(BodyTypeChanged);
+            SubscribeLocalEvent<ContainmentFieldComponent, StartCollideEvent>(HandleFieldCollide);
+            SubscribeLocalEvent<ContainmentFieldGeneratorComponent, StartCollideEvent>(HandleGeneratorCollide);
+            SubscribeLocalEvent<ParticleProjectileComponent, StartCollideEvent>(HandleParticleCollide);
+        }
+
+        private void HandleParticleCollide(EntityUid uid, ParticleProjectileComponent component, StartCollideEvent args)
+        {
+            if (args.OtherFixture.Body.Owner.TryGetComponent<SingularityGeneratorComponent>(out var singularityGeneratorComponent))
+            {
+                singularityGeneratorComponent.Power += component.State switch
+                {
+                    ParticleAcceleratorPowerState.Standby => 0,
+                    ParticleAcceleratorPowerState.Level0 => 1,
+                    ParticleAcceleratorPowerState.Level1 => 2,
+                    ParticleAcceleratorPowerState.Level2 => 4,
+                    ParticleAcceleratorPowerState.Level3 => 8,
+                    _ => 0
+                };
+
+                EntityManager.QueueDeleteEntity(uid);
+            }
+        }
+
+        private void HandleGeneratorCollide(EntityUid uid, ContainmentFieldGeneratorComponent component, StartCollideEvent args)
+        {
+            if (args.OtherFixture.Body.Owner.HasTag("EmitterBolt")) {
+                component.ReceivePower(6);
+            }
+        }
+
+        private void HandleFieldCollide(EntityUid uid, ContainmentFieldComponent component, StartCollideEvent args)
+        {
+            if (component.Parent == null)
+            {
+                EntityManager.QueueDeleteEntity(uid);
+                return;
+            }
+
+            component.Parent.TryRepell(component.Owner, args.OtherFixture.Body.Owner);
         }
 
         private static void BodyTypeChanged(
diff --git a/Content.Server/Singularity/EntitySystems/EmitterSystem.cs b/Content.Server/Singularity/EntitySystems/EmitterSystem.cs
index 5f3fc0c83d..fd5d157a11 100644
--- a/Content.Server/Singularity/EntitySystems/EmitterSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/EmitterSystem.cs
@@ -1,21 +1,102 @@
-using Content.Server.Power.EntitySystems;
+using System;
+using System.Threading;
+using Content.Server.Access.Components;
+using Content.Server.Power.EntitySystems;
+using Content.Server.Projectiles.Components;
 using Content.Server.Singularity.Components;
+using Content.Shared.Audio;
+using Content.Shared.Interaction;
+using Content.Shared.Notification.Managers;
+using Content.Shared.Singularity.Components;
 using JetBrains.Annotations;
+using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
+using Robust.Shared.Localization;
+using Robust.Shared.Log;
+using Robust.Shared.Physics;
+using Robust.Shared.Player;
+using Robust.Shared.Random;
+using Robust.Shared.Utility;
+using Timer = Robust.Shared.Timing.Timer;
 
 namespace Content.Server.Singularity.EntitySystems
 {
     [UsedImplicitly]
     public class EmitterSystem : EntitySystem
     {
+        [Dependency] private readonly IRobustRandom _random = default!;
+
         public override void Initialize()
         {
             base.Initialize();
 
             SubscribeLocalEvent<EmitterComponent, PowerConsumerReceivedChanged>(ReceivedChanged);
+            SubscribeLocalEvent<EmitterComponent, InteractHandEvent>(OnInteractHand);
+            SubscribeLocalEvent<EmitterComponent, InteractUsingEvent>(OnInteractUsing);
         }
 
-        private static void ReceivedChanged(
+        private void OnInteractUsing(EntityUid uid, EmitterComponent component, InteractUsingEvent args)
+        {
+            if(args.Handled) return;
+
+            if (component.AccessReader == null || !args.Used.TryGetComponent(out IAccess? access))
+            {
+                return;
+            }
+
+            if (component.AccessReader.IsAllowed(access))
+            {
+                component.IsLocked ^= true;
+
+                if (component.IsLocked)
+                {
+                    component.Owner.PopupMessage(args.User, Loc.GetString("comp-emitter-lock", ("target", component.Owner)));
+                }
+                else
+                {
+                    component.Owner.PopupMessage(args.User, Loc.GetString("comp-emitter-unlock", ("target", component.Owner)));
+                }
+
+                UpdateAppearance(component);
+            }
+            else
+            {
+                component.Owner.PopupMessage(args.User, Loc.GetString("comp-emitter-access-denied"));
+            }
+
+            args.Handled = true;
+        }
+
+        private void OnInteractHand(EntityUid uid, EmitterComponent component, InteractHandEvent args)
+        {
+            args.Handled = true;
+            if (component.IsLocked)
+            {
+                component.Owner.PopupMessage(args.User, Loc.GetString("comp-emitter-access-locked", ("target", component.Owner)));
+                return;
+            }
+
+            if (component.Owner.TryGetComponent(out PhysicsComponent? phys) && phys.BodyType == BodyType.Static)
+            {
+                if (!component.IsOn)
+                {
+                    SwitchOn(component);
+                    component.Owner.PopupMessage(args.User, Loc.GetString("comp-emitter-turned-on", ("target", component.Owner)));
+                }
+                else
+                {
+                    SwitchOff(component);
+                    component.Owner.PopupMessage(args.User, Loc.GetString("comp-emitter-turned-off", ("target", component.Owner)));
+                }
+            }
+            else
+            {
+                component.Owner.PopupMessage(args.User, Loc.GetString("comp-emitter-not-anchored", ("target", component.Owner)));
+            }
+        }
+
+        private void ReceivedChanged(
             EntityUid uid,
             EmitterComponent component,
             PowerConsumerReceivedChanged args)
@@ -27,12 +108,147 @@ namespace Content.Server.Singularity.EntitySystems
 
             if (args.ReceivedPower < args.DrawRate)
             {
-                component.PowerOff();
+                PowerOff(component);
             }
             else
             {
-                component.PowerOn();
+                PowerOn(component);
             }
         }
+
+        public void SwitchOff(EmitterComponent component)
+        {
+            component.IsOn = false;
+            if (component.PowerConsumer != null) component.PowerConsumer.DrawRate = 0;
+            PowerOff(component);
+            UpdateAppearance(component);
+        }
+
+        public void SwitchOn(EmitterComponent component)
+        {
+            component.IsOn = true;
+            if (component.PowerConsumer != null) component.PowerConsumer.DrawRate = component.PowerUseActive;
+            // Do not directly PowerOn().
+            // OnReceivedPowerChanged will get fired due to DrawRate change which will turn it on.
+            UpdateAppearance(component);
+        }
+
+        public void PowerOff(EmitterComponent component)
+        {
+            if (!component.IsPowered)
+            {
+                return;
+            }
+
+            component.IsPowered = false;
+
+            // Must be set while emitter powered.
+            DebugTools.AssertNotNull(component.TimerCancel);
+            component.TimerCancel?.Cancel();
+
+            UpdateAppearance(component);
+        }
+
+        public void PowerOn(EmitterComponent component)
+        {
+            if (component.IsPowered)
+            {
+                return;
+            }
+
+            component.IsPowered = true;
+
+            component.FireShotCounter = 0;
+            component.TimerCancel = new CancellationTokenSource();
+
+            Timer.Spawn(component.FireBurstDelayMax, () => ShotTimerCallback(component), component.TimerCancel.Token);
+
+            UpdateAppearance(component);
+        }
+
+        private void ShotTimerCallback(EmitterComponent component)
+        {
+            // Any power-off condition should result in the timer for this method being cancelled
+            // and thus not firing
+            DebugTools.Assert(component.IsPowered);
+            DebugTools.Assert(component.IsOn);
+            DebugTools.Assert(component.PowerConsumer != null && (component.PowerConsumer.DrawRate <= component.PowerConsumer.ReceivedPower));
+
+            Fire(component);
+
+            TimeSpan delay;
+            if (component.FireShotCounter < component.FireBurstSize)
+            {
+                component.FireShotCounter += 1;
+                delay = component.FireInterval;
+            }
+            else
+            {
+                component.FireShotCounter = 0;
+                var diff = component.FireBurstDelayMax - component.FireBurstDelayMin;
+                // TIL you can do TimeSpan * double.
+                delay = component.FireBurstDelayMin + _random.NextFloat() * diff;
+            }
+
+            // Must be set while emitter powered.
+            DebugTools.AssertNotNull(component.TimerCancel);
+            Timer.Spawn(delay, () => ShotTimerCallback(component), component.TimerCancel!.Token);
+        }
+
+        private void Fire(EmitterComponent component)
+        {
+            var projectile = component.Owner.EntityManager.SpawnEntity(component.BoltType, component.Owner.Transform.Coordinates);
+
+            if (!projectile.TryGetComponent<PhysicsComponent>(out var physicsComponent))
+            {
+                Logger.Error("Emitter tried firing a bolt, but it was spawned without a PhysicsComponent");
+                return;
+            }
+
+            physicsComponent.BodyStatus = BodyStatus.InAir;
+
+            if (!projectile.TryGetComponent<ProjectileComponent>(out var projectileComponent))
+            {
+                Logger.Error("Emitter tried firing a bolt, but it was spawned without a ProjectileComponent");
+                return;
+            }
+
+            projectileComponent.IgnoreEntity(component.Owner);
+
+            physicsComponent
+                .LinearVelocity = component.Owner.Transform.WorldRotation.ToWorldVec() * 20f;
+            projectile.Transform.WorldRotation = component.Owner.Transform.WorldRotation;
+
+            // TODO: Move to projectile's code.
+            Timer.Spawn(3000, () => projectile.Delete());
+
+            SoundSystem.Play(Filter.Pvs(component.Owner), component.FireSound, component.Owner,
+                AudioHelpers.WithVariation(EmitterComponent.Variation).WithVolume(EmitterComponent.Volume).WithMaxDistance(EmitterComponent.Distance));
+        }
+
+        private void UpdateAppearance(EmitterComponent component)
+        {
+            if (component.Appearance == null)
+            {
+                return;
+            }
+
+            EmitterVisualState state;
+            if (component.IsPowered)
+            {
+                state = EmitterVisualState.On;
+            }
+            else if (component.IsOn)
+            {
+                state = EmitterVisualState.Underpowered;
+            }
+            else
+            {
+                state = EmitterVisualState.Off;
+            }
+
+            component.Appearance.SetData(EmitterVisuals.VisualState, state);
+            component.Appearance.SetData(EmitterVisuals.Locked, component.IsLocked);
+        }
     }
 }
diff --git a/Content.Server/Singularity/EntitySystems/SingularitySystem.cs b/Content.Server/Singularity/EntitySystems/SingularitySystem.cs
index cc457295d3..eafc982c37 100644
--- a/Content.Server/Singularity/EntitySystems/SingularitySystem.cs
+++ b/Content.Server/Singularity/EntitySystems/SingularitySystem.cs
@@ -1,6 +1,9 @@
 using Content.Server.Singularity.Components;
 using Content.Shared.Singularity;
 using JetBrains.Annotations;
+using Robust.Shared.Containers;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Physics.Dynamics;
 
 namespace Content.Server.Singularity.EntitySystems
 {
@@ -10,6 +13,52 @@ namespace Content.Server.Singularity.EntitySystems
         private float _updateInterval = 1.0f;
         private float _accumulator;
 
+        public override void Initialize()
+        {
+            base.Initialize();
+            SubscribeLocalEvent<ServerSingularityComponent, StartCollideEvent>(HandleCollide);
+        }
+
+        private void HandleCollide(EntityUid uid, ServerSingularityComponent component, StartCollideEvent args)
+        {
+            // If we're being deleted by another singularity, this call is probably for that singularity.
+            // Even if not, just don't bother.
+            if (component.BeingDeletedByAnotherSingularity)
+                return;
+
+            var otherEntity = args.OtherFixture.Body.Owner;
+
+            if (otherEntity.TryGetComponent<IMapGridComponent>(out var mapGridComponent))
+            {
+                foreach (var tile in mapGridComponent.Grid.GetTilesIntersecting(args.OurFixture.Body.GetWorldAABB()))
+                {
+                    mapGridComponent.Grid.SetTile(tile.GridIndices, Robust.Shared.Map.Tile.Empty);
+                    component.Energy++;
+                }
+                return;
+            }
+
+            if (otherEntity.HasComponent<ContainmentFieldComponent>() ||
+                (otherEntity.TryGetComponent<ContainmentFieldGeneratorComponent>(out var containmentField) && containmentField.CanRepell(component.Owner)))
+            {
+                return;
+            }
+
+            if (otherEntity.IsInContainer())
+                return;
+
+            // Singularity priority management / etc.
+            if (otherEntity.TryGetComponent<ServerSingularityComponent>(out var otherSingulo))
+                otherSingulo.BeingDeletedByAnotherSingularity = true;
+
+            otherEntity.QueueDelete();
+
+            if (otherEntity.TryGetComponent<SinguloFoodComponent>(out var singuloFood))
+                component.Energy += singuloFood.Energy;
+            else
+                component.Energy++;
+        }
+
         public override void Update(float frameTime)
         {
             base.Update(frameTime);
diff --git a/Content.Server/Singularity/StartSingularityEngineCommand.cs b/Content.Server/Singularity/StartSingularityEngineCommand.cs
index 6a479f5fa1..48f9ca665e 100644
--- a/Content.Server/Singularity/StartSingularityEngineCommand.cs
+++ b/Content.Server/Singularity/StartSingularityEngineCommand.cs
@@ -1,7 +1,7 @@
-#nullable enable
 using Content.Server.Administration;
 using Content.Server.ParticleAccelerator.Components;
 using Content.Server.Singularity.Components;
+using Content.Server.Singularity.EntitySystems;
 using Content.Shared.Administration;
 using Content.Shared.Singularity.Components;
 using Robust.Shared.Console;
@@ -28,7 +28,7 @@ namespace Content.Server.Singularity
             var entityManager = IoCManager.Resolve<IEntityManager>();
             foreach (var comp in entityManager.ComponentManager.EntityQuery<EmitterComponent>())
             {
-                comp.SwitchOn();
+                EntitySystem.Get<EmitterSystem>().SwitchOn(comp);
             }
             foreach (var comp in entityManager.ComponentManager.EntityQuery<RadiationCollectorComponent>())
             {
diff --git a/Content.Server/Slippery/SlipperySystem.cs b/Content.Server/Slippery/SlipperySystem.cs
new file mode 100644
index 0000000000..278ffc6d10
--- /dev/null
+++ b/Content.Server/Slippery/SlipperySystem.cs
@@ -0,0 +1,18 @@
+using Content.Shared.Audio;
+using Content.Shared.Slippery;
+using Robust.Shared.Audio;
+using Robust.Shared.Player;
+
+namespace Content.Server.Slippery
+{
+    internal sealed class SlipperySystem : SharedSlipperySystem
+    {
+        protected override void PlaySound(SlipperyComponent component)
+        {
+            if (component.SlipSound.TryGetSound(out var slipSound))
+            {
+                SoundSystem.Play(Filter.Pvs(component.Owner), slipSound, component.Owner, AudioHelpers.WithVariation(0.2f));
+            }
+        }
+    }
+}
diff --git a/Content.Server/Solar/Components/SolarControlConsoleComponent.cs b/Content.Server/Solar/Components/SolarControlConsoleComponent.cs
index 134564ac1c..c55e6a3058 100644
--- a/Content.Server/Solar/Components/SolarControlConsoleComponent.cs
+++ b/Content.Server/Solar/Components/SolarControlConsoleComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Shared.Solar;
 using Content.Server.Solar.EntitySystems;
 using Content.Server.GameObjects.Components;
diff --git a/Content.Server/Solar/Components/SolarPanelComponent.cs b/Content.Server/Solar/Components/SolarPanelComponent.cs
index d4f918beb6..108e591db1 100644
--- a/Content.Server/Solar/Components/SolarPanelComponent.cs
+++ b/Content.Server/Solar/Components/SolarPanelComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Content.Server.Power.Components;
 using Content.Server.Solar.EntitySystems;
diff --git a/Content.Server/Solar/EntitySystems/PowerSolarControlConsoleSystem.cs b/Content.Server/Solar/EntitySystems/PowerSolarControlConsoleSystem.cs
index 410821b3e9..72bc7e5dfc 100644
--- a/Content.Server/Solar/EntitySystems/PowerSolarControlConsoleSystem.cs
+++ b/Content.Server/Solar/EntitySystems/PowerSolarControlConsoleSystem.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Solar.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
diff --git a/Content.Server/Solar/EntitySystems/PowerSolarSystem.cs b/Content.Server/Solar/EntitySystems/PowerSolarSystem.cs
index 32460e5cae..31a952594d 100644
--- a/Content.Server/Solar/EntitySystems/PowerSolarSystem.cs
+++ b/Content.Server/Solar/EntitySystems/PowerSolarSystem.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Linq;
 using Content.Server.Solar.Components;
@@ -138,7 +137,7 @@ namespace Content.Server.Solar.EntitySystems
                 // Determine if the solar panel is occluded, and zero out coverage if so.
                 // FIXME: The "Opaque" collision group doesn't seem to work right now.
                 var ray = new CollisionRay(entity.Transform.WorldPosition, TowardsSun.ToWorldVec(), (int) CollisionGroup.Opaque);
-                var rayCastResults = EntitySystem.Get<SharedBroadPhaseSystem>().IntersectRay(entity.Transform.MapID, ray, SunOcclusionCheckDistance, entity);
+                var rayCastResults = EntitySystem.Get<SharedBroadphaseSystem>().IntersectRay(entity.Transform.MapID, ray, SunOcclusionCheckDistance, entity);
                 if (rayCastResults.Any())
                     coverage = 0;
             }
diff --git a/Content.Server/Speech/AddAccent.cs b/Content.Server/Speech/AddAccent.cs
index 1afbe8e67a..4d448cc4f9 100644
--- a/Content.Server/Speech/AddAccent.cs
+++ b/Content.Server/Speech/AddAccent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Linq;
 using System.Text;
 using Content.Server.Administration;
diff --git a/Content.Server/Speech/Components/IAccentComponent.cs b/Content.Server/Speech/Components/IAccentComponent.cs
index 14b356c550..8db4d7b1da 100644
--- a/Content.Server/Speech/Components/IAccentComponent.cs
+++ b/Content.Server/Speech/Components/IAccentComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-namespace Content.Server.Speech.Components
+namespace Content.Server.Speech.Components
 {
     internal interface IAccentComponent
     {
diff --git a/Content.Server/Speech/Components/SpanishAccentComponent.cs b/Content.Server/Speech/Components/SpanishAccentComponent.cs
index dec155f7fd..73272bd3d0 100644
--- a/Content.Server/Speech/Components/SpanishAccentComponent.cs
+++ b/Content.Server/Speech/Components/SpanishAccentComponent.cs
@@ -19,7 +19,7 @@ namespace Content.Server.Speech.Components
         private string InsertS(string message)
         {
             // Replace every new Word that starts with s/S
-            var msg = message.Replace(" s", " es").Replace(" S", "Es");
+            var msg = message.Replace(" s", " es").Replace(" S", " Es");
 
             // Still need to check if the beginning of the message starts
             if (msg.StartsWith("s"))
diff --git a/Content.Server/StationEvents/Events/FalseAlarm.cs b/Content.Server/StationEvents/Events/FalseAlarm.cs
index 8cd30ed98d..423220c551 100644
--- a/Content.Server/StationEvents/Events/FalseAlarm.cs
+++ b/Content.Server/StationEvents/Events/FalseAlarm.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
 namespace Content.Server.StationEvents.Events
diff --git a/Content.Server/StationEvents/Events/GasLeak.cs b/Content.Server/StationEvents/Events/GasLeak.cs
index f72ee6d5b3..f41e9b398b 100644
--- a/Content.Server/StationEvents/Events/GasLeak.cs
+++ b/Content.Server/StationEvents/Events/GasLeak.cs
@@ -1,4 +1,5 @@
 using Content.Server.Atmos.Components;
+using Content.Server.Atmos.EntitySystems;
 using Content.Server.GameTicking;
 using Content.Shared.Atmos;
 using Content.Shared.Sound;
@@ -11,7 +12,6 @@ using Robust.Shared.Maths;
 using Robust.Shared.Player;
 using Robust.Shared.Random;
 
-#nullable enable
 namespace Content.Server.StationEvents.Events
 {
     internal sealed class GasLeak : StationEvent
@@ -115,19 +115,20 @@ namespace Content.Server.StationEvents.Events
             if (_timeUntilLeak > 0f) return;
             _timeUntilLeak += LeakCooldown;
 
+            var atmosphereSystem = EntitySystem.Get<AtmosphereSystem>();
+
             if (!_foundTile ||
                 _targetGrid == null ||
                 _targetGrid.Deleted ||
-                !_targetGrid.TryGetComponent(out GridAtmosphereComponent? gridAtmos))
+                !atmosphereSystem.IsSimulatedGrid(_targetGrid.Transform.GridID))
             {
                 Running = false;
                 return;
             }
 
-            var atmos = gridAtmos.GetTile(_targetTile);
+            var environment = atmosphereSystem.GetTileMixture(_targetGrid.Transform.GridID, _targetTile, true);
 
-            atmos?.Air?.AdjustMoles(_leakGas, LeakCooldown * _molesPerSecond);
-            atmos?.Invalidate();
+            environment?.AdjustMoles(_leakGas, LeakCooldown * _molesPerSecond);
         }
 
         public override void Shutdown()
@@ -146,21 +147,21 @@ namespace Content.Server.StationEvents.Events
 
         private void Spark()
         {
+            var atmosphereSystem = EntitySystem.Get<AtmosphereSystem>();
             var robustRandom = IoCManager.Resolve<IRobustRandom>();
             if (robustRandom.NextFloat() <= SparkChance)
             {
                 if (!_foundTile ||
                     _targetGrid == null ||
                     _targetGrid.Deleted ||
-                    !_targetGrid.TryGetComponent(out GridAtmosphereComponent? gridAtmos))
+                    !atmosphereSystem.IsSimulatedGrid(_targetGrid.Transform.GridID))
                 {
                     return;
                 }
 
-                var atmos = gridAtmos.GetTile(_targetTile);
                 // Don't want it to be so obnoxious as to instantly murder anyone in the area but enough that
                 // it COULD start potentially start a bigger fire.
-                atmos?.HotspotExpose(700f, 50f, true);
+                atmosphereSystem.HotspotExpose(_targetGrid.Transform.GridID, _targetTile, 700f, 50f, true);
                 SoundSystem.Play(Filter.Pvs(_targetCoords), "/Audio/Effects/sparks4.ogg", _targetCoords);
             }
         }
@@ -173,7 +174,7 @@ namespace Content.Server.StationEvents.Events
             if (!IoCManager.Resolve<IMapManager>().TryGetGrid(defaultGridId, out var grid) ||
                 !IoCManager.Resolve<IEntityManager>().TryGetEntity(grid.GridEntityId, out _targetGrid)) return false;
 
-            _targetGrid.EnsureComponent(out GridAtmosphereComponent gridAtmos);
+            var atmosphereSystem = EntitySystem.Get<AtmosphereSystem>();
             robustRandom ??= IoCManager.Resolve<IRobustRandom>();
             var found = false;
             var gridBounds = grid.WorldBounds;
@@ -185,7 +186,7 @@ namespace Content.Server.StationEvents.Events
                 var randomY = robustRandom.Next((int) gridBounds.Bottom, (int) gridBounds.Top);
 
                 tile = new Vector2i(randomX - (int) gridPos.X, randomY - (int) gridPos.Y);
-                if (gridAtmos.IsSpace(tile) || gridAtmos.IsAirBlocked(tile)) continue;
+                if (atmosphereSystem.IsTileSpace(defaultGridId, tile) || atmosphereSystem.IsTileAirBlocked(defaultGridId, tile)) continue;
                 found = true;
                 _targetCoords = grid.GridTileToLocal(tile);
                 break;
diff --git a/Content.Server/StationEvents/Events/PowerGridCheck.cs b/Content.Server/StationEvents/Events/PowerGridCheck.cs
index 6ff0b78e1a..999b7f9268 100644
--- a/Content.Server/StationEvents/Events/PowerGridCheck.cs
+++ b/Content.Server/StationEvents/Events/PowerGridCheck.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Collections.Generic;
 using System.Threading;
 using Content.Server.Power.Components;
diff --git a/Content.Server/StationEvents/Events/RadiationStorm.cs b/Content.Server/StationEvents/Events/RadiationStorm.cs
index a199a53038..7791c57695 100644
--- a/Content.Server/StationEvents/Events/RadiationStorm.cs
+++ b/Content.Server/StationEvents/Events/RadiationStorm.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.GameTicking;
 using Content.Server.Radiation;
 using Content.Shared.Coordinates;
diff --git a/Content.Server/StationEvents/Events/StationEvent.cs b/Content.Server/StationEvents/Events/StationEvent.cs
index a092816cd1..5e9e0c717b 100644
--- a/Content.Server/StationEvents/Events/StationEvent.cs
+++ b/Content.Server/StationEvents/Events/StationEvent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Chat.Managers;
 using Robust.Shared.Audio;
 using Robust.Shared.IoC;
diff --git a/Content.Server/StationEvents/StationEventCommand.cs b/Content.Server/StationEvents/StationEventCommand.cs
index 56ef7b8ce5..e126f50083 100644
--- a/Content.Server/StationEvents/StationEventCommand.cs
+++ b/Content.Server/StationEvents/StationEventCommand.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Administration;
 using Content.Shared.Administration;
 using Robust.Server.Player;
diff --git a/Content.Server/StationEvents/StationEventSystem.cs b/Content.Server/StationEvents/StationEventSystem.cs
index 9dc20f2aaf..736590a5c3 100644
--- a/Content.Server/StationEvents/StationEventSystem.cs
+++ b/Content.Server/StationEvents/StationEventSystem.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/Content.Server/Storage/Components/EntityStorageComponent.cs b/Content.Server/Storage/Components/EntityStorageComponent.cs
index ccdce8d8a8..3ee411fd40 100644
--- a/Content.Server/Storage/Components/EntityStorageComponent.cs
+++ b/Content.Server/Storage/Components/EntityStorageComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/Content.Server/Storage/Components/SecretStashComponent.cs b/Content.Server/Storage/Components/SecretStashComponent.cs
index b3975c531b..b202ab19db 100644
--- a/Content.Server/Storage/Components/SecretStashComponent.cs
+++ b/Content.Server/Storage/Components/SecretStashComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Hands.Components;
 using Content.Server.Items;
 using Content.Shared.Acts;
diff --git a/Content.Server/Storage/Components/ServerStorageComponent.cs b/Content.Server/Storage/Components/ServerStorageComponent.cs
index df6994069f..9721b5f9e0 100644
--- a/Content.Server/Storage/Components/ServerStorageComponent.cs
+++ b/Content.Server/Storage/Components/ServerStorageComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/Content.Server/Storage/Components/StorageCounterComponent.cs b/Content.Server/Storage/Components/StorageCounterComponent.cs
index 33f71d99c7..113b466751 100644
--- a/Content.Server/Storage/Components/StorageCounterComponent.cs
+++ b/Content.Server/Storage/Components/StorageCounterComponent.cs
@@ -1,5 +1,5 @@
-#nullable enable
 
+using System;
 using System.Collections.Generic;
 using Content.Shared.Stacks;
 using Content.Shared.Tag;
@@ -22,6 +22,7 @@ namespace Content.Server.Storage.Components
     ///    amount: 6 # Note: this field can be omitted
     ///    countTag: Cigarette # Note: field doesn't point to entity Id, but its tag
     /// </code>
+    [Obsolete("Should be deprecated in favor of SharedItemCounterSystem")]
     [RegisterComponent]
     public class StorageCounterComponent : Component, ISerializationHooks
     {
diff --git a/Content.Server/Storage/Components/StorageFillComponent.cs b/Content.Server/Storage/Components/StorageFillComponent.cs
index 339d8ac5d8..788a1727bb 100644
--- a/Content.Server/Storage/Components/StorageFillComponent.cs
+++ b/Content.Server/Storage/Components/StorageFillComponent.cs
@@ -1,6 +1,6 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
+using Content.Shared.Storage;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
@@ -17,8 +17,7 @@ namespace Content.Server.Storage.Components
     {
         public override string Name => "StorageFill";
 
-        [DataField("contents")]
-        private List<StorageFillEntry> _contents = new();
+        [DataField("contents")] private List<StorageFillEntry> _contents = new();
 
         public IReadOnlyList<StorageFillEntry> Contents => _contents;
 
@@ -41,7 +40,8 @@ namespace Content.Server.Storage.Components
             foreach (var storageItem in _contents)
             {
                 if (string.IsNullOrEmpty(storageItem.PrototypeId)) continue;
-                if (!string.IsNullOrEmpty(storageItem.GroupId) && alreadySpawnedGroups.Contains(storageItem.GroupId)) continue;
+                if (!string.IsNullOrEmpty(storageItem.GroupId) &&
+                    alreadySpawnedGroups.Contains(storageItem.GroupId)) continue;
 
                 if (storageItem.SpawnProbability != 1f &&
                     !random.Prob(storageItem.SpawnProbability))
@@ -51,8 +51,10 @@ namespace Content.Server.Storage.Components
 
                 for (var i = 0; i < storageItem.Amount; i++)
                 {
-                    storage.Insert(Owner.EntityManager.SpawnEntity(storageItem.PrototypeId, Owner.Transform.Coordinates));
+                    storage.Insert(
+                        Owner.EntityManager.SpawnEntity(storageItem.PrototypeId, Owner.Transform.Coordinates));
                 }
+
                 if (!string.IsNullOrEmpty(storageItem.GroupId)) alreadySpawnedGroups.Add(storageItem.GroupId);
             }
         }
@@ -64,13 +66,13 @@ namespace Content.Server.Storage.Components
             [DataField("id", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
             public string? PrototypeId;
 
-            [DataField("prob")]
-            public float SpawnProbability;
+            [DataField("prob")] public float SpawnProbability;
+
             /// <summary>
             /// The probability that an item will spawn. Takes decimal form so 0.05 is 5%, 0.50 is 50% etc.
             /// </summary>
-            [DataField("orGroup")]
-            public string GroupId;
+            [DataField("orGroup")] public string GroupId;
+
             /// <summary>
             /// orGroup signifies to pick between entities designated with an ID.
             ///
@@ -93,8 +95,7 @@ namespace Content.Server.Storage.Components
             /// </code>
             /// </example>
             /// </summary>
-            [DataField("amount")]
-            public int Amount;
+            [DataField("amount")] public int Amount;
 
             public void PopulateDefaultValues()
             {
diff --git a/Content.Server/Storage/ItemCounterSystem.cs b/Content.Server/Storage/ItemCounterSystem.cs
new file mode 100644
index 0000000000..9e79ab984f
--- /dev/null
+++ b/Content.Server/Storage/ItemCounterSystem.cs
@@ -0,0 +1,41 @@
+using System.Collections.Generic;
+using Content.Server.Storage.Components;
+using Content.Shared.Storage.ItemCounter;
+using JetBrains.Annotations;
+using Robust.Shared.Containers;
+using Robust.Shared.GameObjects;
+
+namespace Content.Server.Storage
+{
+    [UsedImplicitly]
+    public class ItemCounterSystem : SharedItemCounterSystem
+    {
+        protected override bool TryGetContainer(ContainerModifiedMessage msg,
+            ItemCounterComponent itemCounter,
+            out IReadOnlyList<string> showLayers)
+        {
+            if (msg.Container.Owner.TryGetComponent(out ServerStorageComponent? component))
+            {
+                var containedLayers = component.StoredEntities ?? new List<IEntity>();
+                var list = new List<string>();
+                foreach (var mapLayerData in itemCounter.MapLayers.Values)
+                {
+                    foreach (var entity in containedLayers)
+                    {
+                        if (mapLayerData.Whitelist.IsValid(entity))
+                        {
+                            list.Add(mapLayerData.Layer);
+                            break;
+                        }
+                    }
+                }
+
+                showLayers = list;
+                return true;
+            }
+
+            showLayers = new List<string>();
+            return false;
+        }
+    }
+}
diff --git a/Content.Server/Strip/StrippableComponent.cs b/Content.Server/Strip/StrippableComponent.cs
index 240d0cd0fd..cd52255b4b 100644
--- a/Content.Server/Strip/StrippableComponent.cs
+++ b/Content.Server/Strip/StrippableComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Collections.Generic;
 using System.Threading;
 using Content.Server.Cuffs.Components;
diff --git a/Content.Server/Stunnable/Components/StunOnCollideComponent.cs b/Content.Server/Stunnable/Components/StunOnCollideComponent.cs
new file mode 100644
index 0000000000..305604b134
--- /dev/null
+++ b/Content.Server/Stunnable/Components/StunOnCollideComponent.cs
@@ -0,0 +1,23 @@
+using Robust.Shared.GameObjects;
+using Robust.Shared.Serialization.Manager.Attributes;
+
+namespace Content.Server.Stunnable.Components
+{
+    /// <summary>
+    /// Adds stun when it collides with an entity
+    /// </summary>
+    [RegisterComponent]
+    internal sealed class StunOnCollideComponent : Component
+    {
+        // TODO: Can probably predict this.
+        public override string Name => "StunOnCollide";
+
+        // See stunnable for what these do
+        [DataField("stunAmount")]
+        internal int StunAmount = default;
+        [DataField("knockdownAmount")]
+        internal int KnockdownAmount = default;
+        [DataField("slowdownAmount")]
+        internal int SlowdownAmount = default;
+    }
+}
diff --git a/Content.Server/Stunnable/Components/StunbatonComponent.cs b/Content.Server/Stunnable/Components/StunbatonComponent.cs
index 46b5baa913..b0c874b731 100644
--- a/Content.Server/Stunnable/Components/StunbatonComponent.cs
+++ b/Content.Server/Stunnable/Components/StunbatonComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Shared.Sound;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
diff --git a/Content.Server/Stunnable/Components/StunnableComponent.cs b/Content.Server/Stunnable/Components/StunnableComponent.cs
index 9cd866f68a..b799f267bf 100644
--- a/Content.Server/Stunnable/Components/StunnableComponent.cs
+++ b/Content.Server/Stunnable/Components/StunnableComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Server.Act;
 using Content.Server.Notification;
 using Content.Shared.Audio;
diff --git a/Content.Server/Stunnable/Components/StunnableProjectileComponent.cs b/Content.Server/Stunnable/Components/StunnableProjectileComponent.cs
deleted file mode 100644
index 9ebd0f6aad..0000000000
--- a/Content.Server/Stunnable/Components/StunnableProjectileComponent.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using Content.Server.Projectiles.Components;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Physics.Collision;
-using Robust.Shared.Physics.Dynamics;
-using Robust.Shared.Serialization.Manager.Attributes;
-
-namespace Content.Server.Stunnable.Components
-{
-    /// <summary>
-    /// Adds stun when it collides with an entity
-    /// </summary>
-    [RegisterComponent]
-    public sealed class StunnableProjectileComponent : Component, IStartCollide
-    {
-        public override string Name => "StunnableProjectile";
-
-        // See stunnable for what these do
-        [DataField("stunAmount")]
-        private int _stunAmount = default;
-        [DataField("knockdownAmount")]
-        private int _knockdownAmount = default;
-        [DataField("slowdownAmount")]
-        private int _slowdownAmount = default;
-
-        protected override void Initialize()
-        {
-            base.Initialize();
-
-            Owner.EnsureComponentWarn(out ProjectileComponent _);
-        }
-
-        void IStartCollide.CollideWith(Fixture ourFixture, Fixture otherFixture, in Manifold manifold)
-        {
-            if (otherFixture.Body.Owner.TryGetComponent(out StunnableComponent? stunnableComponent))
-            {
-                stunnableComponent.Stun(_stunAmount);
-                stunnableComponent.Knockdown(_knockdownAmount);
-                stunnableComponent.Slowdown(_slowdownAmount);
-            }
-        }
-    }
-}
diff --git a/Content.Server/Stunnable/StunOnCollideSystem.cs b/Content.Server/Stunnable/StunOnCollideSystem.cs
new file mode 100644
index 0000000000..178b733596
--- /dev/null
+++ b/Content.Server/Stunnable/StunOnCollideSystem.cs
@@ -0,0 +1,27 @@
+using Content.Server.Stunnable.Components;
+using JetBrains.Annotations;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Physics.Dynamics;
+
+namespace Content.Server.Stunnable
+{
+    [UsedImplicitly]
+    internal sealed class StunOnCollideSystem : EntitySystem
+    {
+        public override void Initialize()
+        {
+            base.Initialize();
+            SubscribeLocalEvent<StunOnCollideComponent, StartCollideEvent>(HandleCollide);
+        }
+
+        private void HandleCollide(EntityUid uid, StunOnCollideComponent component, StartCollideEvent args)
+        {
+            if (args.OtherFixture.Body.Owner.TryGetComponent(out StunnableComponent? stunnableComponent))
+            {
+                stunnableComponent.Stun(component.StunAmount);
+                stunnableComponent.Knockdown(component.KnockdownAmount);
+                stunnableComponent.Slowdown(component.SlowdownAmount);
+            }
+        }
+    }
+}
diff --git a/Content.Server/Suspicion/EntitySystems/SuspicionEndTimerSystem.cs b/Content.Server/Suspicion/EntitySystems/SuspicionEndTimerSystem.cs
index 643d4a98cd..3e3c0213f3 100644
--- a/Content.Server/Suspicion/EntitySystems/SuspicionEndTimerSystem.cs
+++ b/Content.Server/Suspicion/EntitySystems/SuspicionEndTimerSystem.cs
@@ -8,7 +8,6 @@ using Robust.Shared.Enums;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
-#nullable enable
 
 namespace Content.Server.Suspicion.EntitySystems
 {
diff --git a/Content.Server/Suspicion/SuspicionRoleComponent.cs b/Content.Server/Suspicion/SuspicionRoleComponent.cs
index 2b36fef940..10ca4f61b5 100644
--- a/Content.Server/Suspicion/SuspicionRoleComponent.cs
+++ b/Content.Server/Suspicion/SuspicionRoleComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/Content.Server/Throwing/ThrowHelper.cs b/Content.Server/Throwing/ThrowHelper.cs
index 52145f357b..7230c6b534 100644
--- a/Content.Server/Throwing/ThrowHelper.cs
+++ b/Content.Server/Throwing/ThrowHelper.cs
@@ -1,29 +1,41 @@
-#nullable enable
+using System;
 using Content.Server.Interaction;
 using Content.Server.Items;
 using Content.Shared.MobState;
+using Content.Shared.Tag;
 using Content.Shared.Throwing;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Log;
 using Robust.Shared.Maths;
 using Robust.Shared.Physics;
+using Robust.Shared.Timing;
 
 namespace Content.Server.Throwing
 {
     internal static class ThrowHelper
     {
-        private const float ThrowAngularImpulse = 3.0f;
+        private const float ThrowAngularImpulse = 1.5f;
+
+        /// <summary>
+        /// The minimum amount of time an entity needs to be thrown before the timer can be run.
+        /// Anything below this threshold never enters the air.
+        /// </summary>
+        private const float FlyTime = 0.15f;
 
         /// <summary>
         ///     Tries to throw the entity if it has a physics component, otherwise does nothing.
         /// </summary>
-        /// <param name="entity"></param>
-        /// <param name="direction">Will use the vector's magnitude as the strength of the impulse</param>
+        /// <param name="entity">The entity being thrown.</param>
+        /// <param name="direction">A vector pointing from the entity to its destination.</param>
+        /// <param name="strength">How much the direction vector should be multiplied for velocity.</param>
         /// <param name="user"></param>
         /// <param name="pushbackRatio">The ratio of impulse applied to the thrower</param>
-        internal static void TryThrow(this IEntity entity, Vector2 direction, IEntity? user = null, float pushbackRatio = 1.0f)
+        internal static void TryThrow(this IEntity entity, Vector2 direction, float strength = 1.0f, IEntity? user = null, float pushbackRatio = 1.0f)
         {
-            if (entity.Deleted || direction == Vector2.Zero || !entity.TryGetComponent(out PhysicsComponent? physicsComponent))
+            if (entity.Deleted ||
+                direction == Vector2.Zero ||
+                strength <= 0f ||
+                !entity.TryGetComponent(out PhysicsComponent? physicsComponent))
             {
                 return;
             }
@@ -44,13 +56,38 @@ namespace Content.Server.Throwing
             {
                 entity.EnsureComponent<ThrownItemComponent>().Thrower = user;
                 // Give it a l'il spin.
-                physicsComponent.ApplyAngularImpulse(ThrowAngularImpulse);
+                if (!entity.HasTag("NoSpinOnThrow"))
+                {
+                    physicsComponent.ApplyAngularImpulse(ThrowAngularImpulse);
+                }
+                else
+                {
+                    entity.Transform.LocalRotation = direction.ToWorldAngle() - Math.PI;
+                }
 
                 if (user != null)
                     EntitySystem.Get<InteractionSystem>().ThrownInteraction(user, entity);
             }
 
-            physicsComponent.ApplyLinearImpulse(direction);
+            physicsComponent.ApplyLinearImpulse(direction.Normalized * strength * physicsComponent.Mass);
+            // Estimate time to arrival so we can apply OnGround status and slow it much faster.
+            var time = (direction / strength).Length;
+
+            if (time < FlyTime)
+            {
+                physicsComponent.BodyStatus = BodyStatus.OnGround;
+            }
+            else
+            {
+                physicsComponent.BodyStatus = BodyStatus.InAir;
+
+                Timer.Spawn(TimeSpan.FromSeconds(time - FlyTime), () =>
+                {
+                    if (physicsComponent.Deleted) return;
+                    physicsComponent.BodyStatus = BodyStatus.OnGround;
+                });
+            }
+
             // Give thrower an impulse in the other direction
             if (user != null && pushbackRatio > 0.0f && user.TryGetComponent(out IPhysBody? body))
             {
diff --git a/Content.Server/Toilet/ToiletComponent.cs b/Content.Server/Toilet/ToiletComponent.cs
index ad51e85d56..2d9e3a069c 100644
--- a/Content.Server/Toilet/ToiletComponent.cs
+++ b/Content.Server/Toilet/ToiletComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Threading.Tasks;
 using Content.Server.Act;
 using Content.Server.Buckle.Components;
diff --git a/Content.Server/Tools/Components/MultitoolComponent.cs b/Content.Server/Tools/Components/MultitoolComponent.cs
index 267438618d..1fedb20e80 100644
--- a/Content.Server/Tools/Components/MultitoolComponent.cs
+++ b/Content.Server/Tools/Components/MultitoolComponent.cs
@@ -1,11 +1,11 @@
 using System.Collections.Generic;
 using Content.Shared.Interaction;
-using Content.Shared.NetIDs;
 using Content.Shared.Sound;
 using Content.Shared.Tool;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Player;
 using Robust.Shared.Players;
 using Robust.Shared.Serialization.Manager.Attributes;
@@ -16,6 +16,7 @@ namespace Content.Server.Tools.Components
     ///     Not to be confused with Multitool (power)
     /// </summary>
     [RegisterComponent]
+    [NetworkedComponent()]
     public class MultiToolComponent : Component, IUse
     {
         [DataDefinition]
@@ -40,7 +41,6 @@ namespace Content.Server.Tools.Components
         }
 
         public override string Name => "MultiTool";
-        public override uint? NetID => ContentNetIDs.MULTITOOLS;
         [DataField("tools")] private List<ToolEntry> _tools = new();
         private int _currentTool = 0;
 
diff --git a/Content.Server/Tools/Components/WelderComponent.cs b/Content.Server/Tools/Components/WelderComponent.cs
index d7c29b6f82..ad8cc9cc0f 100644
--- a/Content.Server/Tools/Components/WelderComponent.cs
+++ b/Content.Server/Tools/Components/WelderComponent.cs
@@ -1,8 +1,8 @@
-#nullable enable
 using System;
 using System.Threading.Tasks;
 using Content.Server.Act;
 using Content.Server.Atmos;
+using Content.Server.Atmos.EntitySystems;
 using Content.Server.Chat.Managers;
 using Content.Server.Chemistry.Components;
 using Content.Server.Explosion;
@@ -14,7 +14,6 @@ using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Chemistry.Solution.Components;
 using Content.Shared.Examine;
 using Content.Shared.Interaction;
-using Content.Shared.NetIDs;
 using Content.Shared.Notification;
 using Content.Shared.Notification.Managers;
 using Content.Shared.Sound;
@@ -23,6 +22,7 @@ using Content.Shared.Tool;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Player;
@@ -37,12 +37,12 @@ namespace Content.Server.Tools.Components
     [ComponentReference(typeof(ToolComponent))]
     [ComponentReference(typeof(IToolComponent))]
     [ComponentReference(typeof(IHotItem))]
+    [NetworkedComponent()]
     public class WelderComponent : ToolComponent, IExamine, IUse, ISuicideAct, ISolutionChange, IHotItem, IAfterInteract
     {
         [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!;
 
         public override string Name => "Welder";
-        public override uint? NetID => ContentNetIDs.WELDER;
 
         /// <summary>
         /// Default Cost of using the welder fuel for an action
@@ -226,8 +226,7 @@ namespace Content.Server.Tools.Components
                 PlaySound(welderOnSOunds, -5);
             _welderSystem.Subscribe(this);
 
-            Owner.Transform.Coordinates
-                .GetTileAtmosphere()?.HotspotExpose(700f, 50f, true);
+            EntitySystem.Get<AtmosphereSystem>().HotspotExpose(Owner.Transform.Coordinates, 700, 50, true);
 
             return true;
         }
@@ -270,8 +269,7 @@ namespace Content.Server.Tools.Components
 
             _solutionComponent?.TryRemoveReagent("WeldingFuel", ReagentUnit.New(FuelLossRate * frameTime));
 
-            Owner.Transform.Coordinates
-                .GetTileAtmosphere()?.HotspotExpose(700f, 50f, true);
+            EntitySystem.Get<AtmosphereSystem>().HotspotExpose(Owner.Transform.Coordinates, 700, 50, true);
 
             if (Fuel == 0)
                 ToggleWelderStatus();
diff --git a/Content.Server/TraitorDeathMatch/Components/TraitorDeathMatchRedemptionComponent.cs b/Content.Server/TraitorDeathMatch/Components/TraitorDeathMatchRedemptionComponent.cs
index 1027d2c2bc..d6e95e117d 100644
--- a/Content.Server/TraitorDeathMatch/Components/TraitorDeathMatchRedemptionComponent.cs
+++ b/Content.Server/TraitorDeathMatch/Components/TraitorDeathMatchRedemptionComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Threading.Tasks;
 using Content.Server.Inventory.Components;
 using Content.Server.Mind.Components;
@@ -86,7 +85,7 @@ namespace Content.Server.TraitorDeathMatch.Components
             {
                 // This shouldn't even BE POSSIBLE in the actual mode this is meant for.
                 // Advanced Syndicate anti-tampering technology.
-                // Owner.PopupMessage(eventArgs.User, Loc.GetString("Tampering detected."));
+                // Owner.PopupMessage(eventArgs.User, Loc.GetString("traitor-death-match-redemption-component-interact-using-tampering-detected"));
                 // if (eventArgs.User.TryGetComponent<DamagableComponent>(out var userDamagable))
                 //     userDamagable.ChangeDamage(DamageType.Shock, 9001, true, null);
                 // ...So apparently, "it probably shouldn't kill people for a mistake".
diff --git a/Content.Server/TraitorDeathMatch/Components/TraitorDeathMatchReliableOwnerTagComponent.cs b/Content.Server/TraitorDeathMatch/Components/TraitorDeathMatchReliableOwnerTagComponent.cs
index 72f053ec2f..1ef663d0b9 100644
--- a/Content.Server/TraitorDeathMatch/Components/TraitorDeathMatchReliableOwnerTagComponent.cs
+++ b/Content.Server/TraitorDeathMatch/Components/TraitorDeathMatchReliableOwnerTagComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Robust.Shared.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Network;
 using Robust.Shared.ViewVariables;
 
diff --git a/Content.Server/UserInterface/UserInterfaceHelpers.cs b/Content.Server/UserInterface/UserInterfaceHelpers.cs
index c40d1ade3d..5072da1586 100644
--- a/Content.Server/UserInterface/UserInterfaceHelpers.cs
+++ b/Content.Server/UserInterface/UserInterfaceHelpers.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Robust.Server.GameObjects;
+using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 
 namespace Content.Server.UserInterface
diff --git a/Content.Server/VendingMachines/VendingMachineComponent.cs b/Content.Server/VendingMachines/VendingMachineComponent.cs
index 409a59dcb7..6914978eb7 100644
--- a/Content.Server/VendingMachines/VendingMachineComponent.cs
+++ b/Content.Server/VendingMachines/VendingMachineComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -88,7 +87,7 @@ namespace Content.Server.VendingMachines
             if (!string.IsNullOrEmpty(_spriteName))
             {
                 var spriteComponent = Owner.GetComponent<SpriteComponent>();
-                const string vendingMachineRSIPath = "Constructible/Power/VendingMachines/{0}.rsi";
+                const string vendingMachineRSIPath = "Structures/Machines/VendingMachines/{0}.rsi";
                 spriteComponent.BaseRSIPath = string.Format(vendingMachineRSIPath, _spriteName);
             }
 
diff --git a/Content.Server/Verbs/VerbSystem.cs b/Content.Server/Verbs/VerbSystem.cs
index 5483f0d82a..34f53def99 100644
--- a/Content.Server/Verbs/VerbSystem.cs
+++ b/Content.Server/Verbs/VerbSystem.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Reflection;
 using Content.Shared.GameTicking;
 using Content.Shared.Verbs;
diff --git a/Content.Server/Voting/IVoteHandle.cs b/Content.Server/Voting/IVoteHandle.cs
index b4d653f193..9242b9f6e0 100644
--- a/Content.Server/Voting/IVoteHandle.cs
+++ b/Content.Server/Voting/IVoteHandle.cs
@@ -1,21 +1,87 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using Content.Server.Voting.Managers;
 using Robust.Server.Player;
 
 namespace Content.Server.Voting
 {
+    /// <summary>
+    /// A handle to vote, active or past.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// Vote options are referred to by UI/networking as integer IDs.
+    /// These IDs are the index of the vote option in the <see cref="VoteOptions.Options"/> list
+    /// used to create the vote.
+    /// </para>
+    /// </remarks>
     public interface IVoteHandle
     {
+        /// <summary>
+        /// The numeric ID of the vote. Can be used in <see cref="IVoteManager.TryGetVote"/>.
+        /// </summary>
         int Id { get; }
+
+        /// <summary>
+        /// The title of the vote.
+        /// </summary>
         string Title { get; }
+
+        /// <summary>
+        /// Text representing who/what initiated the vote.
+        /// </summary>
         string InitiatorText { get; }
+
+        /// <summary>
+        /// Whether the vote has finished and is no longer active.
+        /// </summary>
         bool Finished { get; }
+
+        /// <summary>
+        /// Whether the vote was cancelled by an administrator and did not finish naturally.
+        /// </summary>
+        /// <remarks>
+        /// If this is true, <see cref="Finished"/> is also true.
+        /// </remarks>
         bool Cancelled { get; }
 
+        /// <summary>
+        /// Current count of votes per option type.
+        /// </summary>
         IReadOnlyDictionary<object, int> VotesPerOption { get; }
 
+        /// <summary>
+        /// Invoked when this vote has successfully finished.
+        /// </summary>
         event VoteFinishedEventHandler OnFinished;
+
+        /// <summary>
+        /// Invoked if this vote gets cancelled.
+        /// </summary>
+        event VoteCancelledEventHandler OnCancelled;
+
+        /// <summary>
+        /// Check whether a certain integer option ID is valid.
+        /// </summary>
+        /// <param name="optionId">The integer ID of the option.</param>
+        /// <returns>True if the option ID is valid, false otherwise.</returns>
         bool IsValidOption(int optionId);
+
+        /// <summary>
+        /// Cast a vote for a specific player.
+        /// </summary>
+        /// <param name="session">The player session to vote for.</param>
+        /// <param name="optionId">
+        /// The integer option ID to vote for. If null, "no vote" is selected (abstaining).
+        /// </param>
+        /// <exception cref="ArgumentOutOfRangeException">
+        /// <paramref name="optionId"/> is not a valid option ID.
+        /// </exception>
         void CastVote(IPlayerSession session, int? optionId);
+
+        /// <summary>
+        /// Cancel this vote.
+        /// </summary>
         void Cancel();
     }
 }
diff --git a/Content.Server/Voting/Managers/IVoteManager.cs b/Content.Server/Voting/Managers/IVoteManager.cs
index b83f35eded..3342dfb754 100644
--- a/Content.Server/Voting/Managers/IVoteManager.cs
+++ b/Content.Server/Voting/Managers/IVoteManager.cs
@@ -1,19 +1,64 @@
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
+using Content.Shared.Voting;
 using Robust.Server.Player;
 
-#nullable enable
-
 namespace Content.Server.Voting.Managers
 {
+    /// <summary>
+    /// Manages in-game votes that players can vote on.
+    /// </summary>
     public interface IVoteManager
     {
+        /// <summary>
+        /// All votes that are currently active and can be voted on by players.
+        /// </summary>
         IEnumerable<IVoteHandle> ActiveVotes { get; }
+
+        /// <summary>
+        /// Try to get a vote handle by integer ID.
+        /// </summary>
+        /// <remarks>
+        /// Only votes that are currently active can be retrieved.
+        /// </remarks>
+        /// <param name="voteId">The integer ID of the vote, corresponding to <see cref="IVoteHandle.Id"/>.</param>
+        /// <param name="vote">The vote handle, if found.</param>
+        /// <returns>True if the vote was found and it was returned, false otherwise.</returns>
         bool TryGetVote(int voteId, [NotNullWhen(true)] out IVoteHandle? vote);
 
-        bool CanCallVote(IPlayerSession initiator);
-        void CreateRestartVote(IPlayerSession? initiator);
-        void CreatePresetVote(IPlayerSession? initiator);
+        /// <summary>
+        /// Check if a player can initiate a vote right now. Optionally of a specified standard type.
+        /// </summary>
+        /// <remarks>
+        /// Players cannot start votes if they have made another vote recently,
+        /// or if the specified vote type has been made recently.
+        /// </remarks>
+        /// <param name="initiator">The player to check.</param>
+        /// <param name="voteType">
+        /// The standard vote type to check cooldown for.
+        /// Null to only check timeout for all vote types for the specified player.
+        /// </param>
+        /// <returns>
+        /// True if <paramref name="initiator"/> can start votes right now,
+        /// and if provided if they can start votes of type <paramref name="voteType"/>.
+        /// </returns>
+        bool CanCallVote(IPlayerSession initiator, StandardVoteType? voteType = null);
+
+        /// <summary>
+        /// Initiate a standard vote such as restart round, that can be initiated by players.
+        /// </summary>
+        /// <param name="initiator">
+        /// The player that called the vote.
+        /// If null it is assumed to be an automatic vote by the server.
+        /// </param>
+        /// <param name="voteType">The type of standard vote to make.</param>
+        void CreateStandardVote(IPlayerSession? initiator, StandardVoteType voteType);
+
+        /// <summary>
+        /// Create a non-standard vote with special parameters.
+        /// </summary>
+        /// <param name="options">The options specifying the vote's behavior.</param>
+        /// <returns>A handle to the created vote.</returns>
         IVoteHandle CreateVote(VoteOptions options);
 
         void Initialize();
diff --git a/Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs b/Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs
index 42ce63700e..7faf616f55 100644
--- a/Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs
+++ b/Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs
@@ -1,12 +1,10 @@
-#nullable enable
-using System;
+using System;
 using System.Collections.Generic;
 using Content.Server.GameTicking;
-using Content.Shared;
 using Content.Shared.CCVar;
+using Content.Shared.Voting;
 using Robust.Server.Player;
 using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Random;
 
@@ -14,7 +12,24 @@ namespace Content.Server.Voting.Managers
 {
     public sealed partial class VoteManager
     {
-        public void CreateRestartVote(IPlayerSession? initiator)
+        public void CreateStandardVote(IPlayerSession? initiator, StandardVoteType voteType)
+        {
+            switch (voteType)
+            {
+                case StandardVoteType.Restart:
+                    CreateRestartVote(initiator);
+                    break;
+                case StandardVoteType.Preset:
+                    CreatePresetVote(initiator);
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(voteType), voteType, null);
+            }
+
+            TimeoutStandardVote(voteType);
+        }
+
+        private void CreateRestartVote(IPlayerSession? initiator)
         {
             var alone = _playerManager.PlayerCount == 1 && initiator != null;
             var options = new VoteOptions
@@ -62,9 +77,18 @@ namespace Content.Server.Voting.Managers
                 // Cast yes vote if created the vote yourself.
                 vote.CastVote(initiator, 0);
             }
+
+            foreach (var player in _playerManager.GetAllPlayers())
+            {
+                if (player != initiator && !_afkManager.IsAfk(player))
+                {
+                    // Everybody else defaults to a no vote.
+                    vote.CastVote(player, 1);
+                }
+            }
         }
 
-        public void CreatePresetVote(IPlayerSession? initiator)
+        private void CreatePresetVote(IPlayerSession? initiator)
         {
             var presets = new Dictionary<string, string>
             {
@@ -100,7 +124,7 @@ namespace Content.Server.Voting.Managers
                 string picked;
                 if (args.Winner == null)
                 {
-                    picked = (string) IoCManager.Resolve<IRobustRandom>().Pick(args.Winners);
+                    picked = (string) _random.Pick(args.Winners);
                     _chatManager.DispatchServerAnnouncement(
                         Loc.GetString("ui-vote-gamemode-tie", ("picked", Loc.GetString(presets[picked]))));
                 }
@@ -114,5 +138,12 @@ namespace Content.Server.Voting.Managers
                 EntitySystem.Get<GameTicker>().SetStartPreset(picked);
             };
         }
+
+        private void TimeoutStandardVote(StandardVoteType type)
+        {
+            var timeout = TimeSpan.FromSeconds(_cfg.GetCVar(CCVars.VoteSameTypeTimeout));
+            _standardVoteTimeout[type] = _timing.RealTime + timeout;
+            DirtyCanCallVoteAll();
+        }
     }
 }
diff --git a/Content.Server/Voting/Managers/VoteManager.cs b/Content.Server/Voting/Managers/VoteManager.cs
index ec119400cf..0d1ff76f66 100644
--- a/Content.Server/Voting/Managers/VoteManager.cs
+++ b/Content.Server/Voting/Managers/VoteManager.cs
@@ -6,8 +6,8 @@ using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Server.Administration;
 using Content.Server.Administration.Managers;
+using Content.Server.Afk;
 using Content.Server.Chat.Managers;
-using Content.Server.GameTicking;
 using Content.Shared.Administration;
 using Content.Shared.Collections;
 using Content.Shared.Voting;
@@ -17,10 +17,10 @@ using Robust.Shared.Enums;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Network;
+using Robust.Shared.Random;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
-#nullable enable
 
 namespace Content.Server.Voting.Managers
 {
@@ -32,12 +32,15 @@ namespace Content.Server.Voting.Managers
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IChatManager _chatManager = default!;
         [Dependency] private readonly IAdminManager _adminMgr = default!;
+        [Dependency] private readonly IRobustRandom _random = default!;
+        [Dependency] private readonly IAfkManager _afkManager = default!;
 
         private int _nextVoteId = 1;
 
         private readonly Dictionary<int, VoteReg> _votes = new();
         private readonly Dictionary<int, VoteHandle> _voteHandles = new();
 
+        private readonly Dictionary<StandardVoteType, TimeSpan> _standardVoteTimeout = new();
         private readonly Dictionary<NetUserId, TimeSpan> _voteTimeout = new();
         private readonly HashSet<IPlayerSession> _playerCanCallVoteDirty = new();
 
@@ -145,6 +148,21 @@ namespace Content.Server.Voting.Managers
                     DirtyCanCallVote(session);
             }
 
+            // Handle standard vote timeouts.
+            var stdTimeoutRemQueue = new RemQueue<StandardVoteType>();
+            foreach (var (type, timeout) in _standardVoteTimeout)
+            {
+                if (timeout < _timing.RealTime)
+                    stdTimeoutRemQueue.Add(type);
+            }
+
+            foreach (var type in stdTimeoutRemQueue)
+            {
+                _standardVoteTimeout.Remove(type);
+
+                DirtyCanCallVoteAll();
+            }
+
             // Handle dirty canCallVotes.
             foreach (var dirtyPlayer in _playerCanCallVoteDirty)
             {
@@ -239,26 +257,47 @@ namespace Content.Server.Voting.Managers
         private void SendUpdateCanCallVote(IPlayerSession player)
         {
             var msg = _netManager.CreateNetMessage<MsgVoteCanCall>();
-            msg.CanCall = CanCallVote(player);
+            msg.CanCall = CanCallVote(player, null, out var isAdmin, out var timeSpan);
+            msg.WhenCanCallVote = timeSpan;
+
+            msg.VotesUnavailable = isAdmin
+                ? Array.Empty<(StandardVoteType, TimeSpan)>()
+                : _standardVoteTimeout.Select(kv => (kv.Key, kv.Value)).ToArray();
 
             _netManager.ServerSendMessage(msg, player.ConnectedClient);
         }
 
-        public bool CanCallVote(IPlayerSession player)
+        private bool CanCallVote(
+            IPlayerSession initiator,
+            StandardVoteType? voteType,
+            out bool isAdmin,
+            out TimeSpan timeSpan)
         {
+            isAdmin = false;
+            timeSpan = default;
+
             // Admins can always call votes.
-            if (_adminMgr.HasAdminFlag(player, AdminFlags.Admin))
+            if (_adminMgr.HasAdminFlag(initiator, AdminFlags.Admin))
             {
+                isAdmin = true;
                 return true;
             }
 
             // Cannot start vote if vote is already active (as non-admin).
             if (_votes.Count != 0)
-            {
                 return false;
-            }
 
-            return !_voteTimeout.ContainsKey(player.UserId);
+            // Standard vote on timeout, no calling.
+            // Ghosts I understand you're dead but stop spamming the restart vote bloody hell.
+            if (voteType != null && _standardVoteTimeout.ContainsKey(voteType.Value))
+                return false;
+
+            return !_voteTimeout.TryGetValue(initiator.UserId, out timeSpan);
+        }
+
+        public bool CanCallVote(IPlayerSession initiator, StandardVoteType? voteType = null)
+        {
+            return CanCallVote(initiator, voteType, out _, out _);
         }
 
         private void EndVote(VoteReg v)
@@ -483,7 +522,7 @@ namespace Content.Server.Voting.Managers
                 }
 
                 public IEnumerable<object> Keys => _reg.Entries.Select(c => c.Data);
-                public IEnumerable<int> Values  => _reg.Entries.Select(c => c.Votes);
+                public IEnumerable<int> Values => _reg.Entries.Select(c => c.Votes);
             }
         }
 
diff --git a/Content.Server/Voting/VoteCommands.cs b/Content.Server/Voting/VoteCommands.cs
index d05546c370..062e0e73dc 100644
--- a/Content.Server/Voting/VoteCommands.cs
+++ b/Content.Server/Voting/VoteCommands.cs
@@ -1,17 +1,15 @@
 using System;
 using System.Linq;
-using System.Text;
 using Content.Server.Administration;
 using Content.Server.Chat.Managers;
 using Content.Server.Voting.Managers;
 using Content.Shared.Administration;
+using Content.Shared.Voting;
 using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 
-#nullable enable
-
 namespace Content.Server.Voting
 {
     [AnyCommand]
@@ -29,28 +27,21 @@ namespace Content.Server.Voting
                 return;
             }
 
-            var type = args[0];
+            if (!Enum.TryParse<StandardVoteType>(args[0], ignoreCase: true, out var type))
+            {
+                shell.WriteError(Loc.GetString("create-vote-command-invalid-vote-type"));
+                return;
+            }
 
             var mgr = IoCManager.Resolve<IVoteManager>();
 
-            if (shell.Player != null && !mgr.CanCallVote((IPlayerSession) shell.Player))
+            if (shell.Player != null && !mgr.CanCallVote((IPlayerSession) shell.Player, type))
             {
                 shell.WriteError(Loc.GetString("create-vote-command-cannot-call-vote-now"));
                 return;
             }
 
-            switch (type)
-            {
-                case "restart":
-                    mgr.CreateRestartVote((IPlayerSession?) shell.Player);
-                    break;
-                case "preset":
-                    mgr.CreatePresetVote((IPlayerSession?) shell.Player);
-                    break;
-                default:
-                    shell.WriteError(Loc.GetString("create-vote-command-invalid-vote-type"));
-                    break;
-            }
+            mgr.CreateStandardVote((IPlayerSession?) shell.Player, type);
         }
     }
 
diff --git a/Content.Server/Voting/VoteFinishedEventArgs.cs b/Content.Server/Voting/VoteFinishedEventArgs.cs
index 24ca99f817..c704c9f080 100644
--- a/Content.Server/Voting/VoteFinishedEventArgs.cs
+++ b/Content.Server/Voting/VoteFinishedEventArgs.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Immutable;
 
-#nullable enable
 
 namespace Content.Server.Voting
 {
diff --git a/Content.Server/Voting/VoteFinishedEventHandler.cs b/Content.Server/Voting/VoteFinishedEventHandler.cs
index 6f3cca43f6..9debafd5c1 100644
--- a/Content.Server/Voting/VoteFinishedEventHandler.cs
+++ b/Content.Server/Voting/VoteFinishedEventHandler.cs
@@ -1,5 +1,4 @@
-#nullable enable
-
+
 namespace Content.Server.Voting
 {
     public delegate void VoteFinishedEventHandler(IVoteHandle sender, VoteFinishedEventArgs args);
diff --git a/Content.Server/Voting/VoteOptions.cs b/Content.Server/Voting/VoteOptions.cs
index c40d119194..5a5b38d090 100644
--- a/Content.Server/Voting/VoteOptions.cs
+++ b/Content.Server/Voting/VoteOptions.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using Robust.Server.Player;
 using Robust.Shared.Localization;
 
-#nullable enable
 
 namespace Content.Server.Voting
 {
diff --git a/Content.Server/Weapon/Melee/MeleeWeaponSystem.cs b/Content.Server/Weapon/Melee/MeleeWeaponSystem.cs
index 5d8541fe48..a4de423800 100644
--- a/Content.Server/Weapon/Melee/MeleeWeaponSystem.cs
+++ b/Content.Server/Weapon/Melee/MeleeWeaponSystem.cs
@@ -221,7 +221,7 @@ namespace Content.Server.Weapon.Melee
             for (var i = 0; i < increments; i++)
             {
                 var castAngle = new Angle(baseAngle + increment * i);
-                var res = EntitySystem.Get<SharedBroadPhaseSystem>().IntersectRay(mapId,
+                var res = EntitySystem.Get<SharedBroadphaseSystem>().IntersectRay(mapId,
                     new CollisionRay(position, castAngle.ToWorldVec(),
                         (int) (CollisionGroup.Impassable | CollisionGroup.MobImpassable)), range, ignore).ToList();
 
diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/BoltActionBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/BoltActionBarrelComponent.cs
index 1d3a93a5c0..34369505b7 100644
--- a/Content.Server/Weapon/Ranged/Barrels/Components/BoltActionBarrelComponent.cs
+++ b/Content.Server/Weapon/Ranged/Barrels/Components/BoltActionBarrelComponent.cs
@@ -5,7 +5,6 @@ using Content.Shared.ActionBlocker;
 using Content.Shared.Examine;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;
-using Content.Shared.NetIDs;
 using Content.Shared.Notification.Managers;
 using Content.Shared.Sound;
 using Content.Shared.Verbs;
@@ -14,6 +13,7 @@ using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Localization;
 using Robust.Shared.Map;
 using Robust.Shared.Player;
@@ -28,13 +28,13 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
     /// Shotguns mostly
     /// </summary>
     [RegisterComponent]
+    [NetworkedComponent()]
     public sealed class BoltActionBarrelComponent : ServerRangedBarrelComponent, IMapInit, IExamine
     {
         // Originally I had this logic shared with PumpBarrel and used a couple of variables to control things
         // but it felt a lot messier to play around with, especially when adding verbs
 
         public override string Name => "BoltActionBarrel";
-        public override uint? NetID => ContentNetIDs.BOLTACTION_BARREL;
 
         public override int ShotsLeft
         {
diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/PumpBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/PumpBarrelComponent.cs
index ab3424102c..348db086db 100644
--- a/Content.Server/Weapon/Ranged/Barrels/Components/PumpBarrelComponent.cs
+++ b/Content.Server/Weapon/Ranged/Barrels/Components/PumpBarrelComponent.cs
@@ -2,7 +2,6 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using Content.Server.Weapon.Ranged.Ammunition.Components;
 using Content.Shared.Interaction;
-using Content.Shared.NetIDs;
 using Content.Shared.Notification;
 using Content.Shared.Notification.Managers;
 using Content.Shared.Sound;
@@ -11,6 +10,7 @@ using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Localization;
 using Robust.Shared.Map;
 using Robust.Shared.Player;
@@ -26,10 +26,10 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
     /// Bolt-action rifles
     /// </summary>
     [RegisterComponent]
+    [NetworkedComponent()]
     public sealed class PumpBarrelComponent : ServerRangedBarrelComponent, IMapInit, ISerializationHooks
     {
         public override string Name => "PumpBarrel";
-        public override uint? NetID => ContentNetIDs.PUMP_BARREL;
 
         public override int ShotsLeft
         {
diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/RevolverBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/RevolverBarrelComponent.cs
index ee82935f3f..ed38699ee1 100644
--- a/Content.Server/Weapon/Ranged/Barrels/Components/RevolverBarrelComponent.cs
+++ b/Content.Server/Weapon/Ranged/Barrels/Components/RevolverBarrelComponent.cs
@@ -4,7 +4,6 @@ using Content.Server.Weapon.Ranged.Ammunition.Components;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;
-using Content.Shared.NetIDs;
 using Content.Shared.Notification.Managers;
 using Content.Shared.Sound;
 using Content.Shared.Verbs;
@@ -13,6 +12,7 @@ using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Map;
@@ -26,12 +26,12 @@ using Robust.Shared.ViewVariables;
 namespace Content.Server.Weapon.Ranged.Barrels.Components
 {
     [RegisterComponent]
+    [NetworkedComponent()]
     public sealed class RevolverBarrelComponent : ServerRangedBarrelComponent, ISerializationHooks
     {
         [Dependency] private readonly IRobustRandom _random = default!;
 
         public override string Name => "RevolverBarrel";
-        public override uint? NetID => ContentNetIDs.REVOLVER_BARREL;
 
         [ViewVariables]
         [DataField("caliber")]
diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/ServerBatteryBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/ServerBatteryBarrelComponent.cs
index 25a91c47eb..5104100622 100644
--- a/Content.Server/Weapon/Ranged/Barrels/Components/ServerBatteryBarrelComponent.cs
+++ b/Content.Server/Weapon/Ranged/Barrels/Components/ServerBatteryBarrelComponent.cs
@@ -9,7 +9,6 @@ using Content.Shared.ActionBlocker;
 using Content.Shared.Damage;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;
-using Content.Shared.NetIDs;
 using Content.Shared.Sound;
 using Content.Shared.Verbs;
 using Content.Shared.Weapons.Ranged.Barrels.Components;
@@ -17,6 +16,7 @@ using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Localization;
 using Robust.Shared.Map;
 using Robust.Shared.Player;
@@ -27,10 +27,10 @@ using Robust.Shared.ViewVariables;
 namespace Content.Server.Weapon.Ranged.Barrels.Components
 {
     [RegisterComponent]
+    [NetworkedComponent()]
     public sealed class ServerBatteryBarrelComponent : ServerRangedBarrelComponent
     {
         public override string Name => "BatteryBarrel";
-        public override uint? NetID => ContentNetIDs.BATTERY_BARREL;
 
         // The minimum change we need before we can fire
         [DataField("lowerChargeLimit")]
diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/ServerMagazineBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/ServerMagazineBarrelComponent.cs
index 75a3eb3b43..429c5d5b65 100644
--- a/Content.Server/Weapon/Ranged/Barrels/Components/ServerMagazineBarrelComponent.cs
+++ b/Content.Server/Weapon/Ranged/Barrels/Components/ServerMagazineBarrelComponent.cs
@@ -8,7 +8,6 @@ using Content.Shared.ActionBlocker;
 using Content.Shared.Examine;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;
-using Content.Shared.NetIDs;
 using Content.Shared.Notification.Managers;
 using Content.Shared.Sound;
 using Content.Shared.Verbs;
@@ -18,6 +17,7 @@ using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Localization;
 using Robust.Shared.Map;
 using Robust.Shared.Player;
@@ -29,10 +29,10 @@ using Robust.Shared.ViewVariables;
 namespace Content.Server.Weapon.Ranged.Barrels.Components
 {
     [RegisterComponent]
+    [NetworkedComponent()]
     public sealed class ServerMagazineBarrelComponent : ServerRangedBarrelComponent, IExamine
     {
         public override string Name => "MagazineBarrel";
-        public override uint? NetID => ContentNetIDs.MAGAZINE_BARREL;
 
         [ViewVariables]
         private ContainerSlot _chamberContainer = default!;
diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/ServerRangedBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/ServerRangedBarrelComponent.cs
index 4946167267..4ab245d7d9 100644
--- a/Content.Server/Weapon/Ranged/Barrels/Components/ServerRangedBarrelComponent.cs
+++ b/Content.Server/Weapon/Ranged/Barrels/Components/ServerRangedBarrelComponent.cs
@@ -361,7 +361,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
 
                 // FIXME: Work around issue where inserting and removing an entity from a container,
                 // then setting its linear velocity in the same tick resets velocity back to zero.
-                // See SharedBroadPhaseSystem.HandleContainerInsert()... It sets Awake to false, which causes this.
+                // See SharedBroadphaseSystem.HandleContainerInsert()... It sets Awake to false, which causes this.
                 projectile.SpawnTimer(TimeSpan.FromMilliseconds(25), () =>
                 {
                     projectile
@@ -397,7 +397,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
         private void FireHitscan(IEntity shooter, HitscanComponent hitscan, Angle angle)
         {
             var ray = new CollisionRay(Owner.Transform.Coordinates.ToMapPos(Owner.EntityManager), angle.ToVec(), (int) hitscan.CollisionMask);
-            var physicsManager = EntitySystem.Get<SharedBroadPhaseSystem>();
+            var physicsManager = EntitySystem.Get<SharedBroadphaseSystem>();
             var rayCastResults = physicsManager.IntersectRay(Owner.Transform.MapID, ray, hitscan.MaxLength, shooter, false).ToList();
 
             if (rayCastResults.Count >= 1)
diff --git a/Content.Server/Weapon/Ranged/ServerRangedWeaponComponent.cs b/Content.Server/Weapon/Ranged/ServerRangedWeaponComponent.cs
index a95ccc86f3..345a69e33e 100644
--- a/Content.Server/Weapon/Ranged/ServerRangedWeaponComponent.cs
+++ b/Content.Server/Weapon/Ranged/ServerRangedWeaponComponent.cs
@@ -1,5 +1,6 @@
 using System;
 using Content.Server.Atmos;
+using Content.Server.Atmos.EntitySystems;
 using Content.Server.CombatMode;
 using Content.Server.Hands.Components;
 using Content.Server.Interaction.Components;
@@ -191,9 +192,9 @@ namespace Content.Server.Weapon.Ranged
                 return;
             }
 
-            if (_canHotspot && user.Transform.Coordinates.TryGetTileAtmosphere(out var tile))
+            if (_canHotspot)
             {
-                tile.HotspotExpose(700, 50);
+                EntitySystem.Get<AtmosphereSystem>().HotspotExpose(user.Transform.Coordinates, 700, 50);
             }
             FireHandler?.Invoke(user, targetPos);
         }
diff --git a/Content.Server/Weapon/WeaponCapacitorChargerComponent.cs b/Content.Server/Weapon/WeaponCapacitorChargerComponent.cs
index 956bfcb5c4..a1e0236d24 100644
--- a/Content.Server/Weapon/WeaponCapacitorChargerComponent.cs
+++ b/Content.Server/Weapon/WeaponCapacitorChargerComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Server.Power.Components;
+using Content.Server.Power.Components;
 using Content.Server.PowerCell.Components;
 using Content.Server.Weapon.Ranged.Barrels.Components;
 using Content.Shared.Interaction;
diff --git a/Content.Server/Window/WindowComponent.cs b/Content.Server/Window/WindowComponent.cs
index 8e7d3cf2e3..b9d38a3f3a 100644
--- a/Content.Server/Window/WindowComponent.cs
+++ b/Content.Server/Window/WindowComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Content.Server.Destructible;
 using Content.Server.Destructible.Thresholds.Triggers;
diff --git a/Content.Server/WireHacking/WiresComponent.cs b/Content.Server/WireHacking/WiresComponent.cs
index 22051ab1e6..c6d16b8d58 100644
--- a/Content.Server/WireHacking/WiresComponent.cs
+++ b/Content.Server/WireHacking/WiresComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/Content.Shared/AI/SharedAiDebug.cs b/Content.Shared/AI/SharedAiDebug.cs
index 92d2d60b20..48c70c2960 100644
--- a/Content.Shared/AI/SharedAiDebug.cs
+++ b/Content.Shared/AI/SharedAiDebug.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using Robust.Shared.GameObjects;
diff --git a/Content.Shared/AME/SharedAMEControllerComponent.cs b/Content.Shared/AME/SharedAMEControllerComponent.cs
index 162cb32a52..84674dec1c 100644
--- a/Content.Shared/AME/SharedAMEControllerComponent.cs
+++ b/Content.Shared/AME/SharedAMEControllerComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/AME/SharedAMEShieldComponent.cs b/Content.Shared/AME/SharedAMEShieldComponent.cs
index a2087c5b2e..1b45ccc5cc 100644
--- a/Content.Shared/AME/SharedAMEShieldComponent.cs
+++ b/Content.Shared/AME/SharedAMEShieldComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/APC/SharedApc.cs b/Content.Shared/APC/SharedApc.cs
index 0e48b19768..4a7644f8fd 100644
--- a/Content.Shared/APC/SharedApc.cs
+++ b/Content.Shared/APC/SharedApc.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Access/AccessLevelPrototype.cs b/Content.Shared/Access/AccessLevelPrototype.cs
index a245f798d7..c23e0db8ef 100644
--- a/Content.Shared/Access/AccessLevelPrototype.cs
+++ b/Content.Shared/Access/AccessLevelPrototype.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Robust.Shared.Localization;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager.Attributes;
diff --git a/Content.Shared/Access/SharedIdCardConsoleComponent.cs b/Content.Shared/Access/SharedIdCardConsoleComponent.cs
index ab33cfa054..3983febb2b 100644
--- a/Content.Shared/Access/SharedIdCardConsoleComponent.cs
+++ b/Content.Shared/Access/SharedIdCardConsoleComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using Robust.Shared.GameObjects;
diff --git a/Content.Shared/ActionBlocker/ActionBlockerSystem.cs b/Content.Shared/ActionBlocker/ActionBlockerSystem.cs
index b0a7dd0580..a4f3080583 100644
--- a/Content.Shared/ActionBlocker/ActionBlockerSystem.cs
+++ b/Content.Shared/ActionBlocker/ActionBlockerSystem.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Shared.DragDrop;
+using Content.Shared.DragDrop;
 using Content.Shared.EffectBlocker;
 using Content.Shared.Emoting;
 using Content.Shared.Interaction.Events;
diff --git a/Content.Shared/ActionBlocker/IActionBlocker.cs b/Content.Shared/ActionBlocker/IActionBlocker.cs
index 5415fb43ac..2646a8ae4b 100644
--- a/Content.Shared/ActionBlocker/IActionBlocker.cs
+++ b/Content.Shared/ActionBlocker/IActionBlocker.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Content.Shared.EffectBlocker;
 
 namespace Content.Shared.ActionBlocker
diff --git a/Content.Shared/Actions/ActionManager.cs b/Content.Shared/Actions/ActionManager.cs
index a7575a4e41..524fa6cb47 100644
--- a/Content.Shared/Actions/ActionManager.cs
+++ b/Content.Shared/Actions/ActionManager.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Shared.Actions.Prototypes;
diff --git a/Content.Shared/Actions/ActionType.cs b/Content.Shared/Actions/ActionType.cs
index fdca3780ea..109a5c73f1 100644
--- a/Content.Shared/Actions/ActionType.cs
+++ b/Content.Shared/Actions/ActionType.cs
@@ -1,4 +1,3 @@
-#nullable enable
 namespace Content.Shared.Actions
 {
     /// <summary>
diff --git a/Content.Shared/Actions/Behaviors/IActionBehavior.cs b/Content.Shared/Actions/Behaviors/IActionBehavior.cs
index 0486ac0e4e..74dc3ca08f 100644
--- a/Content.Shared/Actions/Behaviors/IActionBehavior.cs
+++ b/Content.Shared/Actions/Behaviors/IActionBehavior.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Content.Shared.Actions.Components;
 using Robust.Shared.GameObjects;
 
diff --git a/Content.Shared/Actions/Behaviors/IInstantAction.cs b/Content.Shared/Actions/Behaviors/IInstantAction.cs
index 75922fa0ec..9d3c07bed7 100644
--- a/Content.Shared/Actions/Behaviors/IInstantAction.cs
+++ b/Content.Shared/Actions/Behaviors/IInstantAction.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Robust.Shared.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Shared.Actions.Behaviors
 {
diff --git a/Content.Shared/Actions/Behaviors/ITargetEntityAction.cs b/Content.Shared/Actions/Behaviors/ITargetEntityAction.cs
index f1bdf76f89..9e8e8b8579 100644
--- a/Content.Shared/Actions/Behaviors/ITargetEntityAction.cs
+++ b/Content.Shared/Actions/Behaviors/ITargetEntityAction.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Robust.Shared.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Shared.Actions.Behaviors
 {
diff --git a/Content.Shared/Actions/Behaviors/ITargetEntityItemAction.cs b/Content.Shared/Actions/Behaviors/ITargetEntityItemAction.cs
index 28841d6ae3..26d5c3eb62 100644
--- a/Content.Shared/Actions/Behaviors/ITargetEntityItemAction.cs
+++ b/Content.Shared/Actions/Behaviors/ITargetEntityItemAction.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Shared.Actions.Behaviors.Item;
+using Content.Shared.Actions.Behaviors.Item;
 using Robust.Shared.GameObjects;
 
 namespace Content.Shared.Actions.Behaviors
diff --git a/Content.Shared/Actions/Behaviors/ITargetPointAction.cs b/Content.Shared/Actions/Behaviors/ITargetPointAction.cs
index af0e24bfd4..6e03e7ef3e 100644
--- a/Content.Shared/Actions/Behaviors/ITargetPointAction.cs
+++ b/Content.Shared/Actions/Behaviors/ITargetPointAction.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Robust.Shared.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 
 namespace Content.Shared.Actions.Behaviors
diff --git a/Content.Shared/Actions/Behaviors/ITargetPointItemAction.cs b/Content.Shared/Actions/Behaviors/ITargetPointItemAction.cs
index a44a84a741..9619f092c4 100644
--- a/Content.Shared/Actions/Behaviors/ITargetPointItemAction.cs
+++ b/Content.Shared/Actions/Behaviors/ITargetPointItemAction.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Shared.Actions.Behaviors.Item;
+using Content.Shared.Actions.Behaviors.Item;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 
diff --git a/Content.Shared/Actions/Behaviors/IToggleAction.cs b/Content.Shared/Actions/Behaviors/IToggleAction.cs
index 3fa04b3946..2c56ec3a97 100644
--- a/Content.Shared/Actions/Behaviors/IToggleAction.cs
+++ b/Content.Shared/Actions/Behaviors/IToggleAction.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Robust.Shared.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Shared.Actions.Behaviors
 {
diff --git a/Content.Shared/Actions/Behaviors/Item/IInstantItemAction.cs b/Content.Shared/Actions/Behaviors/Item/IInstantItemAction.cs
index 17891c2be4..4ac8656719 100644
--- a/Content.Shared/Actions/Behaviors/Item/IInstantItemAction.cs
+++ b/Content.Shared/Actions/Behaviors/Item/IInstantItemAction.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Robust.Shared.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Shared.Actions.Behaviors.Item
 {
diff --git a/Content.Shared/Actions/Behaviors/Item/IItemActionBehavior.cs b/Content.Shared/Actions/Behaviors/Item/IItemActionBehavior.cs
index 853da9d4b7..e49a6a9ba0 100644
--- a/Content.Shared/Actions/Behaviors/Item/IItemActionBehavior.cs
+++ b/Content.Shared/Actions/Behaviors/Item/IItemActionBehavior.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Content.Shared.Actions.Components;
 using Robust.Shared.GameObjects;
 
diff --git a/Content.Shared/Actions/Behaviors/Item/IToggleItemAction.cs b/Content.Shared/Actions/Behaviors/Item/IToggleItemAction.cs
index 259a998f1f..d21ebf7cf5 100644
--- a/Content.Shared/Actions/Behaviors/Item/IToggleItemAction.cs
+++ b/Content.Shared/Actions/Behaviors/Item/IToggleItemAction.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Robust.Shared.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Shared.Actions.Behaviors.Item
 {
diff --git a/Content.Shared/Actions/Components/ItemActionsComponent.cs b/Content.Shared/Actions/Components/ItemActionsComponent.cs
index 70df7310dd..74f9f25299 100644
--- a/Content.Shared/Actions/Components/ItemActionsComponent.cs
+++ b/Content.Shared/Actions/Components/ItemActionsComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using Content.Shared.Hands;
diff --git a/Content.Shared/Actions/Components/SharedActionsComponent.cs b/Content.Shared/Actions/Components/SharedActionsComponent.cs
index 01e42498fd..6ad8f5295c 100644
--- a/Content.Shared/Actions/Components/SharedActionsComponent.cs
+++ b/Content.Shared/Actions/Components/SharedActionsComponent.cs
@@ -1,11 +1,10 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Shared.Actions.Prototypes;
-using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Players;
@@ -29,6 +28,7 @@ namespace Content.Shared.Actions.Components
     /// may be unusable while the player is stunned, but this component will still have an entry for the action
     /// so the user can see whether it's currently toggled on or off.
     /// </summary>
+    [NetworkedComponent()]
     public abstract class SharedActionsComponent : Component
     {
         private static readonly TimeSpan CooldownExpiryThreshold = TimeSpan.FromSeconds(10);
@@ -41,7 +41,6 @@ namespace Content.Shared.Actions.Components
         protected readonly IEntityManager EntityManager = default!;
 
         public override string Name => "Actions";
-        public override uint? NetID => ContentNetIDs.ACTIONS;
 
         /// <summary>
         /// Actions granted to this entity as soon as they spawn, regardless
@@ -405,7 +404,7 @@ namespace Content.Shared.Actions.Components
         public Dictionary<EntityUid, Dictionary<ItemActionType, ActionState>> ItemActions;
 
         public ActionComponentState(Dictionary<ActionType, ActionState> actions,
-            Dictionary<EntityUid, Dictionary<ItemActionType, ActionState>> itemActions) : base(ContentNetIDs.ACTIONS)
+            Dictionary<EntityUid, Dictionary<ItemActionType, ActionState>> itemActions)
         {
             Actions = actions;
             ItemActions = itemActions;
diff --git a/Content.Shared/Actions/IActionAttempt.cs b/Content.Shared/Actions/IActionAttempt.cs
index f2cb365bb7..19c9c7c8fd 100644
--- a/Content.Shared/Actions/IActionAttempt.cs
+++ b/Content.Shared/Actions/IActionAttempt.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Shared.Actions.Behaviors;
+using Content.Shared.Actions.Behaviors;
 using Content.Shared.Actions.Behaviors.Item;
 using Content.Shared.Actions.Components;
 using Content.Shared.Actions.Prototypes;
diff --git a/Content.Shared/Actions/Prototypes/ActionPrototype.cs b/Content.Shared/Actions/Prototypes/ActionPrototype.cs
index 8d488b9249..bc4422d052 100644
--- a/Content.Shared/Actions/Prototypes/ActionPrototype.cs
+++ b/Content.Shared/Actions/Prototypes/ActionPrototype.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Shared.Actions.Behaviors;
+using Content.Shared.Actions.Behaviors;
 using Content.Shared.Module;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
diff --git a/Content.Shared/Actions/Prototypes/BaseActionPrototype.cs b/Content.Shared/Actions/Prototypes/BaseActionPrototype.cs
index 451dfb106e..ed7eb4b06e 100644
--- a/Content.Shared/Actions/Prototypes/BaseActionPrototype.cs
+++ b/Content.Shared/Actions/Prototypes/BaseActionPrototype.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using System.Collections.Generic;
 using Robust.Shared.Log;
 using Robust.Shared.Prototypes;
diff --git a/Content.Shared/Actions/Prototypes/ItemActionPrototype.cs b/Content.Shared/Actions/Prototypes/ItemActionPrototype.cs
index 24a66fc8c6..3ab67b45a2 100644
--- a/Content.Shared/Actions/Prototypes/ItemActionPrototype.cs
+++ b/Content.Shared/Actions/Prototypes/ItemActionPrototype.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Shared.Actions.Behaviors;
+using Content.Shared.Actions.Behaviors;
 using Content.Shared.Actions.Behaviors.Item;
 using Content.Shared.Module;
 using Robust.Shared.IoC;
diff --git a/Content.Shared/Actions/SharedActionSystem.cs b/Content.Shared/Actions/SharedActionSystem.cs
index acec005de7..a5d90216ee 100644
--- a/Content.Shared/Actions/SharedActionSystem.cs
+++ b/Content.Shared/Actions/SharedActionSystem.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Shared.Actions.Components;
+using Content.Shared.Actions.Components;
 using Robust.Shared.GameObjects;
 
 namespace Content.Shared.Actions
diff --git a/Content.Shared/Acts/ActSystem.cs b/Content.Shared/Acts/ActSystem.cs
index 37d3fd009a..b54b40ece5 100644
--- a/Content.Shared/Acts/ActSystem.cs
+++ b/Content.Shared/Acts/ActSystem.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using System.Linq;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
@@ -18,7 +17,7 @@ namespace Content.Shared.Acts
         void OnDestroy(DestructionEventArgs eventArgs);
     }
 
-    public class DestructionEventArgs : EventArgs
+    public class DestructionEventArgs : EntityEventArgs
     {
         public IEntity Owner { get; set; } = default!;
     }
diff --git a/Content.Shared/Administration/AdminAddReagentEuiState.cs b/Content.Shared/Administration/AdminAddReagentEuiState.cs
index 800251f1a3..87231ca7a0 100644
--- a/Content.Shared/Administration/AdminAddReagentEuiState.cs
+++ b/Content.Shared/Administration/AdminAddReagentEuiState.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Eui;
diff --git a/Content.Shared/Administration/AdminData.cs b/Content.Shared/Administration/AdminData.cs
index a0727efc67..947617fe82 100644
--- a/Content.Shared/Administration/AdminData.cs
+++ b/Content.Shared/Administration/AdminData.cs
@@ -1,5 +1,4 @@
-#nullable enable
-
+
 namespace Content.Shared.Administration
 {
     /// <summary>
diff --git a/Content.Shared/Administration/AdminFlags.cs b/Content.Shared/Administration/AdminFlags.cs
index 91f69c4384..b458f7a06b 100644
--- a/Content.Shared/Administration/AdminFlags.cs
+++ b/Content.Shared/Administration/AdminFlags.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 
 namespace Content.Shared.Administration
 {
diff --git a/Content.Shared/Administration/AdminFlagsHelper.cs b/Content.Shared/Administration/AdminFlagsHelper.cs
index 7a33c04cfd..5a72d5f65e 100644
--- a/Content.Shared/Administration/AdminFlagsHelper.cs
+++ b/Content.Shared/Administration/AdminFlagsHelper.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Numerics;
diff --git a/Content.Shared/Administration/Menu/AdminMenuPlayerListMessage.cs b/Content.Shared/Administration/Menu/AdminMenuPlayerListMessage.cs
index 67b45e057a..75ce4c7941 100644
--- a/Content.Shared/Administration/Menu/AdminMenuPlayerListMessage.cs
+++ b/Content.Shared/Administration/Menu/AdminMenuPlayerListMessage.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Lidgren.Network;
 using Robust.Shared.Network;
 
diff --git a/Content.Shared/Administration/Menu/AdminMenuPlayerListRequest.cs b/Content.Shared/Administration/Menu/AdminMenuPlayerListRequest.cs
index c838b28dee..2c1de4f8ef 100644
--- a/Content.Shared/Administration/Menu/AdminMenuPlayerListRequest.cs
+++ b/Content.Shared/Administration/Menu/AdminMenuPlayerListRequest.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Lidgren.Network;
+using Lidgren.Network;
 using Robust.Shared.Network;
 
 namespace Content.Shared.Administration.Menu
diff --git a/Content.Shared/Administration/MsgUpdateAdminStatus.cs b/Content.Shared/Administration/MsgUpdateAdminStatus.cs
index 7b55b6a8d1..5a310393d1 100644
--- a/Content.Shared/Administration/MsgUpdateAdminStatus.cs
+++ b/Content.Shared/Administration/MsgUpdateAdminStatus.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Lidgren.Network;
 using Robust.Shared.Network;
 
diff --git a/Content.Shared/Administration/PermissionsEuiState.cs b/Content.Shared/Administration/PermissionsEuiState.cs
index cf342aa6fe..e4de269ef9 100644
--- a/Content.Shared/Administration/PermissionsEuiState.cs
+++ b/Content.Shared/Administration/PermissionsEuiState.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using System.Collections.Generic;
 using Content.Shared.Eui;
 using Robust.Shared.Network;
diff --git a/Content.Shared/Administration/SetOutfitEuiState.cs b/Content.Shared/Administration/SetOutfitEuiState.cs
index 92685b54b7..d16d55bb24 100644
--- a/Content.Shared/Administration/SetOutfitEuiState.cs
+++ b/Content.Shared/Administration/SetOutfitEuiState.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Shared.Eui;
 using Robust.Shared.Serialization;
 using System;
diff --git a/Content.Shared/Alert/AlertManager.cs b/Content.Shared/Alert/AlertManager.cs
index dbea636ce1..4fa11c9482 100644
--- a/Content.Shared/Alert/AlertManager.cs
+++ b/Content.Shared/Alert/AlertManager.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
diff --git a/Content.Shared/Alert/AlertOrderPrototype.cs b/Content.Shared/Alert/AlertOrderPrototype.cs
index 7be8f3cf2a..0e0463dd6e 100644
--- a/Content.Shared/Alert/AlertOrderPrototype.cs
+++ b/Content.Shared/Alert/AlertOrderPrototype.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using System.Collections.Generic;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
diff --git a/Content.Shared/Alert/AlertPrototype.cs b/Content.Shared/Alert/AlertPrototype.cs
index 06901594fd..79eafd637d 100644
--- a/Content.Shared/Alert/AlertPrototype.cs
+++ b/Content.Shared/Alert/AlertPrototype.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using System.Globalization;
 using Robust.Shared.Log;
 using Robust.Shared.Prototypes;
diff --git a/Content.Shared/Alert/AlertType.cs b/Content.Shared/Alert/AlertType.cs
index c2c37a8537..a4962a1d36 100644
--- a/Content.Shared/Alert/AlertType.cs
+++ b/Content.Shared/Alert/AlertType.cs
@@ -1,5 +1,4 @@
-#nullable enable
-namespace Content.Shared.Alert
+namespace Content.Shared.Alert
 {
     /// <summary>
     /// Every category of alert. Corresponds to category field in alert prototypes defined in YML
diff --git a/Content.Shared/Alert/IAlertClick.cs b/Content.Shared/Alert/IAlertClick.cs
index c11c52fde4..614c9ee6a0 100644
--- a/Content.Shared/Alert/IAlertClick.cs
+++ b/Content.Shared/Alert/IAlertClick.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.GameObjects;
 
 namespace Content.Shared.Alert
diff --git a/Content.Shared/Alert/SharedAlertsComponent.cs b/Content.Shared/Alert/SharedAlertsComponent.cs
index d4af917cd0..3a8b6eec68 100644
--- a/Content.Shared/Alert/SharedAlertsComponent.cs
+++ b/Content.Shared/Alert/SharedAlertsComponent.cs
@@ -1,8 +1,7 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
-using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
 using Robust.Shared.Players;
@@ -15,13 +14,13 @@ namespace Content.Shared.Alert
     /// Handles the icons on the right side of the screen.
     /// Should only be used for player-controlled entities.
     /// </summary>
+    [NetworkedComponent()]
     public abstract class SharedAlertsComponent : Component
     {
         [Dependency]
         protected readonly AlertManager AlertManager = default!;
 
         public override string Name => "Alerts";
-        public override uint? NetID => ContentNetIDs.ALERTS;
 
         [ViewVariables] private Dictionary<AlertKey, AlertState> _alerts = new();
 
@@ -169,7 +168,7 @@ namespace Content.Shared.Alert
     {
         public Dictionary<AlertKey, AlertState> Alerts;
 
-        public AlertsComponentState(Dictionary<AlertKey, AlertState> alerts) : base(ContentNetIDs.ALERTS)
+        public AlertsComponentState(Dictionary<AlertKey, AlertState> alerts)
         {
             Alerts = alerts;
         }
diff --git a/Content.Shared/Arcade/BlockGameBlock.cs b/Content.Shared/Arcade/BlockGameBlock.cs
index 75e248fbf1..1f32db1b33 100644
--- a/Content.Shared/Arcade/BlockGameBlock.cs
+++ b/Content.Shared/Arcade/BlockGameBlock.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.Maths;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Arcade/BlockGameMessages.cs b/Content.Shared/Arcade/BlockGameMessages.cs
index a1729edb96..02b6da2fe8 100644
--- a/Content.Shared/Arcade/BlockGameMessages.cs
+++ b/Content.Shared/Arcade/BlockGameMessages.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using System.Collections.Generic;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
diff --git a/Content.Shared/Arcade/BlockGamePlayerAction.cs b/Content.Shared/Arcade/BlockGamePlayerAction.cs
index 3b40ab638f..f88b213a56 100644
--- a/Content.Shared/Arcade/BlockGamePlayerAction.cs
+++ b/Content.Shared/Arcade/BlockGamePlayerAction.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Arcade
diff --git a/Content.Shared/Arcade/BlockGameUiKey.cs b/Content.Shared/Arcade/BlockGameUiKey.cs
index c2d6880b69..6ffb216668 100644
--- a/Content.Shared/Arcade/BlockGameUiKey.cs
+++ b/Content.Shared/Arcade/BlockGameUiKey.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Arcade
diff --git a/Content.Shared/Arcade/SharedSpaceVillainArcadeComponent.cs b/Content.Shared/Arcade/SharedSpaceVillainArcadeComponent.cs
index 7fb3d608db..2a26248717 100644
--- a/Content.Shared/Arcade/SharedSpaceVillainArcadeComponent.cs
+++ b/Content.Shared/Arcade/SharedSpaceVillainArcadeComponent.cs
@@ -1,15 +1,12 @@
-#nullable enable
 using System;
-using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Arcade
 {
-    public class SharedSpaceVillainArcadeComponent : Component
+    public abstract class SharedSpaceVillainArcadeComponent : Component
     {
         public override string Name => "SpaceVillainArcade";
-        public override uint? NetID => ContentNetIDs.SPACE_VILLAIN_ARCADE;
 
         [Serializable, NetSerializable]
         public enum Indicators
diff --git a/Content.Shared/Atmos/AtmosCommandUtils.cs b/Content.Shared/Atmos/AtmosCommandUtils.cs
index f23a13224b..8536b546c8 100644
--- a/Content.Shared/Atmos/AtmosCommandUtils.cs
+++ b/Content.Shared/Atmos/AtmosCommandUtils.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 
 namespace Content.Shared.Atmos
@@ -24,4 +23,4 @@ namespace Content.Shared.Atmos
             return ((x >= 0) && (x < Atmospherics.TotalNumberOfGases));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Content.Shared/Atmos/AtmosDirection.cs b/Content.Shared/Atmos/AtmosDirection.cs
index d6989f0db6..96023a55e8 100644
--- a/Content.Shared/Atmos/AtmosDirection.cs
+++ b/Content.Shared/Atmos/AtmosDirection.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using System.Runtime.CompilerServices;
 using Robust.Shared.Maths;
 using Robust.Shared.Serialization;
diff --git a/Content.Shared/Atmos/Atmospherics.cs b/Content.Shared/Atmos/Atmospherics.cs
index c43ef7b441..b2736ebf68 100644
--- a/Content.Shared/Atmos/Atmospherics.cs
+++ b/Content.Shared/Atmos/Atmospherics.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Robust.Shared.Maths;
 using Robust.Shared.Serialization;
 using System;
@@ -142,14 +141,14 @@ namespace Content.Shared.Atmos
         #endregion
 
         /// <summary>
-        ///     Hard limit for tile equalization.
+        ///     Hard limit for zone-based tile equalization.
         /// </summary>
-        public const int ZumosHardTileLimit = 2000;
+        public const int MonstermosHardTileLimit = 2000;
 
         /// <summary>
         ///     Limit for zone-based tile equalization.
         /// </summary>
-        public const int ZumosTileLimit = 200;
+        public const int MonstermosTileLimit = 200;
 
         /// <summary>
         ///     Total number of gases. Increase this if you want to add more!
diff --git a/Content.Shared/Atmos/Components/SharedFlammableComponent.cs b/Content.Shared/Atmos/Components/SharedFlammableComponent.cs
index cb965945b7..3012c9e6d0 100644
--- a/Content.Shared/Atmos/Components/SharedFlammableComponent.cs
+++ b/Content.Shared/Atmos/Components/SharedFlammableComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Atmos/Components/SharedGasAnalyzerComponent.cs b/Content.Shared/Atmos/Components/SharedGasAnalyzerComponent.cs
index 0e0b3dab45..73f0a9d125 100644
--- a/Content.Shared/Atmos/Components/SharedGasAnalyzerComponent.cs
+++ b/Content.Shared/Atmos/Components/SharedGasAnalyzerComponent.cs
@@ -1,15 +1,15 @@
 using System;
-using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Localization;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Atmos.Components
 {
+    [NetworkedComponent()]
     public class SharedGasAnalyzerComponent : Component
     {
         public override string Name => "GasAnalyzer";
-        public override uint? NetID => ContentNetIDs.GAS_ANALYZER;
 
         [Serializable, NetSerializable]
         public enum GasAnalyzerUiKey
@@ -77,7 +77,7 @@ namespace Content.Shared.Atmos.Components
         {
             public GasAnalyzerDanger Danger;
 
-            public GasAnalyzerComponentState(GasAnalyzerDanger danger) : base(ContentNetIDs.GAS_ANALYZER)
+            public GasAnalyzerComponentState(GasAnalyzerDanger danger)
             {
                 Danger = danger;
             }
diff --git a/Content.Shared/Atmos/Components/SharedGasTankComponent.cs b/Content.Shared/Atmos/Components/SharedGasTankComponent.cs
index de5b64c6eb..b3d5ff3b85 100644
--- a/Content.Shared/Atmos/Components/SharedGasTankComponent.cs
+++ b/Content.Shared/Atmos/Components/SharedGasTankComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Atmos/EntitySystems/SharedAtmosDebugOverlaySystem.cs b/Content.Shared/Atmos/EntitySystems/SharedAtmosDebugOverlaySystem.cs
index 33e69fa700..35d92557c3 100644
--- a/Content.Shared/Atmos/EntitySystems/SharedAtmosDebugOverlaySystem.cs
+++ b/Content.Shared/Atmos/EntitySystems/SharedAtmosDebugOverlaySystem.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
diff --git a/Content.Shared/Atmos/EntitySystems/SharedAtmosphereSystem.cs b/Content.Shared/Atmos/EntitySystems/SharedAtmosphereSystem.cs
index 9e52787813..22a0b4f5fa 100644
--- a/Content.Shared/Atmos/EntitySystems/SharedAtmosphereSystem.cs
+++ b/Content.Shared/Atmos/EntitySystems/SharedAtmosphereSystem.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Content.Shared.Atmos.Prototypes;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
diff --git a/Content.Shared/Atmos/EntitySystems/SharedGasTileOverlaySystem.cs b/Content.Shared/Atmos/EntitySystems/SharedGasTileOverlaySystem.cs
index 3092ec0bae..b589114362 100644
--- a/Content.Shared/Atmos/EntitySystems/SharedGasTileOverlaySystem.cs
+++ b/Content.Shared/Atmos/EntitySystems/SharedGasTileOverlaySystem.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using System.Collections.Generic;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
diff --git a/Content.Shared/Atmos/GasOverlayChunk.cs b/Content.Shared/Atmos/GasOverlayChunk.cs
index 74162f5b55..36a65b98ea 100644
--- a/Content.Shared/Atmos/GasOverlayChunk.cs
+++ b/Content.Shared/Atmos/GasOverlayChunk.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Collections.Generic;
 using Content.Shared.Atmos.EntitySystems;
 using Robust.Shared.Map;
diff --git a/Content.Shared/Atmos/PipeDirection.cs b/Content.Shared/Atmos/PipeDirection.cs
index d00398f19b..598c9d9878 100644
--- a/Content.Shared/Atmos/PipeDirection.cs
+++ b/Content.Shared/Atmos/PipeDirection.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Robust.Shared.Maths;
 using Robust.Shared.Serialization;
@@ -36,8 +35,6 @@ namespace Content.Shared.Atmos
         South = 1 << 1,
         West  = 1 << 2,
         East  = 1 << 3,
-        Port    = 1 << 4,
-        Connector  = 1 << 5,
 
         //Straight pipes
         Longitudinal = North | South,
@@ -49,12 +46,6 @@ namespace Content.Shared.Atmos
         SWBend = South | West,
         SEBend = South | East,
 
-        //Vertical Bends (Port only)
-        NPBend = North | Port,
-        SPBend = South | Port,
-        WPBend = West  | Port,
-        EPBend = East  | Port,
-
         //T-Junctions
         TNorth = North | Lateral,
         TSouth = South | Lateral,
@@ -72,7 +63,6 @@ namespace Content.Shared.Atmos
         Half,
         Straight,
         Bend,
-        VerticalBend,
         TJunction,
         Fourway
     }
@@ -89,7 +79,6 @@ namespace Content.Shared.Atmos
                 PipeShape.Half => PipeDirection.South,
                 PipeShape.Straight => PipeDirection.Longitudinal,
                 PipeShape.Bend => PipeDirection.SWBend,
-                PipeShape.VerticalBend => PipeDirection.SPBend,
                 PipeShape.TJunction => PipeDirection.TSouth,
                 PipeShape.Fourway => PipeDirection.Fourway,
                 _ => throw new ArgumentOutOfRangeException(nameof(shape), $"{shape} does not have an associated {nameof(PipeDirection)}."),
@@ -148,8 +137,6 @@ namespace Content.Shared.Atmos
                 PipeDirection.South => PipeDirection.North,
                 PipeDirection.East  => PipeDirection.West,
                 PipeDirection.West  => PipeDirection.East,
-                PipeDirection.Port    => PipeDirection.Connector,
-                PipeDirection.Connector  => PipeDirection.Port,
                 _ => throw new ArgumentOutOfRangeException(nameof(pipeDirection)),
             };
         }
@@ -171,11 +158,6 @@ namespace Content.Shared.Atmos
                 PipeDirection.SEBend        => PipeShape.Bend,
                 PipeDirection.SWBend        => PipeShape.Bend,
 
-                PipeDirection.NPBend        => PipeShape.VerticalBend,
-                PipeDirection.SPBend        => PipeShape.VerticalBend,
-                PipeDirection.WPBend        => PipeShape.VerticalBend,
-                PipeDirection.EPBend        => PipeShape.VerticalBend,
-
                 PipeDirection.TNorth        => PipeShape.TJunction,
                 PipeDirection.TSouth        => PipeShape.TJunction,
                 PipeDirection.TEast         => PipeShape.TJunction,
diff --git a/Content.Shared/Atmos/Piping/Binary/Components/SharedGasCanisterComponent.cs b/Content.Shared/Atmos/Piping/Binary/Components/SharedGasCanisterComponent.cs
index 3e7e250481..d1c05b25b3 100644
--- a/Content.Shared/Atmos/Piping/Binary/Components/SharedGasCanisterComponent.cs
+++ b/Content.Shared/Atmos/Piping/Binary/Components/SharedGasCanisterComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Atmos/Piping/PipeColorVisuals.cs b/Content.Shared/Atmos/Piping/PipeColorVisuals.cs
new file mode 100644
index 0000000000..f579cb1f20
--- /dev/null
+++ b/Content.Shared/Atmos/Piping/PipeColorVisuals.cs
@@ -0,0 +1,11 @@
+using System;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Atmos.Piping
+{
+    [Serializable, NetSerializable]
+    public enum PipeColorVisuals
+    {
+        Color,
+    }
+}
diff --git a/Content.Shared/Atmos/Prototypes/GasPrototype.cs b/Content.Shared/Atmos/Prototypes/GasPrototype.cs
index 37442375d6..fdf4ba643a 100644
--- a/Content.Shared/Atmos/Prototypes/GasPrototype.cs
+++ b/Content.Shared/Atmos/Prototypes/GasPrototype.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Robust.Shared.Prototypes;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
diff --git a/Content.Shared/Audio/AudioHelpers.cs b/Content.Shared/Audio/AudioHelpers.cs
index 887f3ac1fb..a8a47fbdf5 100644
--- a/Content.Shared/Audio/AudioHelpers.cs
+++ b/Content.Shared/Audio/AudioHelpers.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Robust.Shared.Audio;
 using Robust.Shared.IoC;
diff --git a/Content.Shared/Audio/SoundCollectionPrototype.cs b/Content.Shared/Audio/SoundCollectionPrototype.cs
index b9e966501d..45b615c790 100644
--- a/Content.Shared/Audio/SoundCollectionPrototype.cs
+++ b/Content.Shared/Audio/SoundCollectionPrototype.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Collections.Generic;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager.Attributes;
diff --git a/Content.Shared/Body/Behavior/SharedMechanismBehavior.cs b/Content.Shared/Body/Behavior/SharedMechanismBehavior.cs
index f67adc0db6..4f2f7dad96 100644
--- a/Content.Shared/Body/Behavior/SharedMechanismBehavior.cs
+++ b/Content.Shared/Body/Behavior/SharedMechanismBehavior.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Shared.Body.Components;
+using Content.Shared.Body.Components;
 using Content.Shared.Body.Mechanism;
 using Content.Shared.Body.Part;
 using Robust.Shared.GameObjects;
diff --git a/Content.Shared/Body/Components/SharedBodyComponent.cs b/Content.Shared/Body/Components/SharedBodyComponent.cs
index a0c67dafeb..cf4b2551e1 100644
--- a/Content.Shared/Body/Components/SharedBodyComponent.cs
+++ b/Content.Shared/Body/Components/SharedBodyComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
@@ -12,9 +11,9 @@ using Content.Shared.Body.Template;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Components;
 using Content.Shared.Movement.Components;
-using Content.Shared.NetIDs;
 using Content.Shared.Standing;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.IoC;
 using Robust.Shared.Players;
 using Robust.Shared.Prototypes;
@@ -26,14 +25,14 @@ using Robust.Shared.ViewVariables;
 namespace Content.Shared.Body.Components
 {
     // TODO BODY Damage methods for collections of IDamageableComponents
+
+    [NetworkedComponent()]
     public abstract class SharedBodyComponent : Component, IBodyPartContainer, ISerializationHooks
     {
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
         public override string Name => "Body";
 
-        public override uint? NetID => ContentNetIDs.BODY;
-
         [ViewVariables]
         [DataField("template", required: true)]
         private string? TemplateId { get; } = default;
@@ -711,7 +710,7 @@ namespace Content.Shared.Body.Components
 
         public readonly (string slot, EntityUid partId)[] PartIds;
 
-        public BodyComponentState((string slot, EntityUid partId)[] partIds) : base(ContentNetIDs.BODY)
+        public BodyComponentState((string slot, EntityUid partId)[] partIds)
         {
             PartIds = partIds;
         }
diff --git a/Content.Shared/Body/Mechanism/MechanismSystem.cs b/Content.Shared/Body/Mechanism/MechanismSystem.cs
index 53d7655a66..af5057fd55 100644
--- a/Content.Shared/Body/Mechanism/MechanismSystem.cs
+++ b/Content.Shared/Body/Mechanism/MechanismSystem.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
 namespace Content.Shared.Body.Mechanism
diff --git a/Content.Shared/Body/Mechanism/SharedMechanismComponent.cs b/Content.Shared/Body/Mechanism/SharedMechanismComponent.cs
index 47940141bb..5ee2f0b558 100644
--- a/Content.Shared/Body/Mechanism/SharedMechanismComponent.cs
+++ b/Content.Shared/Body/Mechanism/SharedMechanismComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Content.Shared.Body.Behavior;
diff --git a/Content.Shared/Body/Networks/SharedBloodstreamComponent.cs b/Content.Shared/Body/Networks/SharedBloodstreamComponent.cs
index 0641403b73..0ca35f5ff5 100644
--- a/Content.Shared/Body/Networks/SharedBloodstreamComponent.cs
+++ b/Content.Shared/Body/Networks/SharedBloodstreamComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Shared.Chemistry.Solution;
+using Content.Shared.Chemistry.Solution;
 using Robust.Shared.GameObjects;
 
 namespace Content.Shared.Body.Networks
diff --git a/Content.Shared/Body/Part/BodyPartCompatibility.cs b/Content.Shared/Body/Part/BodyPartCompatibility.cs
index 390bf8c904..aba82d8873 100644
--- a/Content.Shared/Body/Part/BodyPartCompatibility.cs
+++ b/Content.Shared/Body/Part/BodyPartCompatibility.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Body.Part
diff --git a/Content.Shared/Body/Part/BodyPartSymmetry.cs b/Content.Shared/Body/Part/BodyPartSymmetry.cs
index aaf6f958de..b21bd1dc2b 100644
--- a/Content.Shared/Body/Part/BodyPartSymmetry.cs
+++ b/Content.Shared/Body/Part/BodyPartSymmetry.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Body.Part
diff --git a/Content.Shared/Body/Part/BodyPartType.cs b/Content.Shared/Body/Part/BodyPartType.cs
index 40c58d0eb4..535f68ed35 100644
--- a/Content.Shared/Body/Part/BodyPartType.cs
+++ b/Content.Shared/Body/Part/BodyPartType.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Body.Part
diff --git a/Content.Shared/Body/Part/IBodyPartAdded.cs b/Content.Shared/Body/Part/IBodyPartAdded.cs
index 4f16560c24..d299d80541 100644
--- a/Content.Shared/Body/Part/IBodyPartAdded.cs
+++ b/Content.Shared/Body/Part/IBodyPartAdded.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.GameObjects;
 
 namespace Content.Shared.Body.Part
diff --git a/Content.Shared/Body/Part/IBodyPartContainer.cs b/Content.Shared/Body/Part/IBodyPartContainer.cs
index 35f49a6236..bad145939e 100644
--- a/Content.Shared/Body/Part/IBodyPartContainer.cs
+++ b/Content.Shared/Body/Part/IBodyPartContainer.cs
@@ -1,5 +1,4 @@
-#nullable enable
-
+
 namespace Content.Shared.Body.Part
 {
     /// <summary>
diff --git a/Content.Shared/Body/Part/IBodyPartRemoved.cs b/Content.Shared/Body/Part/IBodyPartRemoved.cs
index eeff0b8b7e..04f5d2dfb5 100644
--- a/Content.Shared/Body/Part/IBodyPartRemoved.cs
+++ b/Content.Shared/Body/Part/IBodyPartRemoved.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 
 namespace Content.Shared.Body.Part
 {
diff --git a/Content.Shared/Body/Part/Property/BodyPartPropertyComponent.cs b/Content.Shared/Body/Part/Property/BodyPartPropertyComponent.cs
index e1f6e5f577..7b75457be7 100644
--- a/Content.Shared/Body/Part/Property/BodyPartPropertyComponent.cs
+++ b/Content.Shared/Body/Part/Property/BodyPartPropertyComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
diff --git a/Content.Shared/Body/Part/Property/ExtensionComponent.cs b/Content.Shared/Body/Part/Property/ExtensionComponent.cs
index b613ee830a..bf2df77de7 100644
--- a/Content.Shared/Body/Part/Property/ExtensionComponent.cs
+++ b/Content.Shared/Body/Part/Property/ExtensionComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
diff --git a/Content.Shared/Body/Part/Property/GraspComponent.cs b/Content.Shared/Body/Part/Property/GraspComponent.cs
index 6d021d0a6a..dca53e6112 100644
--- a/Content.Shared/Body/Part/Property/GraspComponent.cs
+++ b/Content.Shared/Body/Part/Property/GraspComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Robust.Shared.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Shared.Body.Part.Property
 {
diff --git a/Content.Shared/Body/Part/Property/IBodyPartProperty.cs b/Content.Shared/Body/Part/Property/IBodyPartProperty.cs
index ff3c5ba627..ff29c38b7b 100644
--- a/Content.Shared/Body/Part/Property/IBodyPartProperty.cs
+++ b/Content.Shared/Body/Part/Property/IBodyPartProperty.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Robust.Shared.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Shared.Body.Part.Property
 {
diff --git a/Content.Shared/Body/Part/Property/LegComponent.cs b/Content.Shared/Body/Part/Property/LegComponent.cs
index 1bc75378bd..0766db0145 100644
--- a/Content.Shared/Body/Part/Property/LegComponent.cs
+++ b/Content.Shared/Body/Part/Property/LegComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
diff --git a/Content.Shared/Body/Part/SharedBodyPartComponent.cs b/Content.Shared/Body/Part/SharedBodyPartComponent.cs
index 81a390553c..1fd1f4dee9 100644
--- a/Content.Shared/Body/Part/SharedBodyPartComponent.cs
+++ b/Content.Shared/Body/Part/SharedBodyPartComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
@@ -8,8 +7,8 @@ using Content.Shared.Body.Components;
 using Content.Shared.Body.Mechanism;
 using Content.Shared.Body.Part.Property;
 using Content.Shared.Body.Surgery;
-using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Players;
@@ -20,12 +19,11 @@ using Robust.Shared.ViewVariables;
 
 namespace Content.Shared.Body.Part
 {
+    [NetworkedComponent()]
     public abstract class SharedBodyPartComponent : Component, IBodyPartContainer
     {
         public override string Name => "BodyPart";
 
-        public override uint? NetID => ContentNetIDs.BODY_PART;
-
         private SharedBodyComponent? _body;
 
         // TODO BODY Remove
@@ -384,7 +382,7 @@ namespace Content.Shared.Body.Part
 
         public readonly EntityUid[] MechanismIds;
 
-        public BodyPartComponentState(EntityUid[] mechanismIds) : base(ContentNetIDs.BODY_PART)
+        public BodyPartComponentState(EntityUid[] mechanismIds)
         {
             MechanismIds = mechanismIds;
         }
diff --git a/Content.Shared/Body/Preset/BodyPresetPrototype.cs b/Content.Shared/Body/Preset/BodyPresetPrototype.cs
index 49736b46df..bc12ba059f 100644
--- a/Content.Shared/Body/Preset/BodyPresetPrototype.cs
+++ b/Content.Shared/Body/Preset/BodyPresetPrototype.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using System.Collections.Generic;
 using Content.Shared.Body.Components;
 using Content.Shared.Body.Part;
diff --git a/Content.Shared/Body/Scanner/SharedBodyScannerComponent.cs b/Content.Shared/Body/Scanner/SharedBodyScannerComponent.cs
index c8657fa68a..0de5b61c09 100644
--- a/Content.Shared/Body/Scanner/SharedBodyScannerComponent.cs
+++ b/Content.Shared/Body/Scanner/SharedBodyScannerComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Body/Surgery/SurgeryDataComponent.cs b/Content.Shared/Body/Surgery/SurgeryDataComponent.cs
index ac4e2faff5..9bfd1a1476 100644
--- a/Content.Shared/Body/Surgery/SurgeryDataComponent.cs
+++ b/Content.Shared/Body/Surgery/SurgeryDataComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Shared.Body.Mechanism;
+using Content.Shared.Body.Mechanism;
 using Content.Shared.Body.Part;
 using Robust.Shared.GameObjects;
 
diff --git a/Content.Shared/Body/Surgery/SurgeryType.cs b/Content.Shared/Body/Surgery/SurgeryType.cs
index 446e067092..2879399834 100644
--- a/Content.Shared/Body/Surgery/SurgeryType.cs
+++ b/Content.Shared/Body/Surgery/SurgeryType.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Body.Surgery
diff --git a/Content.Shared/Body/Surgery/SurgeryUIKey.cs b/Content.Shared/Body/Surgery/SurgeryUIKey.cs
index 3213fc0899..e27bd910a1 100644
--- a/Content.Shared/Body/Surgery/SurgeryUIKey.cs
+++ b/Content.Shared/Body/Surgery/SurgeryUIKey.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Body.Surgery
diff --git a/Content.Shared/Body/Surgery/SurgeryUIMessages.cs b/Content.Shared/Body/Surgery/SurgeryUIMessages.cs
index 85b9cded33..72817f8581 100644
--- a/Content.Shared/Body/Surgery/SurgeryUIMessages.cs
+++ b/Content.Shared/Body/Surgery/SurgeryUIMessages.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using System.Collections.Generic;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
diff --git a/Content.Shared/Body/Template/BodyTemplatePrototype.cs b/Content.Shared/Body/Template/BodyTemplatePrototype.cs
index 324b995c03..84320087e2 100644
--- a/Content.Shared/Body/Template/BodyTemplatePrototype.cs
+++ b/Content.Shared/Body/Template/BodyTemplatePrototype.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using System.Collections.Generic;
 using Content.Shared.Body.Components;
 using Content.Shared.Body.Part;
diff --git a/Content.Shared/Botany/IPlantMetabolizable.cs b/Content.Shared/Botany/IPlantMetabolizable.cs
index 1cf90b281e..e70b271194 100644
--- a/Content.Shared/Botany/IPlantMetabolizable.cs
+++ b/Content.Shared/Botany/IPlantMetabolizable.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Robust.Shared.GameObjects;
 
 namespace Content.Shared.Botany
diff --git a/Content.Shared/Botany/PlantHolderVisuals.cs b/Content.Shared/Botany/PlantHolderVisuals.cs
index 03bde50d48..04680f050b 100644
--- a/Content.Shared/Botany/PlantHolderVisuals.cs
+++ b/Content.Shared/Botany/PlantHolderVisuals.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Botany
diff --git a/Content.Shared/Buckle/Components/SharedBuckleComponent.cs b/Content.Shared/Buckle/Components/SharedBuckleComponent.cs
index 528c6eea74..73e5026e3e 100644
--- a/Content.Shared/Buckle/Components/SharedBuckleComponent.cs
+++ b/Content.Shared/Buckle/Components/SharedBuckleComponent.cs
@@ -1,23 +1,21 @@
-#nullable enable
 using System;
 using Content.Shared.ActionBlocker;
 using Content.Shared.DragDrop;
 using Content.Shared.EffectBlocker;
 using Content.Shared.Interaction;
-using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Shared.Buckle.Components
 {
+    [NetworkedComponent()]
     public abstract class SharedBuckleComponent : Component, IActionBlocker, IEffectBlocker, IDraggable
     {
         public sealed override string Name => "Buckle";
 
-        public sealed override uint? NetID => ContentNetIDs.BUCKLE;
-
         /// <summary>
         ///     The range from which this entity can buckle to a <see cref="SharedStrapComponent"/>.
         /// </summary>
@@ -64,7 +62,7 @@ namespace Content.Shared.Buckle.Components
     [Serializable, NetSerializable]
     public sealed class BuckleComponentState : ComponentState
     {
-        public BuckleComponentState(bool buckled, int? drawDepth, EntityUid? lastEntityBuckledTo, bool dontCollide) : base(ContentNetIDs.BUCKLE)
+        public BuckleComponentState(bool buckled, int? drawDepth, EntityUid? lastEntityBuckledTo, bool dontCollide)
         {
             Buckled = buckled;
             DrawDepth = drawDepth;
diff --git a/Content.Shared/Buckle/Components/SharedStrapComponent.cs b/Content.Shared/Buckle/Components/SharedStrapComponent.cs
index b9d090ee31..c6ea85eb1b 100644
--- a/Content.Shared/Buckle/Components/SharedStrapComponent.cs
+++ b/Content.Shared/Buckle/Components/SharedStrapComponent.cs
@@ -1,9 +1,8 @@
-#nullable enable
 using System;
 using Content.Shared.DragDrop;
 using Content.Shared.Interaction.Helpers;
-using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Buckle.Components
@@ -26,12 +25,11 @@ namespace Content.Shared.Buckle.Components
         Down
     }
 
+    [NetworkedComponent()]
     public abstract class SharedStrapComponent : Component, IDragDropOn
     {
         public sealed override string Name => "Strap";
 
-        public sealed override uint? NetID => ContentNetIDs.STRAP;
-
         bool IDragDropOn.CanDragDropOn(DragDropEvent eventArgs)
         {
             if (!eventArgs.Dragged.TryGetComponent(out SharedBuckleComponent? buckleComponent)) return false;
@@ -46,7 +44,7 @@ namespace Content.Shared.Buckle.Components
     [Serializable, NetSerializable]
     public sealed class StrapComponentState : ComponentState
     {
-        public StrapComponentState(StrapPosition position) : base(ContentNetIDs.BUCKLE)
+        public StrapComponentState(StrapPosition position)
         {
             Position = position;
         }
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index b67f343f63..3656505a4e 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Robust.Shared;
 using Robust.Shared.Configuration;
 
@@ -177,10 +176,19 @@ namespace Content.Shared.CCVar
          */
 
         public static readonly CVarDef<float> TileFrictionModifier =
-            CVarDef.Create("physics.tilefriction", 15.0f);
+            CVarDef.Create("physics.tile_friction", 40.0f);
 
         public static readonly CVarDef<float> StopSpeed =
-            CVarDef.Create("physics.stopspeed", 0.1f);
+            CVarDef.Create("physics.stop_speed", 0.1f);
+
+        /// <summary>
+        /// Whether mobs can push objects like lockers.
+        /// </summary>
+        /// <remarks>
+        /// Technically client doesn't need to know about it but this may prevent a bug in the distant future so it stays.
+        /// </remarks>
+        public static readonly CVarDef<bool> MobPushing =
+            CVarDef.Create("physics.mob_pushing", true, CVar.REPLICATED);
 
         /*
          * Ambience
@@ -244,12 +252,40 @@ namespace Content.Shared.CCVar
         public static readonly CVarDef<bool> SpaceWind =
             CVarDef.Create("atmos.space_wind", true, CVar.SERVERONLY);
 
+        /// <summary>
+        ///     The sound that plays when space wind occurs.
+        /// </summary>
+        public static readonly CVarDef<string> SpaceWindSound =
+            CVarDef.Create("atmos.space_wind_sound", "/Audio/Effects/space_wind.ogg", CVar.SERVERONLY);
+
         /// <summary>
         ///     Whether monstermos tile equalization is enabled.
         /// </summary>
         public static readonly CVarDef<bool> MonstermosEqualization =
             CVarDef.Create("atmos.monstermos_equalization", true, CVar.SERVERONLY);
 
+        /// <summary>
+        ///     Whether monstermos explosive depressurization is enabled.
+        ///     Needs <see cref="MonstermosEqualization"/> to be enabled to work.
+        /// </summary>
+        public static readonly CVarDef<bool> MonstermosDepressurization =
+            CVarDef.Create<bool>("atmos.monstermos_depressurization", true, CVar.SERVERONLY);
+
+        /// <summary>
+        ///     Whether monstermos explosive depressurization will rip tiles..
+        ///     Needs <see cref="MonstermosEqualization"/> and <see cref="MonstermosDepressurization"/> to be enabled to work.
+        /// </summary>
+        public static readonly CVarDef<bool> MonstermosRipTiles =
+            CVarDef.Create<bool>("atmos.monstermos_rip_tiles", true, CVar.SERVERONLY);
+
+        /// <summary>
+        ///     Whether explosive depressurization will cause the grid to gain an impulse.
+        ///     Needs <see cref="MonstermosEqualization"/> and <see cref="MonstermosDepressurization"/> to be enabled to work.
+        /// </summary>
+        public static readonly CVarDef<bool> AtmosGridImpulse =
+            CVarDef.Create("atmos.grid_impulse", false, CVar.SERVERONLY);
+
+
         /// <summary>
         ///     Whether atmos superconduction is enabled.
         /// </summary>
@@ -257,6 +293,14 @@ namespace Content.Shared.CCVar
         public static readonly CVarDef<bool> Superconduction =
             CVarDef.Create("atmos.superconduction", false, 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.
+        /// </summary>
+        public static readonly CVarDef<bool> ExcitedGroupsSpaceIsAllConsuming =
+            CVarDef.Create("atmos.excited_groups_space_is_all_consuming", false, CVar.SERVERONLY);
+
         /// <summary>
         ///     Maximum time in milliseconds that atmos can take processing.
         /// </summary>
@@ -269,9 +313,6 @@ namespace Content.Shared.CCVar
         public static readonly CVarDef<float> AtmosTickRate =
             CVarDef.Create("atmos.tickrate", 26f, CVar.SERVERONLY);
 
-        public static readonly CVarDef<bool> ExcitedGroupsSpaceIsAllConsuming =
-            CVarDef.Create("atmos.excited_groups_space_is_all_consuming", false, CVar.SERVERONLY);
-
         /*
          * MIDI instruments
          */
@@ -318,15 +359,32 @@ namespace Content.Shared.CCVar
          * VOTE
          */
 
+        /// <summary>
+        ///     The required ratio of the server that must agree for a restart round vote to go through.
+        /// </summary>
         public static readonly CVarDef<float> VoteRestartRequiredRatio =
             CVarDef.Create("vote.restart_required_ratio", 0.8f, CVar.SERVERONLY);
 
+        /// <summary>
+        ///     The delay which two votes of the same type are allowed to be made by separate people, in seconds.
+        /// </summary>
+        public static readonly CVarDef<float> VoteSameTypeTimeout =
+            CVarDef.Create("vote.same_type_timeout", 240f, CVar.SERVERONLY);
+
         /*
          * BAN
          */
 
         public static readonly CVarDef<bool> BanHardwareIds =
             CVarDef.Create("ban.hardware_ids", false, CVar.SERVERONLY);
+
+        /*
+         * Shuttles
+         */
+        // Once cruising actually gets implemented I'd likely drop this speed to 3 maybe.
+        public static readonly CVarDef<float> ShuttleDockSpeedCap =
+            CVarDef.Create("shuttle.dock_speed_cap", 5f, CVar.SERVERONLY);
+
         /*
          * VIEWPORT
          */
@@ -346,5 +404,22 @@ namespace Content.Shared.CCVar
 
         public static readonly CVarDef<bool> ViewportScaleRender =
             CVarDef.Create("viewport.scale_render", true, CVar.CLIENTONLY | CVar.ARCHIVE);
+
+        /*
+         * CHAT
+         */
+
+        public static readonly CVarDef<int> ChatMaxMessageLength =
+            CVarDef.Create("chat.max_message_length", 1000, CVar.SERVER | CVar.REPLICATED);
+
+        /*
+         * AFK
+         */
+
+        /// <summary>
+        /// How long a client can go without any input before being considered AFK.
+        /// </summary>
+        public static readonly CVarDef<float> AfkTime =
+            CVarDef.Create("afk.time", 60f, CVar.SERVERONLY);
     }
 }
diff --git a/Content.Shared/Cabinet/ItemCabinetVisuals.cs b/Content.Shared/Cabinet/ItemCabinetVisuals.cs
index 49ab6ee9f5..9ac46e1fa8 100644
--- a/Content.Shared/Cabinet/ItemCabinetVisuals.cs
+++ b/Content.Shared/Cabinet/ItemCabinetVisuals.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Cabinet
diff --git a/Content.Shared/Camera/SharedCameraRecoilComponent.cs b/Content.Shared/Camera/SharedCameraRecoilComponent.cs
index a19fb700dd..964d82e3fb 100644
--- a/Content.Shared/Camera/SharedCameraRecoilComponent.cs
+++ b/Content.Shared/Camera/SharedCameraRecoilComponent.cs
@@ -1,18 +1,16 @@
-#nullable enable
 using System;
-using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Maths;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Camera
 {
+    [NetworkedComponent()]
     public abstract class SharedCameraRecoilComponent : Component
     {
         public sealed override string Name => "CameraRecoil";
 
-        public override uint? NetID => ContentNetIDs.CAMERA_RECOIL;
-
         public abstract void Kick(Vector2 recoil);
 
         [Serializable, NetSerializable]
diff --git a/Content.Shared/Cargo/CargoOrderData.cs b/Content.Shared/Cargo/CargoOrderData.cs
index ad784b6a7b..770cc18856 100644
--- a/Content.Shared/Cargo/CargoOrderData.cs
+++ b/Content.Shared/Cargo/CargoOrderData.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Cargo
diff --git a/Content.Shared/Cargo/CargoProductPrototype.cs b/Content.Shared/Cargo/CargoProductPrototype.cs
index a7f620ad78..65099c20f9 100644
--- a/Content.Shared/Cargo/CargoProductPrototype.cs
+++ b/Content.Shared/Cargo/CargoProductPrototype.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
diff --git a/Content.Shared/Cargo/Components/SharedCargoConsoleComponent.cs b/Content.Shared/Cargo/Components/SharedCargoConsoleComponent.cs
index 4637785555..2abee2f1c4 100644
--- a/Content.Shared/Cargo/Components/SharedCargoConsoleComponent.cs
+++ b/Content.Shared/Cargo/Components/SharedCargoConsoleComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
diff --git a/Content.Shared/Cargo/Components/SharedCargoOrderDatabaseComponent.cs b/Content.Shared/Cargo/Components/SharedCargoOrderDatabaseComponent.cs
index c1331442f8..d7d8f1661d 100644
--- a/Content.Shared/Cargo/Components/SharedCargoOrderDatabaseComponent.cs
+++ b/Content.Shared/Cargo/Components/SharedCargoOrderDatabaseComponent.cs
@@ -1,16 +1,15 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
-using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Cargo.Components
 {
+    [NetworkedComponent()]
     public class SharedCargoOrderDatabaseComponent : Component
     {
         public sealed override string Name => "CargoOrderDatabase";
-        public sealed override uint? NetID => ContentNetIDs.CARGO_ORDER_DATABASE;
     }
 
     [NetSerializable, Serializable]
@@ -18,7 +17,7 @@ namespace Content.Shared.Cargo.Components
     {
         public readonly List<CargoOrderData>? Orders;
 
-        public CargoOrderDatabaseState(List<CargoOrderData>? orders) : base(ContentNetIDs.CARGO_ORDER_DATABASE)
+        public CargoOrderDatabaseState(List<CargoOrderData>? orders)
         {
             Orders = orders;
         }
diff --git a/Content.Shared/Cargo/Components/SharedGalacticMarketComponent.cs b/Content.Shared/Cargo/Components/SharedGalacticMarketComponent.cs
index 70383d0e8a..166489fb3c 100644
--- a/Content.Shared/Cargo/Components/SharedGalacticMarketComponent.cs
+++ b/Content.Shared/Cargo/Components/SharedGalacticMarketComponent.cs
@@ -1,9 +1,8 @@
-#nullable enable
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
@@ -11,10 +10,10 @@ using Robust.Shared.Serialization.Manager.Attributes;
 
 namespace Content.Shared.Cargo.Components
 {
+    [NetworkedComponent()]
     public class SharedGalacticMarketComponent : Component, IEnumerable<CargoProductPrototype>, ISerializationHooks
     {
         public sealed override string Name => "GalacticMarket";
-        public sealed override uint? NetID => ContentNetIDs.GALACTIC_MARKET;
 
         [DataField("products")]
         protected List<string> _productIds = new();
@@ -98,7 +97,7 @@ namespace Content.Shared.Cargo.Components
     public class GalacticMarketState : ComponentState
     {
         public List<string> Products;
-        public GalacticMarketState(List<string> technologies) : base(ContentNetIDs.GALACTIC_MARKET)
+        public GalacticMarketState(List<string> technologies)
         {
             Products = technologies;
         }
diff --git a/Content.Shared/CharacterAppearance/Components/SharedHumanoidAppearanceComponent.cs b/Content.Shared/CharacterAppearance/Components/SharedHumanoidAppearanceComponent.cs
index b77093c23e..9685f00d09 100644
--- a/Content.Shared/CharacterAppearance/Components/SharedHumanoidAppearanceComponent.cs
+++ b/Content.Shared/CharacterAppearance/Components/SharedHumanoidAppearanceComponent.cs
@@ -1,10 +1,9 @@
-#nullable enable
 using System;
-using Content.Shared.NetIDs;
 using Content.Shared.Preferences;
 using Robust.Shared.Enums;
 using Robust.Shared.GameObjects;
 using Robust.Shared.GameObjects.Components.Localization;
+using Robust.Shared.GameStates;
 using Robust.Shared.Players;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
@@ -12,6 +11,7 @@ using Robust.Shared.ViewVariables;
 
 namespace Content.Shared.CharacterAppearance.Components
 {
+    [NetworkedComponent()]
     public abstract class SharedHumanoidAppearanceComponent : Component
     {
         private HumanoidCharacterAppearance _appearance = HumanoidCharacterAppearance.Default();
@@ -19,7 +19,6 @@ namespace Content.Shared.CharacterAppearance.Components
         private Gender _gender;
 
         public sealed override string Name => "HumanoidAppearance";
-        public sealed override uint? NetID => ContentNetIDs.HUMANOID_APPEARANCE;
 
         [DataField("categoriesHair")]
         [ViewVariables]
@@ -105,8 +104,7 @@ namespace Content.Shared.CharacterAppearance.Components
         [NetSerializable]
         private sealed class HumanoidAppearanceComponentState : ComponentState
         {
-            public HumanoidAppearanceComponentState(HumanoidCharacterAppearance appearance, Sex sex, Gender gender) :
-                base(ContentNetIDs.HUMANOID_APPEARANCE)
+            public HumanoidAppearanceComponentState(HumanoidCharacterAppearance appearance, Sex sex, Gender gender)
             {
                 Appearance = appearance;
                 Sex = sex;
diff --git a/Content.Shared/CharacterAppearance/Components/SharedMagicMirrorComponent.cs b/Content.Shared/CharacterAppearance/Components/SharedMagicMirrorComponent.cs
index ebf6ca6caf..babd9efbd7 100644
--- a/Content.Shared/CharacterAppearance/Components/SharedMagicMirrorComponent.cs
+++ b/Content.Shared/CharacterAppearance/Components/SharedMagicMirrorComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
diff --git a/Content.Shared/CharacterAppearance/HairStyles.cs b/Content.Shared/CharacterAppearance/HairStyles.cs
index 0bc7cd0c22..99a016d741 100644
--- a/Content.Shared/CharacterAppearance/HairStyles.cs
+++ b/Content.Shared/CharacterAppearance/HairStyles.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using Robust.Shared.Maths;
diff --git a/Content.Shared/CharacterAppearance/HumanoidCharacterAppearance.cs b/Content.Shared/CharacterAppearance/HumanoidCharacterAppearance.cs
index 665adb3cf0..bd09b43d1f 100644
--- a/Content.Shared/CharacterAppearance/HumanoidCharacterAppearance.cs
+++ b/Content.Shared/CharacterAppearance/HumanoidCharacterAppearance.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 using Robust.Shared.Random;
diff --git a/Content.Shared/CharacterAppearance/ICharacterAppearance.cs b/Content.Shared/CharacterAppearance/ICharacterAppearance.cs
index 41216e08c3..2a49c231f9 100644
--- a/Content.Shared/CharacterAppearance/ICharacterAppearance.cs
+++ b/Content.Shared/CharacterAppearance/ICharacterAppearance.cs
@@ -1,4 +1,3 @@
-#nullable enable
 
 namespace Content.Shared.CharacterAppearance
 {
diff --git a/Content.Shared/CharacterAppearance/Sex.cs b/Content.Shared/CharacterAppearance/Sex.cs
index d5f40bc50e..b0ea69f869 100644
--- a/Content.Shared/CharacterAppearance/Sex.cs
+++ b/Content.Shared/CharacterAppearance/Sex.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Content.Shared.Dataset;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
diff --git a/Content.Shared/CharacterInfo/SharedCharacterInfoComponent.cs b/Content.Shared/CharacterInfo/SharedCharacterInfoComponent.cs
index 813720839c..e3e860198f 100644
--- a/Content.Shared/CharacterInfo/SharedCharacterInfoComponent.cs
+++ b/Content.Shared/CharacterInfo/SharedCharacterInfoComponent.cs
@@ -1,17 +1,16 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
-using Content.Shared.NetIDs;
 using Content.Shared.Objectives;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.CharacterInfo
 {
+    [NetworkedComponent()]
     public class SharedCharacterInfoComponent : Component
     {
         public override string Name => "CharacterInfo";
-        public override uint? NetID => ContentNetIDs.CHARACTERINFO;
 
         [Serializable, NetSerializable]
         protected class RequestCharacterInfoMessage : ComponentMessage
diff --git a/Content.Shared/Chat/ChatChannel.cs b/Content.Shared/Chat/ChatChannel.cs
index 9d76beb32c..fb93d172db 100644
--- a/Content.Shared/Chat/ChatChannel.cs
+++ b/Content.Shared/Chat/ChatChannel.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 
 namespace Content.Shared.Chat
@@ -7,60 +6,60 @@ namespace Content.Shared.Chat
     ///     Represents chat channels that the player can filter chat tabs by.
     /// </summary>
     [Flags]
-    public enum ChatChannel : short
+    public enum ChatChannel : ushort
     {
         None = 0,
 
         /// <summary>
         ///     Chat heard by players within earshot
         /// </summary>
-        Local = 1,
+        Local = 1 << 0,
 
         /// <summary>
         ///     Messages from the server
         /// </summary>
-        Server = 2,
+        Server = 1 << 1,
 
         /// <summary>
         ///     Damage messages
         /// </summary>
-        Damage = 4,
+        Damage = 1 << 2,
 
         /// <summary>
         ///     Radio messages
         /// </summary>
-        Radio = 8,
+        Radio = 1 << 3,
 
         /// <summary>
         ///     Out-of-character channel
         /// </summary>
-        OOC = 16,
+        OOC = 1 << 4,
 
         /// <summary>
         ///     Visual events the player can see.
         ///     Basically like visual_message in SS13.
         /// </summary>
-        Visual = 32,
+        Visual = 1 << 5,
 
         /// <summary>
         ///     Emotes
         /// </summary>
-        Emotes = 64,
+        Emotes = 1 << 6,
 
         /// <summary>
         ///     Deadchat
         /// </summary>
-        Dead = 128,
+        Dead = 1 << 7,
 
         /// <summary>
         ///     Admin chat
         /// </summary>
-        AdminChat = 256,
+        Admin = 1 << 8,
 
         /// <summary>
         ///     Unspecified.
         /// </summary>
-        Unspecified = 512,
+        Unspecified = 1 << 9,
 
         /// <summary>
         ///     Channels considered to be IC.
diff --git a/Content.Shared/Chat/ChatMaxMsgLengthMessage.cs b/Content.Shared/Chat/ChatMaxMsgLengthMessage.cs
deleted file mode 100644
index 7848184874..0000000000
--- a/Content.Shared/Chat/ChatMaxMsgLengthMessage.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-#nullable enable
-using Lidgren.Network;
-using Robust.Shared.Network;
-
-namespace Content.Shared.Chat
-{
-    /// <summary>
-    /// This message is sent by the server to let clients know what is the chat's character limit for this server.
-    /// It is first sent by the client as a request
-    /// </summary>
-    public sealed class ChatMaxMsgLengthMessage : NetMessage
-    {
-        public override MsgGroups MsgGroup => MsgGroups.Command;
-
-        /// <summary>
-        /// The max length a player-sent message can get
-        /// </summary>
-        public int MaxMessageLength { get; set; }
-
-        public override void ReadFromBuffer(NetIncomingMessage buffer)
-        {
-            MaxMessageLength = buffer.ReadInt32();
-        }
-
-        public override void WriteToBuffer(NetOutgoingMessage buffer)
-        {
-            buffer.Write(MaxMessageLength);
-        }
-    }
-}
diff --git a/Content.Shared/Chat/ChatSelectChannel.cs b/Content.Shared/Chat/ChatSelectChannel.cs
new file mode 100644
index 0000000000..56d70cf1d1
--- /dev/null
+++ b/Content.Shared/Chat/ChatSelectChannel.cs
@@ -0,0 +1,48 @@
+using System;
+
+namespace Content.Shared.Chat
+{
+    /// <summary>
+    ///     Chat channels that the player can select in the chat box.
+    /// </summary>
+    /// <remarks>
+    ///     Maps to <see cref="ChatChannel"/>, giving better names.
+    /// </remarks>
+    [Flags]
+    public enum ChatSelectChannel : ushort
+    {
+        None = 0,
+
+        /// <summary>
+        ///     Chat heard by players within earshot
+        /// </summary>
+        Local = ChatChannel.Local,
+
+        /// <summary>
+        ///     Radio messages
+        /// </summary>
+        Radio = ChatChannel.Radio,
+
+        /// <summary>
+        ///     Out-of-character channel
+        /// </summary>
+        OOC = ChatChannel.OOC,
+
+        /// <summary>
+        ///     Emotes
+        /// </summary>
+        Emotes = ChatChannel.Emotes,
+
+        /// <summary>
+        ///     Deadchat
+        /// </summary>
+        Dead = ChatChannel.Dead,
+
+        /// <summary>
+        ///     Admin chat
+        /// </summary>
+        Admin = ChatChannel.Admin,
+
+        Console = ChatChannel.Unspecified
+    }
+}
diff --git a/Content.Shared/Chat/MsgChatMessage.cs b/Content.Shared/Chat/MsgChatMessage.cs
index 69c8a441f5..eae2733c76 100644
--- a/Content.Shared/Chat/MsgChatMessage.cs
+++ b/Content.Shared/Chat/MsgChatMessage.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using JetBrains.Annotations;
 using Lidgren.Network;
 using Robust.Shared.GameObjects;
@@ -52,7 +51,7 @@ namespace Content.Shared.Chat
             {
                 case ChatChannel.Local:
                 case ChatChannel.Dead:
-                case ChatChannel.AdminChat:
+                case ChatChannel.Admin:
                 case ChatChannel.Emotes:
                     SenderEntity = buffer.ReadEntityUid();
                     break;
@@ -70,7 +69,7 @@ namespace Content.Shared.Chat
             {
                 case ChatChannel.Local:
                 case ChatChannel.Dead:
-                case ChatChannel.AdminChat:
+                case ChatChannel.Admin:
                 case ChatChannel.Emotes:
                     buffer.Write(SenderEntity);
                     break;
diff --git a/Content.Shared/Chemistry/ChemistrySystem.cs b/Content.Shared/Chemistry/ChemistrySystem.cs
index 5f5703d927..45881a2050 100644
--- a/Content.Shared/Chemistry/ChemistrySystem.cs
+++ b/Content.Shared/Chemistry/ChemistrySystem.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Linq;
 using Content.Shared.Chemistry.Reaction;
diff --git a/Content.Shared/Chemistry/Components/SharedChemMasterComponent.cs b/Content.Shared/Chemistry/Components/SharedChemMasterComponent.cs
index d75488350a..d9817f97b7 100644
--- a/Content.Shared/Chemistry/Components/SharedChemMasterComponent.cs
+++ b/Content.Shared/Chemistry/Components/SharedChemMasterComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using Content.Shared.Chemistry.Reagent;
diff --git a/Content.Shared/Chemistry/Components/SharedHyposprayComponent.cs b/Content.Shared/Chemistry/Components/SharedHyposprayComponent.cs
index 5c6606eac5..975abbad91 100644
--- a/Content.Shared/Chemistry/Components/SharedHyposprayComponent.cs
+++ b/Content.Shared/Chemistry/Components/SharedHyposprayComponent.cs
@@ -1,16 +1,15 @@
-#nullable enable
 using System;
 using Content.Shared.Chemistry.Reagent;
-using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Chemistry.Components
 {
+    [NetworkedComponent()]
     public abstract class SharedHyposprayComponent : Component
     {
         public sealed override string Name => "Hypospray";
-        public sealed override uint? NetID => ContentNetIDs.HYPOSPRAY;
 
         [Serializable, NetSerializable]
         protected sealed class HyposprayComponentState : ComponentState
@@ -18,7 +17,7 @@ namespace Content.Shared.Chemistry.Components
             public ReagentUnit CurVolume { get; }
             public ReagentUnit MaxVolume { get; }
 
-            public HyposprayComponentState(ReagentUnit curVolume, ReagentUnit maxVolume) : base(ContentNetIDs.HYPOSPRAY)
+            public HyposprayComponentState(ReagentUnit curVolume, ReagentUnit maxVolume)
             {
                 CurVolume = curVolume;
                 MaxVolume = maxVolume;
diff --git a/Content.Shared/Chemistry/Components/SharedInjectorComponent.cs b/Content.Shared/Chemistry/Components/SharedInjectorComponent.cs
index 8c2ad4e365..c2ff3487eb 100644
--- a/Content.Shared/Chemistry/Components/SharedInjectorComponent.cs
+++ b/Content.Shared/Chemistry/Components/SharedInjectorComponent.cs
@@ -1,8 +1,7 @@
-#nullable enable
 using System;
 using Content.Shared.Chemistry.Reagent;
-using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Chemistry.Components
@@ -10,10 +9,10 @@ namespace Content.Shared.Chemistry.Components
     /// <summary>
     /// Shared class for injectors & syringes
     /// </summary>
+    [NetworkedComponent()]
     public class SharedInjectorComponent : Component
     {
         public override string Name => "Injector";
-        public sealed override uint? NetID => ContentNetIDs.REAGENT_INJECTOR;
 
         /// <summary>
         /// Component data used for net updates. Used by client for item status ui
@@ -25,7 +24,7 @@ namespace Content.Shared.Chemistry.Components
             public ReagentUnit TotalVolume { get; }
             public InjectorToggleMode CurrentMode { get; }
 
-            public InjectorComponentState(ReagentUnit currentVolume, ReagentUnit totalVolume, InjectorToggleMode currentMode) : base(ContentNetIDs.REAGENT_INJECTOR)
+            public InjectorComponentState(ReagentUnit currentVolume, ReagentUnit totalVolume, InjectorToggleMode currentMode)
             {
                 CurrentVolume = currentVolume;
                 TotalVolume = totalVolume;
diff --git a/Content.Shared/Chemistry/Dispenser/ReagentDispenserInventoryPrototype.cs b/Content.Shared/Chemistry/Dispenser/ReagentDispenserInventoryPrototype.cs
index 9ca8446944..16d6ae4369 100644
--- a/Content.Shared/Chemistry/Dispenser/ReagentDispenserInventoryPrototype.cs
+++ b/Content.Shared/Chemistry/Dispenser/ReagentDispenserInventoryPrototype.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using System.Collections.Generic;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
diff --git a/Content.Shared/Chemistry/Dispenser/SharedReagentDispenserComponent.cs b/Content.Shared/Chemistry/Dispenser/SharedReagentDispenserComponent.cs
index a8f404e7cb..defe521834 100644
--- a/Content.Shared/Chemistry/Dispenser/SharedReagentDispenserComponent.cs
+++ b/Content.Shared/Chemistry/Dispenser/SharedReagentDispenserComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using System.Collections.Generic;
 using Content.Shared.Chemistry.Reagent;
 using Robust.Shared.GameObjects;
diff --git a/Content.Shared/Chemistry/Metabolizable/DefaultMetabolizable.cs b/Content.Shared/Chemistry/Metabolizable/DefaultMetabolizable.cs
index d69187e378..cbd10016a5 100644
--- a/Content.Shared/Chemistry/Metabolizable/DefaultMetabolizable.cs
+++ b/Content.Shared/Chemistry/Metabolizable/DefaultMetabolizable.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Chemistry.Reagent;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
diff --git a/Content.Shared/Chemistry/Metabolizable/IMetabolizable.cs b/Content.Shared/Chemistry/Metabolizable/IMetabolizable.cs
index 1c96f07e53..e08e209a0c 100644
--- a/Content.Shared/Chemistry/Metabolizable/IMetabolizable.cs
+++ b/Content.Shared/Chemistry/Metabolizable/IMetabolizable.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Chemistry.Reagent;
 using Robust.Shared.GameObjects;
 
 namespace Content.Shared.Chemistry.Metabolizable
diff --git a/Content.Shared/Chemistry/Reaction/IReactionEffect.cs b/Content.Shared/Chemistry/Reaction/IReactionEffect.cs
index 671c79b859..9b8762dd28 100644
--- a/Content.Shared/Chemistry/Reaction/IReactionEffect.cs
+++ b/Content.Shared/Chemistry/Reaction/IReactionEffect.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Robust.Shared.GameObjects;
 
 namespace Content.Shared.Chemistry.Reaction
diff --git a/Content.Shared/Chemistry/Reaction/ITileReaction.cs b/Content.Shared/Chemistry/Reaction/ITileReaction.cs
index 4e4acf45c9..8310652b11 100644
--- a/Content.Shared/Chemistry/Reaction/ITileReaction.cs
+++ b/Content.Shared/Chemistry/Reaction/ITileReaction.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Chemistry.Reagent;
 using Robust.Shared.Map;
 
 namespace Content.Shared.Chemistry.Reaction
diff --git a/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs b/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs
index 7e091ff651..e52b801069 100644
--- a/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs
+++ b/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Collections.Generic;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Sound;
diff --git a/Content.Shared/Chemistry/Reaction/SharedChemicalReactionSystem.cs b/Content.Shared/Chemistry/Reaction/SharedChemicalReactionSystem.cs
index daaa0d1003..bb39151e54 100644
--- a/Content.Shared/Chemistry/Reaction/SharedChemicalReactionSystem.cs
+++ b/Content.Shared/Chemistry/Reaction/SharedChemicalReactionSystem.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Collections.Generic;
 using Content.Shared.Chemistry.Reagent;
 using Robust.Shared.GameObjects;
diff --git a/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs b/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs
index 1fbf8dc8e6..30de264604 100644
--- a/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs
+++ b/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using System.Collections.Generic;
 using Content.Shared.Botany;
 using Content.Shared.Chemistry.Metabolizable;
diff --git a/Content.Shared/Chemistry/Reagent/ReagentUnit.cs b/Content.Shared/Chemistry/Reagent/ReagentUnit.cs
index 1a653b76c8..d03f111376 100644
--- a/Content.Shared/Chemistry/Reagent/ReagentUnit.cs
+++ b/Content.Shared/Chemistry/Reagent/ReagentUnit.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Globalization;
 using System.Linq;
diff --git a/Content.Shared/Chemistry/SharedTransferAmount.cs b/Content.Shared/Chemistry/SharedTransferAmount.cs
new file mode 100644
index 0000000000..b983d1ed5f
--- /dev/null
+++ b/Content.Shared/Chemistry/SharedTransferAmount.cs
@@ -0,0 +1,37 @@
+using System;
+using Content.Shared.Chemistry.Reagent;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Chemistry
+{
+    [Serializable, NetSerializable]
+    public class TransferAmountBoundInterfaceState : BoundUserInterfaceState
+    {
+        public ReagentUnit Max;
+        public ReagentUnit Min;
+
+        public TransferAmountBoundInterfaceState(ReagentUnit max, ReagentUnit min)
+        {
+            Max = max;
+            Min = min;
+        }
+    }
+
+    [Serializable, NetSerializable]
+    public class TransferAmountSetValueMessage : BoundUserInterfaceMessage
+    {
+        public ReagentUnit Value;
+
+        public TransferAmountSetValueMessage(ReagentUnit value)
+        {
+            Value = value;
+        }
+    }
+
+    [Serializable, NetSerializable]
+    public enum TransferAmountUiKey
+    {
+        Key,
+    }
+}
diff --git a/Content.Shared/Chemistry/Solution/Components/ISolutionInteractionsComponent.cs b/Content.Shared/Chemistry/Solution/Components/ISolutionInteractionsComponent.cs
index 853629c38a..d1965f970e 100644
--- a/Content.Shared/Chemistry/Solution/Components/ISolutionInteractionsComponent.cs
+++ b/Content.Shared/Chemistry/Solution/Components/ISolutionInteractionsComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Chemistry.Reagent;
 using Robust.Shared.GameObjects;
 
 namespace Content.Shared.Chemistry.Solution.Components
diff --git a/Content.Shared/Chemistry/Solution/Components/SharedSolutionContainerComponent.cs b/Content.Shared/Chemistry/Solution/Components/SharedSolutionContainerComponent.cs
index 95946865e3..0e6e5c97f9 100644
--- a/Content.Shared/Chemistry/Solution/Components/SharedSolutionContainerComponent.cs
+++ b/Content.Shared/Chemistry/Solution/Components/SharedSolutionContainerComponent.cs
@@ -1,11 +1,10 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using Content.Shared.Chemistry.Reaction;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Examine;
-using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Log;
@@ -22,13 +21,11 @@ namespace Content.Shared.Chemistry.Solution.Components
     /// <summary>
     ///     Holds a <see cref="Solution"/> with a limited volume.
     /// </summary>
+    [NetworkedComponent()]
     public abstract class SharedSolutionContainerComponent : Component, IExamine, ISolutionInteractionsComponent
     {
         public override string Name => "SolutionContainer";
 
-        /// <inheritdoc />
-        public sealed override uint? NetID => ContentNetIDs.SOLUTION;
-
         [ViewVariables]
         [DataField("contents")]
         public Solution Solution { get; private set; } = new();
@@ -324,7 +321,7 @@ namespace Content.Shared.Chemistry.Solution.Components
     {
         public readonly Solution Solution;
 
-        public SolutionContainerComponentState(Solution solution) : base(ContentNetIDs.SOLUTION)
+        public SolutionContainerComponentState(Solution solution)
         {
             Solution = solution;
         }
diff --git a/Content.Shared/Chemistry/Solution/Solution.cs b/Content.Shared/Chemistry/Solution/Solution.cs
index 9b93c53fca..ceae2a17f7 100644
--- a/Content.Shared/Chemistry/Solution/Solution.cs
+++ b/Content.Shared/Chemistry/Solution/Solution.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections;
 using System.Collections.Generic;
diff --git a/Content.Shared/Chemistry/Solution/SolutionContainerCaps.cs b/Content.Shared/Chemistry/Solution/SolutionContainerCaps.cs
index 261625eb7d..510018dff1 100644
--- a/Content.Shared/Chemistry/Solution/SolutionContainerCaps.cs
+++ b/Content.Shared/Chemistry/Solution/SolutionContainerCaps.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Content.Shared.Chemistry.Solution.Components;
 using Robust.Shared.Serialization;
diff --git a/Content.Shared/Climbing/SharedClimbableComponent.cs b/Content.Shared/Climbing/SharedClimbableComponent.cs
index b5d61c4ca5..b27b44dc93 100644
--- a/Content.Shared/Climbing/SharedClimbableComponent.cs
+++ b/Content.Shared/Climbing/SharedClimbableComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Shared.DragDrop;
+using Content.Shared.DragDrop;
 using Content.Shared.Interaction;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
diff --git a/Content.Shared/Climbing/SharedClimbingComponent.cs b/Content.Shared/Climbing/SharedClimbingComponent.cs
index c851593d3c..3f8c99c64f 100644
--- a/Content.Shared/Climbing/SharedClimbingComponent.cs
+++ b/Content.Shared/Climbing/SharedClimbingComponent.cs
@@ -1,19 +1,18 @@
-#nullable enable
 using System;
 using Content.Shared.ActionBlocker;
-using Content.Shared.NetIDs;
 using Content.Shared.Physics;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Physics;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Shared.Climbing
 {
+    [NetworkedComponent()]
     public abstract class SharedClimbingComponent : Component, IActionBlocker
     {
         public sealed override string Name => "Climbing";
-        public sealed override uint? NetID => ContentNetIDs.CLIMBING;
 
         protected bool IsOnClimbableThisFrame
         {
@@ -99,7 +98,7 @@ namespace Content.Shared.Climbing
         [Serializable, NetSerializable]
         protected sealed class ClimbModeComponentState : ComponentState
         {
-            public ClimbModeComponentState(bool climbing, bool isTransitioning) : base(ContentNetIDs.CLIMBING)
+            public ClimbModeComponentState(bool climbing, bool isTransitioning)
             {
                 Climbing = climbing;
                 IsTransitioning = isTransitioning;
diff --git a/Content.Shared/Cloning/AcceptCloningEuiMessage.cs b/Content.Shared/Cloning/AcceptCloningEuiMessage.cs
index 72fbfee8a1..f919422746 100644
--- a/Content.Shared/Cloning/AcceptCloningEuiMessage.cs
+++ b/Content.Shared/Cloning/AcceptCloningEuiMessage.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Content.Shared.Eui;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Cloning/SharedCloningPodComponent.cs b/Content.Shared/Cloning/SharedCloningPodComponent.cs
index 1dd0f852af..f90319bfe2 100644
--- a/Content.Shared/Cloning/SharedCloningPodComponent.cs
+++ b/Content.Shared/Cloning/SharedCloningPodComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using System.Collections.Generic;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
diff --git a/Content.Shared/Clothing/ClothingComponentState.cs b/Content.Shared/Clothing/ClothingComponentState.cs
index 4427bf6cb5..a063fe53e3 100644
--- a/Content.Shared/Clothing/ClothingComponentState.cs
+++ b/Content.Shared/Clothing/ClothingComponentState.cs
@@ -1,6 +1,4 @@
-#nullable enable
 using System;
-using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
@@ -13,7 +11,7 @@ namespace Content.Shared.Clothing
 
         public string? EquippedPrefix { get; }
 
-        public ClothingComponentState(string? clothingEquippedPrefix, string? equippedPrefix) : base(ContentNetIDs.CLOTHING)
+        public ClothingComponentState(string? clothingEquippedPrefix, string? equippedPrefix)
         {
             ClothingEquippedPrefix = clothingEquippedPrefix;
             EquippedPrefix = equippedPrefix;
diff --git a/Content.Shared/Clothing/SharedMagbootsComponent.cs b/Content.Shared/Clothing/SharedMagbootsComponent.cs
index df7bf7a279..4740f6cdf1 100644
--- a/Content.Shared/Clothing/SharedMagbootsComponent.cs
+++ b/Content.Shared/Clothing/SharedMagbootsComponent.cs
@@ -1,16 +1,15 @@
-#nullable enable
 using System;
 using Content.Shared.Movement.Components;
-using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Clothing
 {
+    [NetworkedComponent()]
     public abstract class SharedMagbootsComponent : Component, IMoveSpeedModifier
     {
         public sealed override string Name => "Magboots";
-        public sealed override uint? NetID => ContentNetIDs.MAGBOOTS;
 
         public abstract bool On { get; set; }
 
@@ -28,7 +27,7 @@ namespace Content.Shared.Clothing
         {
             public bool On { get; }
 
-            public MagbootsComponentState(bool @on) : base(ContentNetIDs.MAGBOOTS)
+            public MagbootsComponentState(bool @on)
             {
                 On = on;
             }
diff --git a/Content.Shared/Collections/RemList.cs b/Content.Shared/Collections/RemList.cs
index 57134921db..965adb64d6 100644
--- a/Content.Shared/Collections/RemList.cs
+++ b/Content.Shared/Collections/RemList.cs
@@ -2,7 +2,6 @@
 using System.Collections;
 using System.Collections.Generic;
 
-#nullable enable
 
 namespace Content.Shared.Collections
 {
diff --git a/Content.Shared/CombatMode/CombatModeSystemMessages.cs b/Content.Shared/CombatMode/CombatModeSystemMessages.cs
index a621eac51c..e547495b6d 100644
--- a/Content.Shared/CombatMode/CombatModeSystemMessages.cs
+++ b/Content.Shared/CombatMode/CombatModeSystemMessages.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Content.Shared.Targeting;
 using Robust.Shared.GameObjects;
diff --git a/Content.Shared/CombatMode/SharedCombatModeComponent.cs b/Content.Shared/CombatMode/SharedCombatModeComponent.cs
index 11182e1680..faaf00b3cc 100644
--- a/Content.Shared/CombatMode/SharedCombatModeComponent.cs
+++ b/Content.Shared/CombatMode/SharedCombatModeComponent.cs
@@ -1,17 +1,16 @@
-#nullable enable
 using System;
-using Content.Shared.NetIDs;
 using Content.Shared.Targeting;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Players;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Shared.CombatMode
 {
+    [NetworkedComponent()]
     public abstract class SharedCombatModeComponent : Component
     {
-        public sealed override uint? NetID => ContentNetIDs.COMBATMODE;
         public override string Name => "CombatMode";
 
         private bool _isInCombatMode;
@@ -78,7 +77,6 @@ namespace Content.Shared.CombatMode
             public TargetingZone TargetingZone { get; }
 
             public CombatModeComponentState(bool isInCombatMode, TargetingZone targetingZone)
-                : base(ContentNetIDs.COMBATMODE)
             {
                 IsInCombatMode = isInCombatMode;
                 TargetingZone = targetingZone;
diff --git a/Content.Shared/CombatMode/SharedCombatModeSystem.cs b/Content.Shared/CombatMode/SharedCombatModeSystem.cs
index 65abb41027..70101b35bf 100644
--- a/Content.Shared/CombatMode/SharedCombatModeSystem.cs
+++ b/Content.Shared/CombatMode/SharedCombatModeSystem.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Robust.Shared.GameObjects;
 
 namespace Content.Shared.CombatMode
diff --git a/Content.Shared/Communications/SharedCommunicationsConsoleComponent.cs b/Content.Shared/Communications/SharedCommunicationsConsoleComponent.cs
index 78a8378b6d..1cf3ced253 100644
--- a/Content.Shared/Communications/SharedCommunicationsConsoleComponent.cs
+++ b/Content.Shared/Communications/SharedCommunicationsConsoleComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
diff --git a/Content.Shared/Computer/SharedComputerComponent.cs b/Content.Shared/Computer/SharedComputerComponent.cs
index 4f50e62b0b..7a9ebf1229 100644
--- a/Content.Shared/Computer/SharedComputerComponent.cs
+++ b/Content.Shared/Computer/SharedComputerComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
diff --git a/Content.Shared/Configurable/SharedConfigurationComponent.cs b/Content.Shared/Configurable/SharedConfigurationComponent.cs
index d0b5610abc..f20c17eedf 100644
--- a/Content.Shared/Configurable/SharedConfigurationComponent.cs
+++ b/Content.Shared/Configurable/SharedConfigurationComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using System.Collections.Generic;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
diff --git a/Content.Shared/Construction/Conditions/LowWallInTile.cs b/Content.Shared/Construction/Conditions/LowWallInTile.cs
index 62d1d9a0e1..62b0b8186a 100644
--- a/Content.Shared/Construction/Conditions/LowWallInTile.cs
+++ b/Content.Shared/Construction/Conditions/LowWallInTile.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Shared.Maps;
+using Content.Shared.Maps;
 using Content.Shared.Window;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
diff --git a/Content.Shared/Construction/Conditions/NoWindowsInTile.cs b/Content.Shared/Construction/Conditions/NoWindowsInTile.cs
index a13cf0558e..81b3e4786c 100644
--- a/Content.Shared/Construction/Conditions/NoWindowsInTile.cs
+++ b/Content.Shared/Construction/Conditions/NoWindowsInTile.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Shared.Maps;
+using Content.Shared.Maps;
 using Content.Shared.Window;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
diff --git a/Content.Shared/Construction/Conditions/TileNotBlocked.cs b/Content.Shared/Construction/Conditions/TileNotBlocked.cs
index 2167db08c9..5ad9b06461 100644
--- a/Content.Shared/Construction/Conditions/TileNotBlocked.cs
+++ b/Content.Shared/Construction/Conditions/TileNotBlocked.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Shared.Maps;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
diff --git a/Content.Shared/Construction/Conditions/TileType.cs b/Content.Shared/Construction/Conditions/TileType.cs
index 82efb7793f..c57da7a87e 100644
--- a/Content.Shared/Construction/Conditions/TileType.cs
+++ b/Content.Shared/Construction/Conditions/TileType.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Content.Shared.Maps;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
diff --git a/Content.Shared/Construction/Conditions/WallmountCondition.cs b/Content.Shared/Construction/Conditions/WallmountCondition.cs
index 0391558f5e..f86fa59d8f 100644
--- a/Content.Shared/Construction/Conditions/WallmountCondition.cs
+++ b/Content.Shared/Construction/Conditions/WallmountCondition.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Linq;
 using Content.Shared.Physics;
 using Content.Shared.Tag;
@@ -34,7 +33,7 @@ namespace Content.Shared.Construction.Conditions
                 return false;
 
             // now we need to check that user actually tries to build wallmount on a wall
-            var physics = EntitySystem.Get<SharedBroadPhaseSystem>();
+            var physics = EntitySystem.Get<SharedBroadphaseSystem>();
             var rUserToObj = new CollisionRay(userWorldPosition, userToObject.Normalized, (int) CollisionGroup.Impassable);
             var length = userToObject.Length;
             var userToObjRaycastResults = physics.IntersectRayWithPredicate(user.Transform.MapID, rUserToObj, maxLength: length,
diff --git a/Content.Shared/Construction/ConstructionGraphEdge.cs b/Content.Shared/Construction/ConstructionGraphEdge.cs
index a84f1861bf..0fd82978f9 100644
--- a/Content.Shared/Construction/ConstructionGraphEdge.cs
+++ b/Content.Shared/Construction/ConstructionGraphEdge.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using System.Collections.Generic;
 using Content.Shared.Construction.Steps;
 using Robust.Shared.Serialization.Manager.Attributes;
diff --git a/Content.Shared/Construction/IGraphAction.cs b/Content.Shared/Construction/IGraphAction.cs
index d9bbe30688..c51a84fc18 100644
--- a/Content.Shared/Construction/IGraphAction.cs
+++ b/Content.Shared/Construction/IGraphAction.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Robust.Shared.GameObjects;
 
 namespace Content.Shared.Construction
diff --git a/Content.Shared/Construction/IGraphCondition.cs b/Content.Shared/Construction/IGraphCondition.cs
index ec29bba2a7..18a09984b8 100644
--- a/Content.Shared/Construction/IGraphCondition.cs
+++ b/Content.Shared/Construction/IGraphCondition.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Utility;
 
diff --git a/Content.Shared/Construction/MachineFrameVisuals.cs b/Content.Shared/Construction/MachineFrameVisuals.cs
index 99b2bc29d4..97091945b1 100644
--- a/Content.Shared/Construction/MachineFrameVisuals.cs
+++ b/Content.Shared/Construction/MachineFrameVisuals.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Construction
 {
diff --git a/Content.Shared/Construction/Prototypes/ConstructionPrototype.cs b/Content.Shared/Construction/Prototypes/ConstructionPrototype.cs
index b30fa5d39a..20ea712841 100644
--- a/Content.Shared/Construction/Prototypes/ConstructionPrototype.cs
+++ b/Content.Shared/Construction/Prototypes/ConstructionPrototype.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Content.Shared.Construction.Conditions;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager.Attributes;
diff --git a/Content.Shared/Construction/SharedCanBuildWindowOnTopComponent.cs b/Content.Shared/Construction/SharedCanBuildWindowOnTopComponent.cs
index dd508764cd..9aed112d1d 100644
--- a/Content.Shared/Construction/SharedCanBuildWindowOnTopComponent.cs
+++ b/Content.Shared/Construction/SharedCanBuildWindowOnTopComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Robust.Shared.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Shared.Construction
 {
diff --git a/Content.Shared/Construction/SharedConstructionSystem.cs b/Content.Shared/Construction/SharedConstructionSystem.cs
index 6d588e0412..6472e58265 100644
--- a/Content.Shared/Construction/SharedConstructionSystem.cs
+++ b/Content.Shared/Construction/SharedConstructionSystem.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
diff --git a/Content.Shared/Construction/Steps/ArbitraryInsertConstructionGraphStep.cs b/Content.Shared/Construction/Steps/ArbitraryInsertConstructionGraphStep.cs
index 0e60d05c13..16aab18b29 100644
--- a/Content.Shared/Construction/Steps/ArbitraryInsertConstructionGraphStep.cs
+++ b/Content.Shared/Construction/Steps/ArbitraryInsertConstructionGraphStep.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Robust.Shared.Localization;
+using Robust.Shared.Localization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
 
diff --git a/Content.Shared/Construction/Steps/ComponentConstructionGraphStep.cs b/Content.Shared/Construction/Steps/ComponentConstructionGraphStep.cs
index 32f952377e..55d8908fe0 100644
--- a/Content.Shared/Construction/Steps/ComponentConstructionGraphStep.cs
+++ b/Content.Shared/Construction/Steps/ComponentConstructionGraphStep.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Robust.Shared.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
diff --git a/Content.Shared/Construction/Steps/ConstructionGraphStep.cs b/Content.Shared/Construction/Steps/ConstructionGraphStep.cs
index 2ddb0fec5d..e9e6e5aba9 100644
--- a/Content.Shared/Construction/Steps/ConstructionGraphStep.cs
+++ b/Content.Shared/Construction/Steps/ConstructionGraphStep.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using System.Collections.Generic;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
diff --git a/Content.Shared/Construction/Steps/ConstructionGraphStepTypeSerializer.cs b/Content.Shared/Construction/Steps/ConstructionGraphStepTypeSerializer.cs
index 977a6677a2..9bfac04394 100644
--- a/Content.Shared/Construction/Steps/ConstructionGraphStepTypeSerializer.cs
+++ b/Content.Shared/Construction/Steps/ConstructionGraphStepTypeSerializer.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.IoC;
 using Robust.Shared.Serialization.Manager;
 using Robust.Shared.Serialization.Manager.Attributes;
diff --git a/Content.Shared/Construction/Steps/EntityInsertConstructionGraphStep.cs b/Content.Shared/Construction/Steps/EntityInsertConstructionGraphStep.cs
index 8c74e95c18..e77f4de32f 100644
--- a/Content.Shared/Construction/Steps/EntityInsertConstructionGraphStep.cs
+++ b/Content.Shared/Construction/Steps/EntityInsertConstructionGraphStep.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Robust.Shared.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
 namespace Content.Shared.Construction.Steps
diff --git a/Content.Shared/Construction/Steps/MaterialConstructionGraphStep.cs b/Content.Shared/Construction/Steps/MaterialConstructionGraphStep.cs
index f6570cbcbc..98e71b3ce7 100644
--- a/Content.Shared/Construction/Steps/MaterialConstructionGraphStep.cs
+++ b/Content.Shared/Construction/Steps/MaterialConstructionGraphStep.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Diagnostics.CodeAnalysis;
 using Content.Shared.Stacks;
 using Robust.Shared.GameObjects;
@@ -24,7 +23,7 @@ namespace Content.Shared.Construction.Steps
 
         public override void DoExamine(FormattedMessage message, bool inDetailsRange)
         {
-            message.AddMarkup(Loc.GetString("construction-insert-material-entity",("amount", Amount),("materialName", MaterialPrototype.Name)));
+            message.AddMarkup(Loc.GetString("construction-insert-material-entity", ("amount", Amount), ("materialName", MaterialPrototype.Name)));
         }
 
         public override bool EntityValid(IEntity entity)
diff --git a/Content.Shared/Construction/Steps/MultipleTagsConstructionGraphStep.cs b/Content.Shared/Construction/Steps/MultipleTagsConstructionGraphStep.cs
index de1f4b19b0..8d79712774 100644
--- a/Content.Shared/Construction/Steps/MultipleTagsConstructionGraphStep.cs
+++ b/Content.Shared/Construction/Steps/MultipleTagsConstructionGraphStep.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Collections.Generic;
 using Content.Shared.Tag;
 using Robust.Shared.GameObjects;
diff --git a/Content.Shared/Construction/Steps/NestedConstructionGraphStep.cs b/Content.Shared/Construction/Steps/NestedConstructionGraphStep.cs
index 863a806c73..cf42bd333b 100644
--- a/Content.Shared/Construction/Steps/NestedConstructionGraphStep.cs
+++ b/Content.Shared/Construction/Steps/NestedConstructionGraphStep.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using Robust.Shared.Serialization;
diff --git a/Content.Shared/Construction/Steps/PrototypeConstructionGraphStep.cs b/Content.Shared/Construction/Steps/PrototypeConstructionGraphStep.cs
index 18f19dda20..548ea9b203 100644
--- a/Content.Shared/Construction/Steps/PrototypeConstructionGraphStep.cs
+++ b/Content.Shared/Construction/Steps/PrototypeConstructionGraphStep.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Robust.Shared.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
diff --git a/Content.Shared/Construction/Steps/TagConstructionGraphStep.cs b/Content.Shared/Construction/Steps/TagConstructionGraphStep.cs
index 19c94bcace..c8880764ff 100644
--- a/Content.Shared/Construction/Steps/TagConstructionGraphStep.cs
+++ b/Content.Shared/Construction/Steps/TagConstructionGraphStep.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Shared.Tag;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
diff --git a/Content.Shared/Construction/Steps/ToolConstructionGraphStep.cs b/Content.Shared/Construction/Steps/ToolConstructionGraphStep.cs
index 73ccf75a0c..dd0fae8999 100644
--- a/Content.Shared/Construction/Steps/ToolConstructionGraphStep.cs
+++ b/Content.Shared/Construction/Steps/ToolConstructionGraphStep.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Shared.Tool;
 using Robust.Shared.Localization;
 using Robust.Shared.Serialization.Manager.Attributes;
diff --git a/Content.Shared/Conveyor/SharedConveyorComponent.cs b/Content.Shared/Conveyor/SharedConveyorComponent.cs
index 6e98d5c21c..83b19dd0dc 100644
--- a/Content.Shared/Conveyor/SharedConveyorComponent.cs
+++ b/Content.Shared/Conveyor/SharedConveyorComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Conveyor
diff --git a/Content.Shared/Cooldown/Cooldowns.cs b/Content.Shared/Cooldown/Cooldowns.cs
index 7d45ac7adc..7ad00bbb01 100644
--- a/Content.Shared/Cooldown/Cooldowns.cs
+++ b/Content.Shared/Cooldown/Cooldowns.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.IoC;
 using Robust.Shared.Timing;
 
diff --git a/Content.Shared/Cooldown/ItemCooldownComponent.cs b/Content.Shared/Cooldown/ItemCooldownComponent.cs
index 10a4fe21ee..7dd2d2544a 100644
--- a/Content.Shared/Cooldown/ItemCooldownComponent.cs
+++ b/Content.Shared/Cooldown/ItemCooldownComponent.cs
@@ -1,7 +1,6 @@
-#nullable enable
 using System;
-using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Players;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
@@ -12,10 +11,10 @@ namespace Content.Shared.Cooldown
     ///     Stores a visual "cooldown" for items, that gets displayed in the hands GUI.
     /// </summary>
     [RegisterComponent]
+    [NetworkedComponent()]
     public sealed class ItemCooldownComponent : Component
     {
         public override string Name => "ItemCooldown";
-        public override uint? NetID => ContentNetIDs.ITEMCOOLDOWN;
 
         private TimeSpan? _cooldownEnd;
         private TimeSpan? _cooldownStart;
@@ -80,8 +79,7 @@ namespace Content.Shared.Cooldown
             public TimeSpan? CooldownStart { get; set; }
             public TimeSpan? CooldownEnd { get; set; }
 
-            public ItemCooldownComponentState() : base(ContentNetIDs.ITEMCOOLDOWN)
-            {
+            public ItemCooldownComponentState() {
             }
         }
     }
diff --git a/Content.Shared/Coordinates/EntityCoordinatesExtensions.cs b/Content.Shared/Coordinates/EntityCoordinatesExtensions.cs
index c1f7c17f6d..c6eaace7a1 100644
--- a/Content.Shared/Coordinates/EntityCoordinatesExtensions.cs
+++ b/Content.Shared/Coordinates/EntityCoordinatesExtensions.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Robust.Shared.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
 
diff --git a/Content.Shared/Crayon/SharedCrayonComponent.cs b/Content.Shared/Crayon/SharedCrayonComponent.cs
index 129e114fee..d7269c7b76 100644
--- a/Content.Shared/Crayon/SharedCrayonComponent.cs
+++ b/Content.Shared/Crayon/SharedCrayonComponent.cs
@@ -1,8 +1,7 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
-using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
@@ -11,10 +10,10 @@ using Robust.Shared.ViewVariables;
 
 namespace Content.Shared.Crayon
 {
+    [NetworkedComponent()]
     public class SharedCrayonComponent : Component
     {
         public override string Name => "Crayon";
-        public override uint? NetID => ContentNetIDs.CRAYONS;
 
         public string SelectedState { get; set; } = string.Empty;
 
@@ -54,7 +53,7 @@ namespace Content.Shared.Crayon
         public readonly int Charges;
         public readonly int Capacity;
 
-        public CrayonComponentState(string color, string state, int charges, int capacity) : base(ContentNetIDs.CRAYONS)
+        public CrayonComponentState(string color, string state, int charges, int capacity)
         {
             Color = color;
             State = state;
diff --git a/Content.Shared/Cuffs/Components/SharedCuffableComponent.cs b/Content.Shared/Cuffs/Components/SharedCuffableComponent.cs
index 7283b31e8e..f3b6a7a59f 100644
--- a/Content.Shared/Cuffs/Components/SharedCuffableComponent.cs
+++ b/Content.Shared/Cuffs/Components/SharedCuffableComponent.cs
@@ -1,19 +1,18 @@
-#nullable enable
 using System;
 using Content.Shared.ActionBlocker;
-using Content.Shared.NetIDs;
 using Content.Shared.Pulling.Components;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Maths;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Shared.Cuffs.Components
 {
+    [NetworkedComponent()]
     public class SharedCuffableComponent : Component, IActionBlocker
     {
         public override string Name => "Cuffable";
-        public override uint? NetID => ContentNetIDs.CUFFED;
 
         [ComponentDependency] private readonly SharedPullableComponent? _pullable = default!;
 
@@ -42,7 +41,7 @@ namespace Content.Shared.Cuffs.Components
             public string IconState { get; }
             public Color Color { get; }
 
-            public CuffableComponentState(int numHandsCuffed, bool canStillInteract, string? rsiPath, string iconState, Color color) : base(ContentNetIDs.CUFFED)
+            public CuffableComponentState(int numHandsCuffed, bool canStillInteract, string? rsiPath, string iconState, Color color)
             {
                 NumHandsCuffed = numHandsCuffed;
                 CanStillInteract = canStillInteract;
diff --git a/Content.Shared/Cuffs/Components/SharedHandcuffComponent.cs b/Content.Shared/Cuffs/Components/SharedHandcuffComponent.cs
index 203871e44f..59a8a00d16 100644
--- a/Content.Shared/Cuffs/Components/SharedHandcuffComponent.cs
+++ b/Content.Shared/Cuffs/Components/SharedHandcuffComponent.cs
@@ -1,22 +1,21 @@
-#nullable enable
 using System;
-using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Cuffs.Components
 {
+    [NetworkedComponent()]
     public abstract class SharedHandcuffComponent : Component
     {
         public override string Name => "Handcuff";
-        public override uint? NetID => ContentNetIDs.HANDCUFFS;
 
         [Serializable, NetSerializable]
         protected sealed class HandcuffedComponentState : ComponentState
         {
             public string? IconState { get; }
 
-            public HandcuffedComponentState(string? iconState) : base(ContentNetIDs.HANDCUFFS)
+            public HandcuffedComponentState(string? iconState)
             {
                 IconState = iconState;
             }
diff --git a/Content.Shared/Damage/Components/DamageableComponent.cs b/Content.Shared/Damage/Components/DamageableComponent.cs
index 73acfab3ab..71df457e1e 100644
--- a/Content.Shared/Damage/Components/DamageableComponent.cs
+++ b/Content.Shared/Damage/Components/DamageableComponent.cs
@@ -1,13 +1,12 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using Content.Shared.Acts;
 using Content.Shared.Damage.Container;
 using Content.Shared.Damage.Resistances;
-using Content.Shared.NetIDs;
 using Content.Shared.Radiation;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.IoC;
 using Robust.Shared.Players;
 using Robust.Shared.Prototypes;
@@ -23,12 +22,11 @@ namespace Content.Shared.Damage.Components
     /// </summary>
     [RegisterComponent]
     [ComponentReference(typeof(IDamageableComponent))]
+    [NetworkedComponent()]
     public class DamageableComponent : Component, IDamageableComponent, IRadiationAct, ISerializationHooks
     {
         public override string Name => "Damageable";
 
-        public override uint? NetID => ContentNetIDs.DAMAGEABLE;
-
         // TODO define these in yaml?
         public const string DefaultResistanceSet = "defaultResistances";
         public const string DefaultDamageContainer = "metallicDamageContainer";
@@ -411,7 +409,7 @@ namespace Content.Shared.Damage.Components
     {
         public readonly Dictionary<DamageType, int> DamageList;
 
-        public DamageableComponentState(Dictionary<DamageType, int> damageList) : base(ContentNetIDs.DAMAGEABLE)
+        public DamageableComponentState(Dictionary<DamageType, int> damageList)
         {
             DamageList = damageList;
         }
diff --git a/Content.Shared/Damage/Components/IDamageableComponent.cs b/Content.Shared/Damage/Components/IDamageableComponent.cs
index 6f51161d8d..e00bc605a8 100644
--- a/Content.Shared/Damage/Components/IDamageableComponent.cs
+++ b/Content.Shared/Damage/Components/IDamageableComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Collections.Generic;
 using Content.Shared.Acts;
 using Content.Shared.Damage.Resistances;
diff --git a/Content.Shared/Damage/Container/DamageContainerPrototype.cs b/Content.Shared/Damage/Container/DamageContainerPrototype.cs
index 2cda46b225..37d0b3afea 100644
--- a/Content.Shared/Damage/Container/DamageContainerPrototype.cs
+++ b/Content.Shared/Damage/Container/DamageContainerPrototype.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using System.Collections.Generic;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
diff --git a/Content.Shared/Damage/DamageChangeData.cs b/Content.Shared/Damage/DamageChangeData.cs
index 5d726232e1..98b54f490d 100644
--- a/Content.Shared/Damage/DamageChangeData.cs
+++ b/Content.Shared/Damage/DamageChangeData.cs
@@ -1,5 +1,4 @@
-#nullable enable
-namespace Content.Shared.Damage
+namespace Content.Shared.Damage
 {
     /// <summary>
     ///     Data class with information on how the value of a
diff --git a/Content.Shared/Damage/DamageChangeParams.cs b/Content.Shared/Damage/DamageChangeParams.cs
index be802b8466..26c043d136 100644
--- a/Content.Shared/Damage/DamageChangeParams.cs
+++ b/Content.Shared/Damage/DamageChangeParams.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Content.Shared.Body.Components;
 using Content.Shared.Damage.Components;
 
diff --git a/Content.Shared/Damage/DamageChangedEventArgs.cs b/Content.Shared/Damage/DamageChangedEventArgs.cs
index 3efddf777a..d7a3a7552d 100644
--- a/Content.Shared/Damage/DamageChangedEventArgs.cs
+++ b/Content.Shared/Damage/DamageChangedEventArgs.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using System.Collections.Generic;
 using Content.Shared.Damage.Components;
 
diff --git a/Content.Shared/Damage/DamageChangedMessage.cs b/Content.Shared/Damage/DamageChangedMessage.cs
index cb6ceac546..5e7c2dc478 100644
--- a/Content.Shared/Damage/DamageChangedMessage.cs
+++ b/Content.Shared/Damage/DamageChangedMessage.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Content.Shared.Damage.Components;
 using Robust.Shared.GameObjects;
 
diff --git a/Content.Shared/Damage/DamageClass.cs b/Content.Shared/Damage/DamageClass.cs
index c97041b8eb..b34671b487 100644
--- a/Content.Shared/Damage/DamageClass.cs
+++ b/Content.Shared/Damage/DamageClass.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
diff --git a/Content.Shared/Damage/DamageSystem.cs b/Content.Shared/Damage/DamageSystem.cs
index 6bdc6c821d..d2d7d7dc87 100644
--- a/Content.Shared/Damage/DamageSystem.cs
+++ b/Content.Shared/Damage/DamageSystem.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Collections.Immutable;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
diff --git a/Content.Shared/Damage/DamageType.cs b/Content.Shared/Damage/DamageType.cs
index a6d62575be..65f1912f77 100644
--- a/Content.Shared/Damage/DamageType.cs
+++ b/Content.Shared/Damage/DamageType.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Robust.Shared.Serialization;
diff --git a/Content.Shared/Damage/Resistances/ResistanceSet.cs b/Content.Shared/Damage/Resistances/ResistanceSet.cs
index 81a9fb6973..01016fab37 100644
--- a/Content.Shared/Damage/Resistances/ResistanceSet.cs
+++ b/Content.Shared/Damage/Resistances/ResistanceSet.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using System.Collections.Generic;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
diff --git a/Content.Shared/Damage/Resistances/ResistanceSetPrototype.cs b/Content.Shared/Damage/Resistances/ResistanceSetPrototype.cs
index 96b88b4850..854dd05463 100644
--- a/Content.Shared/Damage/Resistances/ResistanceSetPrototype.cs
+++ b/Content.Shared/Damage/Resistances/ResistanceSetPrototype.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using System.Collections.Generic;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
diff --git a/Content.Shared/Dataset/DatasetPrototype.cs b/Content.Shared/Dataset/DatasetPrototype.cs
index b1aab3ab6c..3c024b4669 100644
--- a/Content.Shared/Dataset/DatasetPrototype.cs
+++ b/Content.Shared/Dataset/DatasetPrototype.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
diff --git a/Content.Shared/Directions/SharedDirectionExtensions.cs b/Content.Shared/Directions/SharedDirectionExtensions.cs
index 61c056d479..d70ee27851 100644
--- a/Content.Shared/Directions/SharedDirectionExtensions.cs
+++ b/Content.Shared/Directions/SharedDirectionExtensions.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Content.Shared.Maps;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
diff --git a/Content.Shared/Disposal/Components/SharedDisposalMailingUnitComponent.cs b/Content.Shared/Disposal/Components/SharedDisposalMailingUnitComponent.cs
index a0d79f628e..213f6f5cb0 100644
--- a/Content.Shared/Disposal/Components/SharedDisposalMailingUnitComponent.cs
+++ b/Content.Shared/Disposal/Components/SharedDisposalMailingUnitComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using System.Collections.Generic;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
diff --git a/Content.Shared/Disposal/Components/SharedDisposalRouterComponent.cs b/Content.Shared/Disposal/Components/SharedDisposalRouterComponent.cs
index 24d54b12db..da89fb9040 100644
--- a/Content.Shared/Disposal/Components/SharedDisposalRouterComponent.cs
+++ b/Content.Shared/Disposal/Components/SharedDisposalRouterComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using System.Text.RegularExpressions;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
diff --git a/Content.Shared/Disposal/Components/SharedDisposalTaggerComponent.cs b/Content.Shared/Disposal/Components/SharedDisposalTaggerComponent.cs
index 45694f86c8..ba5c3db608 100644
--- a/Content.Shared/Disposal/Components/SharedDisposalTaggerComponent.cs
+++ b/Content.Shared/Disposal/Components/SharedDisposalTaggerComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using System.Text.RegularExpressions;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
diff --git a/Content.Shared/Disposal/Components/SharedDisposalTubeComponent.cs b/Content.Shared/Disposal/Components/SharedDisposalTubeComponent.cs
index e2382f255d..fc6bec2178 100644
--- a/Content.Shared/Disposal/Components/SharedDisposalTubeComponent.cs
+++ b/Content.Shared/Disposal/Components/SharedDisposalTubeComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Disposal.Components
diff --git a/Content.Shared/Disposal/Components/SharedDisposalUnitComponent.cs b/Content.Shared/Disposal/Components/SharedDisposalUnitComponent.cs
index 5521b6b873..dd030ba32a 100644
--- a/Content.Shared/Disposal/Components/SharedDisposalUnitComponent.cs
+++ b/Content.Shared/Disposal/Components/SharedDisposalUnitComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Content.Shared.Body.Components;
 using Content.Shared.DragDrop;
diff --git a/Content.Shared/Disposal/SharedDisposalUnitSystem.cs b/Content.Shared/Disposal/SharedDisposalUnitSystem.cs
index 9acb37a14a..8c8e8980a9 100644
--- a/Content.Shared/Disposal/SharedDisposalUnitSystem.cs
+++ b/Content.Shared/Disposal/SharedDisposalUnitSystem.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Shared.Disposal.Components;
+using Content.Shared.Disposal.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
diff --git a/Content.Shared/DoAfter/SharedDoAfterComponent.cs b/Content.Shared/DoAfter/SharedDoAfterComponent.cs
index e128540463..4d625ee35e 100644
--- a/Content.Shared/DoAfter/SharedDoAfterComponent.cs
+++ b/Content.Shared/DoAfter/SharedDoAfterComponent.cs
@@ -1,18 +1,16 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
-using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Map;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.DoAfter
 {
+    [NetworkedComponent()]
     public abstract class SharedDoAfterComponent : Component
     {
         public override string Name => "DoAfter";
-
-        public override uint? NetID => ContentNetIDs.DO_AFTER;
     }
 
     [Serializable, NetSerializable]
@@ -20,7 +18,7 @@ namespace Content.Shared.DoAfter
     {
         public List<ClientDoAfter> DoAfters { get; }
 
-        public DoAfterComponentState(List<ClientDoAfter> doAfters) : base(ContentNetIDs.DO_AFTER)
+        public DoAfterComponentState(List<ClientDoAfter> doAfters)
         {
             DoAfters = doAfters;
         }
diff --git a/Content.Shared/Doors/AirlockWireStatus.cs b/Content.Shared/Doors/AirlockWireStatus.cs
index 9a5175aeff..62c3400639 100644
--- a/Content.Shared/Doors/AirlockWireStatus.cs
+++ b/Content.Shared/Doors/AirlockWireStatus.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Doors
diff --git a/Content.Shared/Doors/SharedDoorComponent.cs b/Content.Shared/Doors/SharedDoorComponent.cs
index 14e584f317..db6902c5c6 100644
--- a/Content.Shared/Doors/SharedDoorComponent.cs
+++ b/Content.Shared/Doors/SharedDoorComponent.cs
@@ -1,8 +1,7 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
-using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.IoC;
 using Robust.Shared.Physics;
 using Robust.Shared.Serialization;
@@ -12,10 +11,10 @@ using Robust.Shared.ViewVariables;
 
 namespace Content.Shared.Doors
 {
+    [NetworkedComponent()]
     public abstract class SharedDoorComponent : Component
     {
         public override string Name => "Door";
-        public override uint? NetID => ContentNetIDs.DOOR;
 
         [ComponentDependency]
         protected readonly SharedAppearanceComponent? AppearanceComponent = null;
@@ -167,7 +166,7 @@ namespace Content.Shared.Doors
         public readonly List<EntityUid> CurrentlyCrushing;
         public readonly TimeSpan CurTime;
 
-        public DoorComponentState(SharedDoorComponent.DoorState doorState, TimeSpan? startTime, List<EntityUid> currentlyCrushing, TimeSpan curTime) : base(ContentNetIDs.DOOR)
+        public DoorComponentState(SharedDoorComponent.DoorState doorState, TimeSpan? startTime, List<EntityUid> currentlyCrushing, TimeSpan curTime)
         {
             DoorState = doorState;
             StartTime = startTime;
diff --git a/Content.Shared/DragDrop/DragDropRequestEvent.cs b/Content.Shared/DragDrop/DragDropRequestEvent.cs
index 8a4632c651..0fd2fdf33e 100644
--- a/Content.Shared/DragDrop/DragDropRequestEvent.cs
+++ b/Content.Shared/DragDrop/DragDropRequestEvent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
diff --git a/Content.Shared/DragDrop/IDragDropOn.cs b/Content.Shared/DragDrop/IDragDropOn.cs
index fa8fb58a6f..9087c1c3be 100644
--- a/Content.Shared/DragDrop/IDragDropOn.cs
+++ b/Content.Shared/DragDrop/IDragDropOn.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Robust.Shared.Analyzers;
 
 namespace Content.Shared.DragDrop
diff --git a/Content.Shared/DragDrop/IDraggable.cs b/Content.Shared/DragDrop/IDraggable.cs
index 735850e946..f646eafbe2 100644
--- a/Content.Shared/DragDrop/IDraggable.cs
+++ b/Content.Shared/DragDrop/IDraggable.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Robust.Shared.Analyzers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
diff --git a/Content.Shared/DragDrop/IDropped.cs b/Content.Shared/DragDrop/IDropped.cs
index 5848167a46..c09f7fc7df 100644
--- a/Content.Shared/DragDrop/IDropped.cs
+++ b/Content.Shared/DragDrop/IDropped.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using JetBrains.Annotations;
 using Robust.Shared.Analyzers;
diff --git a/Content.Shared/DrawDepth/DrawDepth.cs b/Content.Shared/DrawDepth/DrawDepth.cs
index 82a415d577..6ea6bb3f3a 100644
--- a/Content.Shared/DrawDepth/DrawDepth.cs
+++ b/Content.Shared/DrawDepth/DrawDepth.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Robust.Shared.Serialization;
 using DrawDepthTag = Robust.Shared.GameObjects.DrawDepth;
 
diff --git a/Content.Shared/EffectBlocker/EffectBlockerExtensions.cs b/Content.Shared/EffectBlocker/EffectBlockerExtensions.cs
index e2cc0c8058..ae1c6abe99 100644
--- a/Content.Shared/EffectBlocker/EffectBlockerExtensions.cs
+++ b/Content.Shared/EffectBlocker/EffectBlockerExtensions.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Robust.Shared.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Shared.EffectBlocker
 {
diff --git a/Content.Shared/EffectBlocker/EffectBlockerSystem.cs b/Content.Shared/EffectBlocker/EffectBlockerSystem.cs
index 9494427f10..c8428f2d53 100644
--- a/Content.Shared/EffectBlocker/EffectBlockerSystem.cs
+++ b/Content.Shared/EffectBlocker/EffectBlockerSystem.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Content.Shared.ActionBlocker;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
diff --git a/Content.Shared/EffectBlocker/IEffectBlocker.cs b/Content.Shared/EffectBlocker/IEffectBlocker.cs
index 4e3d9d9927..c8c3d05d2e 100644
--- a/Content.Shared/EffectBlocker/IEffectBlocker.cs
+++ b/Content.Shared/EffectBlocker/IEffectBlocker.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Shared.ActionBlocker;
+using Content.Shared.ActionBlocker;
 
 namespace Content.Shared.EffectBlocker
 {
diff --git a/Content.Shared/Emoting/SharedEmotingComponent.cs b/Content.Shared/Emoting/SharedEmotingComponent.cs
index 47a277c1ad..48972b5628 100644
--- a/Content.Shared/Emoting/SharedEmotingComponent.cs
+++ b/Content.Shared/Emoting/SharedEmotingComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Shared.ActionBlocker;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
diff --git a/Content.Shared/Entry/EntryPoint.cs b/Content.Shared/Entry/EntryPoint.cs
index b00bbb2832..642056a1d7 100644
--- a/Content.Shared/Entry/EntryPoint.cs
+++ b/Content.Shared/Entry/EntryPoint.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using Content.Shared.CharacterAppearance;
diff --git a/Content.Shared/Eui/EuiMessageBase.cs b/Content.Shared/Eui/EuiMessageBase.cs
index 1d2052ff5a..5a252572d5 100644
--- a/Content.Shared/Eui/EuiMessageBase.cs
+++ b/Content.Shared/Eui/EuiMessageBase.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 
 namespace Content.Shared.Eui
 {
diff --git a/Content.Shared/Eui/EuiStateBase.cs b/Content.Shared/Eui/EuiStateBase.cs
index 461a1f1b4b..c1fe469c35 100644
--- a/Content.Shared/Eui/EuiStateBase.cs
+++ b/Content.Shared/Eui/EuiStateBase.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Eui
diff --git a/Content.Shared/Eui/MsgEuiCtl.cs b/Content.Shared/Eui/MsgEuiCtl.cs
index 265a9168cf..aad55f8aa4 100644
--- a/Content.Shared/Eui/MsgEuiCtl.cs
+++ b/Content.Shared/Eui/MsgEuiCtl.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Lidgren.Network;
+using Lidgren.Network;
 using Robust.Shared.Network;
 
 namespace Content.Shared.Eui
diff --git a/Content.Shared/Eui/MsgEuiMessage.cs b/Content.Shared/Eui/MsgEuiMessage.cs
index b598c40bb9..39a417f391 100644
--- a/Content.Shared/Eui/MsgEuiMessage.cs
+++ b/Content.Shared/Eui/MsgEuiMessage.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using System.IO;
 using Lidgren.Network;
 using Robust.Shared.IoC;
diff --git a/Content.Shared/Eui/MsgEuiState.cs b/Content.Shared/Eui/MsgEuiState.cs
index 41b295ef31..8dd3115581 100644
--- a/Content.Shared/Eui/MsgEuiState.cs
+++ b/Content.Shared/Eui/MsgEuiState.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using System.IO;
 using Lidgren.Network;
 using Robust.Shared.IoC;
diff --git a/Content.Shared/Examine/ExamineSystemMessages.cs b/Content.Shared/Examine/ExamineSystemMessages.cs
index dc56a9134e..c8e0d41bdb 100644
--- a/Content.Shared/Examine/ExamineSystemMessages.cs
+++ b/Content.Shared/Examine/ExamineSystemMessages.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
diff --git a/Content.Shared/Examine/ExamineSystemShared.cs b/Content.Shared/Examine/ExamineSystemShared.cs
index 23694c18aa..1785fbc795 100644
--- a/Content.Shared/Examine/ExamineSystemShared.cs
+++ b/Content.Shared/Examine/ExamineSystemShared.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using System.Linq;
 using Content.Shared.DragDrop;
 using Content.Shared.Interaction;
@@ -73,6 +72,9 @@ namespace Content.Shared.Examine
 
         public static bool InRangeUnOccluded(MapCoordinates origin, MapCoordinates other, float range, Ignored? predicate, bool ignoreInsideBlocker = true)
         {
+            if (origin.MapId == MapId.Nullspace ||
+                other.MapId == MapId.Nullspace) return false;
+
             var occluderSystem = Get<OccluderSystem>();
             if (!origin.InRange(other, range)) return false;
 
diff --git a/Content.Shared/Examine/ExaminerComponent.cs b/Content.Shared/Examine/ExaminerComponent.cs
index ebd91f02be..386d31f28c 100644
--- a/Content.Shared/Examine/ExaminerComponent.cs
+++ b/Content.Shared/Examine/ExaminerComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
diff --git a/Content.Shared/Explosion/SharedClusterFlashComponent.cs b/Content.Shared/Explosion/SharedClusterFlashComponent.cs
index ae838554f7..d58b1f16e6 100644
--- a/Content.Shared/Explosion/SharedClusterFlashComponent.cs
+++ b/Content.Shared/Explosion/SharedClusterFlashComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Flash/SharedFlashableComponent.cs b/Content.Shared/Flash/SharedFlashableComponent.cs
index 76420f86dd..78c48cbdd2 100644
--- a/Content.Shared/Flash/SharedFlashableComponent.cs
+++ b/Content.Shared/Flash/SharedFlashableComponent.cs
@@ -1,15 +1,14 @@
-#nullable enable
 using System;
-using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Flash
 {
+    [NetworkedComponent()]
     public class SharedFlashableComponent : Component
     {
         public override string Name => "Flashable";
-        public override uint? NetID => ContentNetIDs.FLASHABLE;
     }
 
     [Serializable, NetSerializable]
@@ -18,7 +17,7 @@ namespace Content.Shared.Flash
         public double Duration { get; }
         public TimeSpan Time { get; }
 
-        public FlashComponentState(double duration, TimeSpan time) : base(ContentNetIDs.FLASHABLE)
+        public FlashComponentState(double duration, TimeSpan time)
         {
             Duration = duration;
             Time = time;
diff --git a/Content.Shared/Fluids/SharedSprayComponent.cs b/Content.Shared/Fluids/SharedSprayComponent.cs
index 32c55a39cf..ef46ea9644 100644
--- a/Content.Shared/Fluids/SharedSprayComponent.cs
+++ b/Content.Shared/Fluids/SharedSprayComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Foam/FoamVisuals.cs b/Content.Shared/Foam/FoamVisuals.cs
index d6a7382c1e..676b1e4036 100644
--- a/Content.Shared/Foam/FoamVisuals.cs
+++ b/Content.Shared/Foam/FoamVisuals.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Foam
diff --git a/Content.Shared/Friction/SharedTileFrictionController.cs b/Content.Shared/Friction/SharedTileFrictionController.cs
index 3f7017232b..9140a6d272 100644
--- a/Content.Shared/Friction/SharedTileFrictionController.cs
+++ b/Content.Shared/Friction/SharedTileFrictionController.cs
@@ -7,11 +7,10 @@ using Robust.Shared.Configuration;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
-using Robust.Shared.Physics.Broadphase;
+using Robust.Shared.Physics;
 using Robust.Shared.Physics.Controllers;
 using Robust.Shared.Physics.Dynamics;
 
-#nullable enable
 
 namespace Content.Shared.Friction
 {
@@ -21,7 +20,7 @@ namespace Content.Shared.Friction
         [Dependency] private readonly IMapManager _mapManager = default!;
         [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!;
 
-        private SharedBroadPhaseSystem _broadPhaseSystem = default!;
+        private SharedBroadphaseSystem _broadPhaseSystem = default!;
 
         private float _stopSpeed;
 
@@ -30,7 +29,7 @@ namespace Content.Shared.Friction
         public override void Initialize()
         {
             base.Initialize();
-            _broadPhaseSystem = EntitySystem.Get<SharedBroadPhaseSystem>();
+            _broadPhaseSystem = EntitySystem.Get<SharedBroadphaseSystem>();
 
             _frictionModifier = _configManager.GetCVar(CCVars.TileFrictionModifier);
             _configManager.OnValueChanged(CCVars.TileFrictionModifier, value => _frictionModifier = value);
diff --git a/Content.Shared/Friction/TileFrictionModifier.cs b/Content.Shared/Friction/TileFrictionModifier.cs
index 922a795d71..052af70447 100644
--- a/Content.Shared/Friction/TileFrictionModifier.cs
+++ b/Content.Shared/Friction/TileFrictionModifier.cs
@@ -1,6 +1,4 @@
-#nullable enable
 using System;
-using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 using Robust.Shared.Players;
@@ -50,7 +48,7 @@ namespace Content.Shared.Friction
         {
             public float Modifier;
 
-            public TileFrictionComponentState(float modifier) : base(ContentNetIDs.TILE_FRICTION)
+            public TileFrictionComponentState(float modifier)
             {
                 Modifier = modifier;
             }
diff --git a/Content.Shared/GameTicking/RoundRestartCleanupEvent.cs b/Content.Shared/GameTicking/RoundRestartCleanupEvent.cs
index 0537925b56..1fc9b23fbf 100644
--- a/Content.Shared/GameTicking/RoundRestartCleanupEvent.cs
+++ b/Content.Shared/GameTicking/RoundRestartCleanupEvent.cs
@@ -2,7 +2,6 @@
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-#nullable enable
 
 namespace Content.Shared.GameTicking
 {
diff --git a/Content.Shared/GameTicking/SharedGameTicker.cs b/Content.Shared/GameTicking/SharedGameTicker.cs
index 471935839b..944246ca72 100644
--- a/Content.Shared/GameTicking/SharedGameTicker.cs
+++ b/Content.Shared/GameTicking/SharedGameTicker.cs
@@ -1,5 +1,4 @@
-#nullable enable
-
+
 using System;
 using System.Collections.Generic;
 using Robust.Shared.GameObjects;
diff --git a/Content.Shared/GameWindow/RequestWindowAttentionEvent.cs b/Content.Shared/GameWindow/RequestWindowAttentionEvent.cs
index dc37f415bb..2d18460c8c 100644
--- a/Content.Shared/GameWindow/RequestWindowAttentionEvent.cs
+++ b/Content.Shared/GameWindow/RequestWindowAttentionEvent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Ghost/Roles/GhostRolesEuiMessages.cs b/Content.Shared/Ghost/Roles/GhostRolesEuiMessages.cs
index ea832d2bf9..b37ebb1f47 100644
--- a/Content.Shared/Ghost/Roles/GhostRolesEuiMessages.cs
+++ b/Content.Shared/Ghost/Roles/GhostRolesEuiMessages.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Content.Shared.Eui;
 using Robust.Shared.Serialization;
diff --git a/Content.Shared/Ghost/Roles/MakeGhostRoleEuiState.cs b/Content.Shared/Ghost/Roles/MakeGhostRoleEuiState.cs
index 6f7a648c5f..c28f338d6f 100644
--- a/Content.Shared/Ghost/Roles/MakeGhostRoleEuiState.cs
+++ b/Content.Shared/Ghost/Roles/MakeGhostRoleEuiState.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Content.Shared.Eui;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
diff --git a/Content.Shared/Ghost/Roles/MakeGhostRoleWindowClosedMessage.cs b/Content.Shared/Ghost/Roles/MakeGhostRoleWindowClosedMessage.cs
index 7f5d933bdb..68754df2a8 100644
--- a/Content.Shared/Ghost/Roles/MakeGhostRoleWindowClosedMessage.cs
+++ b/Content.Shared/Ghost/Roles/MakeGhostRoleWindowClosedMessage.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Content.Shared.Eui;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Ghost/Roles/SharedGhostRoleSystem.cs b/Content.Shared/Ghost/Roles/SharedGhostRoleSystem.cs
index 4977d54870..876097783e 100644
--- a/Content.Shared/Ghost/Roles/SharedGhostRoleSystem.cs
+++ b/Content.Shared/Ghost/Roles/SharedGhostRoleSystem.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
diff --git a/Content.Shared/Ghost/SharedGhostComponent.cs b/Content.Shared/Ghost/SharedGhostComponent.cs
index bc24fe9eca..77806356ac 100644
--- a/Content.Shared/Ghost/SharedGhostComponent.cs
+++ b/Content.Shared/Ghost/SharedGhostComponent.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 using Content.Shared.ActionBlocker;
-using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Players;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
@@ -10,10 +10,10 @@ using Robust.Shared.ViewVariables;
 
 namespace Content.Shared.Ghost
 {
+    [NetworkedComponent()]
     public class SharedGhostComponent : Component, IActionBlocker
     {
         public override string Name => "Ghost";
-        public override uint? NetID => ContentNetIDs.GHOST;
 
         /// <summary>
         ///     Changed by <see cref="GhostChangeCanReturnToBodyEvent"/>
@@ -61,7 +61,6 @@ namespace Content.Shared.Ghost
             bool canReturnToBody,
             HashSet<string>? locationWarps = null,
             Dictionary<EntityUid, string>? playerWarps = null)
-            : base(ContentNetIDs.GHOST)
         {
             CanReturnToBody = canReturnToBody;
             LocationWarps = locationWarps;
diff --git a/Content.Shared/Gravity/GravityChangedMessage.cs b/Content.Shared/Gravity/GravityChangedMessage.cs
index de07cb39af..b8955f1d6f 100644
--- a/Content.Shared/Gravity/GravityChangedMessage.cs
+++ b/Content.Shared/Gravity/GravityChangedMessage.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 
diff --git a/Content.Shared/Gravity/GravityComponent.cs b/Content.Shared/Gravity/GravityComponent.cs
index 7050f236ca..c5e77e7989 100644
--- a/Content.Shared/Gravity/GravityComponent.cs
+++ b/Content.Shared/Gravity/GravityComponent.cs
@@ -1,7 +1,7 @@
 using System;
-using Content.Shared.NetIDs;
 using Content.Shared.Sound;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Log;
 using Robust.Shared.Players;
 using Robust.Shared.Serialization;
@@ -11,10 +11,10 @@ using Robust.Shared.ViewVariables;
 namespace Content.Shared.Gravity
 {
     [RegisterComponent]
+    [NetworkedComponent]
     public sealed class GravityComponent : Component
     {
         public override string Name => "Gravity";
-        public override uint? NetID => ContentNetIDs.GRAVITY;
 
         [DataField("gravityShakeSound")]
         public SoundSpecifier GravityShakeSound { get; set; } = new SoundPathSpecifier("/Audio/Effects/alert.ogg");
@@ -58,7 +58,7 @@ namespace Content.Shared.Gravity
         {
             public bool Enabled { get; }
 
-            public GravityComponentState(bool enabled) : base(ContentNetIDs.GRAVITY)
+            public GravityComponentState(bool enabled)
             {
                 Enabled = enabled;
             }
diff --git a/Content.Shared/Gravity/SharedGravityGeneratorComponent.cs b/Content.Shared/Gravity/SharedGravityGeneratorComponent.cs
index 7706182343..41214e037a 100644
--- a/Content.Shared/Gravity/SharedGravityGeneratorComponent.cs
+++ b/Content.Shared/Gravity/SharedGravityGeneratorComponent.cs
@@ -1,17 +1,15 @@
-#nullable enable
 using System;
-using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Gravity
 {
+    [NetworkedComponent()]
     public class SharedGravityGeneratorComponent : Component
     {
         public override string Name => "GravityGenerator";
 
-        public override uint? NetID => ContentNetIDs.GRAVITY_GENERATOR;
-
         /// <summary>
         ///     Sent to the server to set whether the generator should be on or off
         /// </summary>
diff --git a/Content.Shared/Hands/Components/ISharedHandsComponent.cs b/Content.Shared/Hands/Components/ISharedHandsComponent.cs
index 11ef111c20..0eac928ba8 100644
--- a/Content.Shared/Hands/Components/ISharedHandsComponent.cs
+++ b/Content.Shared/Hands/Components/ISharedHandsComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Robust.Shared.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Shared.Hands.Components
 {
diff --git a/Content.Shared/Hands/Components/SharedHandsComponent.cs b/Content.Shared/Hands/Components/SharedHandsComponent.cs
index fb02eefccc..15a2ca3d69 100644
--- a/Content.Shared/Hands/Components/SharedHandsComponent.cs
+++ b/Content.Shared/Hands/Components/SharedHandsComponent.cs
@@ -1,13 +1,12 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Interaction;
-using Content.Shared.NetIDs;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
 using Robust.Shared.Map;
@@ -19,12 +18,11 @@ using Robust.Shared.ViewVariables;
 
 namespace Content.Shared.Hands.Components
 {
+    [NetworkedComponent()]
     public abstract class SharedHandsComponent : Component, ISharedHandsComponent
     {
         public sealed override string Name => "Hands";
 
-        public sealed override uint? NetID => ContentNetIDs.HANDS;
-
         public event Action? OnItemChanged; //TODO: Try to replace C# event
 
         /// <summary>
@@ -68,7 +66,7 @@ namespace Content.Shared.Hands.Components
         /// </summary>
         [DataField("throwForceMultiplier")]
         [ViewVariables(VVAccess.ReadWrite)]
-        public float ThrowForceMultiplier { get; set; } = 14f; //should be tuned so that a thrown item lands about under the player's cursor
+        public float ThrowForceMultiplier { get; set; } = 10f; //should be tuned so that a thrown item lands about under the player's cursor
 
         /// <summary>
         ///     Distance after which longer throw targets stop increasing throw impulse.
@@ -442,14 +440,24 @@ namespace Content.Shared.Hands.Components
             var origin = Owner.Transform.MapPosition;
             var other = targetCoords.ToMap(Owner.EntityManager);
 
+            var dropVector = other.Position - origin.Position;
+            var requestedDropDistance = (dropVector.Length);
+
+            if (dropVector.Length > SharedInteractionSystem.InteractionRange)
+            {
+                dropVector = dropVector.Normalized * SharedInteractionSystem.InteractionRange;
+                other = new MapCoordinates(origin.Position + dropVector, other.MapId);
+            }
+
             var dropLength = EntitySystem.Get<SharedInteractionSystem>().UnobstructedDistance(origin, other, ignoredEnt: Owner);
-            dropLength = MathF.Min(dropLength, SharedInteractionSystem.InteractionRange);
 
-            var dropVector = origin.Position;
-            if (dropLength != 0)
-                dropVector += (other.Position - origin.Position).Normalized * dropLength;
+            var diff = requestedDropDistance - dropLength;
 
-            return targetCoords.WithPosition(dropVector);
+            // If we come up short then offset the drop location.
+            if (diff > 0)
+                return targetCoords.Offset(-dropVector.Normalized * diff);
+
+            return targetCoords;
         }
 
         /// <summary>
@@ -867,7 +875,7 @@ namespace Content.Shared.Hands.Components
         public HandState[] Hands { get; }
         public string? ActiveHand { get; }
 
-        public HandsComponentState(HandState[] hands, string? activeHand = null) : base(ContentNetIDs.HANDS)
+        public HandsComponentState(HandState[] hands, string? activeHand = null)
         {
             Hands = hands;
             ActiveHand = activeHand;
diff --git a/Content.Shared/Hands/IEquippedHand.cs b/Content.Shared/Hands/IEquippedHand.cs
index 79bffd4f84..dd01e37e6c 100644
--- a/Content.Shared/Hands/IEquippedHand.cs
+++ b/Content.Shared/Hands/IEquippedHand.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Content.Shared.Hands.Components;
 using Content.Shared.Inventory;
diff --git a/Content.Shared/Hands/IHandDeselected.cs b/Content.Shared/Hands/IHandDeselected.cs
index 1399ccb2b2..980f3dd489 100644
--- a/Content.Shared/Hands/IHandDeselected.cs
+++ b/Content.Shared/Hands/IHandDeselected.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using JetBrains.Annotations;
 using Robust.Shared.Analyzers;
diff --git a/Content.Shared/Hands/IHandSelected.cs b/Content.Shared/Hands/IHandSelected.cs
index f0709a1da0..5e34cef951 100644
--- a/Content.Shared/Hands/IHandSelected.cs
+++ b/Content.Shared/Hands/IHandSelected.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using JetBrains.Annotations;
 using Robust.Shared.Analyzers;
diff --git a/Content.Shared/Hands/IUnequippedHand.cs b/Content.Shared/Hands/IUnequippedHand.cs
index ccc24cbb0f..9abf762e8c 100644
--- a/Content.Shared/Hands/IUnequippedHand.cs
+++ b/Content.Shared/Hands/IUnequippedHand.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Content.Shared.Hands.Components;
 using Content.Shared.Inventory;
diff --git a/Content.Shared/Input/ContentKeyFunctions.cs b/Content.Shared/Input/ContentKeyFunctions.cs
index 9a3f504f0d..c5327ba431 100644
--- a/Content.Shared/Input/ContentKeyFunctions.cs
+++ b/Content.Shared/Input/ContentKeyFunctions.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Robust.Shared.Input;
 
 namespace Content.Shared.Input
@@ -16,6 +15,8 @@ namespace Content.Shared.Input
         public static readonly BoundKeyFunction FocusRadio = "FocusRadioWindow";
         public static readonly BoundKeyFunction FocusOOC = "FocusOOCWindow";
         public static readonly BoundKeyFunction FocusAdminChat = "FocusAdminChatWindow";
+        public static readonly BoundKeyFunction FocusDeadChat = "FocusDeadChatWindow";
+        public static readonly BoundKeyFunction FocusConsoleChat = "FocusConsoleChatWindow";
         public static readonly BoundKeyFunction CycleChatChannelForward = "CycleChatChannelForward";
         public static readonly BoundKeyFunction CycleChatChannelBackward = "CycleChatChannelBackward";
         public static readonly BoundKeyFunction OpenCharacterMenu = "OpenCharacterMenu";
diff --git a/Content.Shared/Instruments/SharedInstrumentComponent.cs b/Content.Shared/Instruments/SharedInstrumentComponent.cs
index 3f2064e16d..d33eb6e44a 100644
--- a/Content.Shared/Instruments/SharedInstrumentComponent.cs
+++ b/Content.Shared/Instruments/SharedInstrumentComponent.cs
@@ -1,17 +1,16 @@
-#nullable enable
 using System;
-using Content.Shared.NetIDs;
 using Robust.Shared.Audio.Midi;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Shared.Instruments
 {
+    [NetworkedComponent()]
     public class SharedInstrumentComponent : Component
     {
         public override string Name => "Instrument";
-        public override uint? NetID => ContentNetIDs.INSTRUMENTS;
 
         [ViewVariables(VVAccess.ReadWrite)]
         public virtual byte InstrumentProgram { get; set; }
@@ -75,7 +74,7 @@ namespace Content.Shared.Instruments
         public bool AllowProgramChange { get; }
         public bool RespectMidiLimits { get; }
 
-        public InstrumentState(bool playing, byte instrumentProgram, byte instrumentBank, bool allowPercussion, bool allowProgramChange, bool respectMidiLimits, uint sequencerTick = 0) : base(ContentNetIDs.INSTRUMENTS)
+        public InstrumentState(bool playing, byte instrumentProgram, byte instrumentBank, bool allowPercussion, bool allowProgramChange, bool respectMidiLimits, uint sequencerTick = 0)
         {
             Playing = playing;
             InstrumentProgram = instrumentProgram;
diff --git a/Content.Shared/Interaction/Helpers/SharedUnobstructedExtensions.cs b/Content.Shared/Interaction/Helpers/SharedUnobstructedExtensions.cs
index 7c09cc36e6..691943ab69 100644
--- a/Content.Shared/Interaction/Helpers/SharedUnobstructedExtensions.cs
+++ b/Content.Shared/Interaction/Helpers/SharedUnobstructedExtensions.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Shared.DragDrop;
 using Content.Shared.Physics;
 using Robust.Shared.Containers;
diff --git a/Content.Shared/Interaction/Helpers/SharedUnoccludedExtensions.cs b/Content.Shared/Interaction/Helpers/SharedUnoccludedExtensions.cs
index 2e2b395330..18b5537460 100644
--- a/Content.Shared/Interaction/Helpers/SharedUnoccludedExtensions.cs
+++ b/Content.Shared/Interaction/Helpers/SharedUnoccludedExtensions.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Shared.DragDrop;
+using Content.Shared.DragDrop;
 using Content.Shared.Examine;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
diff --git a/Content.Shared/Interaction/IAfterInteract.cs b/Content.Shared/Interaction/IAfterInteract.cs
index 9fc7ddcde0..a9d12a0b7e 100644
--- a/Content.Shared/Interaction/IAfterInteract.cs
+++ b/Content.Shared/Interaction/IAfterInteract.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
@@ -6,7 +5,6 @@ using Robust.Shared.Analyzers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 
-#nullable enable
 
 namespace Content.Shared.Interaction
 {
diff --git a/Content.Shared/Interaction/ITargetedInteractEventArgs.cs b/Content.Shared/Interaction/ITargetedInteractEventArgs.cs
index cb0e51d73c..1b52dbed2c 100644
--- a/Content.Shared/Interaction/ITargetedInteractEventArgs.cs
+++ b/Content.Shared/Interaction/ITargetedInteractEventArgs.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Robust.Shared.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Shared.Interaction
 {
diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs
index d15e0ee256..7f50cf0063 100644
--- a/Content.Shared/Interaction/SharedInteractionSystem.cs
+++ b/Content.Shared/Interaction/SharedInteractionSystem.cs
@@ -46,7 +46,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 = Get<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 +122,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 = Get<SharedBroadphaseSystem>().IntersectRayWithPredicate(origin.MapId, ray, dir.Length, predicate.Invoke, false).ToList();
 
             if (rayResults.Count == 0) return true;
 
diff --git a/Content.Shared/Inventory/EquipmentSlotDefinitions.cs b/Content.Shared/Inventory/EquipmentSlotDefinitions.cs
index 578a74ac59..7fec296312 100644
--- a/Content.Shared/Inventory/EquipmentSlotDefinitions.cs
+++ b/Content.Shared/Inventory/EquipmentSlotDefinitions.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using System.Collections.Generic;
 using JetBrains.Annotations;
 using Robust.Shared.Serialization;
diff --git a/Content.Shared/Inventory/IEquipped.cs b/Content.Shared/Inventory/IEquipped.cs
index d27d4f4054..9021190108 100644
--- a/Content.Shared/Inventory/IEquipped.cs
+++ b/Content.Shared/Inventory/IEquipped.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Content.Shared.Hands;
 using JetBrains.Annotations;
diff --git a/Content.Shared/Inventory/IUnequipped.cs b/Content.Shared/Inventory/IUnequipped.cs
index 8699316513..2a3985231e 100644
--- a/Content.Shared/Inventory/IUnequipped.cs
+++ b/Content.Shared/Inventory/IUnequipped.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Content.Shared.Hands;
 using JetBrains.Annotations;
diff --git a/Content.Shared/Inventory/InventoryTemplates.cs b/Content.Shared/Inventory/InventoryTemplates.cs
index dab4b662b4..56c8d98ad9 100644
--- a/Content.Shared/Inventory/InventoryTemplates.cs
+++ b/Content.Shared/Inventory/InventoryTemplates.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Collections.Generic;
+using System.Collections.Generic;
 using JetBrains.Annotations;
 using static Content.Shared.Inventory.EquipmentSlotDefines;
 
diff --git a/Content.Shared/Inventory/SharedInventoryComponent.cs b/Content.Shared/Inventory/SharedInventoryComponent.cs
index 87f824f62d..ec7ba4157c 100644
--- a/Content.Shared/Inventory/SharedInventoryComponent.cs
+++ b/Content.Shared/Inventory/SharedInventoryComponent.cs
@@ -1,8 +1,8 @@
-using System;
+using System;
 using System.Collections.Generic;
 using Content.Shared.Movement.Components;
-using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.IoC;
 using Robust.Shared.Reflection;
 using Robust.Shared.Serialization;
@@ -13,13 +13,13 @@ using static Content.Shared.Inventory.EquipmentSlotDefines;
 
 namespace Content.Shared.Inventory
 {
+    [NetworkedComponent()]
     public abstract class SharedInventoryComponent : Component, IMoveSpeedModifier
     {
         [Dependency] protected readonly IReflectionManager ReflectionManager = default!;
         [Dependency] protected readonly IDynamicTypeFactory DynamicTypeFactory = default!;
 
         public sealed override string Name => "Inventory";
-        public sealed override uint? NetID => ContentNetIDs.STORAGE;
 
         [ViewVariables]
         protected Inventory InventoryInstance { get; private set; } = default!;
@@ -52,7 +52,7 @@ namespace Content.Shared.Inventory
             public List<KeyValuePair<Slots, EntityUid>> Entities { get; }
             public KeyValuePair<Slots, (EntityUid entity, bool fits)>? HoverEntity { get; }
 
-            public InventoryComponentState(List<KeyValuePair<Slots, EntityUid>> entities, KeyValuePair<Slots, (EntityUid entity, bool fits)>? hoverEntity = null) : base(ContentNetIDs.STORAGE)
+            public InventoryComponentState(List<KeyValuePair<Slots, EntityUid>> entities, KeyValuePair<Slots, (EntityUid entity, bool fits)>? hoverEntity = null)
             {
                 Entities = entities;
                 HoverEntity = hoverEntity;
diff --git a/Content.Shared/Item/SharedItemComponent.cs b/Content.Shared/Item/SharedItemComponent.cs
index b8af477798..50782c35b3 100644
--- a/Content.Shared/Item/SharedItemComponent.cs
+++ b/Content.Shared/Item/SharedItemComponent.cs
@@ -1,12 +1,11 @@
-#nullable enable
 using System;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Hands.Components;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Helpers;
 using Content.Shared.Inventory;
-using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Maths;
 using Robust.Shared.Physics;
 using Robust.Shared.Players;
@@ -19,12 +18,11 @@ namespace Content.Shared.Item
     /// <summary>
     ///    Players can pick up, drop, and put items in bags, and they can be seen in player's hands.
     /// </summary>
+    [NetworkedComponent()]
     public abstract class SharedItemComponent : Component, IEquipped, IUnequipped, IInteractHand
     {
         public override string Name => "Item";
 
-        public override uint? NetID => ContentNetIDs.ITEM;
-
         /// <summary>
         ///     How much big this item is.
         /// </summary>
@@ -169,7 +167,7 @@ namespace Content.Shared.Item
         public Color Color { get; }
         public string? RsiPath { get; }
 
-        public ItemComponentState(int size, string? equippedPrefix, Color color, string? rsiPath) : base(ContentNetIDs.ITEM)
+        public ItemComponentState(int size, string? equippedPrefix, Color color, string? rsiPath)
         {
             Size = size;
             EquippedPrefix = equippedPrefix;
diff --git a/Content.Shared/Kitchen/Components/SharedKitchenSpikeComponent.cs b/Content.Shared/Kitchen/Components/SharedKitchenSpikeComponent.cs
index 6ac9122c65..ebfa220172 100644
--- a/Content.Shared/Kitchen/Components/SharedKitchenSpikeComponent.cs
+++ b/Content.Shared/Kitchen/Components/SharedKitchenSpikeComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Shared.DragDrop;
 using Content.Shared.Nutrition.Components;
 using Content.Shared.Sound;
diff --git a/Content.Shared/Kitchen/Components/SharedMicrowaveComponent.cs b/Content.Shared/Kitchen/Components/SharedMicrowaveComponent.cs
index fb607f37e8..bd0b511317 100644
--- a/Content.Shared/Kitchen/Components/SharedMicrowaveComponent.cs
+++ b/Content.Shared/Kitchen/Components/SharedMicrowaveComponent.cs
@@ -1,18 +1,17 @@
-#nullable enable
 using System;
 using Content.Shared.Chemistry.Solution;
-using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Kitchen.Components
 {
 
+    [NetworkedComponent()]
     public class SharedMicrowaveComponent : Component
     {
 
         public override string Name => "Microwave";
-        public override uint? NetID => ContentNetIDs.MICROWAVE;
 
         [Serializable, NetSerializable]
         public class MicrowaveStartCookMessage : BoundUserInterfaceMessage
diff --git a/Content.Shared/Kitchen/Components/SharedReagentGrinderComponent.cs b/Content.Shared/Kitchen/Components/SharedReagentGrinderComponent.cs
index be769407c4..ca1eae6923 100644
--- a/Content.Shared/Kitchen/Components/SharedReagentGrinderComponent.cs
+++ b/Content.Shared/Kitchen/Components/SharedReagentGrinderComponent.cs
@@ -1,7 +1,5 @@
-#nullable enable
 using System;
 using Content.Shared.Chemistry.Solution;
-using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
@@ -10,7 +8,6 @@ namespace Content.Shared.Kitchen.Components
     public abstract class SharedReagentGrinderComponent : Component
     {
         public override string Name => "ReagentGrinder";
-        public override uint? NetID => ContentNetIDs.REAGENT_GRINDER;
 
         [Serializable, NetSerializable]
         public class ReagentGrinderGrindStartMessage : BoundUserInterfaceMessage
diff --git a/Content.Shared/Kitchen/MicrowaveMealRecipePrototype.cs b/Content.Shared/Kitchen/MicrowaveMealRecipePrototype.cs
index d1ebef976f..891cba433e 100644
--- a/Content.Shared/Kitchen/MicrowaveMealRecipePrototype.cs
+++ b/Content.Shared/Kitchen/MicrowaveMealRecipePrototype.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Robust.Shared.Localization;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager.Attributes;
diff --git a/Content.Shared/Kitchen/RecipeManager.cs b/Content.Shared/Kitchen/RecipeManager.cs
index bb5461def6..93c69e8b62 100644
--- a/Content.Shared/Kitchen/RecipeManager.cs
+++ b/Content.Shared/Kitchen/RecipeManager.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Shared/Lathe/SharedLatheComponent.cs b/Content.Shared/Lathe/SharedLatheComponent.cs
index 1979048842..ee1dc79546 100644
--- a/Content.Shared/Lathe/SharedLatheComponent.cs
+++ b/Content.Shared/Lathe/SharedLatheComponent.cs
@@ -1,21 +1,20 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
-using Content.Shared.NetIDs;
 using Content.Shared.Research.Prototypes;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Lathe
 {
+    [NetworkedComponent()]
     public class SharedLatheComponent : Component
     {
         [Dependency] protected readonly IPrototypeManager PrototypeManager = default!;
 
         public override string Name => "Lathe";
-        public override uint? NetID => ContentNetIDs.LATHE;
 
         public bool CanProduce(LatheRecipePrototype recipe, int quantity = 1)
         {
diff --git a/Content.Shared/Lathe/SharedLatheDatabaseComponent.cs b/Content.Shared/Lathe/SharedLatheDatabaseComponent.cs
index d107c51bf3..fbb146adc3 100644
--- a/Content.Shared/Lathe/SharedLatheDatabaseComponent.cs
+++ b/Content.Shared/Lathe/SharedLatheDatabaseComponent.cs
@@ -1,10 +1,9 @@
-#nullable enable
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using Content.Shared.NetIDs;
 using Content.Shared.Research.Prototypes;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
@@ -12,10 +11,10 @@ using Robust.Shared.Serialization.Manager.Attributes;
 
 namespace Content.Shared.Lathe
 {
+    [NetworkedComponent()]
     public class SharedLatheDatabaseComponent : Component, IEnumerable<LatheRecipePrototype>, ISerializationHooks
     {
         public override string Name => "LatheDatabase";
-        public override uint? NetID => ContentNetIDs.LATHE_DATABASE;
 
         [DataField("recipes")] private List<string> _recipeIds = new();
 
@@ -127,7 +126,7 @@ namespace Content.Shared.Lathe
     public class LatheDatabaseState : ComponentState
     {
         public readonly List<string> Recipes;
-        public LatheDatabaseState(List<string> recipes) : base(ContentNetIDs.LATHE_DATABASE)
+        public LatheDatabaseState(List<string> recipes)
         {
             Recipes = recipes;
         }
diff --git a/Content.Shared/Lathe/SharedMaterialStorageComponent.cs b/Content.Shared/Lathe/SharedMaterialStorageComponent.cs
index fd74793f1d..509e7d55c9 100644
--- a/Content.Shared/Lathe/SharedMaterialStorageComponent.cs
+++ b/Content.Shared/Lathe/SharedMaterialStorageComponent.cs
@@ -1,19 +1,18 @@
-#nullable enable
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using Content.Shared.Materials;
-using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Shared.Lathe
 {
+    [NetworkedComponent()]
     public class SharedMaterialStorageComponent : Component, IEnumerable<KeyValuePair<string, int>>
     {
         public override string Name => "MaterialStorage";
-        public sealed override uint? NetID => ContentNetIDs.MATERIAL_STORAGE;
 
         [ViewVariables]
         protected virtual Dictionary<string, int> Storage { get; set; } = new();
@@ -72,7 +71,7 @@ namespace Content.Shared.Lathe
     public class MaterialStorageState : ComponentState
     {
         public readonly Dictionary<string, int> Storage;
-        public MaterialStorageState(Dictionary<string, int> storage) : base(ContentNetIDs.MATERIAL_STORAGE)
+        public MaterialStorageState(Dictionary<string, int> storage)
         {
             Storage = storage;
         }
diff --git a/Content.Shared/Lathe/SharedProtolatheDatabaseComponent.cs b/Content.Shared/Lathe/SharedProtolatheDatabaseComponent.cs
index f6dc665d27..d7e28bc707 100644
--- a/Content.Shared/Lathe/SharedProtolatheDatabaseComponent.cs
+++ b/Content.Shared/Lathe/SharedProtolatheDatabaseComponent.cs
@@ -1,9 +1,8 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
-using Content.Shared.NetIDs;
 using Content.Shared.Research.Prototypes;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
@@ -12,14 +11,13 @@ using Robust.Shared.Serialization.Manager.Attributes;
 namespace Content.Shared.Lathe
 {
     [ComponentReference(typeof(SharedLatheDatabaseComponent))]
+    [NetworkedComponent()]
     public class SharedProtolatheDatabaseComponent : SharedLatheDatabaseComponent, ISerializationHooks
     {
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
         public override string Name => "ProtolatheDatabase";
 
-        public sealed override uint? NetID => ContentNetIDs.PROTOLATHE_DATABASE;
-
         [DataField("protolatherecipes")] private List<string> _recipeIds = new();
 
         /// <summary>
@@ -41,7 +39,7 @@ namespace Content.Shared.Lathe
     public class ProtolatheDatabaseState : ComponentState
     {
         public readonly List<string> Recipes;
-        public ProtolatheDatabaseState(List<string> recipes) : base(ContentNetIDs.PROTOLATHE_DATABASE)
+        public ProtolatheDatabaseState(List<string> recipes)
         {
             Recipes = recipes;
         }
diff --git a/Content.Shared/Light/Component/SharedExpendableLightComponent.cs b/Content.Shared/Light/Component/SharedExpendableLightComponent.cs
index 2898549e92..1cd4c47b98 100644
--- a/Content.Shared/Light/Component/SharedExpendableLightComponent.cs
+++ b/Content.Shared/Light/Component/SharedExpendableLightComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Content.Shared.Sound;
 using Robust.Shared.Serialization;
diff --git a/Content.Shared/Light/Component/SharedHandheldLightComponent.cs b/Content.Shared/Light/Component/SharedHandheldLightComponent.cs
index b8e1393557..f377a733f9 100644
--- a/Content.Shared/Light/Component/SharedHandheldLightComponent.cs
+++ b/Content.Shared/Light/Component/SharedHandheldLightComponent.cs
@@ -1,15 +1,14 @@
-#nullable enable
 using System;
-using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Light.Component
 {
+    [NetworkedComponent()]
     public abstract class SharedHandheldLightComponent : Robust.Shared.GameObjects.Component
     {
         public sealed override string Name => "HandheldLight";
-        public sealed override uint? NetID => ContentNetIDs.HANDHELD_LIGHT;
 
         protected abstract bool HasCell { get; }
 
@@ -20,7 +19,7 @@ namespace Content.Shared.Light.Component
         {
             public byte? Charge { get; }
 
-            public HandheldLightComponentState(byte? charge) : base(ContentNetIDs.HANDHELD_LIGHT)
+            public HandheldLightComponentState(byte? charge)
             {
                 Charge = charge;
             }
diff --git a/Content.Shared/Light/Component/SharedLightBehaviourComponent.cs b/Content.Shared/Light/Component/SharedLightBehaviourComponent.cs
index 789279bc3e..603cd767a6 100644
--- a/Content.Shared/Light/Component/SharedLightBehaviourComponent.cs
+++ b/Content.Shared/Light/Component/SharedLightBehaviourComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-namespace Content.Shared.Light.Component
+namespace Content.Shared.Light.Component
 {
     /// <summary>
     /// A component which applies a specific behaviour to a PointLightComponent on its owner.
diff --git a/Content.Shared/Light/SharedPoweredLightVisuals.cs b/Content.Shared/Light/SharedPoweredLightVisuals.cs
index 1f9aa3ba6a..20f4ddd61e 100644
--- a/Content.Shared/Light/SharedPoweredLightVisuals.cs
+++ b/Content.Shared/Light/SharedPoweredLightVisuals.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/MachineLinking/TwoWayLeverSignal.cs b/Content.Shared/MachineLinking/TwoWayLeverSignal.cs
index ed6394acb7..9ab282bc08 100644
--- a/Content.Shared/MachineLinking/TwoWayLeverSignal.cs
+++ b/Content.Shared/MachineLinking/TwoWayLeverSignal.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.MachineLinking
diff --git a/Content.Shared/Maps/ContentTileDefinition.cs b/Content.Shared/Maps/ContentTileDefinition.cs
index bfff430f8b..cc7f5961e0 100644
--- a/Content.Shared/Maps/ContentTileDefinition.cs
+++ b/Content.Shared/Maps/ContentTileDefinition.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Shared.Sound;
 using JetBrains.Annotations;
 using Robust.Shared.Map;
@@ -17,6 +16,8 @@ namespace Content.Shared.Maps
         [ViewVariables]
         string IPrototype.ID => Name;
 
+        public string Path => "/Textures/Tiles/";
+
         [DataField("name", required: true)] public string Name { get; } = string.Empty;
 
         public ushort TileId { get; private set; }
diff --git a/Content.Shared/Maps/TurfHelpers.cs b/Content.Shared/Maps/TurfHelpers.cs
index 91350454de..6b6613b617 100644
--- a/Content.Shared/Maps/TurfHelpers.cs
+++ b/Content.Shared/Maps/TurfHelpers.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.CompilerServices;
@@ -182,7 +181,7 @@ namespace Content.Shared.Maps
         /// </summary>
         public static bool IsBlockedTurf(this TileRef turf, bool filterMobs)
         {
-            var physics = EntitySystem.Get<SharedBroadPhaseSystem>();
+            var physics = EntitySystem.Get<SharedBroadphaseSystem>();
 
             var worldBox = GetWorldTileBox(turf);
 
diff --git a/Content.Shared/Markers/SharedSpawnPointComponent.cs b/Content.Shared/Markers/SharedSpawnPointComponent.cs
index 7bac08dbf1..98ab965eef 100644
--- a/Content.Shared/Markers/SharedSpawnPointComponent.cs
+++ b/Content.Shared/Markers/SharedSpawnPointComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Robust.Shared.GameObjects;
 
 namespace Content.Shared.Markers
diff --git a/Content.Shared/Materials/MaterialPrototype.cs b/Content.Shared/Materials/MaterialPrototype.cs
index d2cdce2411..a4b83fd36a 100644
--- a/Content.Shared/Materials/MaterialPrototype.cs
+++ b/Content.Shared/Materials/MaterialPrototype.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Shared.Stacks;
 using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
diff --git a/Content.Shared/Maths/PhysicalConstants.cs b/Content.Shared/Maths/PhysicalConstants.cs
index 7f6d9254c7..301861a0eb 100644
--- a/Content.Shared/Maths/PhysicalConstants.cs
+++ b/Content.Shared/Maths/PhysicalConstants.cs
@@ -1,4 +1,3 @@
-#nullable enable
 namespace Content.Shared.Maths
 {
     /// <summary>
diff --git a/Content.Shared/MedicalScanner/SharedMedicalScannerComponent.cs b/Content.Shared/MedicalScanner/SharedMedicalScannerComponent.cs
index c2b24308d1..2d7af4a463 100644
--- a/Content.Shared/MedicalScanner/SharedMedicalScannerComponent.cs
+++ b/Content.Shared/MedicalScanner/SharedMedicalScannerComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using Content.Shared.Body.Components;
diff --git a/Content.Shared/MobState/Components/SharedMobStateComponent.cs b/Content.Shared/MobState/Components/SharedMobStateComponent.cs
index ffc8112549..79dc0977d8 100644
--- a/Content.Shared/MobState/Components/SharedMobStateComponent.cs
+++ b/Content.Shared/MobState/Components/SharedMobStateComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
@@ -8,8 +7,8 @@ using Content.Shared.Alert;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Components;
 using Content.Shared.MobState.State;
-using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Players;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
@@ -23,12 +22,11 @@ namespace Content.Shared.MobState.Components
     ///     Additionally, it handles sending effects to clients
     ///     (such as blur effect for unconsciousness) and managing the health HUD.
     /// </summary>
+    [NetworkedComponent()]
     public abstract class SharedMobStateComponent : Component, IMobStateComponent, IActionBlocker
     {
         public override string Name => "MobState";
 
-        public override uint? NetID => ContentNetIDs.MOB_STATE;
-
         /// <summary>
         ///     States that this <see cref="SharedMobStateComponent"/> mapped to
         ///     the amount of damage at which they are triggered.
@@ -401,7 +399,7 @@ namespace Content.Shared.MobState.Components
     {
         public readonly int? CurrentThreshold;
 
-        public MobStateComponentState(int? currentThreshold) : base(ContentNetIDs.MOB_STATE)
+        public MobStateComponentState(int? currentThreshold)
         {
             CurrentThreshold = currentThreshold;
         }
diff --git a/Content.Shared/MobState/DamageStateHelpers.cs b/Content.Shared/MobState/DamageStateHelpers.cs
index d5bb97be1c..462f4a9218 100644
--- a/Content.Shared/MobState/DamageStateHelpers.cs
+++ b/Content.Shared/MobState/DamageStateHelpers.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using System.Collections.Generic;
 
 namespace Content.Shared.MobState
diff --git a/Content.Shared/MobState/DamageStateVisuals.cs b/Content.Shared/MobState/DamageStateVisuals.cs
index 30c8de65da..a7628bbfc8 100644
--- a/Content.Shared/MobState/DamageStateVisuals.cs
+++ b/Content.Shared/MobState/DamageStateVisuals.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
diff --git a/Content.Shared/MobState/IMobStateComponent.cs b/Content.Shared/MobState/IMobStateComponent.cs
index ab29c8ac1e..5f709b763b 100644
--- a/Content.Shared/MobState/IMobStateComponent.cs
+++ b/Content.Shared/MobState/IMobStateComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using Content.Shared.MobState.State;
 using Robust.Shared.GameObjects;
 
diff --git a/Content.Shared/MobState/MobStateChangedMessage.cs b/Content.Shared/MobState/MobStateChangedMessage.cs
index 39513a3751..337caa42db 100644
--- a/Content.Shared/MobState/MobStateChangedMessage.cs
+++ b/Content.Shared/MobState/MobStateChangedMessage.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Shared.MobState.State;
+using Content.Shared.MobState.State;
 using Robust.Shared.GameObjects;
 
 namespace Content.Shared.MobState
diff --git a/Content.Shared/MobState/State/BaseMobState.cs b/Content.Shared/MobState/State/BaseMobState.cs
index a159c2d347..760c33e3eb 100644
--- a/Content.Shared/MobState/State/BaseMobState.cs
+++ b/Content.Shared/MobState/State/BaseMobState.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Robust.Shared.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
 namespace Content.Shared.MobState.State
diff --git a/Content.Shared/MobState/State/IMobState.cs b/Content.Shared/MobState/State/IMobState.cs
index b2d3c636d4..9f79a3806c 100644
--- a/Content.Shared/MobState/State/IMobState.cs
+++ b/Content.Shared/MobState/State/IMobState.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Shared.ActionBlocker;
+using Content.Shared.ActionBlocker;
 using Robust.Shared.GameObjects;
 
 namespace Content.Shared.MobState.State
diff --git a/Content.Shared/MobState/State/SharedCriticalMobState.cs b/Content.Shared/MobState/State/SharedCriticalMobState.cs
index 01ba1c36cb..038b14e77b 100644
--- a/Content.Shared/MobState/State/SharedCriticalMobState.cs
+++ b/Content.Shared/MobState/State/SharedCriticalMobState.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Shared.Alert;
+using Content.Shared.Alert;
 using Content.Shared.Hands;
 using Content.Shared.Standing;
 using Robust.Shared.GameObjects;
diff --git a/Content.Shared/MobState/State/SharedNormalMobState.cs b/Content.Shared/MobState/State/SharedNormalMobState.cs
index 5f2b968bed..f6ec05ae90 100644
--- a/Content.Shared/MobState/State/SharedNormalMobState.cs
+++ b/Content.Shared/MobState/State/SharedNormalMobState.cs
@@ -1,7 +1,6 @@
 using Content.Shared.Standing;
 using Robust.Shared.GameObjects;
 
-#nullable enable
 
 namespace Content.Shared.MobState.State
 {
diff --git a/Content.Shared/Module/IModuleManager.cs b/Content.Shared/Module/IModuleManager.cs
index 57833b008a..9644c9cd2e 100644
--- a/Content.Shared/Module/IModuleManager.cs
+++ b/Content.Shared/Module/IModuleManager.cs
@@ -1,5 +1,4 @@
-#nullable enable
-namespace Content.Shared.Module
+namespace Content.Shared.Module
 {
     /// <summary>
     /// Provides a simple way to check whether calling code is being run by
diff --git a/Content.Shared/Module/SharedModuleTestingCallbacks.cs b/Content.Shared/Module/SharedModuleTestingCallbacks.cs
index 12074296e3..dfa0272b52 100644
--- a/Content.Shared/Module/SharedModuleTestingCallbacks.cs
+++ b/Content.Shared/Module/SharedModuleTestingCallbacks.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Robust.Shared.ContentPack;
 
diff --git a/Content.Shared/Morgue/SharedMorgue.cs b/Content.Shared/Morgue/SharedMorgue.cs
index bc66ad1c01..cb56adbe07 100644
--- a/Content.Shared/Morgue/SharedMorgue.cs
+++ b/Content.Shared/Morgue/SharedMorgue.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Morgue
diff --git a/Content.Shared/Movement/Components/IMoverComponent.cs b/Content.Shared/Movement/Components/IMoverComponent.cs
index 184afa9a26..d0a511116b 100644
--- a/Content.Shared/Movement/Components/IMoverComponent.cs
+++ b/Content.Shared/Movement/Components/IMoverComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Robust.Shared.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 
 namespace Content.Shared.Movement.Components
diff --git a/Content.Shared/Movement/Components/IRelayMoveInput.cs b/Content.Shared/Movement/Components/IRelayMoveInput.cs
index 86f8e9f0ab..cd93814028 100644
--- a/Content.Shared/Movement/Components/IRelayMoveInput.cs
+++ b/Content.Shared/Movement/Components/IRelayMoveInput.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Robust.Shared.Players;
 
 namespace Content.Shared.Movement.Components
diff --git a/Content.Shared/Movement/Components/MovementIgnoreGravityComponent.cs b/Content.Shared/Movement/Components/MovementIgnoreGravityComponent.cs
index f206517966..4fb57b6736 100644
--- a/Content.Shared/Movement/Components/MovementIgnoreGravityComponent.cs
+++ b/Content.Shared/Movement/Components/MovementIgnoreGravityComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Shared.Gravity;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
diff --git a/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs b/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs
index 2300b1d2a5..a8b8dde087 100644
--- a/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs
+++ b/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
diff --git a/Content.Shared/Movement/Components/SharedDummyInputMoverComponent.cs b/Content.Shared/Movement/Components/SharedDummyInputMoverComponent.cs
index 2e9412f898..6de12adabd 100644
--- a/Content.Shared/Movement/Components/SharedDummyInputMoverComponent.cs
+++ b/Content.Shared/Movement/Components/SharedDummyInputMoverComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 
diff --git a/Content.Shared/Movement/Components/SharedPlayerInputMoverComponent.cs b/Content.Shared/Movement/Components/SharedPlayerInputMoverComponent.cs
index bef136a2d2..eed34bdad5 100644
--- a/Content.Shared/Movement/Components/SharedPlayerInputMoverComponent.cs
+++ b/Content.Shared/Movement/Components/SharedPlayerInputMoverComponent.cs
@@ -1,9 +1,8 @@
-#nullable enable
 using System;
 using Content.Shared.CCVar;
-using Content.Shared.NetIDs;
 using Robust.Shared.Configuration;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 using Robust.Shared.Players;
@@ -15,6 +14,7 @@ namespace Content.Shared.Movement.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(IMoverComponent))]
+    [NetworkedComponent()]
     public class SharedPlayerInputMoverComponent : Component, IMoverComponent
     {
         // This class has to be able to handle server TPS being lower than client FPS.
@@ -42,7 +42,6 @@ namespace Content.Shared.Movement.Components
         [ComponentDependency] private readonly MovementSpeedModifierComponent? _movementSpeed = default!;
 
         public override string Name => "PlayerInputMover";
-        public override uint? NetID => ContentNetIDs.PLAYER_INPUT_MOVER;
 
         private GameTick _lastInputTick;
         private ushort _lastInputSubTick;
@@ -238,8 +237,7 @@ namespace Content.Shared.Movement.Components
         {
             public MoveButtons Buttons { get; }
 
-            public MoverComponentState(MoveButtons buttons) : base(ContentNetIDs
-                .PLAYER_INPUT_MOVER)
+            public MoverComponentState(MoveButtons buttons)
             {
                 Buttons = buttons;
             }
diff --git a/Content.Shared/Movement/Components/SharedPlayerMobMoverComponent.cs b/Content.Shared/Movement/Components/SharedPlayerMobMoverComponent.cs
index 6f51f4f20c..f521ff6e81 100644
--- a/Content.Shared/Movement/Components/SharedPlayerMobMoverComponent.cs
+++ b/Content.Shared/Movement/Components/SharedPlayerMobMoverComponent.cs
@@ -1,7 +1,6 @@
-#nullable enable
 using System;
-using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Players;
@@ -16,10 +15,10 @@ namespace Content.Shared.Movement.Components
     /// </summary>
     [RegisterComponent]
     [ComponentReference(typeof(IMobMoverComponent))]
+    [NetworkedComponent()]
     public class SharedPlayerMobMoverComponent : Component, IMobMoverComponent
     {
         public override string Name => "PlayerMobMover";
-        public override uint? NetID => ContentNetIDs.PLAYER_MOB_MOVER;
 
         private float _stepSoundDistance;
         [DataField("grabRange")]
@@ -112,7 +111,7 @@ namespace Content.Shared.Movement.Components
             public float PushStrength;
             public float WeightlessStrength;
 
-            public PlayerMobMoverComponentState(float grabRange, float pushStrength, float weightlessStrength) : base(ContentNetIDs.PLAYER_MOB_MOVER)
+            public PlayerMobMoverComponentState(float grabRange, float pushStrength, float weightlessStrength)
             {
                 GrabRange = grabRange;
                 PushStrength = pushStrength;
diff --git a/Content.Shared/Movement/EntitySystems/SharedMobMoverSystem.cs b/Content.Shared/Movement/EntitySystems/SharedMobMoverSystem.cs
index 8a8cea08ab..ea7654ce99 100644
--- a/Content.Shared/Movement/EntitySystems/SharedMobMoverSystem.cs
+++ b/Content.Shared/Movement/EntitySystems/SharedMobMoverSystem.cs
@@ -1,41 +1,51 @@
-#nullable enable
+using Content.Shared.CCVar;
 using Content.Shared.Movement.Components;
+using Robust.Shared.Configuration;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 using Robust.Shared.Physics;
-using Robust.Shared.Physics.Collision;
 using Robust.Shared.Physics.Dynamics;
 
 namespace Content.Shared.Movement.EntitySystems
 {
     public sealed class SharedMobMoverSystem : EntitySystem
     {
+        private bool _pushingEnabled;
+
         public override void Initialize()
         {
             base.Initialize();
             Get<SharedPhysicsSystem>().KinematicControllerCollision += HandleCollisionMessage;
+            IoCManager.Resolve<IConfigurationManager>().OnValueChanged(CCVars.MobPushing, SetPushing, true);
+        }
+
+        private void SetPushing(bool value)
+        {
+            _pushingEnabled = value;
         }
 
         public override void Shutdown()
         {
             base.Shutdown();
+            IoCManager.Resolve<IConfigurationManager>().UnsubValueChanged(CCVars.MobPushing, SetPushing);
             Get<SharedPhysicsSystem>().KinematicControllerCollision -= HandleCollisionMessage;
         }
 
         /// <summary>
         ///     Fake pushing for player collisions.
         /// </summary>
-        private void HandleCollisionMessage(Fixture ourFixture, Fixture otherFixture, float frameTime, Manifold manifold)
+        private void HandleCollisionMessage(Fixture ourFixture, Fixture otherFixture, float frameTime, Vector2 worldNormal)
         {
+            if (!_pushingEnabled) return;
+
             var otherBody = otherFixture.Body;
 
             if (otherBody.BodyType != BodyType.Dynamic || !otherFixture.Hard) return;
 
-            var normal = manifold.LocalNormal;
+            if (!ourFixture.Body.Owner.TryGetComponent(out IMobMoverComponent? mobMover) || worldNormal == Vector2.Zero) return;
 
-            if (!ourFixture.Body.Owner.TryGetComponent(out IMobMoverComponent? mobMover) || normal == Vector2.Zero) return;
-
-            otherBody.ApplyLinearImpulse(-normal * mobMover.PushStrength * frameTime);
+            otherBody.ApplyLinearImpulse(-worldNormal * mobMover.PushStrength * frameTime);
         }
     }
 }
diff --git a/Content.Shared/Movement/EntitySystems/SharedMoverSystem.cs b/Content.Shared/Movement/EntitySystems/SharedMoverSystem.cs
index 86843d8ef3..36302161f2 100644
--- a/Content.Shared/Movement/EntitySystems/SharedMoverSystem.cs
+++ b/Content.Shared/Movement/EntitySystems/SharedMoverSystem.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Diagnostics.CodeAnalysis;
 using Content.Shared.MobState;
 using Content.Shared.Movement.Components;
diff --git a/Content.Shared/Movement/SharedMoverController.cs b/Content.Shared/Movement/SharedMoverController.cs
index 114000f328..d48d7ff3b9 100644
--- a/Content.Shared/Movement/SharedMoverController.cs
+++ b/Content.Shared/Movement/SharedMoverController.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Shared.ActionBlocker;
 using Content.Shared.MobState;
 using Content.Shared.Movement.Components;
@@ -21,12 +20,12 @@ namespace Content.Shared.Movement
     {
         [Dependency] private readonly IMapManager _mapManager = default!;
 
-        private SharedBroadPhaseSystem _broadPhaseSystem = default!;
+        private SharedBroadphaseSystem _broadPhaseSystem = default!;
 
         public override void Initialize()
         {
             base.Initialize();
-            _broadPhaseSystem = EntitySystem.Get<SharedBroadPhaseSystem>();
+            _broadPhaseSystem = EntitySystem.Get<SharedBroadphaseSystem>();
         }
 
         /// <summary>
@@ -101,7 +100,7 @@ namespace Content.Shared.Movement
             physicsComponent.LinearVelocity = total;
         }
 
-        public static bool UseMobMovement(SharedBroadPhaseSystem broadPhaseSystem, PhysicsComponent body, IMapManager mapManager)
+        public static bool UseMobMovement(SharedBroadphaseSystem broadPhaseSystem, PhysicsComponent body, IMapManager mapManager)
         {
             return (body.BodyStatus == BodyStatus.OnGround) &
                    body.Owner.HasComponent<IMobStateComponent>() &&
@@ -119,7 +118,7 @@ namespace Content.Shared.Movement
         /// <param name="mover"></param>
         /// <param name="collider"></param>
         /// <returns></returns>
-        public static bool IsAroundCollider(SharedBroadPhaseSystem broadPhaseSystem, ITransformComponent transform, IMobMoverComponent mover, IPhysBody collider)
+        public static bool IsAroundCollider(SharedBroadphaseSystem broadPhaseSystem, ITransformComponent transform, IMobMoverComponent mover, IPhysBody collider)
         {
             var enlargedAABB = collider.GetWorldAABB().Enlarged(mover.GrabRange);
 
diff --git a/Content.Shared/NetIDs/ContentNetIDs.cs b/Content.Shared/NetIDs/ContentNetIDs.cs
deleted file mode 100644
index 6de59e53ac..0000000000
--- a/Content.Shared/NetIDs/ContentNetIDs.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#nullable enable
-
-namespace Content.Shared.NetIDs
-{
-    // Starting from 1000 to avoid crossover with engine.
-    public static class ContentNetIDs
-    {
-        // As a CMO main I hereby declare the hypospray worthy of ID #1000.
-        public const uint HYPOSPRAY = 1000;
-        public const uint DESTRUCTIBLE = 1001;
-        public const uint MAGAZINE_BARREL = 1002;
-        public const uint HANDS = 1003;
-        public const uint SOLUTION = 1004;
-        public const uint STORAGE = 1005;
-        public const uint INVENTORY = 1006;
-        public const uint POWER_DEBUG_TOOL = 1007;
-        public const uint PLAYER_MOB_MOVER = 1008;
-        public const uint TILE_FRICTION = 1009;
-        public const uint RANGED_WEAPON = 1010;
-        public const uint CAMERA_RECOIL = 1011;
-        public const uint SOUND = 1012;
-        public const uint ITEM = 1013;
-        public const uint CLOTHING = 1014;
-        public const uint ENTITYSTORAGE = 1015;
-        public const uint LATHE = 1016;
-        public const uint LATHE_DATABASE = 1017;
-        public const uint MATERIAL_STORAGE = 1018;
-        public const uint HAND_TELEPORTER = 1019;
-        public const uint VENDING_MACHINE = 1020;
-        public const uint PROTOLATHE_DATABASE = 1021;
-        public const uint TECHNOLOGY_DATABASE = 1022;
-        public const uint RESEARCH_CONSOLE = 1023;
-        public const uint WIRES = 1024;
-        public const uint COMBATMODE = 1025;
-        public const uint ALERTS = 1026;
-        public const uint OVERLAYEFFECTS = 1027;
-        public const uint STOMACH = 1028;
-        public const uint ITEMCOOLDOWN = 1029;
-        public const uint CARGO_ORDER_DATABASE = 1030;
-        public const uint GALACTIC_MARKET = 1031;
-        public const uint HUMANOID_APPEARANCE = 1032;
-        public const uint INSTRUMENTS = 1033;
-        public const uint WELDER = 1034;
-        public const uint STACK = 1035;
-        public const uint HANDHELD_LIGHT = 1036;
-        public const uint PAPER = 1037;
-        public const uint REAGENT_INJECTOR = 1038;
-        public const uint GHOST = 1039;
-        public const uint MICROWAVE = 1040;
-        public const uint GRAVITY_GENERATOR = 1041;
-        public const uint SURGERY = 1042;
-        public const uint MULTITOOLS = 1043;
-        public const uint PDA = 1044;
-        public const uint PATHFINDER_DEBUG = 1045;
-        public const uint AI_DEBUG = 1046;
-        public const uint PLAYER_INPUT_MOVER = 1047;
-        public const uint STUNNABLE = 1048;
-        public const uint HUNGER = 1049;
-        public const uint THIRST = 1050;
-        public const uint FLASHABLE = 1051;
-        public const uint BUCKLE = 1052;
-        public const uint PROJECTILE = 1053;
-        // 1054
-        public const uint STRAP = 1055;
-        public const uint DISPOSABLE = 1056;
-        public const uint GAS_ANALYZER = 1057;
-        public const uint DO_AFTER = 1058;
-        public const uint RADIATION_PULSE = 1059;
-        public const uint BODY = 1060;
-        public const uint CLIMBING = 1061;
-        public const uint BOLTACTION_BARREL = 1062;
-        public const uint PUMP_BARREL = 1063;
-        public const uint REVOLVER_BARREL = 1064;
-        public const uint CUFFED = 1065;
-        public const uint HANDCUFFS = 1066;
-        public const uint BATTERY_BARREL = 1067;
-        public const uint SUSPICION_ROLE = 1068;
-        public const uint ROTATION = 1069;
-        public const uint MOB_STATE = 1070;
-        public const uint SLIP = 1071;
-        public const uint SPACE_VILLAIN_ARCADE = 1072;
-        public const uint BLOCKGAME_ARCADE = 1073;
-        public const uint BODY_PART = 1074;
-        public const uint CRAYONS = 1075;
-        public const uint PLACEABLE_SURFACE = 1076;
-        public const uint STORABLE = 1077;
-        public const uint PULLABLE = 1078;
-        public const uint GAS_TANK = 1079;
-        public const uint SINGULARITY = 1080;
-        public const uint CHARACTERINFO = 1081;
-        public const uint REAGENT_GRINDER = 1082;
-        public const uint ACTIONS = 1083;
-        public const uint DAMAGEABLE = 1084;
-        public const uint MAGBOOTS = 1085;
-        public const uint TAG = 1086;
-        // Used for clientside fake prediction of doors.
-        public const uint DOOR = 1087;
-        public const uint SPAWN_AFTER_INTERACT = 1088;
-        public const uint DISASSEMBLE_ON_ACTIVATE = 1089;
-        public const uint LIGHT_REPLACER = 1090;
-        public const uint SINGULARITY_DISTORTION = 1091;
-        public const uint GRAVITY = 1092;
-        public const uint STANDING_STATE = 1093;
-
-        // Net IDs for integration tests.
-        public const uint PREDICTION_TEST = 10001;
-    }
-}
diff --git a/Content.Shared/Notification/Managers/SharedNotifyManager.cs b/Content.Shared/Notification/Managers/SharedNotifyManager.cs
index 8c9e4e8739..7f43acde85 100644
--- a/Content.Shared/Notification/Managers/SharedNotifyManager.cs
+++ b/Content.Shared/Notification/Managers/SharedNotifyManager.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Lidgren.Network;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
diff --git a/Content.Shared/Nutrition/Components/SharedButcherableComponent.cs b/Content.Shared/Nutrition/Components/SharedButcherableComponent.cs
index f8c3188da4..11a6bd4661 100644
--- a/Content.Shared/Nutrition/Components/SharedButcherableComponent.cs
+++ b/Content.Shared/Nutrition/Components/SharedButcherableComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Shared.DragDrop;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
diff --git a/Content.Shared/Nutrition/Components/SharedCreamPiedComponent.cs b/Content.Shared/Nutrition/Components/SharedCreamPiedComponent.cs
index 38ad6fb9d2..b599257de0 100644
--- a/Content.Shared/Nutrition/Components/SharedCreamPiedComponent.cs
+++ b/Content.Shared/Nutrition/Components/SharedCreamPiedComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Nutrition/Components/SharedDrinkFoodContainerComponent.cs b/Content.Shared/Nutrition/Components/SharedDrinkFoodContainerComponent.cs
index 3a15366656..a4fb1d0288 100644
--- a/Content.Shared/Nutrition/Components/SharedDrinkFoodContainerComponent.cs
+++ b/Content.Shared/Nutrition/Components/SharedDrinkFoodContainerComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
diff --git a/Content.Shared/Nutrition/Components/SharedFoodComponent.cs b/Content.Shared/Nutrition/Components/SharedFoodComponent.cs
index 3f61d1f47d..91c3b6b8c4 100644
--- a/Content.Shared/Nutrition/Components/SharedFoodComponent.cs
+++ b/Content.Shared/Nutrition/Components/SharedFoodComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Nutrition/Components/SharedHungerComponent.cs b/Content.Shared/Nutrition/Components/SharedHungerComponent.cs
index 9fddc5aae2..009aeaa45a 100644
--- a/Content.Shared/Nutrition/Components/SharedHungerComponent.cs
+++ b/Content.Shared/Nutrition/Components/SharedHungerComponent.cs
@@ -1,19 +1,17 @@
-#nullable enable
 using System;
 using Content.Shared.Movement.Components;
-using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Shared.Nutrition.Components
 {
+    [NetworkedComponent()]
     public abstract class SharedHungerComponent : Component, IMoveSpeedModifier
     {
         public sealed override string Name => "Hunger";
 
-        public sealed override uint? NetID => ContentNetIDs.HUNGER;
-
         [ViewVariables]
         public abstract HungerThreshold CurrentHungerThreshold { get; }
 
@@ -46,7 +44,7 @@ namespace Content.Shared.Nutrition.Components
         {
             public HungerThreshold CurrentThreshold { get; }
 
-            public HungerComponentState(HungerThreshold currentThreshold) : base(ContentNetIDs.HUNGER)
+            public HungerComponentState(HungerThreshold currentThreshold)
             {
                 CurrentThreshold = currentThreshold;
             }
diff --git a/Content.Shared/Nutrition/Components/SharedThirstComponent.cs b/Content.Shared/Nutrition/Components/SharedThirstComponent.cs
index e3eb0b6382..e7a7cba426 100644
--- a/Content.Shared/Nutrition/Components/SharedThirstComponent.cs
+++ b/Content.Shared/Nutrition/Components/SharedThirstComponent.cs
@@ -1,19 +1,17 @@
-#nullable enable
 using System;
 using Content.Shared.Movement.Components;
-using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Shared.Nutrition.Components
 {
+    [NetworkedComponent()]
     public abstract class SharedThirstComponent : Component, IMoveSpeedModifier
     {
         public sealed override string Name => "Thirst";
 
-        public sealed override uint? NetID => ContentNetIDs.THIRST;
-
         [ViewVariables]
         public abstract ThirstThreshold CurrentThirstThreshold { get; }
 
@@ -45,7 +43,7 @@ namespace Content.Shared.Nutrition.Components
         {
             public ThirstThreshold CurrentThreshold { get; }
 
-            public ThirstComponentState(ThirstThreshold currentThreshold) : base(ContentNetIDs.THIRST)
+            public ThirstComponentState(ThirstThreshold currentThreshold)
             {
                 CurrentThreshold = currentThreshold;
             }
diff --git a/Content.Shared/Objectives/ConditionInfo.cs b/Content.Shared/Objectives/ConditionInfo.cs
index 152c3fd27b..de0e7f934b 100644
--- a/Content.Shared/Objectives/ConditionInfo.cs
+++ b/Content.Shared/Objectives/ConditionInfo.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.Serialization;
 using Robust.Shared.Utility;
 
diff --git a/Content.Shared/PDA/SharedPDAComponent.cs b/Content.Shared/PDA/SharedPDAComponent.cs
index a9ceb07df1..307b124b60 100644
--- a/Content.Shared/PDA/SharedPDAComponent.cs
+++ b/Content.Shared/PDA/SharedPDAComponent.cs
@@ -1,17 +1,15 @@
-#nullable enable
 using System;
-using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Shared.PDA
 {
+    [NetworkedComponent()]
     public class SharedPDAComponent : Component
     {
         public override string Name => "PDA";
-        public override uint? NetID => ContentNetIDs.PDA;
-
     }
 
     [Serializable, NetSerializable]
@@ -177,7 +175,7 @@ namespace Content.Shared.PDA
 
         public UplinkListingData(string listingName,string itemId,
             int price, UplinkCategory category,
-            string description) : base(ContentNetIDs.PDA)
+            string description)
         {
             ListingName = listingName;
             Price = price;
diff --git a/Content.Shared/PDA/UplinkCategory.cs b/Content.Shared/PDA/UplinkCategory.cs
index a094652188..2b21a230a0 100644
--- a/Content.Shared/PDA/UplinkCategory.cs
+++ b/Content.Shared/PDA/UplinkCategory.cs
@@ -1,4 +1,3 @@
-#nullable enable
 
 namespace Content.Shared.PDA
 {
diff --git a/Content.Shared/PDA/UplinkStoreListingPrototype.cs b/Content.Shared/PDA/UplinkStoreListingPrototype.cs
index e79ba8f0d6..27d718a60c 100644
--- a/Content.Shared/PDA/UplinkStoreListingPrototype.cs
+++ b/Content.Shared/PDA/UplinkStoreListingPrototype.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
diff --git a/Content.Shared/Paper/SharedPaperComponent.cs b/Content.Shared/Paper/SharedPaperComponent.cs
index 8444845815..d65a158ee4 100644
--- a/Content.Shared/Paper/SharedPaperComponent.cs
+++ b/Content.Shared/Paper/SharedPaperComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
diff --git a/Content.Shared/Physics/CollisionGroup.cs b/Content.Shared/Physics/CollisionGroup.cs
index eb63c2abfa..5fd039e99b 100644
--- a/Content.Shared/Physics/CollisionGroup.cs
+++ b/Content.Shared/Physics/CollisionGroup.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using JetBrains.Annotations;
 using Robust.Shared.Map;
diff --git a/Content.Shared/Physics/Pull/PullAttemptMessage.cs b/Content.Shared/Physics/Pull/PullAttemptMessage.cs
index 945d58f678..85617f5f27 100644
--- a/Content.Shared/Physics/Pull/PullAttemptMessage.cs
+++ b/Content.Shared/Physics/Pull/PullAttemptMessage.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Robust.Shared.Physics;
+using Robust.Shared.Physics;
 
 namespace Content.Shared.Physics.Pull
 {
diff --git a/Content.Shared/Physics/Pull/PullMessage.cs b/Content.Shared/Physics/Pull/PullMessage.cs
index d72e15d642..cbdb5af3a1 100644
--- a/Content.Shared/Physics/Pull/PullMessage.cs
+++ b/Content.Shared/Physics/Pull/PullMessage.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Robust.Shared.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Physics;
 
 namespace Content.Shared.Physics.Pull
diff --git a/Content.Shared/Physics/Pull/PullStartedMessage.cs b/Content.Shared/Physics/Pull/PullStartedMessage.cs
index 0f138cf12c..d4364c36fd 100644
--- a/Content.Shared/Physics/Pull/PullStartedMessage.cs
+++ b/Content.Shared/Physics/Pull/PullStartedMessage.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Robust.Shared.Physics;
+using Robust.Shared.Physics;
 
 namespace Content.Shared.Physics.Pull
 {
diff --git a/Content.Shared/Physics/Pull/PullStoppedMessage.cs b/Content.Shared/Physics/Pull/PullStoppedMessage.cs
index 0b91a38d83..177c1b4f4f 100644
--- a/Content.Shared/Physics/Pull/PullStoppedMessage.cs
+++ b/Content.Shared/Physics/Pull/PullStoppedMessage.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Robust.Shared.Physics;
+using Robust.Shared.Physics;
 
 namespace Content.Shared.Physics.Pull
 {
diff --git a/Content.Shared/Placeable/SharedPlaceableSurfaceComponent.cs b/Content.Shared/Placeable/SharedPlaceableSurfaceComponent.cs
index 58e7d68629..63e7f97804 100644
--- a/Content.Shared/Placeable/SharedPlaceableSurfaceComponent.cs
+++ b/Content.Shared/Placeable/SharedPlaceableSurfaceComponent.cs
@@ -1,16 +1,15 @@
-#nullable enable
 using System;
-using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Maths;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Placeable
 {
+    [NetworkedComponent()]
     public abstract class SharedPlaceableSurfaceComponent : Component
     {
         public override string Name => "PlaceableSurface";
-        public override uint? NetID => ContentNetIDs.PLACEABLE_SURFACE;
         public virtual bool IsPlaceable { get; set; }
         public virtual bool PlaceCentered { get; set; }
         public virtual Vector2 PositionOffset { get; set; }
@@ -23,7 +22,7 @@ namespace Content.Shared.Placeable
         public readonly bool PlaceCentered;
         public readonly Vector2 PositionOffset;
 
-        public PlaceableSurfaceComponentState(bool placeable, bool centered, Vector2 offset) : base(ContentNetIDs.PLACEABLE_SURFACE)
+        public PlaceableSurfaceComponentState(bool placeable, bool centered, Vector2 offset)
         {
             IsPlaceable = placeable;
             PlaceCentered = centered;
diff --git a/Content.Shared/Pointing/Components/SharedPointingArrowComponent.cs b/Content.Shared/Pointing/Components/SharedPointingArrowComponent.cs
index a1b2810809..ed6761d84e 100644
--- a/Content.Shared/Pointing/Components/SharedPointingArrowComponent.cs
+++ b/Content.Shared/Pointing/Components/SharedPointingArrowComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Robust.Shared.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Shared.Pointing.Components
 {
diff --git a/Content.Shared/Pointing/Components/SharedRoguePointingArrowComponent.cs b/Content.Shared/Pointing/Components/SharedRoguePointingArrowComponent.cs
index 856a531dcd..f58890b919 100644
--- a/Content.Shared/Pointing/Components/SharedRoguePointingArrowComponent.cs
+++ b/Content.Shared/Pointing/Components/SharedRoguePointingArrowComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Portal/Components/SharedPortalComponent.cs b/Content.Shared/Portal/Components/SharedPortalComponent.cs
deleted file mode 100644
index eaad2fe7d1..0000000000
--- a/Content.Shared/Portal/Components/SharedPortalComponent.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-#nullable enable
-using System;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Physics;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Portal.Components
-{
-    public abstract class SharedPortalComponent : Component
-    {
-        public override string Name => "Portal";
-
-        protected override void OnAdd()
-        {
-            base.OnAdd();
-
-            if (Owner.TryGetComponent<IPhysBody>(out var physics))
-            {
-                physics.Hard = false;
-            }
-        }
-    }
-
-    [Serializable, NetSerializable]
-    public enum PortalVisuals
-    {
-        State
-    }
-
-    [Serializable, NetSerializable]
-    public enum PortalState
-    {
-        RecentlyTeleported,
-        Pending,
-        UnableToTeleport,
-    }
-
-}
diff --git a/Content.Shared/Portal/Components/SharedTeleporterComponent.cs b/Content.Shared/Portal/Components/SharedTeleporterComponent.cs
deleted file mode 100644
index ba9f079bf8..0000000000
--- a/Content.Shared/Portal/Components/SharedTeleporterComponent.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-#nullable enable
-using System;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Map;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Portal.Components
-{
-    public enum ItemTeleporterState
-    {
-        Off,
-        Charging,
-        On,
-        Cooldown,
-    }
-
-    public enum TeleporterType
-    {
-        Directed,
-        Random,
-        Beacon,
-    }
-
-    [NetSerializable]
-    [Serializable]
-    public enum TeleporterVisuals
-    {
-        VisualState,
-    }
-
-    [NetSerializable]
-    [Serializable]
-    public enum TeleporterVisualState
-    {
-        Ready,
-        Charging,
-    }
-
-    [Serializable, NetSerializable]
-    public class TeleportMessage : ComponentMessage
-    {
-        public readonly EntityCoordinates Target;
-
-        public TeleportMessage(EntityCoordinates target)
-        {
-            Target = target;
-        }
-    }
-}
diff --git a/Content.Shared/Power/SharedPower.cs b/Content.Shared/Power/SharedPower.cs
index 82b89d3b75..16f36ee765 100644
--- a/Content.Shared/Power/SharedPower.cs
+++ b/Content.Shared/Power/SharedPower.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Power
diff --git a/Content.Shared/Power/SharedPowerDevice.cs b/Content.Shared/Power/SharedPowerDevice.cs
index d80d7e01e2..1083495611 100644
--- a/Content.Shared/Power/SharedPowerDevice.cs
+++ b/Content.Shared/Power/SharedPowerDevice.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Power/SharedPowerItemCharger.cs b/Content.Shared/Power/SharedPowerItemCharger.cs
index cd2d2ade00..1c3575468f 100644
--- a/Content.Shared/Power/SharedPowerItemCharger.cs
+++ b/Content.Shared/Power/SharedPowerItemCharger.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/PowerCell/SharedPowerCell.cs b/Content.Shared/PowerCell/SharedPowerCell.cs
index e7a6797233..b90b83bcbb 100644
--- a/Content.Shared/PowerCell/SharedPowerCell.cs
+++ b/Content.Shared/PowerCell/SharedPowerCell.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Preferences/BackpackPreference.cs b/Content.Shared/Preferences/BackpackPreference.cs
index cb6e6e072b..da2c4b8fe8 100644
--- a/Content.Shared/Preferences/BackpackPreference.cs
+++ b/Content.Shared/Preferences/BackpackPreference.cs
@@ -1,4 +1,3 @@
-#nullable enable
 namespace Content.Shared.Preferences
 {
     /// <summary>
diff --git a/Content.Shared/Preferences/ClothingPreference.cs b/Content.Shared/Preferences/ClothingPreference.cs
index f660b2ecce..24a4b206c7 100644
--- a/Content.Shared/Preferences/ClothingPreference.cs
+++ b/Content.Shared/Preferences/ClothingPreference.cs
@@ -1,4 +1,3 @@
-#nullable enable
 namespace Content.Shared.Preferences
 {
     /// <summary>
diff --git a/Content.Shared/Preferences/GameSettings.cs b/Content.Shared/Preferences/GameSettings.cs
index bf25d8a14a..f41811bc36 100644
--- a/Content.Shared/Preferences/GameSettings.cs
+++ b/Content.Shared/Preferences/GameSettings.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
index 22ca05e337..5b44b715b5 100644
--- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs
+++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/Content.Shared/Preferences/ICharacterProfile.cs b/Content.Shared/Preferences/ICharacterProfile.cs
index 80e94ebf98..2efa088105 100644
--- a/Content.Shared/Preferences/ICharacterProfile.cs
+++ b/Content.Shared/Preferences/ICharacterProfile.cs
@@ -1,6 +1,5 @@
 using Content.Shared.CharacterAppearance;
 
-#nullable enable
 
 namespace Content.Shared.Preferences
 {
diff --git a/Content.Shared/Preferences/JobPriority.cs b/Content.Shared/Preferences/JobPriority.cs
index 8d70d51bb4..b42884cd00 100644
--- a/Content.Shared/Preferences/JobPriority.cs
+++ b/Content.Shared/Preferences/JobPriority.cs
@@ -1,4 +1,3 @@
-#nullable enable
 
 namespace Content.Shared.Preferences
 {
diff --git a/Content.Shared/Preferences/MsgDeleteCharacter.cs b/Content.Shared/Preferences/MsgDeleteCharacter.cs
index f2c353476c..0378551918 100644
--- a/Content.Shared/Preferences/MsgDeleteCharacter.cs
+++ b/Content.Shared/Preferences/MsgDeleteCharacter.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Lidgren.Network;
+using Lidgren.Network;
 using Robust.Shared.Network;
 
 namespace Content.Shared.Preferences
diff --git a/Content.Shared/Preferences/MsgPreferencesAndSettings.cs b/Content.Shared/Preferences/MsgPreferencesAndSettings.cs
index 8056340641..85d6041c5b 100644
--- a/Content.Shared/Preferences/MsgPreferencesAndSettings.cs
+++ b/Content.Shared/Preferences/MsgPreferencesAndSettings.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.IO;
+using System.IO;
 using Lidgren.Network;
 using Robust.Shared.IoC;
 using Robust.Shared.Network;
diff --git a/Content.Shared/Preferences/MsgSelectCharacter.cs b/Content.Shared/Preferences/MsgSelectCharacter.cs
index 7e81df9f7b..423666c185 100644
--- a/Content.Shared/Preferences/MsgSelectCharacter.cs
+++ b/Content.Shared/Preferences/MsgSelectCharacter.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Lidgren.Network;
+using Lidgren.Network;
 using Robust.Shared.Network;
 
 namespace Content.Shared.Preferences
diff --git a/Content.Shared/Preferences/MsgUpdateCharacter.cs b/Content.Shared/Preferences/MsgUpdateCharacter.cs
index 21f93bd51b..bc44c860ca 100644
--- a/Content.Shared/Preferences/MsgUpdateCharacter.cs
+++ b/Content.Shared/Preferences/MsgUpdateCharacter.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.IO;
+using System.IO;
 using Lidgren.Network;
 using Robust.Shared.IoC;
 using Robust.Shared.Network;
diff --git a/Content.Shared/Preferences/PlayerPreferences.cs b/Content.Shared/Preferences/PlayerPreferences.cs
index afd90e4211..bf6003dd82 100644
--- a/Content.Shared/Preferences/PlayerPreferences.cs
+++ b/Content.Shared/Preferences/PlayerPreferences.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using Robust.Shared.Maths;
diff --git a/Content.Shared/Preferences/PreferenceUnavailableMode.cs b/Content.Shared/Preferences/PreferenceUnavailableMode.cs
index 2b06f80f4f..0df1a6bfa7 100644
--- a/Content.Shared/Preferences/PreferenceUnavailableMode.cs
+++ b/Content.Shared/Preferences/PreferenceUnavailableMode.cs
@@ -1,4 +1,3 @@
-#nullable enable
 
 namespace Content.Shared.Preferences
 {
diff --git a/Content.Shared/Projectiles/SharedProjectileComponent.cs b/Content.Shared/Projectiles/SharedProjectileComponent.cs
index 85f1167242..c2d40c6346 100644
--- a/Content.Shared/Projectiles/SharedProjectileComponent.cs
+++ b/Content.Shared/Projectiles/SharedProjectileComponent.cs
@@ -1,16 +1,15 @@
-#nullable enable
 using System;
-using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Projectiles
 {
+    [NetworkedComponent()]
     public abstract class SharedProjectileComponent : Component
     {
         private bool _ignoreShooter = true;
         public override string Name => "Projectile";
-        public override uint? NetID => ContentNetIDs.PROJECTILE;
 
         public EntityUid Shooter { get; protected set; }
 
@@ -29,7 +28,7 @@ namespace Content.Shared.Projectiles
         [NetSerializable, Serializable]
         protected class ProjectileComponentState : ComponentState
         {
-            public ProjectileComponentState(EntityUid shooter, bool ignoreShooter) : base(ContentNetIDs.PROJECTILE)
+            public ProjectileComponentState(EntityUid shooter, bool ignoreShooter)
             {
                 Shooter = shooter;
                 IgnoreShooter = ignoreShooter;
diff --git a/Content.Shared/Prototypes/EntityPrototypeHelpers.cs b/Content.Shared/Prototypes/EntityPrototypeHelpers.cs
index dceb11c6e3..2560efaa79 100644
--- a/Content.Shared/Prototypes/EntityPrototypeHelpers.cs
+++ b/Content.Shared/Prototypes/EntityPrototypeHelpers.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
diff --git a/Content.Shared/Pulling/Components/SharedPullableComponent.cs b/Content.Shared/Pulling/Components/SharedPullableComponent.cs
index d5c7c9e066..34890165eb 100644
--- a/Content.Shared/Pulling/Components/SharedPullableComponent.cs
+++ b/Content.Shared/Pulling/Components/SharedPullableComponent.cs
@@ -1,13 +1,12 @@
-#nullable enable
 using System;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Alert;
 using Content.Shared.Movement;
 using Content.Shared.Movement.Components;
-using Content.Shared.NetIDs;
 using Content.Shared.Physics.Pull;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Log;
 using Robust.Shared.Map;
 using Robust.Shared.Physics;
@@ -17,10 +16,10 @@ using Robust.Shared.Serialization;
 
 namespace Content.Shared.Pulling.Components
 {
+    [NetworkedComponent()]
     public abstract class SharedPullableComponent : Component, IRelayMoveInput
     {
         public override string Name => "Pullable";
-        public override uint? NetID => ContentNetIDs.PULLABLE;
 
         [ComponentDependency] private readonly PhysicsComponent? _physics = default!;
 
@@ -381,7 +380,7 @@ namespace Content.Shared.Pulling.Components
     {
         public readonly EntityUid? Puller;
 
-        public PullableComponentState(EntityUid? puller) : base(ContentNetIDs.PULLABLE)
+        public PullableComponentState(EntityUid? puller)
         {
             Puller = puller;
         }
diff --git a/Content.Shared/Pulling/Components/SharedPullerComponent.cs b/Content.Shared/Pulling/Components/SharedPullerComponent.cs
index 83902e42c2..12a539ab12 100644
--- a/Content.Shared/Pulling/Components/SharedPullerComponent.cs
+++ b/Content.Shared/Pulling/Components/SharedPullerComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Shared.Alert;
+using Content.Shared.Alert;
 using Content.Shared.Movement.Components;
 using Content.Shared.Physics.Pull;
 using Robust.Shared.GameObjects;
diff --git a/Content.Shared/Pulling/SharedPullingSystem.cs b/Content.Shared/Pulling/SharedPullingSystem.cs
index 9660f7f1bc..0bb04d19b4 100644
--- a/Content.Shared/Pulling/SharedPullingSystem.cs
+++ b/Content.Shared/Pulling/SharedPullingSystem.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
diff --git a/Content.Shared/Radiation/IRadiationAct.cs b/Content.Shared/Radiation/IRadiationAct.cs
index a0378f9d6c..d681f2a015 100644
--- a/Content.Shared/Radiation/IRadiationAct.cs
+++ b/Content.Shared/Radiation/IRadiationAct.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Robust.Shared.Analyzers;
+using Robust.Shared.Analyzers;
 using Robust.Shared.GameObjects;
 
 namespace Content.Shared.Radiation
diff --git a/Content.Shared/Radiation/SharedRadiationStorm.cs b/Content.Shared/Radiation/SharedRadiationStorm.cs
index 9c308bdd09..5b4b4a070f 100644
--- a/Content.Shared/Radiation/SharedRadiationStorm.cs
+++ b/Content.Shared/Radiation/SharedRadiationStorm.cs
@@ -1,15 +1,14 @@
-#nullable enable
 using System;
-using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Radiation
 {
+    [NetworkedComponent()]
     public abstract class SharedRadiationPulseComponent : Component
     {
         public override string Name => "RadiationPulse";
-        public override uint? NetID => ContentNetIDs.RADIATION_PULSE;
 
         public virtual float RadsPerSecond { get; set; }
 
@@ -36,7 +35,7 @@ namespace Content.Shared.Radiation
         public readonly bool Decay;
         public readonly TimeSpan EndTime;
 
-        public RadiationPulseState(float radsPerSecond, float range, bool draw, bool decay, TimeSpan endTime) : base(ContentNetIDs.RADIATION_PULSE)
+        public RadiationPulseState(float radsPerSecond, float range, bool draw, bool decay, TimeSpan endTime)
         {
             RadsPerSecond = radsPerSecond;
             Range = range;
diff --git a/Content.Shared/Random/Helpers/SharedEntityExtensions.cs b/Content.Shared/Random/Helpers/SharedEntityExtensions.cs
index ed13ef5b73..bd33c46bd5 100644
--- a/Content.Shared/Random/Helpers/SharedEntityExtensions.cs
+++ b/Content.Shared/Random/Helpers/SharedEntityExtensions.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Maths;
diff --git a/Content.Shared/Recycling/SharedRecyclerComponent.cs b/Content.Shared/Recycling/SharedRecyclerComponent.cs
index 385513320e..203dc45906 100644
--- a/Content.Shared/Recycling/SharedRecyclerComponent.cs
+++ b/Content.Shared/Recycling/SharedRecyclerComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Recycling
diff --git a/Content.Shared/Research/Components/SharedResearchClientComponent.cs b/Content.Shared/Research/Components/SharedResearchClientComponent.cs
index f0460f6e63..cf9f65ee10 100644
--- a/Content.Shared/Research/Components/SharedResearchClientComponent.cs
+++ b/Content.Shared/Research/Components/SharedResearchClientComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Research/Components/SharedResearchConsoleComponent.cs b/Content.Shared/Research/Components/SharedResearchConsoleComponent.cs
index 5600a6e36a..bebb8cf1c9 100644
--- a/Content.Shared/Research/Components/SharedResearchConsoleComponent.cs
+++ b/Content.Shared/Research/Components/SharedResearchConsoleComponent.cs
@@ -1,15 +1,14 @@
-#nullable enable
 using System;
-using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Research.Components
 {
+    [NetworkedComponent()]
     public class SharedResearchConsoleComponent : Component
     {
         public override string Name => "ResearchConsole";
-        public override uint? NetID => ContentNetIDs.RESEARCH_CONSOLE;
 
         [NetSerializable, Serializable]
         public enum ResearchConsoleUiKey
diff --git a/Content.Shared/Research/Components/SharedTechnologyDatabaseComponent.cs b/Content.Shared/Research/Components/SharedTechnologyDatabaseComponent.cs
index 2b860eddb9..1b511cc983 100644
--- a/Content.Shared/Research/Components/SharedTechnologyDatabaseComponent.cs
+++ b/Content.Shared/Research/Components/SharedTechnologyDatabaseComponent.cs
@@ -1,10 +1,9 @@
-#nullable enable
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using Content.Shared.NetIDs;
 using Content.Shared.Research.Prototypes;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
@@ -12,10 +11,10 @@ using Robust.Shared.Serialization.Manager.Attributes;
 
 namespace Content.Shared.Research.Components
 {
+    [NetworkedComponent()]
     public class SharedTechnologyDatabaseComponent : Component, IEnumerable<TechnologyPrototype>, ISerializationHooks
     {
         public override string Name => "TechnologyDatabase";
-        public override uint? NetID => ContentNetIDs.TECHNOLOGY_DATABASE;
 
         [DataField("technologies")] private List<string> _technologyIds = new();
 
@@ -114,12 +113,12 @@ namespace Content.Shared.Research.Components
     public class TechnologyDatabaseState : ComponentState
     {
         public List<string> Technologies;
-        public TechnologyDatabaseState(List<string> technologies) : base(ContentNetIDs.TECHNOLOGY_DATABASE)
+        public TechnologyDatabaseState(List<string> technologies)
         {
             Technologies = technologies;
         }
 
-        public TechnologyDatabaseState(List<TechnologyPrototype> technologies) : base(ContentNetIDs.TECHNOLOGY_DATABASE)
+        public TechnologyDatabaseState(List<TechnologyPrototype> technologies)
         {
             Technologies = new List<string>();
             foreach (var technology in technologies)
diff --git a/Content.Shared/Research/Prototypes/LatheRecipePrototype.cs b/Content.Shared/Research/Prototypes/LatheRecipePrototype.cs
index 07246f4a37..021f2aca1d 100644
--- a/Content.Shared/Research/Prototypes/LatheRecipePrototype.cs
+++ b/Content.Shared/Research/Prototypes/LatheRecipePrototype.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using Content.Shared.Materials;
diff --git a/Content.Shared/Research/Prototypes/TechnologyPrototype.cs b/Content.Shared/Research/Prototypes/TechnologyPrototype.cs
index b4cba7d5cf..46e1e601d1 100644
--- a/Content.Shared/Research/Prototypes/TechnologyPrototype.cs
+++ b/Content.Shared/Research/Prototypes/TechnologyPrototype.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using System.Collections.Generic;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
diff --git a/Content.Shared/Roles/AntagPrototype.cs b/Content.Shared/Roles/AntagPrototype.cs
index 87ab88c6d8..3f03f22377 100644
--- a/Content.Shared/Roles/AntagPrototype.cs
+++ b/Content.Shared/Roles/AntagPrototype.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
diff --git a/Content.Shared/Roles/JobPrototype.cs b/Content.Shared/Roles/JobPrototype.cs
index 3c9367cc27..fea7913f3e 100644
--- a/Content.Shared/Roles/JobPrototype.cs
+++ b/Content.Shared/Roles/JobPrototype.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using Robust.Shared.Prototypes;
diff --git a/Content.Shared/Roles/JobSpecial.cs b/Content.Shared/Roles/JobSpecial.cs
index 3d174466cc..c2924eb014 100644
--- a/Content.Shared/Roles/JobSpecial.cs
+++ b/Content.Shared/Roles/JobSpecial.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
diff --git a/Content.Shared/Roles/StartingGearPrototype.cs b/Content.Shared/Roles/StartingGearPrototype.cs
index e64c89467e..02bdf1331c 100644
--- a/Content.Shared/Roles/StartingGearPrototype.cs
+++ b/Content.Shared/Roles/StartingGearPrototype.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Collections.Generic;
 using Content.Shared.Preferences;
 using Robust.Shared.Prototypes;
diff --git a/Content.Shared/Rotatable/SharedRotatableComponent.cs b/Content.Shared/Rotatable/SharedRotatableComponent.cs
index 9ea50ccc00..b8754ea856 100644
--- a/Content.Shared/Rotatable/SharedRotatableComponent.cs
+++ b/Content.Shared/Rotatable/SharedRotatableComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
diff --git a/Content.Shared/Rotation/SharedRotationComponent.cs b/Content.Shared/Rotation/SharedRotationComponent.cs
index 688dc74b26..4091b81141 100644
--- a/Content.Shared/Rotation/SharedRotationComponent.cs
+++ b/Content.Shared/Rotation/SharedRotationComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Rotation
diff --git a/Content.Shared/Rounding/ContentHelpers.cs b/Content.Shared/Rounding/ContentHelpers.cs
index d81e2ebe93..f3f89184aa 100644
--- a/Content.Shared/Rounding/ContentHelpers.cs
+++ b/Content.Shared/Rounding/ContentHelpers.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 
 namespace Content.Shared.Rounding
 {
diff --git a/Content.Shared/SMES/SharedSmesComponent.cs b/Content.Shared/SMES/SharedSmesComponent.cs
index 2d7fd5ede2..c6bfd9a543 100644
--- a/Content.Shared/SMES/SharedSmesComponent.cs
+++ b/Content.Shared/SMES/SharedSmesComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.SMES
diff --git a/Content.Shared/Sandbox/SharedSandboxManager.cs b/Content.Shared/Sandbox/SharedSandboxManager.cs
index b87bd56fee..96adbd2b07 100644
--- a/Content.Shared/Sandbox/SharedSandboxManager.cs
+++ b/Content.Shared/Sandbox/SharedSandboxManager.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Lidgren.Network;
+using Lidgren.Network;
 using Robust.Shared.Network;
 
 namespace Content.Shared.Sandbox
diff --git a/Content.Shared/Shuttles/PilotComponent.cs b/Content.Shared/Shuttles/PilotComponent.cs
new file mode 100644
index 0000000000..2303c3a1dc
--- /dev/null
+++ b/Content.Shared/Shuttles/PilotComponent.cs
@@ -0,0 +1,58 @@
+using System;
+using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
+using Robust.Shared.Log;
+using Robust.Shared.Players;
+using Robust.Shared.Serialization;
+using Robust.Shared.ViewVariables;
+
+namespace Content.Shared.Shuttles
+{
+    /// <summary>
+    /// Stores what shuttle this entity is currently piloting.
+    /// </summary>
+    [RegisterComponent]
+    [NetworkedComponent()]
+    public sealed class PilotComponent : Component
+    {
+        public override string Name => "Pilot";
+        [ViewVariables] public SharedShuttleConsoleComponent? Console { get; set; }
+
+        public override void HandleComponentState(ComponentState? curState, ComponentState? nextState)
+        {
+            base.HandleComponentState(curState, nextState);
+            if (curState is not PilotComponentState state) return;
+
+            if (state.Console == null)
+            {
+                Console = null;
+                return;
+            }
+
+            if (!Owner.EntityManager.TryGetEntity(state.Console.Value, out var consoleEnt) ||
+                !consoleEnt.TryGetComponent(out SharedShuttleConsoleComponent? shuttleConsoleComponent))
+            {
+                Logger.Warning($"Unable to set Helmsman console to {state.Console.Value}");
+                return;
+            }
+
+            Console = shuttleConsoleComponent;
+        }
+
+        public override ComponentState GetComponentState(ICommonSession player)
+        {
+            return new PilotComponentState(Console?.Owner.Uid);
+        }
+
+        [Serializable, NetSerializable]
+        private sealed class PilotComponentState : ComponentState
+        {
+            public EntityUid? Console { get; }
+
+            public PilotComponentState(EntityUid? uid)
+            {
+                Console = uid;
+            }
+        }
+    }
+}
diff --git a/Content.Shared/Shuttles/SharedShuttleComponent.cs b/Content.Shared/Shuttles/SharedShuttleComponent.cs
new file mode 100644
index 0000000000..cc7ba7fe65
--- /dev/null
+++ b/Content.Shared/Shuttles/SharedShuttleComponent.cs
@@ -0,0 +1,28 @@
+using Robust.Shared.GameObjects;
+using Robust.Shared.ViewVariables;
+
+namespace Content.Shared.Shuttles
+{
+    public abstract class SharedShuttleComponent : Component
+    {
+        public override string Name => "Shuttle";
+
+        [ViewVariables]
+        public virtual bool Enabled { get; set; } = true;
+
+        /// <summary>
+        /// How much our linear impulse is multiplied by.
+        /// </summary>
+        [ViewVariables(VVAccess.ReadWrite)]
+        public float SpeedMultipler { get; set; } = 200.0f;
+
+        [ViewVariables]
+        public ShuttleMode Mode { get; set; } = ShuttleMode.Docking;
+    }
+
+    public enum ShuttleMode : byte
+    {
+        Docking,
+        Cruise,
+    }
+}
diff --git a/Content.Shared/Shuttles/SharedShuttleConsoleComponent.cs b/Content.Shared/Shuttles/SharedShuttleConsoleComponent.cs
new file mode 100644
index 0000000000..13c1c4a211
--- /dev/null
+++ b/Content.Shared/Shuttles/SharedShuttleConsoleComponent.cs
@@ -0,0 +1,14 @@
+using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Shuttles
+{
+    /// <summary>
+    /// Interact with to start piloting a shuttle.
+    /// </summary>
+    [NetworkedComponent()]
+    public abstract class SharedShuttleConsoleComponent : Component
+    {
+        public override string Name => "ShuttleConsole";
+    }
+}
diff --git a/Content.Shared/Shuttles/SharedShuttleConsoleSystem.cs b/Content.Shared/Shuttles/SharedShuttleConsoleSystem.cs
new file mode 100644
index 0000000000..8e9070571c
--- /dev/null
+++ b/Content.Shared/Shuttles/SharedShuttleConsoleSystem.cs
@@ -0,0 +1,20 @@
+using Content.Shared.Movement;
+using Robust.Shared.GameObjects;
+
+namespace Content.Shared.Shuttles
+{
+    public abstract class SharedShuttleConsoleSystem : EntitySystem
+    {
+        public override void Initialize()
+        {
+            base.Initialize();
+            SubscribeLocalEvent<PilotComponent, MovementAttemptEvent>(HandleMovementBlock);
+        }
+
+        private void HandleMovementBlock(EntityUid uid, PilotComponent component, MovementAttemptEvent args)
+        {
+            if (component.Console == null) return;
+            args.Cancel();
+        }
+    }
+}
diff --git a/Content.Shared/Singularity/Components/SharedEmitterComponent.cs b/Content.Shared/Singularity/Components/SharedEmitterComponent.cs
index e82e5d7c5b..d5d128bcb2 100644
--- a/Content.Shared/Singularity/Components/SharedEmitterComponent.cs
+++ b/Content.Shared/Singularity/Components/SharedEmitterComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Singularity.Components
diff --git a/Content.Shared/Singularity/Components/SharedParticleAcceleratorComponent.cs b/Content.Shared/Singularity/Components/SharedParticleAcceleratorComponent.cs
index 0ef9a1482a..24884fce7b 100644
--- a/Content.Shared/Singularity/Components/SharedParticleAcceleratorComponent.cs
+++ b/Content.Shared/Singularity/Components/SharedParticleAcceleratorComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Singularity/Components/SharedRadiationCollectorComponent.cs b/Content.Shared/Singularity/Components/SharedRadiationCollectorComponent.cs
index dd347381bf..32890c42c5 100644
--- a/Content.Shared/Singularity/Components/SharedRadiationCollectorComponent.cs
+++ b/Content.Shared/Singularity/Components/SharedRadiationCollectorComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Singularity.Components
diff --git a/Content.Shared/Singularity/Components/SharedSingularityComponent.cs b/Content.Shared/Singularity/Components/SharedSingularityComponent.cs
index 2b9b9ebc4e..687a4d1494 100644
--- a/Content.Shared/Singularity/Components/SharedSingularityComponent.cs
+++ b/Content.Shared/Singularity/Components/SharedSingularityComponent.cs
@@ -1,16 +1,16 @@
 using System;
-using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Shared.Singularity.Components
 {
+    [NetworkedComponent]
     public abstract class SharedSingularityComponent : Component
     {
         public override string Name => "Singularity";
-        public override uint? NetID => ContentNetIDs.SINGULARITY;
 
         [DataField("deleteFixture")] public string? DeleteFixtureId { get; } = default;
 
@@ -36,7 +36,7 @@ namespace Content.Shared.Singularity.Components
     {
         public int Level { get; }
 
-        public SingularityComponentState(int level) : base(ContentNetIDs.SINGULARITY)
+        public SingularityComponentState(int level)
         {
             Level = level;
         }
diff --git a/Content.Shared/Singularity/Components/SingularityDistortionComponent.cs b/Content.Shared/Singularity/Components/SingularityDistortionComponent.cs
index 46a62ae318..e31cf8d81a 100644
--- a/Content.Shared/Singularity/Components/SingularityDistortionComponent.cs
+++ b/Content.Shared/Singularity/Components/SingularityDistortionComponent.cs
@@ -1,6 +1,6 @@
-using System;
-using Content.Shared.NetIDs;
+using System;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Players;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
@@ -9,10 +9,10 @@ using Robust.Shared.ViewVariables;
 namespace Content.Shared.Singularity.Components
 {
     [RegisterComponent]
+    [NetworkedComponent]
     public class SingularityDistortionComponent : Component
     {
         public override string Name => "SingularityDistortion";
-        public override uint? NetID => ContentNetIDs.SINGULARITY_DISTORTION;
 
         [DataField("intensity")]
         private float _intensity = 0.25f;
@@ -56,7 +56,7 @@ namespace Content.Shared.Singularity.Components
     [Serializable, NetSerializable]
     public class SingularityDistortionComponentState : ComponentState
     {
-        public SingularityDistortionComponentState(float intensity, float falloff) : base(ContentNetIDs.SINGULARITY_DISTORTION)
+        public SingularityDistortionComponentState(float intensity, float falloff)
         {
             Intensity = intensity;
             Falloff = falloff;
diff --git a/Content.Shared/Singularity/SingularitySoundMessage.cs b/Content.Shared/Singularity/SingularitySoundMessage.cs
index ef736d01bb..6554b81b24 100644
--- a/Content.Shared/Singularity/SingularitySoundMessage.cs
+++ b/Content.Shared/Singularity/SingularitySoundMessage.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
diff --git a/Content.Shared/Slippery/SharedSlipperySystem.cs b/Content.Shared/Slippery/SharedSlipperySystem.cs
new file mode 100644
index 0000000000..cfa08a6a8b
--- /dev/null
+++ b/Content.Shared/Slippery/SharedSlipperySystem.cs
@@ -0,0 +1,112 @@
+using System.Linq;
+using Content.Shared.EffectBlocker;
+using Content.Shared.Stunnable;
+using JetBrains.Annotations;
+using Robust.Shared.Containers;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Physics;
+using Robust.Shared.Physics.Dynamics;
+
+namespace Content.Shared.Slippery
+{
+    [UsedImplicitly]
+    public abstract class SharedSlipperySystem : EntitySystem
+    {
+        public override void Initialize()
+        {
+            base.Initialize();
+            SubscribeLocalEvent<SlipperyComponent, StartCollideEvent>(HandleCollide);
+        }
+
+        private void HandleCollide(EntityUid uid, SlipperyComponent component, StartCollideEvent args)
+        {
+            component.Colliding.Add(args.OtherFixture.Body.Owner.Uid);
+        }
+
+        /// <inheritdoc />
+        public override void Update(float frameTime)
+        {
+            foreach (var slipperyComp in ComponentManager.EntityQuery<SlipperyComponent>().ToArray())
+            {
+                Update(slipperyComp);
+            }
+        }
+
+        private bool TrySlip(SlipperyComponent component, IPhysBody ourBody, IPhysBody otherBody)
+        {
+            if (!component.Slippery
+                || component.Owner.IsInContainer()
+                ||  component.Slipped.Contains(otherBody.Owner.Uid)
+                ||  !otherBody.Owner.TryGetComponent(out SharedStunnableComponent? stun))
+            {
+                return false;
+            }
+
+            if (otherBody.LinearVelocity.Length < component.RequiredSlipSpeed || stun.KnockedDown)
+            {
+                return false;
+            }
+
+            var percentage = otherBody.GetWorldAABB().IntersectPercentage(ourBody.GetWorldAABB());
+
+            if (percentage < component.IntersectPercentage)
+            {
+                return false;
+            }
+
+            if (!EffectBlockerSystem.CanSlip(otherBody.Owner))
+            {
+                return false;
+            }
+
+            otherBody.LinearVelocity *= component.LaunchForwardsMultiplier;
+
+            stun.Paralyze(5);
+            component.Slipped.Add(otherBody.Owner.Uid);
+            component.Dirty();
+
+            PlaySound(component);
+
+            return true;
+        }
+
+        // Until we get predicted slip sounds TM?
+        protected abstract void PlaySound(SlipperyComponent component);
+
+        // TODO: Now that we have StartCollide and EndCollide this should just use that to track bodies intersecting.
+        private void Update(SlipperyComponent component)
+        {
+            if (!component.Slippery)
+                return;
+
+            if (!ComponentManager.TryGetComponent(component.Owner.Uid, out PhysicsComponent? body))
+            {
+                component.Colliding.Clear();
+                return;
+            }
+
+            foreach (var uid in component.Colliding.ToArray())
+            {
+                if (!uid.IsValid() || !EntityManager.TryGetEntity(uid, out var entity))
+                {
+                    component.Colliding.Remove(uid);
+                    component.Slipped.Remove(uid);
+                    component.Dirty();
+                    continue;
+                }
+
+                if (!entity.TryGetComponent(out PhysicsComponent? otherPhysics) ||
+                    !body.GetWorldAABB().Intersects(otherPhysics.GetWorldAABB()))
+                {
+                    component.Colliding.Remove(uid);
+                    component.Slipped.Remove(uid);
+                    component.Dirty();
+                    continue;
+                }
+
+                if (!component.Slipped.Contains(uid))
+                    TrySlip(component, body, otherPhysics);
+            }
+        }
+    }
+}
diff --git a/Content.Shared/Slippery/SlipperyComponent.cs b/Content.Shared/Slippery/SlipperyComponent.cs
index d06a108383..46f76306e9 100644
--- a/Content.Shared/Slippery/SlipperyComponent.cs
+++ b/Content.Shared/Slippery/SlipperyComponent.cs
@@ -1,22 +1,10 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Content.Shared.Audio;
-using Content.Shared.EffectBlocker;
-using Content.Shared.Module;
-using Content.Shared.NetIDs;
 using Content.Shared.Sound;
-using Content.Shared.Stunnable;
-using Robust.Shared.Audio;
-using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
+using Robust.Shared.GameStates;
 using Robust.Shared.Maths;
-using Robust.Shared.Physics;
-using Robust.Shared.Physics.Collision;
-using Robust.Shared.Physics.Dynamics;
-using Robust.Shared.Player;
 using Robust.Shared.Players;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
@@ -25,12 +13,10 @@ using Robust.Shared.ViewVariables;
 namespace Content.Shared.Slippery
 {
     [RegisterComponent]
-    public class SlipperyComponent : Component, IStartCollide
+    [NetworkedComponent()]
+    public sealed class SlipperyComponent : Component
     {
-        [Dependency] private IModuleManager _moduleManager = default!;
-
-        public sealed override string Name => "Slippery";
-        public override uint? NetID => ContentNetIDs.SLIP;
+        public override string Name => "Slippery";
 
         private float _paralyzeTime = 3f;
         private float _intersectPercentage = 0.3f;
@@ -42,12 +28,12 @@ namespace Content.Shared.Slippery
         /// <summary>
         ///     List of entities that are currently colliding with the entity.
         /// </summary>
-        private readonly HashSet<EntityUid> _colliding = new();
+        public readonly HashSet<EntityUid> Colliding = new();
 
         /// <summary>
         ///     The list of entities that have been slipped by this component, which shouldn't be slipped again.
         /// </summary>
-        private readonly HashSet<EntityUid> _slipped = new();
+        public readonly HashSet<EntityUid> Slipped = new();
 
         /// <summary>
         ///     Path to the sound to be played when a mob slips.
@@ -152,88 +138,9 @@ namespace Content.Shared.Slippery
             }
         }
 
-        private bool TrySlip(IPhysBody ourBody, IPhysBody otherBody)
-        {
-            if (!Slippery
-                || Owner.IsInContainer()
-                ||  _slipped.Contains(otherBody.Owner.Uid)
-                ||  !otherBody.Owner.TryGetComponent(out SharedStunnableComponent? stun))
-            {
-                return false;
-            }
-
-            if (otherBody.LinearVelocity.Length < RequiredSlipSpeed || stun.KnockedDown)
-            {
-                return false;
-            }
-
-            var percentage = otherBody.GetWorldAABB().IntersectPercentage(ourBody.GetWorldAABB());
-
-            if (percentage < IntersectPercentage)
-            {
-                return false;
-            }
-
-            if (!EffectBlockerSystem.CanSlip(otherBody.Owner))
-            {
-                return false;
-            }
-
-            otherBody.LinearVelocity *= LaunchForwardsMultiplier;
-
-            stun.Paralyze(5);
-            _slipped.Add(otherBody.Owner.Uid);
-            Dirty();
-
-            if (SlipSound.TryGetSound(out var slipSound) && _moduleManager.IsServerModule)
-            {
-                SoundSystem.Play(Filter.Broadcast(), slipSound, Owner, AudioHelpers.WithVariation(0.2f));
-            }
-
-            return true;
-        }
-
-        void IStartCollide.CollideWith(Fixture _, Fixture otherFixture, in Manifold manifold)
-        {
-            _colliding.Add(otherFixture.Body.Owner.Uid);
-        }
-
-        public void Update()
-        {
-            if (!Slippery)
-                return;
-
-            var physics = Owner.GetComponent<IPhysBody>();
-
-            foreach (var uid in _colliding.ToArray())
-            {
-                if (!uid.IsValid() || !Owner.EntityManager.EntityExists(uid))
-                {
-                    _colliding.Remove(uid);
-                    _slipped.Remove(uid);
-                    Dirty();
-                    continue;
-                }
-
-                var entity = Owner.EntityManager.GetEntity(uid);
-                var otherPhysics = entity.GetComponent<IPhysBody>();
-
-                if (!physics.GetWorldAABB().Intersects(otherPhysics.GetWorldAABB()))
-                {
-                    _colliding.Remove(uid);
-                    _slipped.Remove(uid);
-                    Dirty();
-                    continue;
-                }
-
-                if (!_slipped.Contains(uid))
-                    TrySlip(physics, otherPhysics);
-            }
-        }
-
         public override ComponentState GetComponentState(ICommonSession player)
         {
-            return new SlipperyComponentState(ParalyzeTime, IntersectPercentage, RequiredSlipSpeed, LaunchForwardsMultiplier, Slippery, SlipSound.GetSound(), _slipped.ToArray());
+            return new SlipperyComponentState(ParalyzeTime, IntersectPercentage, RequiredSlipSpeed, LaunchForwardsMultiplier, Slippery, SlipSound.GetSound(), Slipped.ToArray());
         }
 
         public override void HandleComponentState(ComponentState? curState, ComponentState? nextState)
@@ -246,11 +153,11 @@ namespace Content.Shared.Slippery
             _requiredSlipSpeed = state.RequiredSlipSpeed;
             _launchForwardsMultiplier = state.LaunchForwardsMultiplier;
             _slipSound = new SoundPathSpecifier(state.SlipSound);
-            _slipped.Clear();
+            Slipped.Clear();
 
             foreach (var slipped in state.Slipped)
             {
-                _slipped.Add(slipped);
+                Slipped.Add(slipped);
             }
         }
     }
@@ -266,7 +173,7 @@ namespace Content.Shared.Slippery
         public string SlipSound { get; }
         public readonly EntityUid[] Slipped;
 
-        public SlipperyComponentState(float paralyzeTime, float intersectPercentage, float requiredSlipSpeed, float launchForwardsMultiplier, bool slippery, string slipSound, EntityUid[] slipped) : base(ContentNetIDs.SLIP)
+        public SlipperyComponentState(float paralyzeTime, float intersectPercentage, float requiredSlipSpeed, float launchForwardsMultiplier, bool slippery, string slipSound, EntityUid[] slipped)
         {
             ParalyzeTime = paralyzeTime;
             IntersectPercentage = intersectPercentage;
diff --git a/Content.Shared/Slippery/SlipperySystem.cs b/Content.Shared/Slippery/SlipperySystem.cs
deleted file mode 100644
index 8eb6b67ac6..0000000000
--- a/Content.Shared/Slippery/SlipperySystem.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-#nullable enable
-using System.Linq;
-using JetBrains.Annotations;
-using Robust.Shared.GameObjects;
-
-namespace Content.Shared.Slippery
-{
-    [UsedImplicitly]
-    public class SlipperySystem : EntitySystem
-    {
-        /// <inheritdoc />
-        public override void Update(float frameTime)
-        {
-            foreach (var slipperyComp in ComponentManager.EntityQuery<SlipperyComponent>().ToArray())
-            {
-                slipperyComp.Update();
-            }
-        }
-    }
-}
diff --git a/Content.Shared/Smoking/SharedBurningStates.cs b/Content.Shared/Smoking/SharedBurningStates.cs
index 30473b4b96..2d83827552 100644
--- a/Content.Shared/Smoking/SharedBurningStates.cs
+++ b/Content.Shared/Smoking/SharedBurningStates.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Smoking
diff --git a/Content.Shared/Smoking/SmokeVisuals.cs b/Content.Shared/Smoking/SmokeVisuals.cs
index 41621e3c72..70dddff63a 100644
--- a/Content.Shared/Smoking/SmokeVisuals.cs
+++ b/Content.Shared/Smoking/SmokeVisuals.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Smoking
diff --git a/Content.Shared/Smoking/SmokingVisuals.cs b/Content.Shared/Smoking/SmokingVisuals.cs
index bea1705a7d..c571852882 100644
--- a/Content.Shared/Smoking/SmokingVisuals.cs
+++ b/Content.Shared/Smoking/SmokingVisuals.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Smoking
diff --git a/Content.Shared/Solar/SharedSolarControlConsoleComponent.cs b/Content.Shared/Solar/SharedSolarControlConsoleComponent.cs
index 492e83f7f0..9154efd066 100644
--- a/Content.Shared/Solar/SharedSolarControlConsoleComponent.cs
+++ b/Content.Shared/Solar/SharedSolarControlConsoleComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
diff --git a/Content.Shared/Sound/SharedLoopingSoundComponent.cs b/Content.Shared/Sound/SharedLoopingSoundComponent.cs
index 71eb6dccfe..b31234d03e 100644
--- a/Content.Shared/Sound/SharedLoopingSoundComponent.cs
+++ b/Content.Shared/Sound/SharedLoopingSoundComponent.cs
@@ -1,17 +1,16 @@
-#nullable enable
 using System;
-using Content.Shared.NetIDs;
 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";
-        public override uint? NetID => ContentNetIDs.SOUND;
 
         /// <summary>
         /// Stops all sounds.
diff --git a/Content.Shared/Spawning/EntitySystemExtensions.cs b/Content.Shared/Spawning/EntitySystemExtensions.cs
index c7ab1ac712..6ec0226358 100644
--- a/Content.Shared/Spawning/EntitySystemExtensions.cs
+++ b/Content.Shared/Spawning/EntitySystemExtensions.cs
@@ -1,9 +1,9 @@
-#nullable enable
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using Content.Shared.Physics;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
+using Robust.Shared.Physics;
 using Robust.Shared.Physics.Broadphase;
 
 namespace Content.Shared.Spawning
@@ -16,9 +16,9 @@ namespace Content.Shared.Spawning
             EntityCoordinates coordinates,
             CollisionGroup collisionLayer,
             in Box2? box = null,
-            SharedBroadPhaseSystem? physicsManager = null)
+            SharedBroadphaseSystem? physicsManager = null)
         {
-            physicsManager ??= EntitySystem.Get<SharedBroadPhaseSystem>();
+            physicsManager ??= EntitySystem.Get<SharedBroadphaseSystem>();
             var mapCoordinates = coordinates.ToMap(entityManager);
 
             return entityManager.SpawnIfUnobstructed(prototypeName, mapCoordinates, collisionLayer, box, physicsManager);
@@ -30,10 +30,10 @@ namespace Content.Shared.Spawning
             MapCoordinates coordinates,
             CollisionGroup collisionLayer,
             in Box2? box = null,
-            SharedBroadPhaseSystem? collision = null)
+            SharedBroadphaseSystem? collision = null)
         {
             var boxOrDefault = box.GetValueOrDefault(Box2.UnitCentered);
-            collision ??= EntitySystem.Get<SharedBroadPhaseSystem>();
+            collision ??= EntitySystem.Get<SharedBroadphaseSystem>();
 
             foreach (var body in collision.GetCollidingEntities(coordinates.MapId, in boxOrDefault))
             {
@@ -61,7 +61,7 @@ namespace Content.Shared.Spawning
             CollisionGroup collisionLayer,
             [NotNullWhen(true)] out IEntity? entity,
             Box2? box = null,
-            SharedBroadPhaseSystem? physicsManager = null)
+            SharedBroadphaseSystem? physicsManager = null)
         {
             entity = entityManager.SpawnIfUnobstructed(prototypeName, coordinates, collisionLayer, box, physicsManager);
 
@@ -75,7 +75,7 @@ namespace Content.Shared.Spawning
             CollisionGroup collisionLayer,
             [NotNullWhen(true)] out IEntity? entity,
             in Box2? box = null,
-            SharedBroadPhaseSystem? physicsManager = null)
+            SharedBroadphaseSystem? physicsManager = null)
         {
             entity = entityManager.SpawnIfUnobstructed(prototypeName, coordinates, collisionLayer, box, physicsManager);
 
diff --git a/Content.Shared/Speech/SharedSpeechComponent.cs b/Content.Shared/Speech/SharedSpeechComponent.cs
index c783b0b17c..fdc736447d 100644
--- a/Content.Shared/Speech/SharedSpeechComponent.cs
+++ b/Content.Shared/Speech/SharedSpeechComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Shared.ActionBlocker;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
diff --git a/Content.Shared/Stacks/SharedStackComponent.cs b/Content.Shared/Stacks/SharedStackComponent.cs
index c9c0b8c300..7a7153aeb7 100644
--- a/Content.Shared/Stacks/SharedStackComponent.cs
+++ b/Content.Shared/Stacks/SharedStackComponent.cs
@@ -1,6 +1,6 @@
 using System;
-using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Players;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
@@ -9,13 +9,10 @@ using Robust.Shared.ViewVariables;
 
 namespace Content.Shared.Stacks
 {
+    [NetworkedComponent()]
     public abstract class SharedStackComponent : Component, ISerializationHooks
     {
         public sealed override string Name => "Stack";
-        public sealed override uint? NetID => ContentNetIDs.STACK;
-
-        [DataField("max")]
-        private int _maxCount = 30;
 
         [ViewVariables(VVAccess.ReadWrite)]
         [DataField("stackType", required:true, customTypeSerializer:typeof(PrototypeIdSerializer<StackPrototype>))]
@@ -29,19 +26,12 @@ namespace Content.Shared.Stacks
         [DataField("count")]
         public int Count { get; set; } = 30;
 
-        [ViewVariables]
-        public int MaxCount
-        {
-            get => _maxCount;
-            private set
-            {
-                if (_maxCount == value)
-                    return;
-
-                _maxCount = value;
-                Dirty();
-            }
-        }
+        /// <summary>
+        ///     Max amount of things that can be in the stack.
+        /// </summary>
+        [ViewVariables(VVAccess.ReadOnly)]
+        [DataField("max")]
+        public int MaxCount { get; set; } = 30;
 
         [ViewVariables]
         public int AvailableSpace => MaxCount - Count;
@@ -50,29 +40,18 @@ namespace Content.Shared.Stacks
         {
             return new StackComponentState(Count, MaxCount);
         }
+    }
 
-        public override void HandleComponentState(ComponentState? curState, ComponentState? nextState)
+    [Serializable, NetSerializable]
+    public sealed class StackComponentState : ComponentState
+    {
+        public int Count { get; }
+        public int MaxCount { get; }
+
+        public StackComponentState(int count, int maxCount)
         {
-            if (curState is not StackComponentState cast)
-                return;
-
-            // This will change the count and call events.
-            EntitySystem.Get<SharedStackSystem>().SetCount(Owner.Uid, this, cast.Count);
-            MaxCount = cast.MaxCount;
-        }
-
-
-        [Serializable, NetSerializable]
-        private sealed class StackComponentState : ComponentState
-        {
-            public int Count { get; }
-            public int MaxCount { get; }
-
-            public StackComponentState(int count, int maxCount) : base(ContentNetIDs.STACK)
-            {
-                Count = count;
-                MaxCount = maxCount;
-            }
+            Count = count;
+            MaxCount = maxCount;
         }
     }
 }
diff --git a/Content.Shared/Stacks/SharedStackSystem.cs b/Content.Shared/Stacks/SharedStackSystem.cs
index 9c62543d42..a9a74547fd 100644
--- a/Content.Shared/Stacks/SharedStackSystem.cs
+++ b/Content.Shared/Stacks/SharedStackSystem.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Examine;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Localization;
 
 namespace Content.Shared.Stacks
@@ -12,6 +13,7 @@ namespace Content.Shared.Stacks
         {
             base.Initialize();
 
+            SubscribeLocalEvent<SharedStackComponent, ComponentHandleState>(OnStackHandleState);
             SubscribeLocalEvent<SharedStackComponent, ComponentStartup>(OnStackStarted);
             SubscribeLocalEvent<SharedStackComponent, ExaminedEvent>(OnStackExamined);
         }
@@ -60,6 +62,16 @@ namespace Content.Shared.Stacks
             RaiseLocalEvent(uid, new StackCountChangedEvent(old, component.Count));
         }
 
+        private void OnStackHandleState(EntityUid uid, SharedStackComponent component, ComponentHandleState args)
+        {
+            if (args.Current is not StackComponentState cast)
+                return;
+
+            // This will change the count and call events.
+            SetCount(uid, component, cast.Count);
+            component.MaxCount = cast.MaxCount;
+        }
+
         private void OnStackExamined(EntityUid uid, SharedStackComponent component, ExaminedEvent args)
         {
             if (!args.IsInDetailsRange)
diff --git a/Content.Shared/Stacks/StackPrototype.cs b/Content.Shared/Stacks/StackPrototype.cs
index 67e700e406..185eaed14e 100644
--- a/Content.Shared/Stacks/StackPrototype.cs
+++ b/Content.Shared/Stacks/StackPrototype.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Robust.Shared.Prototypes;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
diff --git a/Content.Shared/Stacks/StackVisuals.cs b/Content.Shared/Stacks/StackVisuals.cs
index e942efd2ad..b4099abf96 100644
--- a/Content.Shared/Stacks/StackVisuals.cs
+++ b/Content.Shared/Stacks/StackVisuals.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Standing/StandingStateComponent.cs b/Content.Shared/Standing/StandingStateComponent.cs
index dcba6f3490..6be3d48390 100644
--- a/Content.Shared/Standing/StandingStateComponent.cs
+++ b/Content.Shared/Standing/StandingStateComponent.cs
@@ -1,8 +1,8 @@
 using System;
 using Content.Shared.EffectBlocker;
-using Content.Shared.NetIDs;
 using Content.Shared.Sound;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Players;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
@@ -11,12 +11,11 @@ using Robust.Shared.ViewVariables;
 namespace Content.Shared.Standing
 {
     [RegisterComponent]
+    [NetworkedComponent]
     public sealed class StandingStateComponent : Component, IEffectBlocker
     {
         public override string Name => "StandingState";
 
-        public override uint? NetID => ContentNetIDs.STANDING_STATE;
-
         [ViewVariables(VVAccess.ReadWrite)]
         [DataField("downSoundCollection")]
         public SoundSpecifier DownSoundCollection { get; } = new SoundCollectionSpecifier("BodyFall");
@@ -46,7 +45,7 @@ namespace Content.Shared.Standing
         {
             public bool Standing { get; }
 
-            public StandingComponentState(bool standing) : base(ContentNetIDs.STANDING_STATE)
+            public StandingComponentState(bool standing)
             {
                 Standing = standing;
             }
diff --git a/Content.Shared/Standing/StandingStateSystem.cs b/Content.Shared/Standing/StandingStateSystem.cs
index 3932e5d0f7..7f96cc3bf8 100644
--- a/Content.Shared/Standing/StandingStateSystem.cs
+++ b/Content.Shared/Standing/StandingStateSystem.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Shared.Audio;
 using Content.Shared.Hands;
 using Content.Shared.Rotation;
diff --git a/Content.Shared/StationEvents/MsgRequestStationEvents.cs b/Content.Shared/StationEvents/MsgRequestStationEvents.cs
index a7390781a1..aeb8c5d9ca 100644
--- a/Content.Shared/StationEvents/MsgRequestStationEvents.cs
+++ b/Content.Shared/StationEvents/MsgRequestStationEvents.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Lidgren.Network;
+using Lidgren.Network;
 using Robust.Shared.Network;
 
 namespace Content.Shared.StationEvents
diff --git a/Content.Shared/StationEvents/MsgStationEvents.cs b/Content.Shared/StationEvents/MsgStationEvents.cs
index 7c88c8e34e..b03e6db7f7 100644
--- a/Content.Shared/StationEvents/MsgStationEvents.cs
+++ b/Content.Shared/StationEvents/MsgStationEvents.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using System.IO;
 using Lidgren.Network;
 using Robust.Shared.IoC;
diff --git a/Content.Shared/Storage/ItemCounter/ItemCounterComponent.cs b/Content.Shared/Storage/ItemCounter/ItemCounterComponent.cs
new file mode 100644
index 0000000000..c06dc53987
--- /dev/null
+++ b/Content.Shared/Storage/ItemCounter/ItemCounterComponent.cs
@@ -0,0 +1,24 @@
+using System.Collections.Generic;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Serialization;
+using Robust.Shared.Serialization.Manager.Attributes;
+
+namespace Content.Shared.Storage.ItemCounter
+{
+    [RegisterComponent]
+    public class ItemCounterComponent : Component, ISerializationHooks
+    {
+        public override string Name => "ItemCounter";
+
+        [DataField("mapLayers")] public readonly Dictionary<string, SharedMapLayerData> MapLayers = new();
+
+        void ISerializationHooks.AfterDeserialization()
+        {
+            foreach (var (layerName, val) in MapLayers)
+            {
+                val.Layer = layerName;
+            }
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/Content.Shared/Storage/ItemCounter/SharedItemCounterSystem.cs b/Content.Shared/Storage/ItemCounter/SharedItemCounterSystem.cs
new file mode 100644
index 0000000000..cde603bec9
--- /dev/null
+++ b/Content.Shared/Storage/ItemCounter/SharedItemCounterSystem.cs
@@ -0,0 +1,53 @@
+using System.Collections.Generic;
+using JetBrains.Annotations;
+using Robust.Shared.Containers;
+using Robust.Shared.GameObjects;
+
+namespace Content.Shared.Storage.ItemCounter
+{
+    [UsedImplicitly]
+    public abstract class SharedItemCounterSystem : EntitySystem
+    {
+        /// <inheritdoc />
+        public override void Initialize()
+        {
+            base.Initialize();
+            SubscribeLocalEvent<ItemCounterComponent, ComponentInit>(InitLayers);
+            SubscribeLocalEvent<ItemCounterComponent, EntInsertedIntoContainerMessage>(HandleEntityInsert);
+            SubscribeLocalEvent<ItemCounterComponent, EntRemovedFromContainerMessage>(HandleEntityRemoved);
+        }
+
+        private void InitLayers(EntityUid uid, ItemCounterComponent component, ComponentInit args)
+        {
+            if (component.Owner.TryGetComponent(out SharedAppearanceComponent? appearanceComponent))
+            {
+                var list = new List<string>(component.MapLayers.Keys);
+                appearanceComponent.SetData(StorageMapVisuals.InitLayers, new ShowLayerData(list));
+            }
+        }
+
+        private void HandleEntityRemoved(EntityUid uid, ItemCounterComponent itemCounter,
+            EntRemovedFromContainerMessage args)
+        {
+            if (itemCounter.Owner.TryGetComponent(out SharedAppearanceComponent? appearanceComponent)
+                && TryGetContainer(args, itemCounter, out var containedLayers))
+            {
+                appearanceComponent.SetData(StorageMapVisuals.LayerChanged, new ShowLayerData(containedLayers));
+            }
+        }
+
+        private void HandleEntityInsert(EntityUid uid, ItemCounterComponent itemCounter,
+            EntInsertedIntoContainerMessage args)
+        {
+            if (itemCounter.Owner.TryGetComponent(out SharedAppearanceComponent? appearanceComponent)
+                && TryGetContainer(args, itemCounter, out var containedLayers))
+            {
+                appearanceComponent.SetData(StorageMapVisuals.LayerChanged, new ShowLayerData(containedLayers));
+            }
+        }
+
+        protected abstract bool TryGetContainer(ContainerModifiedMessage msg,
+            ItemCounterComponent itemCounter,
+            out IReadOnlyList<string> containedLayers);
+    }
+}
\ No newline at end of file
diff --git a/Content.Shared/Storage/ItemCounter/SharedMapLayerData.cs b/Content.Shared/Storage/ItemCounter/SharedMapLayerData.cs
new file mode 100644
index 0000000000..4bc7867ddf
--- /dev/null
+++ b/Content.Shared/Storage/ItemCounter/SharedMapLayerData.cs
@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Generic;
+using Content.Shared.Whitelist;
+using Robust.Shared.Serialization;
+using Robust.Shared.Serialization.Manager.Attributes;
+
+namespace Content.Shared.Storage.ItemCounter
+{
+    [Serializable, NetSerializable]
+    public enum StorageMapVisuals : sbyte
+    {
+        InitLayers,
+        LayerChanged,
+    }
+
+    [Serializable]
+    [DataDefinition]
+    public class SharedMapLayerData
+    {
+        public string Layer = string.Empty;
+
+        [DataField("whitelist", required: true)]
+        public EntityWhitelist Whitelist { get; set; } = new();
+    }
+
+    [Serializable, NetSerializable]
+    public class ShowLayerData
+    {
+        public IReadOnlyList<string> QueuedEntities { get; internal set; }
+
+        public ShowLayerData()
+        {
+            QueuedEntities = new List<string>();
+        }
+
+        public ShowLayerData(IReadOnlyList<string> other)
+        {
+            QueuedEntities = other;
+        }
+
+        public ShowLayerData(ShowLayerData other)
+        {
+            QueuedEntities = other.QueuedEntities;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Content.Shared/Storage/SharedBagOpenVisuals.cs b/Content.Shared/Storage/SharedBagOpenVisuals.cs
index f894452e8f..be4a8013d4 100644
--- a/Content.Shared/Storage/SharedBagOpenVisuals.cs
+++ b/Content.Shared/Storage/SharedBagOpenVisuals.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Storage/SharedStorageComponent.cs b/Content.Shared/Storage/SharedStorageComponent.cs
index 52b9b0d2b1..46877f6050 100644
--- a/Content.Shared/Storage/SharedStorageComponent.cs
+++ b/Content.Shared/Storage/SharedStorageComponent.cs
@@ -1,22 +1,21 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using Content.Shared.ActionBlocker;
 using Content.Shared.DragDrop;
 using Content.Shared.Interaction.Events;
-using Content.Shared.NetIDs;
 using Content.Shared.Placeable;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Map;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Storage
 {
+    [NetworkedComponent()]
     public abstract class SharedStorageComponent : Component, IDraggable
     {
         public override string Name => "Storage";
-        public override uint? NetID => ContentNetIDs.INVENTORY;
 
         public abstract IReadOnlyList<IEntity>? StoredEntities { get; }
 
@@ -65,7 +64,7 @@ namespace Content.Shared.Storage
     {
         public readonly EntityUid[] StoredEntities;
 
-        public StorageComponentState(EntityUid[] storedEntities) : base(ContentNetIDs.INVENTORY)
+        public StorageComponentState(EntityUid[] storedEntities)
         {
             StoredEntities = storedEntities;
         }
diff --git a/Content.Shared/Strip/Components/SharedStrippableComponent.cs b/Content.Shared/Strip/Components/SharedStrippableComponent.cs
index 8a6e11d266..bf211a76c0 100644
--- a/Content.Shared/Strip/Components/SharedStrippableComponent.cs
+++ b/Content.Shared/Strip/Components/SharedStrippableComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using System.Collections.Generic;
 using Content.Shared.ActionBlocker;
 using Content.Shared.DragDrop;
diff --git a/Content.Shared/Strip/Components/SharedStrippingComponent.cs b/Content.Shared/Strip/Components/SharedStrippingComponent.cs
index 32145088eb..294f5c331f 100644
--- a/Content.Shared/Strip/Components/SharedStrippingComponent.cs
+++ b/Content.Shared/Strip/Components/SharedStrippingComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Shared.DragDrop;
 using Robust.Shared.GameObjects;
 
diff --git a/Content.Shared/Stunnable/SharedStunnableComponent.cs b/Content.Shared/Stunnable/SharedStunnableComponent.cs
index 2f3e15f657..2ac8f3c1f5 100644
--- a/Content.Shared/Stunnable/SharedStunnableComponent.cs
+++ b/Content.Shared/Stunnable/SharedStunnableComponent.cs
@@ -1,12 +1,11 @@
-#nullable enable
 using System;
 using System.Threading;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Alert;
 using Content.Shared.Interaction;
 using Content.Shared.Movement.Components;
-using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.IoC;
 using Robust.Shared.Players;
 using Robust.Shared.Serialization;
@@ -16,12 +15,12 @@ using Robust.Shared.ViewVariables;
 
 namespace Content.Shared.Stunnable
 {
+    [NetworkedComponent()]
     public abstract class SharedStunnableComponent : Component, IMoveSpeedModifier, IActionBlocker, IInteractHand
     {
         [Dependency] private readonly IGameTiming _gameTiming = default!;
 
         public sealed override string Name => "Stunnable";
-        public override uint? NetID => ContentNetIDs.STUNNABLE;
 
         public (TimeSpan Start, TimeSpan End)? StunnedTimer { get; protected set; }
         public (TimeSpan Start, TimeSpan End)? KnockdownTimer { get; protected set; }
@@ -368,7 +367,7 @@ namespace Content.Shared.Stunnable
 
             public StunnableComponentState(
                 (TimeSpan Start, TimeSpan End)? stunnedTimer, (TimeSpan Start, TimeSpan End)? knockdownTimer,
-                (TimeSpan Start, TimeSpan End)? slowdownTimer, float walkModifierOverride, float runModifierOverride) : base(ContentNetIDs.STUNNABLE)
+                (TimeSpan Start, TimeSpan End)? slowdownTimer, float walkModifierOverride, float runModifierOverride)
             {
                 StunnedTimer = stunnedTimer;
                 KnockdownTimer = knockdownTimer;
diff --git a/Content.Shared/SubFloor/SubFloorHideComponent.cs b/Content.Shared/SubFloor/SubFloorHideComponent.cs
index 9a3c8f71dd..a76c73473e 100644
--- a/Content.Shared/SubFloor/SubFloorHideComponent.cs
+++ b/Content.Shared/SubFloor/SubFloorHideComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Robust.Shared.GameObjects;
 
 namespace Content.Shared.SubFloor
diff --git a/Content.Shared/SubFloor/SubFloorHideSystem.cs b/Content.Shared/SubFloor/SubFloorHideSystem.cs
index 6b63950a59..5dd30a86a3 100644
--- a/Content.Shared/SubFloor/SubFloorHideSystem.cs
+++ b/Content.Shared/SubFloor/SubFloorHideSystem.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Content.Shared.Maps;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
@@ -33,22 +32,10 @@ namespace Content.Shared.SubFloor
             }
         }
 
-        private void UpdateAll()
-        {
-            foreach (var comp in ComponentManager.EntityQuery<SubFloorHideComponent>(true))
-            {
-                var transform = comp.Owner.Transform;
-                if (!_mapManager.TryGetGrid(transform.GridID, out var grid)) return;
-                UpdateTile(grid, grid.TileIndicesFor(transform.Coordinates));
-            }
-        }
-
         public override void Initialize()
         {
             base.Initialize();
 
-            IoCManager.InjectDependencies(this);
-
             _mapManager.GridChanged += MapManagerOnGridChanged;
             _mapManager.TileChanged += MapManagerOnTileChanged;
 
@@ -72,7 +59,8 @@ namespace Content.Shared.SubFloor
 
         private void OnSubFloorTerminating(EntityUid uid, SubFloorHideComponent component, ComponentShutdown _)
         {
-            UpdateEntity(uid);
+            // Regardless of whether we're on a subfloor or not, unhide.
+            UpdateEntity(uid, true);
         }
 
         private void HandleAnchorChanged(EntityUid uid, SubFloorHideComponent component, AnchorStateChangedEvent args)
@@ -97,37 +85,76 @@ namespace Content.Shared.SubFloor
             }
         }
 
-        private void UpdateEntity(EntityUid uid)
+        private bool IsSubFloor(IMapGrid grid, Vector2i position)
         {
-            if (!ComponentManager.TryGetComponent(uid, out ITransformComponent? transform) ||
-                !_mapManager.TryGetGrid(transform.GridID, out var grid)) return;
+            var tileDef = (ContentTileDefinition) _tileDefinitionManager[grid.GetTileRef(position).Tile.TypeId];
+            return tileDef.IsSubFloor;
+        }
 
-            UpdateTile(grid, grid.WorldToTile(transform.WorldPosition));
+        private void UpdateAll()
+        {
+            foreach (var comp in ComponentManager.EntityQuery<SubFloorHideComponent>(true))
+            {
+                UpdateEntity(comp.Owner.Uid);
+            }
         }
 
         private void UpdateTile(IMapGrid grid, Vector2i position)
         {
-            var tile = grid.GetTileRef(position);
-            var tileDef = (ContentTileDefinition) _tileDefinitionManager[tile.Tile.TypeId];
-            foreach (var anchored in grid.GetAnchoredEntities(position))
+            var isSubFloor = IsSubFloor(grid, position);
+
+            foreach (var uid in grid.GetAnchoredEntities(position))
             {
-                if (!ComponentManager.TryGetComponent(anchored, out SubFloorHideComponent? subFloorComponent))
-                {
-                    continue;
-                }
+                if(ComponentManager.HasComponent<SubFloorHideComponent>(uid))
+                    UpdateEntity(uid, isSubFloor);
+            }
+        }
 
-                // Show sprite
-                if (ComponentManager.TryGetComponent(anchored, out SharedSpriteComponent ? spriteComponent))
-                {
-                    spriteComponent.Visible = ShowAll || !subFloorComponent.Running || tileDef.IsSubFloor;
-                }
+        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.
+                UpdateEntity(uid, true);
+                return;
+            }
 
-                // So for collision all we care about is that the component is running.
-                if (ComponentManager.TryGetComponent(anchored, out PhysicsComponent ? physicsComponent))
-                {
-                    physicsComponent.CanCollide = !subFloorComponent.Running;
-                }
+            // Update normally.
+            UpdateEntity(uid, IsSubFloor(grid, grid.TileIndicesFor(transform.Coordinates)));
+        }
+
+        private void UpdateEntity(EntityUid uid, bool subFloor)
+        {
+            // We raise an event to allow other entity systems to handle this.
+            var subFloorHideEvent = new SubFloorHideEvent(subFloor);
+            RaiseLocalEvent(uid, subFloorHideEvent, false);
+
+            // Check if it has been handled by someone else.
+            if (subFloorHideEvent.Handled)
+                return;
+
+            // Show sprite
+            if (ComponentManager.TryGetComponent(uid, out SharedSpriteComponent? spriteComponent))
+            {
+                spriteComponent.Visible = ShowAll || subFloor;
+            }
+
+            // So for collision all we care about is that the component is running.
+            if (ComponentManager.TryGetComponent(uid, out PhysicsComponent? physicsComponent))
+            {
+                physicsComponent.CanCollide = subFloor;
             }
         }
     }
+
+    public class SubFloorHideEvent : HandledEntityEventArgs
+    {
+        public bool SubFloor { get; }
+
+        public SubFloorHideEvent(bool subFloor)
+        {
+            SubFloor = subFloor;
+        }
+    }
 }
diff --git a/Content.Shared/Suspicion/SharedSuspicionRoleComponent.cs b/Content.Shared/Suspicion/SharedSuspicionRoleComponent.cs
index 07c9a3897f..10f0acda99 100644
--- a/Content.Shared/Suspicion/SharedSuspicionRoleComponent.cs
+++ b/Content.Shared/Suspicion/SharedSuspicionRoleComponent.cs
@@ -1,15 +1,14 @@
-#nullable enable
 using System;
-using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Suspicion
 {
+    [NetworkedComponent()]
     public abstract class SharedSuspicionRoleComponent : Component
     {
         public sealed override string Name => "SuspicionRole";
-        public sealed override uint? NetID => ContentNetIDs.SUSPICION_ROLE;
     }
 
     [Serializable, NetSerializable]
@@ -19,7 +18,7 @@ namespace Content.Shared.Suspicion
         public readonly bool? Antagonist;
         public readonly (string name, EntityUid)[] Allies;
 
-        public SuspicionRoleComponentState(string? role, bool? antagonist, (string name, EntityUid)[] allies) : base(ContentNetIDs.SUSPICION_ROLE)
+        public SuspicionRoleComponentState(string? role, bool? antagonist, (string name, EntityUid)[] allies)
         {
             Role = role;
             Antagonist = antagonist;
diff --git a/Content.Shared/Suspicion/SuspicionMessages.cs b/Content.Shared/Suspicion/SuspicionMessages.cs
index 2b1220f123..41be6f0545 100644
--- a/Content.Shared/Suspicion/SuspicionMessages.cs
+++ b/Content.Shared/Suspicion/SuspicionMessages.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Tag/TagComponent.cs b/Content.Shared/Tag/TagComponent.cs
index 6bf08db2f7..ba0332ec07 100644
--- a/Content.Shared/Tag/TagComponent.cs
+++ b/Content.Shared/Tag/TagComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
diff --git a/Content.Shared/Tag/TagComponentExtensions.cs b/Content.Shared/Tag/TagComponentExtensions.cs
index d8fb85d428..082a160705 100644
--- a/Content.Shared/Tag/TagComponentExtensions.cs
+++ b/Content.Shared/Tag/TagComponentExtensions.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Shared/Tag/TagComponentState.cs b/Content.Shared/Tag/TagComponentState.cs
index d97e1f7d36..bd19aae427 100644
--- a/Content.Shared/Tag/TagComponentState.cs
+++ b/Content.Shared/Tag/TagComponentState.cs
@@ -1,6 +1,4 @@
-#nullable enable
 using System;
-using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
@@ -9,7 +7,7 @@ namespace Content.Shared.Tag
     [Serializable, NetSerializable]
     public class TagComponentState : ComponentState
     {
-        public TagComponentState(string[] tags) : base(ContentNetIDs.TAG)
+        public TagComponentState(string[] tags)
         {
             Tags = tags;
         }
diff --git a/Content.Shared/Tag/TagPrototype.cs b/Content.Shared/Tag/TagPrototype.cs
index 212bbf900f..7ce6b1f03a 100644
--- a/Content.Shared/Tag/TagPrototype.cs
+++ b/Content.Shared/Tag/TagPrototype.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Robust.Shared.Prototypes;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
diff --git a/Content.Shared/Targeting/TargetingZone.cs b/Content.Shared/Targeting/TargetingZone.cs
index 269a401afe..2fb936bf41 100644
--- a/Content.Shared/Targeting/TargetingZone.cs
+++ b/Content.Shared/Targeting/TargetingZone.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Temperature/IHotItem.cs b/Content.Shared/Temperature/IHotItem.cs
index 5f7d952642..8cac8aa13d 100644
--- a/Content.Shared/Temperature/IHotItem.cs
+++ b/Content.Shared/Temperature/IHotItem.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Robust.Shared.Analyzers;
+using Robust.Shared.Analyzers;
 
 namespace Content.Shared.Temperature
 {
diff --git a/Content.Shared/Temperature/TemperatureHelpers.cs b/Content.Shared/Temperature/TemperatureHelpers.cs
index 62f7c0c00b..a92f62f851 100644
--- a/Content.Shared/Temperature/TemperatureHelpers.cs
+++ b/Content.Shared/Temperature/TemperatureHelpers.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Content.Shared.Maths;
+using Content.Shared.Maths;
 
 namespace Content.Shared.Temperature
 {
diff --git a/Content.Shared/Throwing/ILand.cs b/Content.Shared/Throwing/ILand.cs
index 96d0aa4a4d..449ec198bf 100644
--- a/Content.Shared/Throwing/ILand.cs
+++ b/Content.Shared/Throwing/ILand.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using JetBrains.Annotations;
 using Robust.Shared.Analyzers;
diff --git a/Content.Shared/Throwing/IThrowCollide.cs b/Content.Shared/Throwing/IThrowCollide.cs
index 4969d231f6..ed5903029d 100644
--- a/Content.Shared/Throwing/IThrowCollide.cs
+++ b/Content.Shared/Throwing/IThrowCollide.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Robust.Shared.Analyzers;
 using Robust.Shared.GameObjects;
diff --git a/Content.Shared/Throwing/IThrown.cs b/Content.Shared/Throwing/IThrown.cs
index f3e7de048f..03e308232d 100644
--- a/Content.Shared/Throwing/IThrown.cs
+++ b/Content.Shared/Throwing/IThrown.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using JetBrains.Annotations;
 using Robust.Shared.Analyzers;
diff --git a/Content.Shared/Throwing/ThrownItemComponent.cs b/Content.Shared/Throwing/ThrownItemComponent.cs
index 041911be05..b192afcef9 100644
--- a/Content.Shared/Throwing/ThrownItemComponent.cs
+++ b/Content.Shared/Throwing/ThrownItemComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Robust.Shared.GameObjects;
 
 namespace Content.Shared.Throwing
diff --git a/Content.Shared/Throwing/ThrownItemSystem.cs b/Content.Shared/Throwing/ThrownItemSystem.cs
index 61b94ef4cf..70cd566203 100644
--- a/Content.Shared/Throwing/ThrownItemSystem.cs
+++ b/Content.Shared/Throwing/ThrownItemSystem.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Collections.Generic;
 using System.Linq;
 using Content.Shared.Physics;
@@ -40,7 +39,8 @@ namespace Content.Shared.Throwing
                 Logger.Error($"Tried to remove throwing fixture for {component.Owner} but none found?");
                 return;
             }
-            physicsComponent.RemoveFixture(fixture);
+
+            Get<SharedBroadphaseSystem>().DestroyFixture(physicsComponent, fixture);
         }
 
         private void ThrowItem(EntityUid uid, ThrownItemComponent component, ThrownEvent args)
@@ -55,8 +55,7 @@ namespace Content.Shared.Throwing
             }
 
             var shape = physicsComponent.Fixtures[0].Shape;
-            var fixture = new Fixture(physicsComponent, shape) {CollisionLayer = (int) CollisionGroup.ThrownItem, Hard = false, ID = ThrowingFixture};
-            physicsComponent.AddFixture(fixture);
+            Get<SharedBroadphaseSystem>().CreateFixture(physicsComponent, new Fixture(physicsComponent, shape) {CollisionLayer = (int) CollisionGroup.ThrownItem, Hard = false, ID = ThrowingFixture});
         }
 
         private void HandleCollision(EntityUid uid, ThrownItemComponent component, StartCollideEvent args)
diff --git a/Content.Shared/Toilet/SharedWaterclosetVisuals.cs b/Content.Shared/Toilet/SharedWaterclosetVisuals.cs
index d933c61b77..6c66ef8305 100644
--- a/Content.Shared/Toilet/SharedWaterclosetVisuals.cs
+++ b/Content.Shared/Toilet/SharedWaterclosetVisuals.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Tool/SharedToolComponent.cs b/Content.Shared/Tool/SharedToolComponent.cs
index 4025c5ea91..028516e952 100644
--- a/Content.Shared/Tool/SharedToolComponent.cs
+++ b/Content.Shared/Tool/SharedToolComponent.cs
@@ -1,6 +1,4 @@
-#nullable enable
 using System;
-using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
@@ -47,7 +45,7 @@ namespace Content.Shared.Tool
     {
         public ToolQuality Quality { get; }
 
-        public MultiToolComponentState(ToolQuality quality) : base(ContentNetIDs.MULTITOOLS)
+        public MultiToolComponentState(ToolQuality quality)
         {
             Quality = quality;
         }
@@ -61,7 +59,7 @@ namespace Content.Shared.Tool
         public bool Activated { get; }
         public ToolQuality Quality { get; }
 
-        public WelderComponentState(float fuelCapacity, float fuel, bool activated) : base(ContentNetIDs.WELDER)
+        public WelderComponentState(float fuelCapacity, float fuel, bool activated)
         {
             FuelCapacity = fuelCapacity;
             Fuel = fuel;
diff --git a/Content.Shared/Transform/TransformExtensions.cs b/Content.Shared/Transform/TransformExtensions.cs
index 3358d9e5da..2872034bc2 100644
--- a/Content.Shared/Transform/TransformExtensions.cs
+++ b/Content.Shared/Transform/TransformExtensions.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Robust.Shared.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Shared.Transform
 {
diff --git a/Content.Shared/Trigger/TriggerVisuals.cs b/Content.Shared/Trigger/TriggerVisuals.cs
index 61b6664edf..193ecd5478 100644
--- a/Content.Shared/Trigger/TriggerVisuals.cs
+++ b/Content.Shared/Trigger/TriggerVisuals.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Trigger
diff --git a/Content.Shared/Vapor/SharedVaporComponent.cs b/Content.Shared/Vapor/SharedVaporComponent.cs
index 1746fbb4c1..0d9754dcf7 100644
--- a/Content.Shared/Vapor/SharedVaporComponent.cs
+++ b/Content.Shared/Vapor/SharedVaporComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/VendingMachines/SharedVendingMachineComponent.cs b/Content.Shared/VendingMachines/SharedVendingMachineComponent.cs
index 564957a9b9..407ba232e7 100644
--- a/Content.Shared/VendingMachines/SharedVendingMachineComponent.cs
+++ b/Content.Shared/VendingMachines/SharedVendingMachineComponent.cs
@@ -1,17 +1,16 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
-using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Shared.VendingMachines
 {
+    [NetworkedComponent()]
     public class SharedVendingMachineComponent : Component
     {
         public override string Name => "VendingMachine";
-        public override uint? NetID => ContentNetIDs.VENDING_MACHINE;
 
         [ViewVariables]
         public List<VendingMachineInventoryEntry> Inventory = new();
diff --git a/Content.Shared/VendingMachines/VendingMachineInventoryPrototype.cs b/Content.Shared/VendingMachines/VendingMachineInventoryPrototype.cs
index 1e9aa05771..08921b6ad9 100644
--- a/Content.Shared/VendingMachines/VendingMachineInventoryPrototype.cs
+++ b/Content.Shared/VendingMachines/VendingMachineInventoryPrototype.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using System.Collections.Generic;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
diff --git a/Content.Shared/Verbs/GlobalVerb.cs b/Content.Shared/Verbs/GlobalVerb.cs
index 32f4ac1857..84e8a74913 100644
--- a/Content.Shared/Verbs/GlobalVerb.cs
+++ b/Content.Shared/Verbs/GlobalVerb.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
diff --git a/Content.Shared/Verbs/HideContextMenuComponent.cs b/Content.Shared/Verbs/HideContextMenuComponent.cs
index 8600ae066f..bebccac2ec 100644
--- a/Content.Shared/Verbs/HideContextMenuComponent.cs
+++ b/Content.Shared/Verbs/HideContextMenuComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Robust.Shared.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Shared.Verbs
 {
diff --git a/Content.Shared/Verbs/IShowContextMenu.cs b/Content.Shared/Verbs/IShowContextMenu.cs
index bcd65229ec..3839ceb49d 100644
--- a/Content.Shared/Verbs/IShowContextMenu.cs
+++ b/Content.Shared/Verbs/IShowContextMenu.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Robust.Shared.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Shared.Verbs
 {
diff --git a/Content.Shared/Verbs/PlayerContainerVisibilityMessage.cs b/Content.Shared/Verbs/PlayerContainerVisibilityMessage.cs
index dafd3de76f..1b5ed824c7 100644
--- a/Content.Shared/Verbs/PlayerContainerVisibilityMessage.cs
+++ b/Content.Shared/Verbs/PlayerContainerVisibilityMessage.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Verbs/SharedVerbSystem.cs b/Content.Shared/Verbs/SharedVerbSystem.cs
index 84589a7811..c7628da9a6 100644
--- a/Content.Shared/Verbs/SharedVerbSystem.cs
+++ b/Content.Shared/Verbs/SharedVerbSystem.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
diff --git a/Content.Shared/Verbs/Verb.cs b/Content.Shared/Verbs/Verb.cs
index 76ab513335..41cb116d86 100644
--- a/Content.Shared/Verbs/Verb.cs
+++ b/Content.Shared/Verbs/Verb.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
diff --git a/Content.Shared/Verbs/VerbBase.cs b/Content.Shared/Verbs/VerbBase.cs
index 1a18a83f9d..40d0c0f0b4 100644
--- a/Content.Shared/Verbs/VerbBase.cs
+++ b/Content.Shared/Verbs/VerbBase.cs
@@ -1,5 +1,4 @@
-#nullable enable
-
+
 namespace Content.Shared.Verbs
 {
     public abstract class VerbBase
diff --git a/Content.Shared/Verbs/VerbCategories.cs b/Content.Shared/Verbs/VerbCategories.cs
index bcc1fadb13..89c268f793 100644
--- a/Content.Shared/Verbs/VerbCategories.cs
+++ b/Content.Shared/Verbs/VerbCategories.cs
@@ -1,4 +1,3 @@
-#nullable enable
 
 namespace Content.Shared.Verbs
 {
@@ -12,5 +11,7 @@ namespace Content.Shared.Verbs
 
         public static readonly VerbCategoryData Rotate = ("Rotate", null);
         public static readonly VerbCategoryData Construction = ("Construction", null);
+        public static readonly VerbCategoryData SetTransferAmount =
+            ("Set Transfer Amount", "/Textures/Interface/VerbIcons/spill.svg.192dpi.png");
     }
 }
diff --git a/Content.Shared/Verbs/VerbCategoryData.cs b/Content.Shared/Verbs/VerbCategoryData.cs
index f5a1f1c7f9..b0ee545159 100644
--- a/Content.Shared/Verbs/VerbCategoryData.cs
+++ b/Content.Shared/Verbs/VerbCategoryData.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using Robust.Shared.Utility;
 
 namespace Content.Shared.Verbs
diff --git a/Content.Shared/Verbs/VerbData.cs b/Content.Shared/Verbs/VerbData.cs
index 09f0ea5a53..20a8edbdee 100644
--- a/Content.Shared/Verbs/VerbData.cs
+++ b/Content.Shared/Verbs/VerbData.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Utility;
diff --git a/Content.Shared/Verbs/VerbSystemMessages.cs b/Content.Shared/Verbs/VerbSystemMessages.cs
index bbc2eb3728..7452e8440b 100644
--- a/Content.Shared/Verbs/VerbSystemMessages.cs
+++ b/Content.Shared/Verbs/VerbSystemMessages.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
diff --git a/Content.Shared/Verbs/VerbUtility.cs b/Content.Shared/Verbs/VerbUtility.cs
index 289181fc91..08289ff5e6 100644
--- a/Content.Shared/Verbs/VerbUtility.cs
+++ b/Content.Shared/Verbs/VerbUtility.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using System.Collections.Generic;
 using System.Reflection;
 using Robust.Shared.Containers;
diff --git a/Content.Shared/Verbs/VerbVisibility.cs b/Content.Shared/Verbs/VerbVisibility.cs
index b1fd22495e..dadf19dd58 100644
--- a/Content.Shared/Verbs/VerbVisibility.cs
+++ b/Content.Shared/Verbs/VerbVisibility.cs
@@ -1,4 +1,3 @@
-#nullable enable
 
 namespace Content.Shared.Verbs
 {
diff --git a/Content.Shared/Voting/MsgVoteCanCall.cs b/Content.Shared/Voting/MsgVoteCanCall.cs
index dc9d3f592f..7c5d0daf30 100644
--- a/Content.Shared/Voting/MsgVoteCanCall.cs
+++ b/Content.Shared/Voting/MsgVoteCanCall.cs
@@ -1,4 +1,4 @@
-#nullable enable
+using System;
 using Lidgren.Network;
 using Robust.Shared.Network;
 
@@ -11,16 +11,47 @@ namespace Content.Shared.Voting
     {
         public override MsgGroups MsgGroup => MsgGroups.Command;
 
+        // If true, we can currently call votes.
         public bool CanCall;
+        // When we can call votes again in server RealTime.
+        // Can be null if the reason is something not timeout related.
+        public TimeSpan WhenCanCallVote;
+
+        // Which standard votes are currently unavailable, and when will they become available.
+        public (StandardVoteType type, TimeSpan whenAvailable)[] VotesUnavailable = default!;
+
+        // It's possible to be able to call votes but all standard votes to be timed out.
+        // In this case you can open the interface and see the timeout listed there, I suppose.
 
         public override void ReadFromBuffer(NetIncomingMessage buffer)
         {
             CanCall = buffer.ReadBoolean();
+            buffer.ReadPadBits();
+            WhenCanCallVote = TimeSpan.FromTicks(buffer.ReadInt64());
+
+            var lenVotes = buffer.ReadByte();
+            VotesUnavailable = new (StandardVoteType type, TimeSpan whenAvailable)[lenVotes];
+            for (var i = 0; i < lenVotes; i++)
+            {
+                var type = (StandardVoteType) buffer.ReadByte();
+                var timeOut = TimeSpan.FromTicks(buffer.ReadInt64());
+
+                VotesUnavailable[i] = (type, timeOut);
+            }
         }
 
         public override void WriteToBuffer(NetOutgoingMessage buffer)
         {
             buffer.Write(CanCall);
+            buffer.WritePadBits();
+            buffer.Write(WhenCanCallVote.Ticks);
+
+            buffer.Write((byte) VotesUnavailable.Length);
+            foreach (var (type, timeout) in VotesUnavailable)
+            {
+                buffer.Write((byte) type);
+                buffer.Write(timeout.Ticks);
+            }
         }
     }
 }
diff --git a/Content.Shared/Voting/MsgVoteData.cs b/Content.Shared/Voting/MsgVoteData.cs
index de91996809..b9df59a36c 100644
--- a/Content.Shared/Voting/MsgVoteData.cs
+++ b/Content.Shared/Voting/MsgVoteData.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Lidgren.Network;
 using Robust.Shared.Network;
 
diff --git a/Content.Shared/Voting/StandardVoteType.cs b/Content.Shared/Voting/StandardVoteType.cs
new file mode 100644
index 0000000000..d3d6e48db8
--- /dev/null
+++ b/Content.Shared/Voting/StandardVoteType.cs
@@ -0,0 +1,18 @@
+namespace Content.Shared.Voting
+{
+    /// <summary>
+    /// Standard vote types that players can initiate themselves from the escape menu.
+    /// </summary>
+    public enum StandardVoteType : byte
+    {
+        /// <summary>
+        /// Vote to restart the round.
+        /// </summary>
+        Restart,
+
+        /// <summary>
+        /// Vote to change the game preset for next round.
+        /// </summary>
+        Preset
+    }
+}
diff --git a/Content.Shared/Wall/ReinforcedWallVisuals.cs b/Content.Shared/Wall/ReinforcedWallVisuals.cs
index eba46accbb..17a99c033e 100644
--- a/Content.Shared/Wall/ReinforcedWallVisuals.cs
+++ b/Content.Shared/Wall/ReinforcedWallVisuals.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Wall
diff --git a/Content.Shared/Weapons/Melee/MeleeWeaponAnimationPrototype.cs b/Content.Shared/Weapons/Melee/MeleeWeaponAnimationPrototype.cs
index c617968dcb..7cc7a7da45 100644
--- a/Content.Shared/Weapons/Melee/MeleeWeaponAnimationPrototype.cs
+++ b/Content.Shared/Weapons/Melee/MeleeWeaponAnimationPrototype.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
diff --git a/Content.Shared/Weapons/Melee/MeleeWeaponSystemMessages.cs b/Content.Shared/Weapons/Melee/MeleeWeaponSystemMessages.cs
index 4321051f6e..088fec634b 100644
--- a/Content.Shared/Weapons/Melee/MeleeWeaponSystemMessages.cs
+++ b/Content.Shared/Weapons/Melee/MeleeWeaponSystemMessages.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using Robust.Shared.GameObjects;
diff --git a/Content.Shared/Weapons/Ranged/Barrels/Components/SharedBatteryBarrelComponent.cs b/Content.Shared/Weapons/Ranged/Barrels/Components/SharedBatteryBarrelComponent.cs
index e59d53f8f3..c82b2bcf68 100644
--- a/Content.Shared/Weapons/Ranged/Barrels/Components/SharedBatteryBarrelComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Barrels/Components/SharedBatteryBarrelComponent.cs
@@ -1,6 +1,4 @@
-#nullable enable
-using System;
-using Content.Shared.NetIDs;
+using System;
 using Content.Shared.Weapons.Ranged.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
@@ -15,8 +13,7 @@ namespace Content.Shared.Weapons.Ranged.Barrels.Components
 
         public BatteryBarrelComponentState(
             FireRateSelector fireRateSelector,
-            (int count, int max)? magazine) :
-            base(ContentNetIDs.BATTERY_BARREL)
+            (int count, int max)? magazine)
         {
             FireRateSelector = fireRateSelector;
             Magazine = magazine;
diff --git a/Content.Shared/Weapons/Ranged/Barrels/Components/SharedBoltActionBarrelComponent.cs b/Content.Shared/Weapons/Ranged/Barrels/Components/SharedBoltActionBarrelComponent.cs
index 979e6ede4e..0f21330a70 100644
--- a/Content.Shared/Weapons/Ranged/Barrels/Components/SharedBoltActionBarrelComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Barrels/Components/SharedBoltActionBarrelComponent.cs
@@ -1,6 +1,4 @@
-#nullable enable
-using System;
-using Content.Shared.NetIDs;
+using System;
 using Content.Shared.Weapons.Ranged.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
@@ -19,8 +17,7 @@ namespace Content.Shared.Weapons.Ranged.Barrels.Components
             (bool chambered, bool spent) chamber,
             FireRateSelector fireRateSelector,
             (int count, int max)? magazine,
-            string? soundGunshot) :
-            base(ContentNetIDs.BOLTACTION_BARREL)
+            string? soundGunshot)
         {
             Chamber = chamber;
             FireRateSelector = fireRateSelector;
diff --git a/Content.Shared/Weapons/Ranged/Barrels/Components/SharedMagazineBarrelComponent.cs b/Content.Shared/Weapons/Ranged/Barrels/Components/SharedMagazineBarrelComponent.cs
index d337a4e4df..246e2fea37 100644
--- a/Content.Shared/Weapons/Ranged/Barrels/Components/SharedMagazineBarrelComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Barrels/Components/SharedMagazineBarrelComponent.cs
@@ -1,6 +1,4 @@
-#nullable enable
 using System;
-using Content.Shared.NetIDs;
 using Content.Shared.Weapons.Ranged.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
@@ -39,8 +37,7 @@ namespace Content.Shared.Weapons.Ranged.Barrels.Components
             bool chambered,
             FireRateSelector fireRateSelector,
             (int count, int max)? magazine,
-            string? soundGunshot) :
-            base(ContentNetIDs.MAGAZINE_BARREL)
+            string? soundGunshot)
         {
             Chambered = chambered;
             FireRateSelector = fireRateSelector;
diff --git a/Content.Shared/Weapons/Ranged/Barrels/Components/SharedPumpBarrelComponent.cs b/Content.Shared/Weapons/Ranged/Barrels/Components/SharedPumpBarrelComponent.cs
index 8789661af8..24b8564006 100644
--- a/Content.Shared/Weapons/Ranged/Barrels/Components/SharedPumpBarrelComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Barrels/Components/SharedPumpBarrelComponent.cs
@@ -1,6 +1,4 @@
-#nullable enable
-using System;
-using Content.Shared.NetIDs;
+using System;
 using Content.Shared.Weapons.Ranged.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
@@ -19,8 +17,7 @@ namespace Content.Shared.Weapons.Ranged.Barrels.Components
             (bool chambered, bool spent) chamber,
             FireRateSelector fireRateSelector,
             (int count, int max)? magazine,
-            string? soundGunshot) :
-            base(ContentNetIDs.PUMP_BARREL)
+            string? soundGunshot)
         {
             Chamber = chamber;
             FireRateSelector = fireRateSelector;
diff --git a/Content.Shared/Weapons/Ranged/Barrels/Components/SharedRevolverBarrelComponent.cs b/Content.Shared/Weapons/Ranged/Barrels/Components/SharedRevolverBarrelComponent.cs
index 97ff37ead4..0e4e3dcfb2 100644
--- a/Content.Shared/Weapons/Ranged/Barrels/Components/SharedRevolverBarrelComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Barrels/Components/SharedRevolverBarrelComponent.cs
@@ -1,6 +1,4 @@
-#nullable enable
-using System;
-using Content.Shared.NetIDs;
+using System;
 using Content.Shared.Weapons.Ranged.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
@@ -19,8 +17,7 @@ namespace Content.Shared.Weapons.Ranged.Barrels.Components
             int currentSlot,
             FireRateSelector fireRateSelector,
             bool?[] bullets,
-            string? soundGunshot) :
-            base(ContentNetIDs.REVOLVER_BARREL)
+            string? soundGunshot)
         {
             CurrentSlot = currentSlot;
             FireRateSelector = fireRateSelector;
diff --git a/Content.Shared/Weapons/Ranged/Components/SharedRangedBarrelComponent.cs b/Content.Shared/Weapons/Ranged/Components/SharedRangedBarrelComponent.cs
index 7436dd11bc..62aa2d87d6 100644
--- a/Content.Shared/Weapons/Ranged/Components/SharedRangedBarrelComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Components/SharedRangedBarrelComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.ViewVariables;
 
diff --git a/Content.Shared/Weapons/Ranged/Components/SharedRangedWeaponComponent.cs b/Content.Shared/Weapons/Ranged/Components/SharedRangedWeaponComponent.cs
index 4a09320ccc..b9493cb6c1 100644
--- a/Content.Shared/Weapons/Ranged/Components/SharedRangedWeaponComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Components/SharedRangedWeaponComponent.cs
@@ -1,19 +1,18 @@
-#nullable enable
 using System;
-using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Weapons.Ranged.Components
 {
+    [NetworkedComponent()]
     public abstract class SharedRangedWeaponComponent : Component
     {
         // Each RangedWeapon should have a RangedWeapon component +
         // some kind of RangedBarrelComponent (this dictates what ammo is retrieved).
         public override string Name => "RangedWeapon";
-        public override uint? NetID => ContentNetIDs.RANGED_WEAPON;
     }
 
     [Serializable, NetSerializable]
@@ -23,7 +22,7 @@ namespace Content.Shared.Weapons.Ranged.Components
 
         public RangedWeaponComponentState(
             FireRateSelector fireRateSelector
-            ) : base(ContentNetIDs.RANGED_WEAPON)
+            )
         {
             FireRateSelector = fireRateSelector;
         }
diff --git a/Content.Shared/Weapons/Ranged/MagazineAutoEjectMessage.cs b/Content.Shared/Weapons/Ranged/MagazineAutoEjectMessage.cs
index 632e905f6a..047b64c89c 100644
--- a/Content.Shared/Weapons/Ranged/MagazineAutoEjectMessage.cs
+++ b/Content.Shared/Weapons/Ranged/MagazineAutoEjectMessage.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
diff --git a/Content.Shared/Whitelist/EntityWhitelist.cs b/Content.Shared/Whitelist/EntityWhitelist.cs
index adfe5e1f78..89a6f6ea53 100644
--- a/Content.Shared/Whitelist/EntityWhitelist.cs
+++ b/Content.Shared/Whitelist/EntityWhitelist.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using Content.Shared.Tag;
+using Content.Shared.Wires;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
@@ -50,13 +51,16 @@ namespace Content.Shared.Whitelist
             _registrations = new List<IComponentRegistration>();
             foreach (var name in Components)
             {
-                if (!compfact.TryGetRegistration(name, out var registration))
+                var availability = compfact.GetComponentAvailability(name);
+                if (compfact.TryGetRegistration(name, out var registration)
+                    && availability == ComponentAvailability.Available)
                 {
-                    Logger.Warning($"Invalid component name {name} passed to EntityWhitelist!");
-                    continue;
+                    _registrations.Add(registration);
+                }
+                else if (availability == ComponentAvailability.Unknown)
+                {
+                    Logger.Warning($"Unknown component name {name} passed to EntityWhitelist!");
                 }
-
-                _registrations.Add(registration);
             }
         }
 
@@ -75,7 +79,7 @@ namespace Content.Shared.Whitelist
             {
                 foreach (var reg in _registrations)
                 {
-                    if (entity.TryGetComponent(reg.Type, out _))
+                    if (entity.HasComponent(reg.Type))
                         return true;
                 }
             }
diff --git a/Content.Shared/Window/SharedWindowComponent.cs b/Content.Shared/Window/SharedWindowComponent.cs
index c4dbc9e027..f2be96b98d 100644
--- a/Content.Shared/Window/SharedWindowComponent.cs
+++ b/Content.Shared/Window/SharedWindowComponent.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Wires/SharedWiresComponent.cs b/Content.Shared/Wires/SharedWiresComponent.cs
index c392d93af7..862be567ab 100644
--- a/Content.Shared/Wires/SharedWiresComponent.cs
+++ b/Content.Shared/Wires/SharedWiresComponent.cs
@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Diagnostics.CodeAnalysis;
 using JetBrains.Annotations;
diff --git a/Content.Tools/test/0A.yml b/Content.Tools/test/0A.yml
index 9399d2d377..d595d4236f 100644
--- a/Content.Tools/test/0A.yml
+++ b/Content.Tools/test/0A.yml
@@ -88,9 +88,4 @@ entities:
     type: Transform
   - index: 0
     type: MapGrid
-  - fixtures:
-    - shape:
-       !type:PhysShapeGrid
-         grid: 0
-    type: Physics
 
diff --git a/Content.Tools/test/0B.yml b/Content.Tools/test/0B.yml
index 9d9c99e9c2..eb3a3c690e 100644
--- a/Content.Tools/test/0B.yml
+++ b/Content.Tools/test/0B.yml
@@ -79,8 +79,4 @@ entities:
     type: Transform
   - index: 0
     type: MapGrid
-  - fixtures:
-    - !type:PhysShapeGrid
-      grid: 0
-    type: Physics
 
diff --git a/Content.Tools/test/0C.yml b/Content.Tools/test/0C.yml
index de44d5871b..4ee4b4eb4a 100644
--- a/Content.Tools/test/0C.yml
+++ b/Content.Tools/test/0C.yml
@@ -98,9 +98,4 @@ entities:
     type: Transform
   - index: 0
     type: MapGrid
-  - fixtures:
-    - shape:
-        !type:PhysShapeGrid
-          grid: 0
-    type: Physics
 
diff --git a/Resources/Audio/Lobby/absconditus.ogg b/Resources/Audio/Lobby/absconditus.ogg
index 1e1b0e6b2f..d41f501fd6 100644
Binary files a/Resources/Audio/Lobby/absconditus.ogg and b/Resources/Audio/Lobby/absconditus.ogg differ
diff --git a/Resources/Audio/Lobby/atomicamnesiammx.ogg b/Resources/Audio/Lobby/atomicamnesiammx.ogg
index 4e126bd5d8..5cd6c8823c 100644
Binary files a/Resources/Audio/Lobby/atomicamnesiammx.ogg and b/Resources/Audio/Lobby/atomicamnesiammx.ogg differ
diff --git a/Resources/Audio/Lobby/endless_space.ogg b/Resources/Audio/Lobby/endless_space.ogg
index 3ec55a0621..8325f05c5b 100644
Binary files a/Resources/Audio/Lobby/endless_space.ogg and b/Resources/Audio/Lobby/endless_space.ogg differ
diff --git a/Resources/Audio/Lobby/space_asshole.ogg b/Resources/Audio/Lobby/space_asshole.ogg
index 7b302e44b1..9d3fd15c6d 100644
Binary files a/Resources/Audio/Lobby/space_asshole.ogg and b/Resources/Audio/Lobby/space_asshole.ogg differ
diff --git a/Resources/Audio/Lobby/thunderdome.ogg b/Resources/Audio/Lobby/thunderdome.ogg
index a32f8de69b..79f67b5dc2 100644
Binary files a/Resources/Audio/Lobby/thunderdome.ogg and b/Resources/Audio/Lobby/thunderdome.ogg differ
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 22b615ac10..95ed321f80 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1381,3 +1381,210 @@ Entries:
   - {message: More machines and station equipment is destructible, type: Tweak}
   id: 244
   time: '2021-06-19T19:34:01.0000000+00:00'
+- author: metalgearsloth
+  changes:
+  - {message: Add cvar to specify discrete gas overlay thresholds, type: Add}
+  id: 245
+  time: '2021-06-21T07:08:37.0000000+00:00'
+- author: metalgearsloth
+  changes:
+  - {message: Throw no longer pushes you back if you are buckled, type: Fix}
+  id: 246
+  time: '2021-06-28T04:17:09.0000000+00:00'
+- author: Zumorica
+  changes:
+  - {message: You can no longer start pulling something while incapacitated., type: Fix}
+  id: 247
+  time: '2021-06-28T12:17:37.0000000+00:00'
+- author: CrudeWax
+  changes:
+  - {message: Thirteen Loko added to dispenser and now hazardous to your health, type: Add}
+  id: 248
+  time: '2021-06-30T14:35:19.0000000+00:00'
+- author: CrudeWax
+  changes:
+  - {message: Theatre is again accessible by clowns and mimes, type: Fix}
+  id: 249
+  time: '2021-07-01T11:07:19.0000000+00:00'
+- author: CrudeWax
+  changes:
+  - {message: added an item-spawning spell template, type: Add}
+  - {message: added a pie-spawning spell. Honk!, type: Add}
+  id: 250
+  time: '2021-07-01T11:26:44.0000000+00:00'
+- author: CrudeWax
+  changes:
+  - {message: Added omnizine. A reagent which heals any type of damage when ingested.,
+    type: Add}
+  - {message: A small amount of Omnizine can be found in warm donk pockets., type: Add}
+  id: 251
+  time: '2021-07-03T01:16:21.0000000+00:00'
+- author: metalgearsloth
+  changes:
+  - {message: Reduce potted plant bounding box, type: Tweak}
+  id: 252
+  time: '2021-07-04T12:35:09.0000000+00:00'
+- author: PJB3005
+  changes:
+  - {message: Rewrote most of the power system., type: Tweak}
+  - {message: 'All power supplying objects now have a built-in ramping system. If
+      a large amount of extra power is suddenly needed, engines and batteries on the
+      grid need a bit of time to "ramp up" to match.', type: Add}
+  - {message: 'Power is passed through batteries immediately. This means that APCs
+      are basically on standby until engine power or such cuts out. When the engine
+      cuts out, heavy electrical grids will be underpowered for a second or two until
+      backup batteries can spin up to fill the gap.', type: Add}
+  id: 253
+  time: '2021-07-04T16:11:52.0000000+00:00'
+- author: Swept
+  changes:
+  - {message: Changed chatbox UI to be more consistent with SS14's UI, type: Tweak}
+  id: 254
+  time: '2021-07-09T07:10:57.0000000+00:00'
+- author: mirrorcult
+  changes:
+  - {message: Airlocks & low walls near arrivals don't look weird anymore, type: Fix}
+  id: 255
+  time: '2021-07-13T04:10:03.0000000+00:00'
+- author: Swept
+  changes:
+  - {message: AME jars and parts now show inhand sprites, type: Fix}
+  id: 256
+  time: '2021-07-15T07:45:11.671231+00:00'
+- author: Zumorica
+  changes:
+  - {message: Fix bug where constructing walls and windows would place them in the
+      bar., type: Fix}
+  id: 257
+  time: '2021-07-15T07:45:11.671976+00:00'
+- author: Zumorica
+  changes:
+  - {message: Fix being able to play instruments while incapacitated., type: Fix}
+  id: 258
+  time: '2021-07-15T07:45:11.672684+00:00'
+- author: Zumorica
+  changes:
+  - {message: Fix crash when MIDI stops playing., type: Fix}
+  id: 259
+  time: '2021-07-15T07:45:11.673363+00:00'
+- author: Zumorica
+  changes:
+  - {message: Fixes spray puff and fire extinguisher cloud not moving., type: Fix}
+  id: 260
+  time: '2021-07-15T07:45:11.674114+00:00'
+- author: Zumorica
+  changes:
+  - {message: Added the dual-port air vent., type: Add}
+  id: 261
+  time: '2021-07-15T13:24:45.0000000+00:00'
+- author: Fogapod
+  changes:
+  - {message: Added missing space in Spanish accent., type: Fix}
+  id: 262
+  time: '2021-07-17T21:04:04.0000000+00:00'
+- author: Zumorica
+  changes:
+  - {message: Fixes handheld instruments not working., type: Fix}
+  id: 263
+  time: '2021-07-18T13:00:50.345009+00:00'
+- author: metalgearsloth
+  changes:
+  - {message: Fix physics rotation issues, type: Fix}
+  id: 264
+  time: '2021-07-19T08:49:18.0000000+00:00'
+- author: Seth
+  changes:
+  - {message: Changed Crowbar and Wrench damage from 5 to 7, type: Tweak}
+  id: 265
+  time: '2021-07-19T20:55:37.0000000+00:00'
+- author: PJB3005
+  changes:
+  - {message: Chatbox channel management has been tweaked to be much more intuitive
+      and nice to use., type: Tweak}
+  id: 266
+  time: '2021-07-20T08:29:09.0000000+00:00'
+- author: metalgearsloth
+  changes:
+  - {message: Remove portals until someone does a better job coding it, type: Remove}
+  id: 267
+  time: '2021-07-21T09:16:10.0000000+00:00'
+- author: metalgearsloth
+  changes:
+  - {message: Add Station driving, type: Add}
+  id: 268
+  time: '2021-07-21T11:15:12.0000000+00:00'
+- author: Visne
+  changes:
+  - {message: 'Added integer scaling option. Turn it off to get rid of black bars,
+      at the cost of less crisp scaling.', type: Add}
+  id: 269
+  time: '2021-07-21T11:30:50.0000000+00:00'
+- author: Visne
+  changes:
+  - {message: Examine tooltip now closes when moving out of range, type: Tweak}
+  id: 270
+  time: '2021-07-21T11:31:00.0000000+00:00'
+- author: PJB
+  changes:
+  - {message: 'Restart round votes now start with everybody selecting "no", effectively
+      requiring 80% of the whole server to agree.', type: Tweak}
+  id: 271
+  time: '2021-07-21T13:26:06.988275+00:00'
+- author: PJB
+  changes:
+  - {message: You can now only make the same type of vote once every 4 minutes., type: Tweak}
+  id: 272
+  time: '2021-07-21T17:04:18.364235+00:00'
+- author: Seth
+  changes:
+  - {message: Added Cannabis and Tabaco seeds into the exotic seeds crate, type: Add}
+  id: 273
+  time: '2021-07-22T02:20:41.0000000+00:00'
+- author: Ygg01
+  changes:
+  - {message: Added visualizer for things like Crayons and Toolbelts, type: Add}
+  id: 274
+  time: '2021-07-22T09:56:55.0000000+00:00'
+- author: PJB
+  changes:
+  - {message: AFK players no longer automatically vote "no" on restart votes., type: Tweak}
+  id: 275
+  time: '2021-07-22T21:22:04.854449+00:00'
+- author: metalgearsloth
+  changes:
+  - {message: Pies no longer spin when thrown., type: Tweak}
+  id: 276
+  time: '2021-07-23T06:12:08.0000000+00:00'
+- author: Seth
+  changes:
+  - {message: Made the baseball bat craftable, type: Add}
+  id: 277
+  time: '2021-07-24T23:51:17.0000000+00:00'
+- author: metalgearsloth
+  changes:
+  - {message: Throwing feels more natural., type: Tweak}
+  - {message: Pushed objects don't slide as far., type: Tweak}
+  id: 278
+  time: '2021-07-25T06:58:03.0000000+00:00'
+- author: metalgearsloth
+  changes:
+  - {message: Add server cvar for whether pushing is enabled., type: Add}
+  id: 279
+  time: '2021-07-25T06:58:11.0000000+00:00'
+- author: SweptWasTaken
+  changes:
+  - {message: botanical belt for gardening tools, type: Add}
+  - {message: add mapped storage sprites for lots of belts and other stuff, type: Add}
+  id: 280
+  time: '2021-07-25T07:21:18.0000000+00:00'
+- author: mirrorcult
+  changes:
+  - {message: You can now set the transfer amount of solution containers using a right-click
+      verb., type: Add}
+  id: 281
+  time: '2021-07-25T07:53:53.0000000+00:00'
+- author: mirrorcult
+  changes:
+  - {message: Items with missing inhand sprites no longer show a giant ERROR, type: Fix}
+  id: 282
+  time: '2021-07-25T10:02:48.0000000+00:00'
diff --git a/Resources/Changelog/Parts/changelog.yml b/Resources/Changelog/Parts/changelog.yml
deleted file mode 100644
index 9b006c0343..0000000000
--- a/Resources/Changelog/Parts/changelog.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Swept
-changes:
-  - type: Fix # One of the following: Add, Remove, Tweak, Fix
-    message: AME jars and parts now show inhand sprites
diff --git a/Resources/Changelog/Parts/construction.yml b/Resources/Changelog/Parts/construction.yml
deleted file mode 100644
index e1f7aa6c78..0000000000
--- a/Resources/Changelog/Parts/construction.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Zumorica
-changes:
-  - type: Fix
-    message: Fix bug where constructing walls and windows would place them in the bar.
diff --git a/Resources/Changelog/Parts/instrument_dead.yml b/Resources/Changelog/Parts/instrument_dead.yml
deleted file mode 100644
index a7d3cb0b31..0000000000
--- a/Resources/Changelog/Parts/instrument_dead.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Zumorica
-changes:
-  - type: Fix
-    message: Fix being able to play instruments while incapacitated.
diff --git a/Resources/Changelog/Parts/midi.yml b/Resources/Changelog/Parts/midi.yml
deleted file mode 100644
index fa68fa7c34..0000000000
--- a/Resources/Changelog/Parts/midi.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Zumorica
-changes:
-  - type: Fix
-    message: Fix crash when MIDI stops playing.
diff --git a/Resources/Changelog/Parts/spray.yml b/Resources/Changelog/Parts/spray.yml
deleted file mode 100644
index 444be3dd4b..0000000000
--- a/Resources/Changelog/Parts/spray.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Zumorica
-changes:
-  - type: Fix # One of the following: Add, Remove, Tweak, Fix
-    message: Fixes spray puff and fire extinguisher cloud not moving.
diff --git a/Resources/Locale/en-US/arcade/components/space-villain-game-component.ftl b/Resources/Locale/en-US/arcade/components/space-villain-game-component.ftl
index e7766bd2f9..af005ae62d 100644
--- a/Resources/Locale/en-US/arcade/components/space-villain-game-component.ftl
+++ b/Resources/Locale/en-US/arcade/components/space-villain-game-component.ftl
@@ -10,6 +10,6 @@ space-villain-game-enemy-cheers-message = {$enemyName} cheers.
 space-villain-game-enemy-dies-with-player-message = {$enemyName} dies, but takes you with him.
 space-villain-game-enemy-throws-bomb-message = {$enemyName} throws a bomb, exploding you for {$damageReceived} damage!
 space-villain-game-enemy-steals-player-power-message = {$enemyName} steals {$stolenAmount} of your power!
-space-villain-game-enemy-heals-message = {$enemyName} heals for {healedAmount} health!
+space-villain-game-enemy-heals-message = {$enemyName} heals for {$healedAmount} health!
 space-villain-game-enemy-steals-player-power-message = {$enemyName} steals {$stolenAmount} of your power!
 space-villain-game-enemy-attacks-message = {$enemyName} attacks you for {$damageDealt} damage!
\ No newline at end of file
diff --git a/Resources/Locale/en-US/game-objects/components/atmos/firelock-component.ftl b/Resources/Locale/en-US/atmos/firelock-component.ftl
similarity index 100%
rename from Resources/Locale/en-US/game-objects/components/atmos/firelock-component.ftl
rename to Resources/Locale/en-US/atmos/firelock-component.ftl
diff --git a/Resources/Locale/en-US/game-objects/components/atmos/flammable-component.ftl b/Resources/Locale/en-US/atmos/flammable-component.ftl
similarity index 100%
rename from Resources/Locale/en-US/game-objects/components/atmos/flammable-component.ftl
rename to Resources/Locale/en-US/atmos/flammable-component.ftl
diff --git a/Resources/Locale/en-US/game-objects/components/atmos/gas-analyzer-component.ftl b/Resources/Locale/en-US/atmos/gas-analyzer-component.ftl
similarity index 100%
rename from Resources/Locale/en-US/game-objects/components/atmos/gas-analyzer-component.ftl
rename to Resources/Locale/en-US/atmos/gas-analyzer-component.ftl
diff --git a/Resources/Locale/en-US/game-objects/components/atmos/gas-canister-component.ftl b/Resources/Locale/en-US/atmos/gas-canister-component.ftl
similarity index 100%
rename from Resources/Locale/en-US/game-objects/components/atmos/gas-canister-component.ftl
rename to Resources/Locale/en-US/atmos/gas-canister-component.ftl
diff --git a/Resources/Locale/en-US/game-objects/components/atmos/gas-tank-component.ftl b/Resources/Locale/en-US/atmos/gas-tank-component.ftl
similarity index 100%
rename from Resources/Locale/en-US/game-objects/components/atmos/gas-tank-component.ftl
rename to Resources/Locale/en-US/atmos/gas-tank-component.ftl
diff --git a/Resources/Locale/en-US/botany/components/plant-holder-component.ftl b/Resources/Locale/en-US/botany/components/plant-holder-component.ftl
index 5900a1a373..8f2e070711 100644
--- a/Resources/Locale/en-US/botany/components/plant-holder-component.ftl
+++ b/Resources/Locale/en-US/botany/components/plant-holder-component.ftl
@@ -12,7 +12,7 @@ plant-holder-component-no-plant-message = There is no plant to remove.
 plant-holder-component-empty-message = {$owner} is empty!
 plant-holder-component-spray-message = You spray {$owner}.
 plant-holder-component-transfer-message = You transfer {$amount}u to {$owner}.
-plant-holder-component-nothing-to-sample-message =There is nothing to take a sample of!.
+plant-holder-component-nothing-to-sample-message = There is nothing to take a sample of!
 plant-holder-component-already-sampled-message = This plant has already been sampled.
 plant-holder-component-dead-plant-message = This plant is dead.
 plant-holder-component-take-sample-message = You take a sample from the {$seedName}.
diff --git a/Resources/Locale/en-US/chat/ui/chat-box.ftl b/Resources/Locale/en-US/chat/ui/chat-box.ftl
index aa9d912893..84a7d09283 100644
--- a/Resources/Locale/en-US/chat/ui/chat-box.ftl
+++ b/Resources/Locale/en-US/chat/ui/chat-box.ftl
@@ -1,4 +1,20 @@
 hud-chatbox-info = T to talk, Tab to cycle channels.
-hud-chatbox-admin = Admin
-hud-chatbox-ooc = OOC
-hud-chatbox-console = Console
+
+hud-chatbox-select-name-prefixed = {$prefix} {$name}
+hud-chatbox-select-channel-Admin = Admin
+hud-chatbox-select-channel-Console = Console
+hud-chatbox-select-channel-Dead = Dead
+hud-chatbox-select-channel-Emotes = Emotes
+hud-chatbox-select-channel-Local = Local
+hud-chatbox-select-channel-OOC = OOC
+hud-chatbox-select-channel-Radio = Radio
+
+hud-chatbox-channel-Admin = Admin
+hud-chatbox-channel-Dead = Dead
+hud-chatbox-channel-Emotes = Emotes
+hud-chatbox-channel-Local = Local
+hud-chatbox-channel-OOC = OOC
+hud-chatbox-channel-Radio = Radio
+hud-chatbox-channel-Server = Server
+hud-chatbox-channel-Visual = Visual
+hud-chatbox-channel-Unspecified = Unspecified
diff --git a/Resources/Locale/en-US/chemistry/components/chem-master-component.ftl b/Resources/Locale/en-US/chemistry/components/chem-master-component.ftl
index 432ea43e2b..c52cf23f7a 100644
--- a/Resources/Locale/en-US/chemistry/components/chem-master-component.ftl
+++ b/Resources/Locale/en-US/chemistry/components/chem-master-component.ftl
@@ -5,7 +5,7 @@ chem-master-component-interact-using-no-hands = You have no hands.
 chem-master-component-interact-using-nothing-in-hands = You have nothing in your hand!
 chem-master-component-has-beaker-already-message = This ChemMaster already has a container in it.
 chem-master-component-container-too-large-message = The {$container} is too large for the ChemMaster!
-chem-master-component-cannot-put-entity-message = You can't put {entity} in the ChemMaster!
+chem-master-component-cannot-put-entity-message = You can't put {$entity} in the ChemMaster!
 
 ## Bound UI
 chem-master-bound-user-interface-title = ChemMaster 4000
diff --git a/Resources/Locale/en-US/chemistry/components/solution-transfer-component.ftl b/Resources/Locale/en-US/chemistry/components/solution-transfer-component.ftl
index 414113c034..b40c8b3f37 100644
--- a/Resources/Locale/en-US/chemistry/components/solution-transfer-component.ftl
+++ b/Resources/Locale/en-US/chemistry/components/solution-transfer-component.ftl
@@ -1,5 +1,18 @@
-solution-transfer-component-fill-to-brim-message = You fill {$owner} to the brim with {$amount}u from {$target}
-solution-transfer-component-fill--message = You fill {$owner} with {$amount}u from {$target}
-solution-transfer-component-transfer-success-message = You transfer {$amount}u to {$target}.
-solution-transfer-component-do-transfer-component-is-empty = {$entity} is empty!
-solution-transfer-component-do-transfer-component-is-full = {$entity} is full!
\ No newline at end of file
+### Solution transfer component
+
+comp-solution-transfer-fill-normal = You fill {THE($target)} with {$amount}u from {THE($owner)}.
+comp-solution-transfer-fill-fully = You fill {THE($target)} to the brim with {$amount}u from {THE($owner)}.
+comp-solution-transfer-transfer-solution = You transfer {$amount}u to {THE($target)}.
+
+## Displayed when trying to transfer to a solution, but either the giver is empty or the taker is full
+comp-solution-transfer-is-empty = {THE($target)} is empty!
+comp-solution-transfer-is-full = {THE($target)} is full!
+
+## Displayed in change transfer amount verb's name
+comp-solution-transfer-verb-transfer-amount-min = {$amount}u
+comp-solution-transfer-verb-transfer-amount-max = {$amount}u
+comp-solution-transfer-verb-transfer-amount-ideal = {$amount}u
+comp-solution-transfer-verb-transfer-amount-custom = Custom
+
+## Displayed after you successfully change a solution's amount using the BUI
+comp-solution-transfer-set-amount = Transfer amount set to {$amount}u.
diff --git a/Resources/Locale/en-US/construction/steps/material-construction-graph-step.ftl b/Resources/Locale/en-US/construction/steps/material-construction-graph-step.ftl
index e62e250c17..54e72d22fb 100644
--- a/Resources/Locale/en-US/construction/steps/material-construction-graph-step.ftl
+++ b/Resources/Locale/en-US/construction/steps/material-construction-graph-step.ftl
@@ -1 +1 @@
-construction-insert-material-entity = Next, add [color=yellow]{$amount}}x[/color] [color=cyan]{$materialName}[/color].
\ No newline at end of file
+construction-insert-material-entity = Next, add [color=yellow]{$amount}x[/color] [color=cyan]{$materialName}[/color].
\ No newline at end of file
diff --git a/Resources/Locale/en-US/crayon/crayon-component.ftl b/Resources/Locale/en-US/crayon/crayon-component.ftl
index 34fe271be1..af8e0a7cdb 100644
--- a/Resources/Locale/en-US/crayon/crayon-component.ftl
+++ b/Resources/Locale/en-US/crayon/crayon-component.ftl
@@ -3,6 +3,7 @@
 
 crayon-drawing-label = Drawing: [color={$color}]{$state}[/color] ({$charges}/{$capacity})
 crayon-interact-not-enough-left-text = Not enough left.
+crayon-interact-invalid-location = Can't reach there!
 
 ## UI
-crayon-window-title = Crayon
\ No newline at end of file
+crayon-window-title = Crayon
diff --git a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
index d2746a3c6e..6ee69cb997 100644
--- a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
+++ b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
@@ -13,7 +13,7 @@ ui-options-reset-all = Reset All
 ui-options-master-volume = Master Volume:
 ui-options-ambient-hum = Ambient Hum
 ui-options-lobby-music = Lobby Music
-ui-options-volume-sliders = Volume Sliders
+ui-options-volume-label = Volume
 ui-options-volume-percent = { TOSTRING($volume, "P0") }
 
 ## Graphics menu
@@ -37,9 +37,14 @@ ui-options-hud-theme = HUD Theme:
 ui-options-hud-theme-default = Default
 ui-options-hud-theme-modernized = Modernized
 ui-options-hud-theme-classic = Classic
-ui-options-vp-stretch = Stretch viewport to fit game window?
+ui-options-vp-stretch = Stretch viewport to fit game window
 ui-options-vp-scale = Fixed viewport scale: x{ $scale }
-ui-options-vp-low-res = Low-resolution viewport?
+ui-options-vp-integer-scaling = Prefer integer scaling (might cause black bars/clipping)
+ui-options-vp-integer-scaling-tooltip = If this option is enabled, the viewport will be scaled using an integer value
+                                        at specific resolutions. While this results in crisp textures, it also often
+                                        means that black bars appear at the top/bottom of the screen or that part
+                                        of the viewport is not visible.
+ui-options-vp-low-res = Low-resolution viewport
 
 ## Controls menu
 
@@ -85,6 +90,8 @@ ui-options-function-focus-local-chat-window = Focus chat (IC)
 ui-options-function-focus-radio-window = Focus chat (Radio)
 ui-options-function-focus-ooc-window = Focus chat (OOC)
 ui-options-function-focus-admin-chat-window = Focus chat (Admin)
+ui-options-function-focus-dead-chat-window = Focus chat (Dead)
+ui-options-function-focus-console-chat-window = Focus chat (Console)
 ui-options-function-cycle-chat-channel-forward = Cycle channel (Forward)
 ui-options-function-cycle-chat-channel-backward = Cycle channel (Backward)
 ui-options-function-open-character-menu = Open character menu
@@ -130,4 +137,4 @@ ui-options-function-loadout5 = Hotbar Loadout 5
 ui-options-function-loadout6 = Hotbar Loadout 6
 ui-options-function-loadout7 = Hotbar Loadout 7
 ui-options-function-loadout8 = Hotbar Loadout 8
-ui-options-function-loadout9 = Hotbar Loadout 9
\ No newline at end of file
+ui-options-function-loadout9 = Hotbar Loadout 9
diff --git a/Resources/Locale/en-US/game-objects/DONT_PUT_STUFF_HERE_ATMOS_LEFTOVER b/Resources/Locale/en-US/game-objects/DONT_PUT_STUFF_HERE_ATMOS_LEFTOVER
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/Resources/Locale/en-US/game-ticking/game-presets/preset-traitor.ftl b/Resources/Locale/en-US/game-ticking/game-presets/preset-traitor.ftl
index 590a76db5c..51d6363bc4 100644
--- a/Resources/Locale/en-US/game-ticking/game-presets/preset-traitor.ftl
+++ b/Resources/Locale/en-US/game-ticking/game-presets/preset-traitor.ftl
@@ -28,7 +28,7 @@ traitor-death-match-title = Traitor Deathmatch
 traitor-death-match-description = Everyone's a traitor. Everyone wants each other dead.
 traitor-death-match-station-is-too-unsafe-announcement = The station is too unsafe to continue. You have one minute.
 traitor-death-match-end-round-description-first-line = The PDAs recovered afterwards...
-traitor-death-match-end-round-description-entry = {$originalName}'s PDA, with {tcBalance} TC
+traitor-death-match-end-round-description-entry = {$originalName}'s PDA, with {$tcBalance} TC
 
 ## TraitorRole
 
diff --git a/Resources/Locale/en-US/hands/components/hands-component.ftl b/Resources/Locale/en-US/hands/components/hands-component.ftl
index 406095d2a7..6782bb403f 100644
--- a/Resources/Locale/en-US/hands/components/hands-component.ftl
+++ b/Resources/Locale/en-US/hands/components/hands-component.ftl
@@ -1,8 +1,4 @@
-hands-component-disarm-success-others-message = {$source} disarms {$target}!
-hands-component-disarm-success-message = You disarm {$target}!
-hands-component-shove-success-others-message = {$source} shoves {$target}!
-hands-component-shove-success-message = You shove {$target}!
-
-### HandComponent stuff
-
-
+hands-component-disarm-success-others-message = {$disarmer} disarms {$disarmed}!
+hands-component-disarm-success-message = You disarm {$disarmed}!
+hands-component-shove-success-others-message = {$shover} shoves {$shoved}!
+hands-component-shove-success-message = You shove {$shoved}!
\ No newline at end of file
diff --git a/Resources/Locale/en-US/interaction/interaction-system.ftl b/Resources/Locale/en-US/interaction/interaction-system.ftl
index c5c3b58c8c..a4c380abca 100644
--- a/Resources/Locale/en-US/interaction/interaction-system.ftl
+++ b/Resources/Locale/en-US/interaction/interaction-system.ftl
@@ -1 +1,2 @@
-shared-interaction-system-in-range-unobstructed-cannot-reach = You can't reach there!
\ No newline at end of file
+shared-interaction-system-in-range-unobstructed-cannot-reach = You can't reach there!
+interaction-system-user-interaction-cannot-reach = You can't reach there!
\ No newline at end of file
diff --git a/Resources/Locale/en-US/kitchen/components/microwave-component.ftl b/Resources/Locale/en-US/kitchen/components/microwave-component.ftl
index e304ce8b87..4b1643db9b 100644
--- a/Resources/Locale/en-US/kitchen/components/microwave-component.ftl
+++ b/Resources/Locale/en-US/kitchen/components/microwave-component.ftl
@@ -1,6 +1,7 @@
 ## Entity
 
 microwave-component-interact-using-no-power = It has no power!
+microwave-component-interact-using-broken = It's broken!
 microwave-component-interact-using-no-active-hand = You have no active hand!
 microwave-component-interact-using-container-full = Container is full
 microwave-component-interact-using-transfer-success = Transferred {$amount}u
diff --git a/Resources/Locale/en-US/launcher/launcher-connecting.ftl b/Resources/Locale/en-US/launcher/launcher-connecting.ftl
index 7d25adb736..7f083951e2 100644
--- a/Resources/Locale/en-US/launcher/launcher-connecting.ftl
+++ b/Resources/Locale/en-US/launcher/launcher-connecting.ftl
@@ -9,4 +9,9 @@ connecting-disconnected = Disconnected from server:
 connecting-tip = Don't die!
 connecting-version = ver 0.1
 connecting-fail-reason = Failed to connect to server:
-                         { $reason }
\ No newline at end of file
+                         { $reason }
+connecting-state-NotConnecting = Not connecting
+connecting-state-ResolvingHost = Resolving host
+connecting-state-EstablishingConnection = Establishing connection
+connecting-state-Handshake = Handshake
+connecting-state-Connected = Connected
\ No newline at end of file
diff --git a/Resources/Locale/en-US/medical/components/medical-scanner-component.ftl b/Resources/Locale/en-US/medical/components/medical-scanner-component.ftl
index 3f16bc956b..46bfcc9710 100644
--- a/Resources/Locale/en-US/medical/components/medical-scanner-component.ftl
+++ b/Resources/Locale/en-US/medical/components/medical-scanner-component.ftl
@@ -9,7 +9,7 @@ enter-verb-get-data-text = Enter
 
 ## EjectVerb
 
-eject-verb-get-data-text = Eject
+medical-scanner-eject-verb-get-data-text = Eject
 
 ## UI
 
diff --git a/Resources/Locale/en-US/particle-accelerator/components/ui/particle-accelerator-control-menu.ftl b/Resources/Locale/en-US/particle-accelerator/components/ui/particle-accelerator-control-menu.ftl
index 022ce3087c..6bc3ec5068 100644
--- a/Resources/Locale/en-US/particle-accelerator/components/ui/particle-accelerator-control-menu.ftl
+++ b/Resources/Locale/en-US/particle-accelerator/components/ui/particle-accelerator-control-menu.ftl
@@ -13,4 +13,4 @@ particle-accelerator-control-menu-status-label = Status: {$status}
 particle-accelerator-control-menu-status-operational = Operational
 particle-accelerator-control-menu-status-incomplete = Incomplete
 particle-accelerator-control-menu-draw-not-available = Draw: N/A
-particle-accelerator-control-menu-draw = Draw: {$watts}/{lastReceive} 
\ No newline at end of file
+particle-accelerator-control-menu-draw = Draw: {$watts}/{$lastReceive} 
\ No newline at end of file
diff --git a/Resources/Locale/en-US/shell.ftl b/Resources/Locale/en-US/shell.ftl
index 371e12585b..b8fe21d26b 100644
--- a/Resources/Locale/en-US/shell.ftl
+++ b/Resources/Locale/en-US/shell.ftl
@@ -5,7 +5,7 @@
 shell-server-cannot = Server cannot do this.
 shell-command-success = Command successful
 shell-invalid-command = Invalid command.
-shell-invalid-command-specific = Invalid {commandName} command.
+shell-invalid-command-specific = Invalid {$commandName} command.
 shell-cannot-run-command-from-server = You cannot run this command from the server. 
 shell-only-players-can-run-this-command = Only players can run this command.
 
diff --git a/Resources/Locale/en-US/shuttles/console.ftl b/Resources/Locale/en-US/shuttles/console.ftl
new file mode 100644
index 0000000000..dfd8b6734c
--- /dev/null
+++ b/Resources/Locale/en-US/shuttles/console.ftl
@@ -0,0 +1,2 @@
+shuttle-pilot-start = Piloting ship
+shuttle-pilot-end = Stopped piloting
\ No newline at end of file
diff --git a/Resources/Locale/en-US/strip/strippable-component.ftl b/Resources/Locale/en-US/strip/strippable-component.ftl
index af6b84b473..427a2f2162 100644
--- a/Resources/Locale/en-US/strip/strippable-component.ftl
+++ b/Resources/Locale/en-US/strip/strippable-component.ftl
@@ -12,5 +12,5 @@ strip-verb-get-data-text = Strip
 
 ## UI
 
-strippable-bound-user-interface-stripping-menu-title = {ownerName}'s inventory
+strippable-bound-user-interface-stripping-menu-title = {$ownerName}'s inventory
 strippable-bound-user-interface-stripping-menu-handcuffs-button = Restraints
\ No newline at end of file
diff --git a/Resources/Locale/en-US/traitor-death-match/components/traitor-death-match-redemption-component.ftl b/Resources/Locale/en-US/traitor-death-match/components/traitor-death-match-redemption-component.ftl
index a66c7c3d7d..badefc4976 100644
--- a/Resources/Locale/en-US/traitor-death-match/components/traitor-death-match-redemption-component.ftl
+++ b/Resources/Locale/en-US/traitor-death-match/components/traitor-death-match-redemption-component.ftl
@@ -6,6 +6,7 @@ traitor-death-match-redemption-component-interact-using-no-pda-message = GIVEN P
 traitor-death-match-redemption-component-interact-using-no-pda-owner-message ="GIVEN PDA HAS NO OWNER (0064)"
 traitor-death-match-redemption-component-interact-using-pda-different-user-message = "GIVEN PDA OWNED BY USER (0070)"
 traitor-death-match-redemption-component-interact-using-no-pda-in-pocket-message = "NO USER PDA IN IDCARD POCKET (0083)"
+traitor-death-match-redemption-component-interact-using-tampering-detected = "TAMPERING DETECTED (0101)"
 traitor-death-match-redemption-component-interact-using-user-no-uplink-account-message = "USER PDA HAS NO UPLINK ACCOUNT (0102)"
 traitor-death-match-redemption-component-interact-using-victim-no-uplink-account-message = "USER PDA HAS NO UPLINK ACCOUNT (0108)"
 traitor-death-match-redemption-component-interact-using-success-message = The machine plays a happy little tune, and displays: "SUCCESS: {$tcAmount} TC TRANSFERRED"
\ No newline at end of file
diff --git a/Resources/Locale/en-US/ui/transfer-amount.ftl b/Resources/Locale/en-US/ui/transfer-amount.ftl
new file mode 100644
index 0000000000..a1f549d934
--- /dev/null
+++ b/Resources/Locale/en-US/ui/transfer-amount.ftl
@@ -0,0 +1,13 @@
+### Loc for the transfer amount eui window
+
+## Title
+
+ui-transfer-amount-title = Change Transfer Amount
+
+## Text for the button to apply changes
+
+ui-transfer-amount-apply = Set Amount
+
+## Placeholder text for the amount line edit
+
+ui-transfer-amount-line-edit-placeholder = Amount
diff --git a/Resources/Locale/en-US/voting/ui/vote-call-menu.ftl b/Resources/Locale/en-US/voting/ui/vote-call-menu.ftl
index 87b3d60440..1e9fefc2c9 100644
--- a/Resources/Locale/en-US/voting/ui/vote-call-menu.ftl
+++ b/Resources/Locale/en-US/voting/ui/vote-call-menu.ftl
@@ -7,10 +7,13 @@ ui-vote-create-title = Call Vote
 # Submit button in the vote create button
 ui-vote-create-button = Call Vote
 
+# Timeout text if a standard vote type is currently on timeout.
+ui-vote-type-timeout = This vote was called too recently ({$remaining})
+
 # Hue hue hue
 ui-vote-fluff = Powered by Robust™ Anti-Tamper Technology
 
 ## Vote menu command
 
 ui-vote-menu-command-description = Opens the voting menu
-ui-vote-menu-command-help-text = Usage: votemenu
\ No newline at end of file
+ui-vote-menu-command-help-text = Usage: votemenu
diff --git a/Resources/Maps/Test/Breathing/3by3-20oxy-80nit.yml b/Resources/Maps/Test/Breathing/3by3-20oxy-80nit.yml
index 63dce1bf34..f6c2480d8a 100644
--- a/Resources/Maps/Test/Breathing/3by3-20oxy-80nit.yml
+++ b/Resources/Maps/Test/Breathing/3by3-20oxy-80nit.yml
@@ -58,10 +58,6 @@ entities:
     type: Transform
   - index: 0
     type: MapGrid
-  - fixtures:
-    - shape: !type:PhysShapeGrid
-        grid: 0
-    type: Physics
   - tiles:
       -1,-1: 0
       0,-1: 0
diff --git a/Resources/Maps/Test/empty.yml b/Resources/Maps/Test/empty.yml
index e9979e70cf..cf293569fb 100644
--- a/Resources/Maps/Test/empty.yml
+++ b/Resources/Maps/Test/empty.yml
@@ -47,9 +47,4 @@ entities:
     type: Transform
   - index: 0
     type: MapGrid
-  - fixtures:
-    - shape:
-        !type:PhysShapeGrid
-          grid: 0
-    type: Physics
 ...
diff --git a/Resources/Maps/Test/singularity.yml b/Resources/Maps/Test/singularity.yml
index ceb80b4927..66539dafc2 100644
--- a/Resources/Maps/Test/singularity.yml
+++ b/Resources/Maps/Test/singularity.yml
@@ -77,11 +77,6 @@ entities:
     type: Transform
   - index: 0
     type: MapGrid
-  - fixtures:
-    - shape:
-        !type:PhysShapeGrid
-          grid: 0
-    type: Physics
   - uniqueMixes:
     - volume: 2500
       moles:
diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml
index 9383b08baf..2c0fd2c5ac 100644
--- a/Resources/Maps/saltern.yml
+++ b/Resources/Maps/saltern.yml
@@ -1271,8 +1271,6 @@ entities:
     pos: 58.5,-31.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 153
   type: CableHV
   components:
@@ -1281,8 +1279,6 @@ entities:
     pos: 58.5,-29.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 154
   type: SignDirectionalEvac
   components:
@@ -1997,8 +1993,7 @@ entities:
 - uid: 218
   type: Recycler
   components:
-  - anchored: True
-    pos: -21.5,-13.5
+  - pos: -21.5,-13.5
     parent: 853
     type: Transform
 - uid: 219
@@ -7246,7 +7241,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 760
-  type: LockerEmergencyFilledRandom
+  type: ClosetEmergencyFilledRandom
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 5.5,-21.5
@@ -7268,7 +7263,7 @@ entities:
       stash: !type:ContainerSlot {}
     type: ContainerContainer
 - uid: 762
-  type: LockerEmergencyFilledRandom
+  type: ClosetEmergencyFilledRandom
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -23.5,11.5
@@ -7281,7 +7276,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 763
-  type: LockerEmergencyFilledRandom
+  type: ClosetEmergencyFilledRandom
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 24.5,13.5
@@ -7314,7 +7309,7 @@ entities:
       stash: !type:ContainerSlot {}
     type: ContainerContainer
 - uid: 766
-  type: LockerEmergencyFilledRandom
+  type: ClosetEmergencyFilledRandom
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -2.5,30.5
@@ -7327,7 +7322,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 767
-  type: LockerEmergencyFilledRandom
+  type: ClosetEmergencyFilledRandom
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 9.5,30.5
@@ -7362,7 +7357,7 @@ entities:
       stash: !type:ContainerSlot {}
     type: ContainerContainer
 - uid: 770
-  type: LockerEmergencyFilledRandom
+  type: ClosetEmergencyFilledRandom
   components:
   - pos: 0.5,14.5
     parent: 853
@@ -7392,7 +7387,7 @@ entities:
       stash: !type:ContainerSlot {}
     type: ContainerContainer
 - uid: 773
-  type: LockerFireFilled
+  type: ClosetFireFilled
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -37.5,-6.5
@@ -7405,7 +7400,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 774
-  type: LockerFireFilled
+  type: ClosetFireFilled
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -11.5,-11.5
@@ -7424,7 +7419,7 @@ entities:
     parent: 853
     type: Transform
 - uid: 776
-  type: LockerBombFilled
+  type: ClosetBombFilled
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -12.5,21.5
@@ -7437,7 +7432,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 777
-  type: LockerFireFilled
+  type: ClosetFireFilled
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 13.5,21.5
@@ -7450,7 +7445,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 778
-  type: LockerEmergencyFilledRandom
+  type: ClosetEmergencyFilledRandom
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 12.5,21.5
@@ -7463,7 +7458,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 779
-  type: LockerFireFilled
+  type: ClosetFireFilled
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 28.5,12.5
@@ -7476,7 +7471,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 780
-  type: LockerEmergencyFilledRandom
+  type: ClosetEmergencyFilledRandom
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 43.5,9.5
@@ -7489,7 +7484,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 781
-  type: LockerFireFilled
+  type: ClosetFireFilled
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 44.5,9.5
@@ -7502,7 +7497,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 782
-  type: LockerFireFilled
+  type: ClosetFireFilled
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 23.5,0.5
@@ -7515,7 +7510,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 783
-  type: LockerEmergencyFilledRandom
+  type: ClosetEmergencyFilledRandom
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 8.5,-18.5
@@ -7528,7 +7523,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 784
-  type: LockerFireFilled
+  type: ClosetFireFilled
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 9.5,-18.5
@@ -7541,7 +7536,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 785
-  type: LockerEmergencyFilledRandom
+  type: ClosetEmergencyFilledRandom
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -15.5,-17.5
@@ -7554,7 +7549,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 786
-  type: LockerEmergencyFilledRandom
+  type: ClosetEmergencyFilledRandom
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -7.5,-25.5
@@ -7567,7 +7562,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 787
-  type: LockerEmergencyFilledRandom
+  type: ClosetEmergencyFilledRandom
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 26.5,12.5
@@ -7580,7 +7575,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 788
-  type: LockerEmergencyFilledRandom
+  type: ClosetEmergencyFilledRandom
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 23.5,1.5
@@ -7593,7 +7588,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 789
-  type: LockerFireFilled
+  type: ClosetFireFilled
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -14.5,-17.5
@@ -7606,7 +7601,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 790
-  type: LockerEmergencyFilledRandom
+  type: ClosetEmergencyFilledRandom
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -11.5,-10.5
@@ -7619,7 +7614,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 791
-  type: LockerEmergencyFilledRandom
+  type: ClosetEmergencyFilledRandom
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -37.5,-7.5
@@ -7632,7 +7627,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 792
-  type: LockerEmergencyFilledRandom
+  type: ClosetEmergencyFilledRandom
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -39.5,2.5
@@ -7645,7 +7640,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 793
-  type: LockerEmergencyFilledRandom
+  type: ClosetEmergencyFilledRandom
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -34.5,10.5
@@ -7712,7 +7707,7 @@ entities:
     parent: 853
     type: Transform
 - uid: 800
-  type: LockerChefFilled
+  type: ClosetChefFilled
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -14.5,1.5
@@ -7725,7 +7720,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 801
-  type: LockerJanitorFilled
+  type: ClosetJanitorFilled
   components:
   - pos: -19.5,10.5
     parent: 853
@@ -7807,7 +7802,7 @@ entities:
     parent: 853
     type: Transform
 - uid: 808
-  type: LockerL3SecurityFilled
+  type: ClosetL3SecurityFilled
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -11.5,21.5
@@ -7973,7 +7968,7 @@ entities:
       stash: !type:ContainerSlot {}
     type: ContainerContainer
 - uid: 823
-  type: LockerGeneric
+  type: ClosetBase
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -11.5,-12.5
@@ -8285,10 +8280,6 @@ entities:
     type: Transform
   - index: 0
     type: MapGrid
-  - fixtures:
-    - shape: !type:PhysShapeGrid
-        grid: 0
-    type: Physics
   - tiles:
       -16,-16: 0
       -16,-15: 0
@@ -12346,6 +12337,290 @@ entities:
       - 0
       - 0
     type: GridAtmosphere
+  - linearDamping: 0.05
+    fixtures:
+    - shape: !type:PolygonShape
+        vertices:
+        - 0,-16
+        - 0,0
+        - -16,0
+        - -16,-16
+      id: grid_chunk--1--1
+      mask: []
+      layer: []
+      mass: 256
+    - shape: !type:PolygonShape
+        vertices:
+        - 0,0
+        - 0,16
+        - -16,16
+        - -16,0
+      id: grid_chunk--1-0
+      mask: []
+      layer: []
+      mass: 256
+    - shape: !type:PolygonShape
+        vertices:
+        - 16,-16
+        - 16,0
+        - 0,0
+        - 0,-16
+      id: grid_chunk-0--1
+      mask: []
+      layer: []
+      mass: 256
+    - shape: !type:PolygonShape
+        vertices:
+        - 16,0
+        - 16,16
+        - 0,16
+        - 0,0
+      id: grid_chunk-0-0
+      mask: []
+      layer: []
+      mass: 256
+    - shape: !type:PolygonShape
+        vertices:
+        - 32,0
+        - 32,16
+        - 16,16
+        - 16,0
+      id: grid_chunk-1-0
+      mask: []
+      layer: []
+      mass: 256
+    - shape: !type:PolygonShape
+        vertices:
+        - 16,16
+        - 16,32
+        - 0,32
+        - 0,16
+      id: grid_chunk-0-1
+      mask: []
+      layer: []
+      mass: 256
+    - shape: !type:PolygonShape
+        vertices:
+        - -16,0
+        - -16,16
+        - -32,16
+        - -32,0
+      id: grid_chunk--2-0
+      mask: []
+      layer: []
+      mass: 256
+    - shape: !type:PolygonShape
+        vertices:
+        - 32,-16
+        - 32,0
+        - 16,0
+        - 16,-16
+      id: grid_chunk-1--1
+      mask: []
+      layer: []
+      mass: 256
+    - shape: !type:PolygonShape
+        vertices:
+        - 16,-32
+        - 16,-16
+        - 0,-16
+        - 0,-32
+      id: grid_chunk-0--2
+      mask: []
+      layer: []
+      mass: 256
+    - shape: !type:PolygonShape
+        vertices:
+        - 29,-27
+        - 29,-16
+        - 16,-16
+        - 16,-27
+      id: grid_chunk-1--2
+      mask: []
+      layer: []
+      mass: 143
+    - shape: !type:PolygonShape
+        vertices:
+        - 0,16
+        - 0,32
+        - -16,32
+        - -16,16
+      id: grid_chunk--1-1
+      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
+        - 0,34
+        - -3,34
+        - -3,32
+      id: grid_chunk--1-2
+      mask: []
+      layer: []
+      mass: 6
+    - shape: !type:PolygonShape
+        vertices:
+        - 18,16
+        - 18,17
+        - 16,17
+        - 16,16
+      id: grid_chunk-1-1
+      mask: []
+      layer: []
+      mass: 2
+    - shape: !type:PolygonShape
+        vertices:
+        - 10,32
+        - 10,34
+        - 0,34
+        - 0,32
+      id: grid_chunk-0-2
+      mask: []
+      layer: []
+      mass: 20
+    - shape: !type:PolygonShape
+        vertices:
+        - 48,0
+        - 48,16
+        - 32,16
+        - 32,0
+      id: grid_chunk-2-0
+      mask: []
+      layer: []
+      mass: 256
+    - shape: !type:PolygonShape
+        vertices:
+        - 52,0
+        - 52,15
+        - 48,15
+        - 48,0
+      id: grid_chunk-3-0
+      mask: []
+      layer: []
+      mass: 60
+    - shape: !type:PolygonShape
+        vertices:
+        - 48,-16
+        - 48,0
+        - 32,0
+        - 32,-16
+      id: grid_chunk-2--1
+      mask: []
+      layer: []
+      mass: 256
+    - shape: !type:PolygonShape
+        vertices:
+        - 0,-31
+        - 0,-16
+        - -16,-16
+        - -16,-31
+      id: grid_chunk--1--2
+      mask: []
+      layer: []
+      mass: 240
+    - shape: !type:PolygonShape
+        vertices:
+        - -16,-28
+        - -16,-16
+        - -26,-16
+        - -26,-28
+      id: grid_chunk--2--2
+      mask: []
+      layer: []
+      mass: 120
+    - shape: !type:PolygonShape
+        vertices:
+        - -16,-16
+        - -16,0
+        - -32,0
+        - -32,-16
+      id: grid_chunk--2--1
+      mask: []
+      layer: []
+      mass: 256
+    - shape: !type:PolygonShape
+        vertices:
+        - -32,0
+        - -32,16
+        - -42,16
+        - -42,0
+      id: grid_chunk--3-0
+      mask: []
+      layer: []
+      mass: 160
+    - shape: !type:PolygonShape
+        vertices:
+        - -32,-13
+        - -32,0
+        - -40,0
+        - -40,-13
+      id: grid_chunk--3--1
+      mask: []
+      layer: []
+      mass: 104
+    - shape: !type:PolygonShape
+        vertices:
+        - 56,-16
+        - 56,0
+        - 48,0
+        - 48,-16
+      id: grid_chunk-3--1
+      mask: []
+      layer: []
+      mass: 128
+    - shape: !type:PolygonShape
+        vertices:
+        - 48,-32
+        - 48,-16
+        - 40,-16
+        - 40,-32
+      id: grid_chunk-2--2
+      mask: []
+      layer: []
+      mass: 128
+    - shape: !type:PolygonShape
+        vertices:
+        - 59,-32
+        - 59,-16
+        - 48,-16
+        - 48,-32
+      id: grid_chunk-3--2
+      mask: []
+      layer: []
+      mass: 176
+    - shape: !type:PolygonShape
+        vertices:
+        - 59,-34
+        - 59,-32
+        - 48,-32
+        - 48,-34
+      id: grid_chunk-3--3
+      mask: []
+      layer: []
+      mass: 22
+    - shape: !type:PolygonShape
+        vertices:
+        - 48,-34
+        - 48,-32
+        - 40,-32
+        - 40,-34
+      id: grid_chunk-2--3
+      mask: []
+      layer: []
+      mass: 16
+    bodyType: Dynamic
+    type: Physics
 - uid: 854
   type: Catwalk
   components:
@@ -12499,8 +12774,7 @@ entities:
 - uid: 873
   type: Autolathe
   components:
-  - anchored: True
-    pos: 29.5,-2.5
+  - pos: 29.5,-2.5
     parent: 853
     type: Transform
   - containers:
@@ -12520,8 +12794,7 @@ entities:
 - uid: 875
   type: Protolathe
   components:
-  - anchored: True
-    pos: 29.5,-1.5
+  - pos: 29.5,-1.5
     parent: 853
     type: Transform
   - containers:
@@ -12628,8 +12901,7 @@ entities:
 - uid: 889
   type: GravityGenerator
   components:
-  - anchored: True
-    rot: 4.371139006309477E-08 rad
+  - rot: 4.371139006309477E-08 rad
     pos: 49.5,-4.5
     parent: 853
     type: Transform
@@ -12682,8 +12954,7 @@ entities:
 - uid: 894
   type: KitchenMicrowave
   components:
-  - anchored: True
-    rot: 4.371139006309477E-08 rad
+  - rot: 4.371139006309477E-08 rad
     pos: -14.5,-1.5
     parent: 853
     type: Transform
@@ -13398,8 +13669,6 @@ entities:
     pos: 1.5,1.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 995
   type: Catwalk
   components:
@@ -13424,8 +13693,6 @@ entities:
     pos: 0.5,2.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 998
   type: CableApcExtension
   components:
@@ -13433,8 +13700,6 @@ entities:
     pos: 1.5,2.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 999
   type: WallSolid
   components:
@@ -13569,8 +13834,6 @@ entities:
     pos: 22.5,-18.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 1013
   type: DisposalPipe
   components:
@@ -13630,8 +13893,6 @@ entities:
     pos: -6.5,-26.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 1020
   type: Catwalk
   components:
@@ -13810,8 +14071,7 @@ entities:
 - uid: 1043
   type: Autolathe
   components:
-  - anchored: True
-    pos: -5.5,-12.5
+  - pos: -5.5,-12.5
     parent: 853
     type: Transform
   - containers:
@@ -13823,8 +14083,7 @@ entities:
 - uid: 1044
   type: Protolathe
   components:
-  - anchored: True
-    pos: -3.5,-12.5
+  - pos: -3.5,-12.5
     parent: 853
     type: Transform
   - containers:
@@ -14436,8 +14695,6 @@ entities:
     pos: -6.5,-26.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 1118
   type: CableHV
   components:
@@ -14445,8 +14702,6 @@ entities:
     pos: -4.5,-26.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 1119
   type: Catwalk
   components:
@@ -15344,7 +15599,7 @@ entities:
         ent: 3179
     type: ContainerContainer
 - uid: 1223
-  type: LockerToolFilled
+  type: ClosetToolFilled
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 35.5,-0.5
@@ -15363,7 +15618,7 @@ entities:
     parent: 853
     type: Transform
 - uid: 1225
-  type: LockerToolFilled
+  type: ClosetToolFilled
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 35.5,0.5
@@ -15458,7 +15713,7 @@ entities:
       light_bulb: !type:ContainerSlot {}
     type: ContainerContainer
 - uid: 1233
-  type: LockerToolFilled
+  type: ClosetToolFilled
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -27.5,11.5
@@ -16719,8 +16974,6 @@ entities:
     pos: -32.5,1.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 1352
   type: WallSolid
   components:
@@ -17797,8 +18050,6 @@ entities:
     pos: -7.5,-26.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 1484
   type: Window
   components:
@@ -18199,8 +18450,6 @@ entities:
     pos: 58.5,-28.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 1540
   type: SignArmory
   components:
@@ -18258,8 +18507,6 @@ entities:
     pos: 58.5,-32.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 1547
   type: CableHV
   components:
@@ -18268,8 +18515,6 @@ entities:
     pos: 57.5,-33.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 1548
   type: ReinforcedWindow
   components:
@@ -19696,8 +19941,6 @@ entities:
     pos: 54.5,-33.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 1754
   type: LowWall
   components:
@@ -19733,8 +19976,6 @@ entities:
     pos: 58.5,-30.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 1759
   type: WallSolid
   components:
@@ -19890,8 +20131,6 @@ entities:
     pos: 56.5,-33.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 1781
   type: CableHV
   components:
@@ -19900,8 +20139,6 @@ entities:
     pos: 58.5,-33.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 1782
   type: SignDirectionalBridge
   components:
@@ -19924,8 +20161,6 @@ entities:
     pos: 52.5,-33.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 1785
   type: WallSolid
   components:
@@ -20206,8 +20441,6 @@ entities:
     pos: 53.5,-33.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 1826
   type: CableHV
   components:
@@ -20216,8 +20449,6 @@ entities:
     pos: 55.5,-33.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 1827
   type: WallReinforced
   components:
@@ -22045,8 +22276,6 @@ entities:
     pos: -7.5,-24.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2086
   type: WallSolid
   components:
@@ -22068,8 +22297,6 @@ entities:
     pos: 1.5,6.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2089
   type: WallSolid
   components:
@@ -24344,8 +24571,6 @@ entities:
     pos: -1.5,6.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2411
   type: ShotgunGladstone
   components:
@@ -24373,7 +24598,7 @@ entities:
     parent: 853
     type: Transform
 - uid: 2414
-  type: LockerGeneric
+  type: ClosetBase
   components:
   - pos: -8.5,-25.5
     parent: 853
@@ -24391,8 +24616,6 @@ entities:
     pos: -3.5,6.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2416
   type: CableApcExtension
   components:
@@ -24400,8 +24623,6 @@ entities:
     pos: -2.5,6.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2417
   type: WallSolid
   components:
@@ -24423,8 +24644,6 @@ entities:
     pos: -4.5,6.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2420
   type: WallSolid
   components:
@@ -25283,8 +25502,6 @@ entities:
     pos: -28.5,12.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2529
   type: CableApcExtension
   components:
@@ -25365,8 +25582,6 @@ entities:
     pos: -25.5,9.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2536
   type: CableApcExtension
   components:
@@ -25387,8 +25602,6 @@ entities:
     pos: -26.5,7.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2538
   type: CableApcExtension
   components:
@@ -25529,8 +25742,6 @@ entities:
     pos: -28.5,14.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2550
   type: CableApcExtension
   components:
@@ -25539,8 +25750,6 @@ entities:
     pos: -17.5,9.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2551
   type: CableApcExtension
   components:
@@ -25573,8 +25782,6 @@ entities:
     pos: -16.5,7.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2554
   type: SalternApc
   components:
@@ -25605,8 +25812,6 @@ entities:
     pos: -17.5,15.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2557
   type: CableApcExtension
   components:
@@ -25831,8 +26036,6 @@ entities:
     pos: -7.5,24.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2576
   type: CableApcExtension
   components:
@@ -25841,8 +26044,6 @@ entities:
     pos: -12.5,12.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2577
   type: CableApcExtension
   components:
@@ -26163,8 +26364,6 @@ entities:
     pos: 0.5,6.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2604
   type: CableApcExtension
   components:
@@ -26173,8 +26372,6 @@ entities:
     pos: 0.5,6.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2605
   type: CableApcExtension
   components:
@@ -26183,8 +26380,6 @@ entities:
     pos: -0.5,6.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2606
   type: CableApcExtension
   components:
@@ -26193,8 +26388,6 @@ entities:
     pos: -3.5,15.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2607
   type: CableApcExtension
   components:
@@ -26275,8 +26468,6 @@ entities:
     pos: -3.5,15.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2614
   type: CableApcExtension
   components:
@@ -26369,8 +26560,6 @@ entities:
     pos: -10.5,14.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2622
   type: CableApcExtension
   components:
@@ -26691,8 +26880,6 @@ entities:
     pos: 1.5,14.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2649
   type: CableApcExtension
   components:
@@ -26725,8 +26912,6 @@ entities:
     pos: -39.5,11.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2652
   type: CableApcExtension
   components:
@@ -27203,8 +27388,6 @@ entities:
     pos: -18.5,9.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2692
   type: CableApcExtension
   components:
@@ -27213,8 +27396,6 @@ entities:
     pos: -17.5,7.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2693
   type: CableApcExtension
   components:
@@ -27223,8 +27404,6 @@ entities:
     pos: -18.5,7.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2694
   type: CableApcExtension
   components:
@@ -27233,8 +27412,6 @@ entities:
     pos: -30.5,-3.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2695
   type: CableApcExtension
   components:
@@ -27267,8 +27444,6 @@ entities:
     pos: -30.5,-6.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2698
   type: CableApcExtension
   components:
@@ -27433,8 +27608,6 @@ entities:
     pos: -30.5,-0.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2712
   type: CableApcExtension
   components:
@@ -27503,8 +27676,6 @@ entities:
     pos: -27.5,-0.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2718
   type: CableApcExtension
   components:
@@ -27544,8 +27715,6 @@ entities:
     pos: -32.5,-6.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2722
   type: CableApcExtension
   components:
@@ -27626,8 +27795,6 @@ entities:
     pos: -32.5,0.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2729
   type: CableApcExtension
   components:
@@ -27636,8 +27803,6 @@ entities:
     pos: -32.5,1.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2730
   type: CableApcExtension
   components:
@@ -27646,8 +27811,6 @@ entities:
     pos: -20.5,-12.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2731
   type: CableApcExtension
   components:
@@ -27792,6 +27955,16 @@ entities:
     type: Sprite
   - canCollide: False
     type: Physics
+- uid: 2743
+  type: ComputerShuttle
+  components:
+  - pos: 2.5,32.5
+    parent: 853
+    type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 2744
   type: CableApcExtension
   components:
@@ -27968,8 +28141,6 @@ entities:
     pos: -18.5,-6.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2759
   type: CableApcExtension
   components:
@@ -28122,8 +28293,6 @@ entities:
     pos: -22.5,1.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2772
   type: CableApcExtension
   components:
@@ -28143,8 +28312,6 @@ entities:
     pos: -15.5,-6.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2774
   type: CableApcExtension
   components:
@@ -28153,8 +28320,6 @@ entities:
     pos: -15.5,-5.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2775
   type: CableApcExtension
   components:
@@ -28163,8 +28328,6 @@ entities:
     pos: -15.5,-4.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2776
   type: CableApcExtension
   components:
@@ -28173,8 +28336,6 @@ entities:
     pos: -11.5,2.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2777
   type: CableApcExtension
   components:
@@ -28231,8 +28392,6 @@ entities:
     pos: -11.5,-2.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2782
   type: CableApcExtension
   components:
@@ -28755,8 +28914,6 @@ entities:
     pos: -5.5,-8.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2826
   type: CableApcExtension
   components:
@@ -28885,8 +29042,6 @@ entities:
     pos: -5.5,-10.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2837
   type: CableApcExtension
   components:
@@ -28895,8 +29050,6 @@ entities:
     pos: -4.5,-10.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2838
   type: CableApcExtension
   components:
@@ -28905,8 +29058,6 @@ entities:
     pos: -4.5,-10.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2839
   type: CableApcExtension
   components:
@@ -28915,8 +29066,6 @@ entities:
     pos: -3.5,-10.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2840
   type: CableApcExtension
   components:
@@ -28925,8 +29074,6 @@ entities:
     pos: -2.5,-10.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2841
   type: CableApcExtension
   components:
@@ -28935,8 +29082,6 @@ entities:
     pos: -1.5,-10.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2842
   type: CableApcExtension
   components:
@@ -28945,8 +29090,6 @@ entities:
     pos: -0.5,-10.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2843
   type: CableApcExtension
   components:
@@ -28955,8 +29098,6 @@ entities:
     pos: 0.5,-10.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2844
   type: CableApcExtension
   components:
@@ -28965,8 +29106,6 @@ entities:
     pos: 0.5,-9.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2845
   type: CableApcExtension
   components:
@@ -28975,8 +29114,6 @@ entities:
     pos: 0.5,-8.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2846
   type: CableApcExtension
   components:
@@ -28985,8 +29122,6 @@ entities:
     pos: 0.5,-7.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2847
   type: CableApcExtension
   components:
@@ -28995,8 +29130,6 @@ entities:
     pos: -0.5,-11.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2848
   type: CableApcExtension
   components:
@@ -29005,8 +29138,6 @@ entities:
     pos: -1.5,-18.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2849
   type: CableApcExtension
   components:
@@ -29147,8 +29278,6 @@ entities:
     pos: -9.5,-21.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2861
   type: CableApcExtension
   components:
@@ -29205,8 +29334,6 @@ entities:
     pos: -7.5,-24.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2866
   type: CableApcExtension
   components:
@@ -29467,8 +29594,6 @@ entities:
     pos: 0.5,-17.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2888
   type: CableApcExtension
   components:
@@ -29525,8 +29650,6 @@ entities:
     pos: -6.5,-12.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2893
   type: CableApcExtension
   components:
@@ -29547,8 +29670,6 @@ entities:
     pos: -14.5,-16.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2895
   type: CableApcExtension
   components:
@@ -29725,8 +29846,6 @@ entities:
     pos: -1.5,-23.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2910
   type: CableApcExtension
   components:
@@ -29735,8 +29854,6 @@ entities:
     pos: -0.5,-23.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2911
   type: CableApcExtension
   components:
@@ -29745,8 +29862,6 @@ entities:
     pos: 0.5,-23.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2912
   type: CableApcExtension
   components:
@@ -29755,8 +29870,6 @@ entities:
     pos: 7.5,-17.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2913
   type: CableApcExtension
   components:
@@ -29777,8 +29890,6 @@ entities:
     pos: 7.5,-19.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2915
   type: CableApcExtension
   components:
@@ -29871,8 +29982,6 @@ entities:
     pos: 14.5,-19.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2923
   type: CableApcExtension
   components:
@@ -29941,8 +30050,6 @@ entities:
     pos: 6.5,-13.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2929
   type: CableApcExtension
   components:
@@ -29999,8 +30106,6 @@ entities:
     pos: 11.5,-13.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2934
   type: CableApcExtension
   components:
@@ -30057,8 +30162,6 @@ entities:
     pos: 25.5,-4.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2939
   type: CableApcExtension
   components:
@@ -30067,8 +30170,6 @@ entities:
     pos: 22.5,-2.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2940
   type: CableApcExtension
   components:
@@ -30125,8 +30226,6 @@ entities:
     pos: 21.5,1.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2945
   type: CableApcExtension
   components:
@@ -30399,8 +30498,6 @@ entities:
     pos: 18.5,-18.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2968
   type: CableApcExtension
   components:
@@ -30757,8 +30854,6 @@ entities:
     pos: 16.5,2.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2998
   type: CableApcExtension
   components:
@@ -31099,8 +31194,6 @@ entities:
     pos: 6.5,-17.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3027
   type: CableApcExtension
   components:
@@ -31193,8 +31286,6 @@ entities:
     pos: 22.5,-3.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3035
   type: CableApcExtension
   components:
@@ -31203,8 +31294,6 @@ entities:
     pos: 31.5,1.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3036
   type: CableApcExtension
   components:
@@ -31345,8 +31434,6 @@ entities:
     pos: 31.5,1.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3048
   type: CableApcExtension
   components:
@@ -31547,8 +31634,6 @@ entities:
     pos: 43.5,10.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3065
   type: CableApcExtension
   components:
@@ -32073,8 +32158,6 @@ entities:
     pos: 33.5,-6.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3109
   type: CableApcExtension
   components:
@@ -32119,8 +32202,6 @@ entities:
     pos: 29.5,-6.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3113
   type: CableApcExtension
   components:
@@ -32129,8 +32210,6 @@ entities:
     pos: 28.5,-6.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3114
   type: CableApcExtension
   components:
@@ -32139,8 +32218,6 @@ entities:
     pos: 27.5,-6.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3115
   type: CableApcExtension
   components:
@@ -32329,8 +32406,6 @@ entities:
     pos: 47.5,-1.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3131
   type: CableApcExtension
   components:
@@ -32339,8 +32414,6 @@ entities:
     pos: 47.5,-2.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3132
   type: CableApcExtension
   components:
@@ -32349,8 +32422,6 @@ entities:
     pos: 47.5,-3.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3133
   type: CableApcExtension
   components:
@@ -32359,8 +32430,6 @@ entities:
     pos: 48.5,-2.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3134
   type: CableApcExtension
   components:
@@ -32369,8 +32438,6 @@ entities:
     pos: 49.5,-2.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3135
   type: CableApcExtension
   components:
@@ -32379,8 +32446,6 @@ entities:
     pos: 50.5,-2.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3136
   type: CableApcExtension
   components:
@@ -32389,8 +32454,6 @@ entities:
     pos: 51.5,-2.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3137
   type: CableApcExtension
   components:
@@ -32399,8 +32462,6 @@ entities:
     pos: 51.5,-3.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3138
   type: CableApcExtension
   components:
@@ -32409,8 +32470,6 @@ entities:
     pos: 51.5,-4.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3139
   type: CableApcExtension
   components:
@@ -32467,8 +32526,6 @@ entities:
     pos: 28.5,14.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3144
   type: CableApcExtension
   components:
@@ -32477,8 +32534,6 @@ entities:
     pos: 28.5,13.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3145
   type: CableApcExtension
   components:
@@ -32535,8 +32590,6 @@ entities:
     pos: 28.5,9.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3150
   type: CableApcExtension
   components:
@@ -32557,8 +32610,6 @@ entities:
     pos: 26.5,9.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3152
   type: CableApcExtension
   components:
@@ -32603,8 +32654,6 @@ entities:
     pos: 27.5,8.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3156
   type: CableApcExtension
   components:
@@ -32757,8 +32806,6 @@ entities:
     pos: 35.5,7.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3169
   type: CableApcExtension
   components:
@@ -32815,8 +32862,6 @@ entities:
     pos: 24.5,14.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3174
   type: CableApcExtension
   components:
@@ -32861,8 +32906,6 @@ entities:
     pos: 58.5,-27.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3178
   type: Window
   components:
@@ -32912,8 +32955,6 @@ entities:
     pos: 58.5,-26.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3183
   type: CableHV
   components:
@@ -32922,8 +32963,6 @@ entities:
     pos: 58.5,-25.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3184
   type: CableApcExtension
   components:
@@ -33076,8 +33115,6 @@ entities:
     pos: 17.5,8.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3197
   type: CableApcExtension
   components:
@@ -33110,8 +33147,6 @@ entities:
     pos: 12.5,13.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3200
   type: CableApcExtension
   components:
@@ -33228,8 +33263,6 @@ entities:
     pos: 11.5,10.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3210
   type: CableApcExtension
   components:
@@ -33346,8 +33379,6 @@ entities:
     pos: 8.5,6.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3220
   type: CableApcExtension
   components:
@@ -33356,8 +33387,6 @@ entities:
     pos: 12.5,13.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3221
   type: CableApcExtension
   components:
@@ -33366,8 +33395,6 @@ entities:
     pos: 12.5,14.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3222
   type: CableApcExtension
   components:
@@ -33376,8 +33403,6 @@ entities:
     pos: 11.5,14.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3223
   type: CableApcExtension
   components:
@@ -33386,8 +33411,6 @@ entities:
     pos: 10.5,14.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3224
   type: CableApcExtension
   components:
@@ -33432,8 +33455,6 @@ entities:
     pos: 6.5,14.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3228
   type: CableApcExtension
   components:
@@ -33442,8 +33463,6 @@ entities:
     pos: 12.5,14.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3229
   type: CableApcExtension
   components:
@@ -33524,8 +33543,6 @@ entities:
     pos: 9.5,22.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3236
   type: CableApcExtension
   components:
@@ -33786,8 +33803,6 @@ entities:
     pos: 3.5,22.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3258
   type: CableApcExtension
   components:
@@ -33820,8 +33835,6 @@ entities:
     pos: 9.5,27.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3261
   type: CableApcExtension
   components:
@@ -33986,8 +33999,6 @@ entities:
     pos: -2.5,27.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3275
   type: CableApcExtension
   components:
@@ -34322,8 +34333,6 @@ entities:
     pos: 42.5,0.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3304
   type: CableHV
   components:
@@ -34332,8 +34341,6 @@ entities:
     pos: 42.5,-0.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3305
   type: CableHV
   components:
@@ -34342,8 +34349,6 @@ entities:
     pos: 42.5,-1.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3306
   type: CableHV
   components:
@@ -34352,8 +34357,6 @@ entities:
     pos: 42.5,-2.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3307
   type: CableHV
   components:
@@ -34374,8 +34377,6 @@ entities:
     pos: 42.5,-4.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3309
   type: CableHV
   components:
@@ -34384,8 +34385,6 @@ entities:
     pos: 42.5,-4.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3310
   type: CableHV
   components:
@@ -34394,8 +34393,6 @@ entities:
     pos: 41.5,-4.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3311
   type: CableHV
   components:
@@ -34404,8 +34401,6 @@ entities:
     pos: 40.5,-4.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3312
   type: CableHV
   components:
@@ -34414,8 +34409,6 @@ entities:
     pos: 39.5,-4.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3313
   type: CableHV
   components:
@@ -34424,8 +34417,6 @@ entities:
     pos: 38.5,-4.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3314
   type: CableHV
   components:
@@ -34434,8 +34425,6 @@ entities:
     pos: 38.5,-5.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3315
   type: CableHV
   components:
@@ -34444,8 +34433,6 @@ entities:
     pos: 38.5,-6.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3316
   type: CableHV
   components:
@@ -34454,8 +34441,6 @@ entities:
     pos: 38.5,-7.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3317
   type: CableHV
   components:
@@ -34464,8 +34449,6 @@ entities:
     pos: 37.5,-7.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3318
   type: CableHV
   components:
@@ -34474,8 +34457,6 @@ entities:
     pos: 36.5,-7.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3319
   type: CableHV
   components:
@@ -34484,8 +34465,6 @@ entities:
     pos: 35.5,-7.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3320
   type: CableHV
   components:
@@ -34494,8 +34473,6 @@ entities:
     pos: 34.5,-7.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3321
   type: CableHV
   components:
@@ -34504,8 +34481,6 @@ entities:
     pos: 33.5,-7.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3322
   type: CableHV
   components:
@@ -34514,8 +34489,6 @@ entities:
     pos: 32.5,-7.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3323
   type: CableHV
   components:
@@ -34524,8 +34497,6 @@ entities:
     pos: 31.5,-7.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3324
   type: CableHV
   components:
@@ -34534,8 +34505,6 @@ entities:
     pos: 30.5,-7.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3325
   type: CableHV
   components:
@@ -34544,8 +34513,6 @@ entities:
     pos: 29.5,-7.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3326
   type: CableHV
   components:
@@ -34554,8 +34521,6 @@ entities:
     pos: 28.5,-7.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3327
   type: CableHV
   components:
@@ -34576,8 +34541,6 @@ entities:
     pos: 26.5,-7.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3329
   type: CableHV
   components:
@@ -34586,8 +34549,6 @@ entities:
     pos: 26.5,-8.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3330
   type: CableHV
   components:
@@ -34596,8 +34557,6 @@ entities:
     pos: 26.5,-9.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3331
   type: CableHV
   components:
@@ -34606,8 +34565,6 @@ entities:
     pos: 26.5,-10.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3332
   type: CableHV
   components:
@@ -34616,8 +34573,6 @@ entities:
     pos: 26.5,-11.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3333
   type: CableHV
   components:
@@ -34626,8 +34581,6 @@ entities:
     pos: 26.5,-12.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3334
   type: CableHV
   components:
@@ -34636,8 +34589,6 @@ entities:
     pos: 26.5,-13.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3335
   type: CableHV
   components:
@@ -34646,8 +34597,6 @@ entities:
     pos: 26.5,-14.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3336
   type: CableHV
   components:
@@ -34656,8 +34605,6 @@ entities:
     pos: 26.5,-15.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3337
   type: CableHV
   components:
@@ -34666,8 +34613,6 @@ entities:
     pos: 26.5,-16.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3338
   type: CableHV
   components:
@@ -34676,8 +34621,6 @@ entities:
     pos: 26.5,-17.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3339
   type: CableHV
   components:
@@ -34686,8 +34629,6 @@ entities:
     pos: 25.5,-9.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3340
   type: CableHV
   components:
@@ -34696,8 +34637,6 @@ entities:
     pos: 24.5,-9.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3341
   type: CableHV
   components:
@@ -34706,8 +34645,6 @@ entities:
     pos: 23.5,-9.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3342
   type: CableHV
   components:
@@ -34716,8 +34653,6 @@ entities:
     pos: 22.5,-9.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3343
   type: CableHV
   components:
@@ -34726,8 +34661,6 @@ entities:
     pos: 21.5,-9.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3344
   type: CableHV
   components:
@@ -34736,8 +34669,6 @@ entities:
     pos: 25.5,-17.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3345
   type: CableHV
   components:
@@ -34746,8 +34677,6 @@ entities:
     pos: 24.5,-17.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3346
   type: CableHV
   components:
@@ -34756,8 +34685,6 @@ entities:
     pos: 23.5,-17.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3347
   type: CableHV
   components:
@@ -34766,8 +34693,6 @@ entities:
     pos: 22.5,-17.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3348
   type: CableHV
   components:
@@ -34776,8 +34701,6 @@ entities:
     pos: 22.5,-18.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3349
   type: CableHV
   components:
@@ -34786,8 +34709,6 @@ entities:
     pos: 22.5,-19.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3350
   type: CableHV
   components:
@@ -34796,8 +34717,6 @@ entities:
     pos: 22.5,-20.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3351
   type: CableHV
   components:
@@ -34806,8 +34725,6 @@ entities:
     pos: 22.5,-21.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3352
   type: CableHV
   components:
@@ -34816,8 +34733,6 @@ entities:
     pos: 22.5,-22.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3353
   type: CableHV
   components:
@@ -34826,8 +34741,6 @@ entities:
     pos: 22.5,-23.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3354
   type: CableHV
   components:
@@ -34836,8 +34749,6 @@ entities:
     pos: 22.5,-24.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3355
   type: CableHV
   components:
@@ -34846,8 +34757,6 @@ entities:
     pos: 22.5,-25.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3356
   type: CableHV
   components:
@@ -34856,8 +34765,6 @@ entities:
     pos: 21.5,-25.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3357
   type: CableHV
   components:
@@ -34866,8 +34773,6 @@ entities:
     pos: 20.5,-25.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3358
   type: CableHV
   components:
@@ -34876,8 +34781,6 @@ entities:
     pos: 19.5,-25.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3359
   type: CableHV
   components:
@@ -34886,8 +34789,6 @@ entities:
     pos: 18.5,-25.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3360
   type: CableHV
   components:
@@ -34896,8 +34797,6 @@ entities:
     pos: 17.5,-25.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3361
   type: CableHV
   components:
@@ -34906,8 +34805,6 @@ entities:
     pos: 16.5,-25.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3362
   type: CableHV
   components:
@@ -34916,8 +34813,6 @@ entities:
     pos: 15.5,-25.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3363
   type: CableHV
   components:
@@ -34926,8 +34821,6 @@ entities:
     pos: 14.5,-25.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3364
   type: CableHV
   components:
@@ -34936,8 +34829,6 @@ entities:
     pos: 14.5,-24.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3365
   type: CableHV
   components:
@@ -34946,8 +34837,6 @@ entities:
     pos: 14.5,-23.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3366
   type: CableHV
   components:
@@ -34956,8 +34845,6 @@ entities:
     pos: 14.5,-22.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3367
   type: CableHV
   components:
@@ -34966,8 +34853,6 @@ entities:
     pos: 14.5,-21.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3368
   type: CableHV
   components:
@@ -34976,8 +34861,6 @@ entities:
     pos: 14.5,-20.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3369
   type: CableHV
   components:
@@ -34986,8 +34869,6 @@ entities:
     pos: 13.5,-20.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3370
   type: CableHV
   components:
@@ -34996,8 +34877,6 @@ entities:
     pos: 12.5,-20.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3371
   type: CableHV
   components:
@@ -35006,8 +34885,6 @@ entities:
     pos: 11.5,-20.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3372
   type: CableHV
   components:
@@ -35016,8 +34893,6 @@ entities:
     pos: 10.5,-20.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3373
   type: CableHV
   components:
@@ -35026,8 +34901,6 @@ entities:
     pos: 9.5,-20.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3374
   type: CableHV
   components:
@@ -35036,8 +34909,6 @@ entities:
     pos: 8.5,-20.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3375
   type: CableHV
   components:
@@ -35046,8 +34917,6 @@ entities:
     pos: 7.5,-20.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3376
   type: CableHV
   components:
@@ -35056,8 +34925,6 @@ entities:
     pos: 6.5,-20.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3377
   type: CableHV
   components:
@@ -35106,8 +34973,6 @@ entities:
     pos: 14.5,-25.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3382
   type: CableMV
   components:
@@ -35115,8 +34980,6 @@ entities:
     pos: 13.5,-25.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3383
   type: CableHV
   components:
@@ -35149,8 +35012,6 @@ entities:
     pos: -0.5,-23.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3386
   type: CableHV
   components:
@@ -35159,8 +35020,6 @@ entities:
     pos: 0.5,-23.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3387
   type: CableHV
   components:
@@ -35169,8 +35028,6 @@ entities:
     pos: -0.5,-24.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3388
   type: CableHV
   components:
@@ -35179,8 +35036,6 @@ entities:
     pos: -0.5,-25.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3389
   type: CableHV
   components:
@@ -35189,8 +35044,6 @@ entities:
     pos: -0.5,-26.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3390
   type: CableHV
   components:
@@ -35199,8 +35052,6 @@ entities:
     pos: -1.5,-26.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3391
   type: CableHV
   components:
@@ -35209,8 +35060,6 @@ entities:
     pos: -2.5,-26.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3392
   type: CableHV
   components:
@@ -35219,8 +35068,6 @@ entities:
     pos: -3.5,-26.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3393
   type: CableApcExtension
   components:
@@ -35240,8 +35087,6 @@ entities:
     pos: -4.5,-26.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3395
   type: CableApcExtension
   components:
@@ -35261,8 +35106,6 @@ entities:
     pos: -7.5,-26.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3397
   type: CableHV
   components:
@@ -35271,8 +35114,6 @@ entities:
     pos: -8.5,-26.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3398
   type: CableHV
   components:
@@ -35281,8 +35122,6 @@ entities:
     pos: -9.5,-26.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3399
   type: CableHV
   components:
@@ -35291,8 +35130,6 @@ entities:
     pos: -10.5,-26.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3400
   type: CableHV
   components:
@@ -35301,8 +35138,6 @@ entities:
     pos: -11.5,-26.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3401
   type: CableHV
   components:
@@ -35311,8 +35146,6 @@ entities:
     pos: -11.5,-26.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3402
   type: CableHV
   components:
@@ -35321,8 +35154,6 @@ entities:
     pos: -11.5,-25.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3403
   type: CableHV
   components:
@@ -35331,8 +35162,6 @@ entities:
     pos: -11.5,-24.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3404
   type: CableHV
   components:
@@ -35341,8 +35170,6 @@ entities:
     pos: -11.5,-23.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3405
   type: CableHV
   components:
@@ -35351,8 +35178,6 @@ entities:
     pos: -11.5,-22.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3406
   type: CableHV
   components:
@@ -35421,8 +35246,6 @@ entities:
     pos: -11.5,-16.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3412
   type: CableHV
   components:
@@ -35443,8 +35266,6 @@ entities:
     pos: -11.5,-14.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3414
   type: CableHV
   components:
@@ -35453,8 +35274,6 @@ entities:
     pos: -10.5,-14.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3415
   type: CableHV
   components:
@@ -35463,8 +35282,6 @@ entities:
     pos: -9.5,-14.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3416
   type: CableHV
   components:
@@ -35473,8 +35290,6 @@ entities:
     pos: -9.5,-13.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3417
   type: CableHV
   components:
@@ -35483,8 +35298,6 @@ entities:
     pos: -9.5,-12.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3418
   type: CableHV
   components:
@@ -35493,8 +35306,6 @@ entities:
     pos: -9.5,-11.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3419
   type: CableHV
   components:
@@ -35503,8 +35314,6 @@ entities:
     pos: -9.5,-10.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3420
   type: CableHV
   components:
@@ -35513,8 +35322,6 @@ entities:
     pos: -8.5,-10.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3421
   type: CableHV
   components:
@@ -35523,8 +35330,6 @@ entities:
     pos: -7.5,-10.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3422
   type: CableHV
   components:
@@ -35533,8 +35338,6 @@ entities:
     pos: -6.5,-10.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3423
   type: CableHV
   components:
@@ -35543,8 +35346,6 @@ entities:
     pos: -5.5,-10.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3424
   type: CableHV
   components:
@@ -35553,8 +35354,6 @@ entities:
     pos: -4.5,-10.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3425
   type: CableHV
   components:
@@ -35563,8 +35362,6 @@ entities:
     pos: -3.5,-10.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3426
   type: CableHV
   components:
@@ -35573,8 +35370,6 @@ entities:
     pos: -2.5,-10.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3427
   type: CableHV
   components:
@@ -35583,8 +35378,6 @@ entities:
     pos: -1.5,-10.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3428
   type: CableHV
   components:
@@ -35593,8 +35386,6 @@ entities:
     pos: -0.5,-10.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3429
   type: CableHV
   components:
@@ -35603,8 +35394,6 @@ entities:
     pos: 0.5,-10.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3430
   type: CableHV
   components:
@@ -35613,8 +35402,6 @@ entities:
     pos: 0.5,-9.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3431
   type: CableHV
   components:
@@ -35623,8 +35410,6 @@ entities:
     pos: 0.5,-8.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3432
   type: CableHV
   components:
@@ -35633,8 +35418,6 @@ entities:
     pos: 0.5,-7.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3433
   type: CableHV
   components:
@@ -35655,8 +35438,6 @@ entities:
     pos: -12.5,-14.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3435
   type: CableHV
   components:
@@ -35665,8 +35446,6 @@ entities:
     pos: -13.5,-14.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3436
   type: CableHV
   components:
@@ -35675,8 +35454,6 @@ entities:
     pos: -14.5,-14.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3437
   type: CableHV
   components:
@@ -35685,8 +35462,6 @@ entities:
     pos: -15.5,-14.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3438
   type: CableHV
   components:
@@ -35695,8 +35470,6 @@ entities:
     pos: -16.5,-14.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3439
   type: CableHV
   components:
@@ -35705,8 +35478,6 @@ entities:
     pos: -17.5,-14.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3440
   type: CableHV
   components:
@@ -35715,8 +35486,6 @@ entities:
     pos: -18.5,-14.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3441
   type: CableHV
   components:
@@ -35725,8 +35494,6 @@ entities:
     pos: -18.5,-13.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3442
   type: CableHV
   components:
@@ -35735,8 +35502,6 @@ entities:
     pos: -18.5,-12.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3443
   type: CableHV
   components:
@@ -35745,8 +35510,6 @@ entities:
     pos: -18.5,-11.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3444
   type: CableHV
   components:
@@ -35755,8 +35518,6 @@ entities:
     pos: -18.5,-11.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3445
   type: CableHV
   components:
@@ -35765,8 +35526,6 @@ entities:
     pos: -19.5,-11.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3446
   type: CableHV
   components:
@@ -35775,8 +35534,6 @@ entities:
     pos: -20.5,-11.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3447
   type: CableHV
   components:
@@ -35785,8 +35542,6 @@ entities:
     pos: -21.5,-11.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3448
   type: CableHV
   components:
@@ -35795,8 +35550,6 @@ entities:
     pos: -22.5,-11.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3449
   type: CableHV
   components:
@@ -35805,8 +35558,6 @@ entities:
     pos: -23.5,-11.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3450
   type: CableHV
   components:
@@ -35815,8 +35566,6 @@ entities:
     pos: -24.5,-11.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3451
   type: CableHV
   components:
@@ -35825,8 +35574,6 @@ entities:
     pos: -25.5,-11.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3452
   type: CableHV
   components:
@@ -35835,8 +35582,6 @@ entities:
     pos: -26.5,-11.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3453
   type: CableHV
   components:
@@ -35845,8 +35590,6 @@ entities:
     pos: -27.5,-11.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3454
   type: CableHV
   components:
@@ -35867,8 +35610,6 @@ entities:
     pos: -28.5,-11.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3456
   type: CableHV
   components:
@@ -35877,8 +35618,6 @@ entities:
     pos: -29.5,-11.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3457
   type: CableHV
   components:
@@ -35887,8 +35626,6 @@ entities:
     pos: -30.5,-11.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3458
   type: CableHV
   components:
@@ -35897,8 +35634,6 @@ entities:
     pos: -31.5,-11.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3459
   type: CableHV
   components:
@@ -35907,8 +35642,6 @@ entities:
     pos: -32.5,-11.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3460
   type: CableHV
   components:
@@ -35917,8 +35650,6 @@ entities:
     pos: -33.5,-11.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3461
   type: CableHV
   components:
@@ -35927,8 +35658,6 @@ entities:
     pos: -33.5,-10.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3462
   type: CableHV
   components:
@@ -35937,8 +35666,6 @@ entities:
     pos: -33.5,-9.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3463
   type: CableHV
   components:
@@ -35947,8 +35674,6 @@ entities:
     pos: -33.5,-8.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3464
   type: CableHV
   components:
@@ -35957,8 +35682,6 @@ entities:
     pos: -33.5,-7.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3465
   type: CableHV
   components:
@@ -35967,8 +35690,6 @@ entities:
     pos: -33.5,-6.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3466
   type: CableHV
   components:
@@ -35977,8 +35698,6 @@ entities:
     pos: -33.5,-5.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3467
   type: CableHV
   components:
@@ -35987,8 +35706,6 @@ entities:
     pos: -33.5,-4.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3468
   type: CableHV
   components:
@@ -35997,8 +35714,6 @@ entities:
     pos: -33.5,-3.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3469
   type: CableHV
   components:
@@ -36007,8 +35722,6 @@ entities:
     pos: -33.5,-2.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3470
   type: CableHV
   components:
@@ -36017,8 +35730,6 @@ entities:
     pos: -33.5,-1.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3471
   type: CableHV
   components:
@@ -36027,8 +35738,6 @@ entities:
     pos: -33.5,-0.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3472
   type: CableHV
   components:
@@ -36037,8 +35746,6 @@ entities:
     pos: -33.5,0.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3473
   type: CableHV
   components:
@@ -36047,8 +35754,6 @@ entities:
     pos: -32.5,0.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3474
   type: CableHV
   components:
@@ -36057,8 +35762,6 @@ entities:
     pos: -32.5,1.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3475
   type: CableHV
   components:
@@ -36115,8 +35818,6 @@ entities:
     pos: -32.5,6.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3480
   type: CableHV
   components:
@@ -36125,8 +35826,6 @@ entities:
     pos: -32.5,7.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3481
   type: CableHV
   components:
@@ -36135,8 +35834,6 @@ entities:
     pos: -32.5,8.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3482
   type: CableHV
   components:
@@ -36145,8 +35842,6 @@ entities:
     pos: -32.5,9.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3483
   type: CableHV
   components:
@@ -36155,8 +35850,6 @@ entities:
     pos: -32.5,10.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3484
   type: CableHV
   components:
@@ -36165,8 +35858,6 @@ entities:
     pos: -32.5,11.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3485
   type: CableHV
   components:
@@ -36175,8 +35866,6 @@ entities:
     pos: -32.5,12.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3486
   type: CableHV
   components:
@@ -36185,8 +35874,6 @@ entities:
     pos: -32.5,13.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3487
   type: CableHV
   components:
@@ -36195,8 +35882,6 @@ entities:
     pos: -32.5,14.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3488
   type: CableHV
   components:
@@ -36205,8 +35890,6 @@ entities:
     pos: -32.5,14.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3489
   type: CableHV
   components:
@@ -36215,8 +35898,6 @@ entities:
     pos: -31.5,14.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3490
   type: CableHV
   components:
@@ -36225,8 +35906,6 @@ entities:
     pos: -30.5,14.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3491
   type: CableHV
   components:
@@ -36235,8 +35914,6 @@ entities:
     pos: -29.5,14.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3492
   type: CableHV
   components:
@@ -36245,8 +35922,6 @@ entities:
     pos: -28.5,14.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3493
   type: CableHV
   components:
@@ -36255,8 +35930,6 @@ entities:
     pos: -27.5,14.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3494
   type: CableHV
   components:
@@ -36265,8 +35938,6 @@ entities:
     pos: -26.5,14.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3495
   type: CableHV
   components:
@@ -36275,8 +35946,6 @@ entities:
     pos: -25.5,14.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3496
   type: CableHV
   components:
@@ -36285,8 +35954,6 @@ entities:
     pos: -24.5,14.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3497
   type: CableHV
   components:
@@ -36295,8 +35962,6 @@ entities:
     pos: -23.5,14.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3498
   type: CableHV
   components:
@@ -36305,8 +35970,6 @@ entities:
     pos: -22.5,14.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3499
   type: CableHV
   components:
@@ -36315,8 +35978,6 @@ entities:
     pos: -21.5,14.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3500
   type: CableHV
   components:
@@ -36325,8 +35986,6 @@ entities:
     pos: -20.5,14.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3501
   type: CableHV
   components:
@@ -36335,8 +35994,6 @@ entities:
     pos: -20.5,13.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3502
   type: CableHV
   components:
@@ -36345,8 +36002,6 @@ entities:
     pos: -19.5,13.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3503
   type: CableHV
   components:
@@ -36355,8 +36010,6 @@ entities:
     pos: -18.5,13.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3504
   type: CableHV
   components:
@@ -36365,8 +36018,6 @@ entities:
     pos: -18.5,13.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3505
   type: CableHV
   components:
@@ -36375,8 +36026,6 @@ entities:
     pos: -17.5,13.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3506
   type: CableHV
   components:
@@ -36385,8 +36034,6 @@ entities:
     pos: -17.5,14.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3507
   type: CableHV
   components:
@@ -36395,8 +36042,6 @@ entities:
     pos: -17.5,15.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3508
   type: CableHV
   components:
@@ -36405,8 +36050,6 @@ entities:
     pos: -18.5,16.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3509
   type: CableHV
   components:
@@ -36439,8 +36082,6 @@ entities:
     pos: -15.5,16.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3512
   type: CableHV
   components:
@@ -36449,8 +36090,6 @@ entities:
     pos: -18.5,17.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3513
   type: CableHV
   components:
@@ -36459,8 +36098,6 @@ entities:
     pos: -18.5,18.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3514
   type: CableHV
   components:
@@ -36469,8 +36106,6 @@ entities:
     pos: -18.5,19.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3515
   type: CableHV
   components:
@@ -36479,8 +36114,6 @@ entities:
     pos: -18.5,20.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3516
   type: CableHV
   components:
@@ -36489,8 +36122,6 @@ entities:
     pos: -18.5,21.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3517
   type: CableHV
   components:
@@ -36499,8 +36130,6 @@ entities:
     pos: -18.5,22.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3518
   type: CableHV
   components:
@@ -36509,8 +36138,6 @@ entities:
     pos: -18.5,23.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3519
   type: CableHV
   components:
@@ -36519,8 +36146,6 @@ entities:
     pos: -18.5,24.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3520
   type: CableHV
   components:
@@ -36529,8 +36154,6 @@ entities:
     pos: -18.5,25.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3521
   type: CableHV
   components:
@@ -36539,8 +36162,6 @@ entities:
     pos: -17.5,25.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3522
   type: CableHV
   components:
@@ -36549,8 +36170,6 @@ entities:
     pos: -16.5,25.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3523
   type: CableHV
   components:
@@ -36559,8 +36178,6 @@ entities:
     pos: -15.5,25.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3524
   type: CableHV
   components:
@@ -36569,8 +36186,6 @@ entities:
     pos: -14.5,25.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3525
   type: CableHV
   components:
@@ -36579,8 +36194,6 @@ entities:
     pos: -13.5,25.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3526
   type: CableHV
   components:
@@ -36589,8 +36202,6 @@ entities:
     pos: -12.5,25.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3527
   type: CableHV
   components:
@@ -36599,8 +36210,6 @@ entities:
     pos: -11.5,25.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3528
   type: CableHV
   components:
@@ -36609,8 +36218,6 @@ entities:
     pos: -10.5,25.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3529
   type: CableHV
   components:
@@ -36619,8 +36226,6 @@ entities:
     pos: -9.5,25.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3530
   type: CableHV
   components:
@@ -36629,8 +36234,6 @@ entities:
     pos: -8.5,25.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3531
   type: CableHV
   components:
@@ -36639,8 +36242,6 @@ entities:
     pos: -7.5,25.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3532
   type: CableHV
   components:
@@ -36649,8 +36250,6 @@ entities:
     pos: -7.5,24.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3533
   type: CableHV
   components:
@@ -36659,8 +36258,6 @@ entities:
     pos: -6.5,24.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3534
   type: CableHV
   components:
@@ -36669,8 +36266,6 @@ entities:
     pos: -5.5,24.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3535
   type: CableHV
   components:
@@ -36679,8 +36274,6 @@ entities:
     pos: -4.5,24.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3536
   type: CableHV
   components:
@@ -36689,8 +36282,6 @@ entities:
     pos: -4.5,24.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3537
   type: CableHV
   components:
@@ -36699,8 +36290,6 @@ entities:
     pos: -4.5,23.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3538
   type: CableHV
   components:
@@ -36709,8 +36298,6 @@ entities:
     pos: -4.5,22.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3539
   type: CableHV
   components:
@@ -36719,8 +36306,6 @@ entities:
     pos: -4.5,21.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3540
   type: CableHV
   components:
@@ -36729,8 +36314,6 @@ entities:
     pos: -4.5,21.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3541
   type: CableHV
   components:
@@ -36739,8 +36322,6 @@ entities:
     pos: -3.5,21.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3542
   type: CableHV
   components:
@@ -36749,8 +36330,6 @@ entities:
     pos: -2.5,21.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3543
   type: CableHV
   components:
@@ -36759,8 +36338,6 @@ entities:
     pos: -1.5,21.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3544
   type: CableHV
   components:
@@ -36769,8 +36346,6 @@ entities:
     pos: -0.5,21.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3545
   type: CableHV
   components:
@@ -36779,8 +36354,6 @@ entities:
     pos: -0.5,20.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3546
   type: CableHV
   components:
@@ -36933,8 +36506,6 @@ entities:
     pos: 12.5,20.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3559
   type: CableHV
   components:
@@ -36979,8 +36550,6 @@ entities:
     pos: 12.5,24.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3563
   type: CableHV
   components:
@@ -36989,8 +36558,6 @@ entities:
     pos: 11.5,24.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3564
   type: CableHV
   components:
@@ -36999,8 +36566,6 @@ entities:
     pos: 12.5,20.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3565
   type: CableHV
   components:
@@ -37009,8 +36574,6 @@ entities:
     pos: 12.5,19.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3566
   type: CableHV
   components:
@@ -37019,8 +36582,6 @@ entities:
     pos: 12.5,18.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3567
   type: CableHV
   components:
@@ -37029,8 +36590,6 @@ entities:
     pos: 12.5,17.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3568
   type: CableHV
   components:
@@ -37039,8 +36598,6 @@ entities:
     pos: 12.5,16.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3569
   type: CableHV
   components:
@@ -37049,8 +36606,6 @@ entities:
     pos: 12.5,15.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3570
   type: CableHV
   components:
@@ -37059,8 +36614,6 @@ entities:
     pos: 12.5,14.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3571
   type: CableHV
   components:
@@ -37069,8 +36622,6 @@ entities:
     pos: 11.5,14.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3572
   type: CableHV
   components:
@@ -37079,8 +36630,6 @@ entities:
     pos: 10.5,14.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3573
   type: CableHV
   components:
@@ -37089,8 +36638,6 @@ entities:
     pos: 10.5,13.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3574
   type: CableHV
   components:
@@ -37099,8 +36646,6 @@ entities:
     pos: 10.5,12.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3575
   type: CableHV
   components:
@@ -37121,8 +36666,6 @@ entities:
     pos: 11.5,11.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3577
   type: CableHV
   components:
@@ -37283,8 +36826,6 @@ entities:
     pos: 25.5,11.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3591
   type: CableHV
   components:
@@ -37329,8 +36870,6 @@ entities:
     pos: 27.5,13.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3595
   type: CableHV
   components:
@@ -37351,8 +36890,6 @@ entities:
     pos: 29.5,11.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3597
   type: CableHV
   components:
@@ -37457,8 +36994,6 @@ entities:
     pos: 34.5,7.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3606
   type: CableHV
   components:
@@ -37603,8 +37138,6 @@ entities:
     pos: -0.5,-22.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3620
   type: SalternSubstation
   components:
@@ -37640,8 +37173,6 @@ entities:
     pos: 27.5,13.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3624
   type: CableMV
   components:
@@ -37650,8 +37181,6 @@ entities:
     pos: 28.5,13.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3625
   type: CableMV
   components:
@@ -37660,8 +37189,6 @@ entities:
     pos: 28.5,14.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3626
   type: CableMV
   components:
@@ -37670,8 +37197,6 @@ entities:
     pos: 26.5,13.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3627
   type: CableMV
   components:
@@ -37680,8 +37205,6 @@ entities:
     pos: 25.5,13.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3628
   type: CableMV
   components:
@@ -37702,8 +37225,6 @@ entities:
     pos: 24.5,14.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3630
   type: CableMV
   components:
@@ -37796,8 +37317,6 @@ entities:
     pos: 17.5,12.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3638
   type: CableMV
   components:
@@ -37866,8 +37385,6 @@ entities:
     pos: 12.5,13.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3644
   type: CableMV
   components:
@@ -37876,8 +37393,6 @@ entities:
     pos: 11.5,24.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3645
   type: CableMV
   components:
@@ -37898,8 +37413,6 @@ entities:
     pos: 10.5,24.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3647
   type: CableMV
   components:
@@ -37920,8 +37433,6 @@ entities:
     pos: 9.5,22.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3649
   type: CableMV
   components:
@@ -37978,8 +37489,6 @@ entities:
     pos: 9.5,27.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3654
   type: CableMV
   components:
@@ -38156,8 +37665,6 @@ entities:
     pos: -2.5,27.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3669
   type: CableMV
   components:
@@ -38166,8 +37673,6 @@ entities:
     pos: 42.5,-0.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3670
   type: CableMV
   components:
@@ -38296,8 +37801,6 @@ entities:
     pos: 48.5,-1.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3681
   type: CableMV
   components:
@@ -38306,8 +37809,6 @@ entities:
     pos: 48.5,-2.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3682
   type: CableMV
   components:
@@ -38316,8 +37817,6 @@ entities:
     pos: 47.5,-2.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3683
   type: CableMV
   components:
@@ -38326,8 +37825,6 @@ entities:
     pos: 47.5,-1.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3684
   type: CableMV
   components:
@@ -38336,8 +37833,6 @@ entities:
     pos: 41.5,-0.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3685
   type: CableMV
   components:
@@ -38394,8 +37889,6 @@ entities:
     pos: 36.5,-0.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3690
   type: CableMV
   components:
@@ -38476,8 +37969,6 @@ entities:
     pos: 31.5,1.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3697
   type: CableMV
   components:
@@ -38582,8 +38073,6 @@ entities:
     pos: 43.5,10.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3706
   type: CableMV
   components:
@@ -38592,8 +38081,6 @@ entities:
     pos: 21.5,-9.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3707
   type: CableMV
   components:
@@ -38602,8 +38089,6 @@ entities:
     pos: 21.5,-8.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3708
   type: CableMV
   components:
@@ -38672,8 +38157,6 @@ entities:
     pos: 22.5,-3.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3714
   type: CableMV
   components:
@@ -38682,8 +38165,6 @@ entities:
     pos: 20.5,-9.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3715
   type: CableMV
   components:
@@ -38704,8 +38185,6 @@ entities:
     pos: 21.5,-9.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3717
   type: CableMV
   components:
@@ -38942,8 +38421,6 @@ entities:
     pos: 7.5,-17.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3737
   type: CableMV
   components:
@@ -39096,8 +38573,6 @@ entities:
     pos: 16.5,2.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3750
   type: CableMV
   components:
@@ -39106,8 +38581,6 @@ entities:
     pos: -0.5,-22.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3751
   type: CableMV
   components:
@@ -39116,8 +38589,6 @@ entities:
     pos: -0.5,-21.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3752
   type: CableMV
   components:
@@ -39162,8 +38633,6 @@ entities:
     pos: -1.5,-18.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3756
   type: CableMV
   components:
@@ -39280,8 +38749,6 @@ entities:
     pos: -9.5,-21.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3766
   type: CableMV
   components:
@@ -39386,8 +38853,6 @@ entities:
     pos: -14.5,-16.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3775
   type: CableMV
   components:
@@ -39408,8 +38873,6 @@ entities:
     pos: 0.5,-7.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3777
   type: CableMV
   components:
@@ -39418,8 +38881,6 @@ entities:
     pos: 0.5,-8.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3778
   type: CableMV
   components:
@@ -39512,8 +38973,6 @@ entities:
     pos: -5.5,-8.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3786
   type: CableMV
   components:
@@ -39558,8 +39017,6 @@ entities:
     pos: -9.5,-9.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3790
   type: CableMV
   components:
@@ -39568,8 +39025,6 @@ entities:
     pos: -9.5,-8.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3791
   type: CableMV
   components:
@@ -39638,8 +39093,6 @@ entities:
     pos: -12.5,-5.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3797
   type: CableMV
   components:
@@ -39744,8 +39197,6 @@ entities:
     pos: -11.5,2.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3806
   type: CableMV
   components:
@@ -39766,8 +39217,6 @@ entities:
     pos: -21.5,-9.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3808
   type: CableMV
   components:
@@ -39788,8 +39237,6 @@ entities:
     pos: -20.5,-8.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3810
   type: CableMV
   components:
@@ -39846,8 +39293,6 @@ entities:
     pos: -16.5,-9.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3815
   type: CableMV
   components:
@@ -39904,8 +39349,6 @@ entities:
     pos: -21.5,-11.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3820
   type: CableMV
   components:
@@ -39914,8 +39357,6 @@ entities:
     pos: -21.5,-12.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3821
   type: CableMV
   components:
@@ -39924,8 +39365,6 @@ entities:
     pos: -20.5,-12.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3822
   type: CableMV
   components:
@@ -39970,8 +39409,6 @@ entities:
     pos: -26.5,-8.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3826
   type: CableMV
   components:
@@ -40028,8 +39465,6 @@ entities:
     pos: -29.5,-6.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3831
   type: CableMV
   components:
@@ -40074,8 +39509,6 @@ entities:
     pos: -30.5,-3.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3835
   type: CableMV
   components:
@@ -40084,8 +39517,6 @@ entities:
     pos: -32.5,7.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3836
   type: CableMV
   components:
@@ -40094,8 +39525,6 @@ entities:
     pos: -32.5,8.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3837
   type: CableMV
   components:
@@ -40104,8 +39533,6 @@ entities:
     pos: -32.5,9.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3838
   type: CableMV
   components:
@@ -40114,8 +39541,6 @@ entities:
     pos: -33.5,9.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3839
   type: CableMV
   components:
@@ -40208,8 +39633,6 @@ entities:
     pos: -39.5,11.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3847
   type: CableMV
   components:
@@ -40218,8 +39641,6 @@ entities:
     pos: -28.5,12.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3848
   type: CableMV
   components:
@@ -40324,8 +39745,6 @@ entities:
     pos: -15.5,16.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3857
   type: CableMV
   components:
@@ -40406,8 +39825,6 @@ entities:
     pos: -12.5,12.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3864
   type: CableMV
   components:
@@ -40428,8 +39845,6 @@ entities:
     pos: -10.5,13.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3866
   type: CableMV
   components:
@@ -40534,8 +39949,6 @@ entities:
     pos: -3.5,15.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3875
   type: CableMV
   components:
@@ -40544,8 +39957,6 @@ entities:
     pos: -15.5,16.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3876
   type: CableMV
   components:
@@ -41231,8 +40642,6 @@ entities:
     pos: 13.5,-24.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3946
   type: CableMV
   components:
@@ -41240,8 +40649,6 @@ entities:
     pos: 13.5,-23.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3947
   type: CableApcExtension
   components:
@@ -41525,8 +40932,6 @@ entities:
     pos: -26.5,7.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3976
   type: CableApcExtension
   components:
@@ -41535,8 +40940,6 @@ entities:
     pos: -26.5,6.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3977
   type: CableApcExtension
   components:
@@ -41565,8 +40968,6 @@ entities:
     pos: -26.5,6.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3980
   type: CableApcExtension
   components:
@@ -42174,8 +41575,6 @@ entities:
     pos: -18.5,13.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4049
   type: CableApcExtension
   components:
@@ -42183,8 +41582,6 @@ entities:
     pos: -17.5,13.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4050
   type: CableApcExtension
   components:
@@ -42192,8 +41589,6 @@ entities:
     pos: -17.5,14.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4051
   type: CableHV
   components:
@@ -42202,8 +41597,6 @@ entities:
     pos: -5.5,-26.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4052
   type: FirelockGlass
   components:
@@ -42220,8 +41613,6 @@ entities:
     pos: -5.5,-26.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4054
   type: FirelockGlass
   components:
@@ -42238,8 +41629,6 @@ entities:
     pos: -4.5,-26.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4056
   type: FirelockGlass
   components:
@@ -42303,8 +41692,6 @@ entities:
     pos: -20.5,13.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4064
   type: Firelock
   components:
@@ -42332,8 +41719,6 @@ entities:
     pos: -32.5,-6.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4067
   type: Firelock
   components:
@@ -42394,8 +41779,6 @@ entities:
     pos: -19.5,13.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4074
   type: CableApcExtension
   components:
@@ -42403,8 +41786,6 @@ entities:
     pos: 0.5,6.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4075
   type: CableApcExtension
   components:
@@ -42412,8 +41793,6 @@ entities:
     pos: -0.5,6.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4076
   type: WallSolid
   components:
@@ -42941,7 +42320,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 4143
-  type: LockerGeneric
+  type: ClosetBase
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -3.5,8.5
@@ -42954,7 +42333,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 4144
-  type: LockerGeneric
+  type: ClosetBase
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -0.5,8.5
@@ -43313,8 +42692,7 @@ entities:
 - uid: 4182
   type: KitchenReagentGrinder
   components:
-  - anchored: True
-    rot: 4.371139006309477E-08 rad
+  - rot: 4.371139006309477E-08 rad
     pos: -14.5,-0.5
     parent: 853
     type: Transform
@@ -43331,8 +42709,6 @@ entities:
     pos: 26.5,-10.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4184
   type: CableApcExtension
   components:
@@ -43812,8 +43188,7 @@ entities:
 - uid: 4247
   type: KitchenMicrowave
   components:
-  - anchored: True
-    pos: -7.5,-28.5
+  - pos: -7.5,-28.5
     parent: 853
     type: Transform
   - containers:
@@ -45186,8 +44561,6 @@ entities:
     pos: 44.5,-12.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4414
   type: CableApcExtension
   components:
@@ -45196,8 +44569,6 @@ entities:
     pos: 44.5,-11.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4415
   type: CableApcExtension
   components:
@@ -45206,8 +44577,6 @@ entities:
     pos: 44.5,-10.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4416
   type: CableApcExtension
   components:
@@ -45216,8 +44585,6 @@ entities:
     pos: 44.5,-9.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4417
   type: CableApcExtension
   components:
@@ -45226,8 +44593,6 @@ entities:
     pos: 45.5,-9.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4418
   type: CableApcExtension
   components:
@@ -45248,8 +44613,6 @@ entities:
     pos: 54.5,-12.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4420
   type: CableApcExtension
   components:
@@ -45258,8 +44621,6 @@ entities:
     pos: 54.5,-11.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4421
   type: CableApcExtension
   components:
@@ -45268,8 +44629,6 @@ entities:
     pos: 54.5,-10.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4422
   type: CableApcExtension
   components:
@@ -45278,8 +44637,6 @@ entities:
     pos: 54.5,-9.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4423
   type: CableApcExtension
   components:
@@ -45288,8 +44645,6 @@ entities:
     pos: 53.5,-9.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4424
   type: CableApcExtension
   components:
@@ -45310,8 +44665,6 @@ entities:
     pos: 51.5,-9.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4426
   type: CableApcExtension
   components:
@@ -45320,8 +44673,6 @@ entities:
     pos: 47.5,-9.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4427
   type: CableApcExtension
   components:
@@ -45366,8 +44717,6 @@ entities:
     pos: 49.5,-8.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4431
   type: CableApcExtension
   components:
@@ -45388,8 +44737,6 @@ entities:
     pos: 49.5,-6.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4433
   type: CableApcExtension
   components:
@@ -45398,8 +44745,6 @@ entities:
     pos: 48.5,-6.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4434
   type: CableApcExtension
   components:
@@ -45408,8 +44753,6 @@ entities:
     pos: 47.5,-6.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4435
   type: CableApcExtension
   components:
@@ -45418,8 +44761,6 @@ entities:
     pos: 47.5,-5.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4436
   type: CableApcExtension
   components:
@@ -45428,8 +44769,6 @@ entities:
     pos: 47.5,-4.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4437
   type: CableApcExtension
   components:
@@ -45498,8 +44837,6 @@ entities:
     pos: 45.5,-11.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4443
   type: CableHV
   components:
@@ -45532,8 +44869,6 @@ entities:
     pos: 46.5,-11.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4446
   type: CableHV
   components:
@@ -45542,8 +44877,6 @@ entities:
     pos: 47.5,-11.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4447
   type: CableHV
   components:
@@ -45612,8 +44945,6 @@ entities:
     pos: 51.5,-11.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4453
   type: CableHV
   components:
@@ -45622,8 +44953,6 @@ entities:
     pos: 52.5,-11.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4454
   type: CableHV
   components:
@@ -45632,8 +44961,6 @@ entities:
     pos: 53.5,-11.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4455
   type: CableHV
   components:
@@ -45678,8 +45005,6 @@ entities:
     pos: 49.5,-8.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4459
   type: CableHV
   components:
@@ -45700,8 +45025,6 @@ entities:
     pos: 49.5,-6.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4461
   type: CableHV
   components:
@@ -45710,8 +45033,6 @@ entities:
     pos: 48.5,-6.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4462
   type: CableHV
   components:
@@ -45720,8 +45041,6 @@ entities:
     pos: 47.5,-6.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4463
   type: CableHV
   components:
@@ -45730,8 +45049,6 @@ entities:
     pos: 47.5,-5.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4464
   type: CableHV
   components:
@@ -45740,8 +45057,6 @@ entities:
     pos: 47.5,-4.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4465
   type: CableHV
   components:
@@ -45750,8 +45065,6 @@ entities:
     pos: 47.5,-3.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4466
   type: CableHV
   components:
@@ -45760,8 +45073,6 @@ entities:
     pos: 47.5,-2.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4467
   type: CableHV
   components:
@@ -45770,8 +45081,6 @@ entities:
     pos: 48.5,-2.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4468
   type: CableHV
   components:
@@ -45780,8 +45089,6 @@ entities:
     pos: 48.5,-1.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4469
   type: CableHV
   components:
@@ -46001,8 +45308,6 @@ entities:
     pos: 45.5,-11.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4489
   type: CableMV
   components:
@@ -46023,8 +45328,6 @@ entities:
     pos: 53.5,-11.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4491
   type: CableMV
   components:
@@ -46033,8 +45336,6 @@ entities:
     pos: 52.5,-11.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4492
   type: CableMV
   components:
@@ -46043,8 +45344,6 @@ entities:
     pos: 51.5,-11.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4493
   type: CableMV
   components:
@@ -46053,8 +45352,6 @@ entities:
     pos: 51.5,-12.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4494
   type: CableMV
   components:
@@ -46063,8 +45360,6 @@ entities:
     pos: 46.5,-11.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4495
   type: CableMV
   components:
@@ -46073,8 +45368,6 @@ entities:
     pos: 47.5,-11.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4496
   type: CableMV
   components:
@@ -46083,8 +45376,6 @@ entities:
     pos: 47.5,-12.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4497
   type: CableMV
   components:
@@ -46093,8 +45384,6 @@ entities:
     pos: 47.5,-13.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4498
   type: CableMV
   components:
@@ -46103,8 +45392,6 @@ entities:
     pos: 49.5,-13.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4499
   type: CableMV
   components:
@@ -46113,8 +45400,6 @@ entities:
     pos: 48.5,-13.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4500
   type: CableMV
   components:
@@ -46123,8 +45408,6 @@ entities:
     pos: 50.5,-13.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4501
   type: CableMV
   components:
@@ -46133,8 +45416,6 @@ entities:
     pos: 51.5,-13.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4502
   type: CableMV
   components:
@@ -46143,8 +45424,6 @@ entities:
     pos: 49.5,-14.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4503
   type: CableMV
   components:
@@ -46153,8 +45432,6 @@ entities:
     pos: 49.5,-15.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4504
   type: CableMV
   components:
@@ -46163,8 +45440,6 @@ entities:
     pos: 49.5,-16.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4505
   type: CableMV
   components:
@@ -46173,8 +45448,6 @@ entities:
     pos: 49.5,-17.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4506
   type: CableMV
   components:
@@ -46183,8 +45456,6 @@ entities:
     pos: 48.5,-17.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4507
   type: CableMV
   components:
@@ -46193,8 +45464,6 @@ entities:
     pos: 47.5,-17.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4508
   type: CableMV
   components:
@@ -46203,8 +45472,6 @@ entities:
     pos: 46.5,-17.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4509
   type: CableMV
   components:
@@ -46213,8 +45480,6 @@ entities:
     pos: 45.5,-17.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4510
   type: CableMV
   components:
@@ -46223,8 +45488,6 @@ entities:
     pos: 50.5,-17.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4511
   type: CableMV
   components:
@@ -46233,8 +45496,6 @@ entities:
     pos: 51.5,-17.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4512
   type: CableMV
   components:
@@ -46243,8 +45504,6 @@ entities:
     pos: 52.5,-17.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4513
   type: CableMV
   components:
@@ -46253,8 +45512,6 @@ entities:
     pos: 53.5,-17.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4514
   type: CableMV
   components:
@@ -46263,8 +45520,6 @@ entities:
     pos: 54.5,-17.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4515
   type: CableMV
   components:
@@ -46273,8 +45528,6 @@ entities:
     pos: 55.5,-17.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4516
   type: CableMV
   components:
@@ -46283,8 +45536,6 @@ entities:
     pos: 56.5,-17.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4517
   type: CableMV
   components:
@@ -46293,8 +45544,6 @@ entities:
     pos: 56.5,-18.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4518
   type: CableMV
   components:
@@ -46303,8 +45552,6 @@ entities:
     pos: 56.5,-19.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4519
   type: CableMV
   components:
@@ -46313,8 +45560,6 @@ entities:
     pos: 56.5,-20.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4520
   type: CableMV
   components:
@@ -46323,8 +45568,6 @@ entities:
     pos: 56.5,-21.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4521
   type: CableMV
   components:
@@ -46333,8 +45576,6 @@ entities:
     pos: 56.5,-22.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4522
   type: CableMV
   components:
@@ -46343,8 +45584,6 @@ entities:
     pos: 56.5,-23.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4523
   type: CableMV
   components:
@@ -46353,8 +45592,6 @@ entities:
     pos: 56.5,-24.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4524
   type: CableMV
   components:
@@ -46363,8 +45600,6 @@ entities:
     pos: 56.5,-25.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4525
   type: CableMV
   components:
@@ -46373,8 +45608,6 @@ entities:
     pos: 56.5,-26.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4526
   type: CableMV
   components:
@@ -46383,8 +45616,6 @@ entities:
     pos: 56.5,-27.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4527
   type: CableMV
   components:
@@ -46393,8 +45624,6 @@ entities:
     pos: 56.5,-28.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4528
   type: CableMV
   components:
@@ -46403,8 +45632,6 @@ entities:
     pos: 56.5,-29.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4529
   type: CableMV
   components:
@@ -46413,8 +45640,6 @@ entities:
     pos: 56.5,-30.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4530
   type: CableMV
   components:
@@ -46423,8 +45648,6 @@ entities:
     pos: 56.5,-31.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4531
   type: CableMV
   components:
@@ -46433,8 +45656,6 @@ entities:
     pos: 55.5,-31.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4532
   type: CableMV
   components:
@@ -46443,8 +45664,6 @@ entities:
     pos: 54.5,-31.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4533
   type: CableMV
   components:
@@ -46453,8 +45672,6 @@ entities:
     pos: 53.5,-31.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4534
   type: CableMV
   components:
@@ -46463,8 +45680,6 @@ entities:
     pos: 52.5,-31.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4535
   type: CableMV
   components:
@@ -46473,8 +45688,6 @@ entities:
     pos: 51.5,-31.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4536
   type: CableMV
   components:
@@ -46483,8 +45696,6 @@ entities:
     pos: 50.5,-31.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4537
   type: CableMV
   components:
@@ -46493,8 +45704,6 @@ entities:
     pos: 49.5,-31.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4538
   type: CableMV
   components:
@@ -46503,8 +45712,6 @@ entities:
     pos: 48.5,-31.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4539
   type: CableMV
   components:
@@ -46513,8 +45720,6 @@ entities:
     pos: 47.5,-31.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4540
   type: CableMV
   components:
@@ -46523,8 +45728,6 @@ entities:
     pos: 46.5,-31.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4541
   type: CableMV
   components:
@@ -46533,8 +45736,6 @@ entities:
     pos: 45.5,-31.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4542
   type: CableMV
   components:
@@ -46543,8 +45744,6 @@ entities:
     pos: 44.5,-31.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4543
   type: CableMV
   components:
@@ -46553,8 +45752,6 @@ entities:
     pos: 43.5,-31.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4544
   type: CableMV
   components:
@@ -46563,8 +45760,6 @@ entities:
     pos: 42.5,-31.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4545
   type: CableMV
   components:
@@ -46573,8 +45768,6 @@ entities:
     pos: 42.5,-30.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4546
   type: CableMV
   components:
@@ -46583,8 +45776,6 @@ entities:
     pos: 42.5,-29.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4547
   type: CableMV
   components:
@@ -46593,8 +45784,6 @@ entities:
     pos: 42.5,-28.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4548
   type: CableMV
   components:
@@ -46603,8 +45792,6 @@ entities:
     pos: 42.5,-27.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4549
   type: CableMV
   components:
@@ -46613,8 +45800,6 @@ entities:
     pos: 42.5,-26.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4550
   type: CableMV
   components:
@@ -46623,8 +45808,6 @@ entities:
     pos: 42.5,-25.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4551
   type: CableMV
   components:
@@ -46633,8 +45816,6 @@ entities:
     pos: 42.5,-22.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4552
   type: CableMV
   components:
@@ -46643,8 +45824,6 @@ entities:
     pos: 42.5,-23.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4553
   type: CableMV
   components:
@@ -46653,8 +45832,6 @@ entities:
     pos: 42.5,-24.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4554
   type: CableMV
   components:
@@ -46663,8 +45840,6 @@ entities:
     pos: 42.5,-21.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4555
   type: CableMV
   components:
@@ -46673,8 +45848,6 @@ entities:
     pos: 42.5,-20.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4556
   type: CableMV
   components:
@@ -46683,8 +45856,6 @@ entities:
     pos: 42.5,-19.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4557
   type: CableMV
   components:
@@ -46693,8 +45864,6 @@ entities:
     pos: 42.5,-18.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4558
   type: CableMV
   components:
@@ -46703,8 +45872,6 @@ entities:
     pos: 42.5,-17.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4559
   type: CableMV
   components:
@@ -46713,8 +45880,6 @@ entities:
     pos: 43.5,-17.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4560
   type: CableMV
   components:
@@ -46723,8 +45888,6 @@ entities:
     pos: 44.5,-17.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4561
   type: ContainmentFieldGenerator
   components:
@@ -47269,8 +46432,6 @@ entities:
     pos: 46.5,-17.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4628
   type: CableHV
   components:
@@ -47279,8 +46440,6 @@ entities:
     pos: 47.5,-17.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4629
   type: CableHV
   components:
@@ -47289,8 +46448,6 @@ entities:
     pos: 48.5,-17.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4630
   type: CableHV
   components:
@@ -47299,8 +46456,6 @@ entities:
     pos: 49.5,-17.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4631
   type: CableHV
   components:
@@ -47309,8 +46464,6 @@ entities:
     pos: 50.5,-17.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4632
   type: CableHV
   components:
@@ -47319,8 +46472,6 @@ entities:
     pos: 51.5,-17.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4633
   type: CableHV
   components:
@@ -47329,8 +46480,6 @@ entities:
     pos: 52.5,-17.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4634
   type: CableHV
   components:
@@ -47339,8 +46488,6 @@ entities:
     pos: 53.5,-17.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4635
   type: CableHV
   components:
@@ -47349,8 +46496,6 @@ entities:
     pos: 45.5,-17.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4636
   type: CableHV
   components:
@@ -47359,8 +46504,6 @@ entities:
     pos: 44.5,-17.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4637
   type: CableHV
   components:
@@ -47369,8 +46512,6 @@ entities:
     pos: 43.5,-17.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4638
   type: CableHV
   components:
@@ -47379,8 +46520,6 @@ entities:
     pos: 42.5,-17.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4639
   type: CableHV
   components:
@@ -47389,8 +46528,6 @@ entities:
     pos: 54.5,-17.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4640
   type: CableHV
   components:
@@ -47399,8 +46536,6 @@ entities:
     pos: 55.5,-17.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4641
   type: CableHV
   components:
@@ -47409,8 +46544,6 @@ entities:
     pos: 56.5,-17.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4642
   type: CableHV
   components:
@@ -47419,8 +46552,6 @@ entities:
     pos: 57.5,-17.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4643
   type: CableHV
   components:
@@ -47429,8 +46560,6 @@ entities:
     pos: 58.5,-17.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4644
   type: CableHV
   components:
@@ -47439,8 +46568,6 @@ entities:
     pos: 58.5,-18.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4645
   type: CableHV
   components:
@@ -47449,8 +46576,6 @@ entities:
     pos: 58.5,-19.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4646
   type: CableHV
   components:
@@ -47459,8 +46584,6 @@ entities:
     pos: 58.5,-20.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4647
   type: CableHV
   components:
@@ -47469,8 +46592,6 @@ entities:
     pos: 58.5,-21.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4648
   type: CableHV
   components:
@@ -47479,8 +46600,6 @@ entities:
     pos: 58.5,-22.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4649
   type: CableHV
   components:
@@ -47489,8 +46608,6 @@ entities:
     pos: 57.5,-24.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4650
   type: CableHV
   components:
@@ -47499,8 +46616,6 @@ entities:
     pos: 58.5,-24.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4651
   type: CableHV
   components:
@@ -47509,8 +46624,6 @@ entities:
     pos: 58.5,-23.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4652
   type: CableHV
   components:
@@ -47519,8 +46632,6 @@ entities:
     pos: 41.5,-24.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4653
   type: CableHV
   components:
@@ -47529,8 +46640,6 @@ entities:
     pos: 40.5,-24.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4654
   type: CableHV
   components:
@@ -47539,8 +46648,6 @@ entities:
     pos: 40.5,-23.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4655
   type: CableHV
   components:
@@ -47549,8 +46656,6 @@ entities:
     pos: 40.5,-22.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4656
   type: CableHV
   components:
@@ -47559,8 +46664,6 @@ entities:
     pos: 40.5,-21.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4657
   type: CableHV
   components:
@@ -47569,8 +46672,6 @@ entities:
     pos: 40.5,-20.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4658
   type: CableHV
   components:
@@ -47579,8 +46680,6 @@ entities:
     pos: 40.5,-19.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4659
   type: CableHV
   components:
@@ -47589,8 +46688,6 @@ entities:
     pos: 40.5,-18.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4660
   type: CableHV
   components:
@@ -47599,8 +46696,6 @@ entities:
     pos: 40.5,-17.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4661
   type: CableHV
   components:
@@ -47609,8 +46704,6 @@ entities:
     pos: 41.5,-17.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4662
   type: CableHV
   components:
@@ -47619,8 +46712,6 @@ entities:
     pos: 42.5,-24.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4663
   type: CableHV
   components:
@@ -47629,8 +46720,6 @@ entities:
     pos: 42.5,-23.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4664
   type: CableHV
   components:
@@ -47639,8 +46728,6 @@ entities:
     pos: 42.5,-22.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4665
   type: CableHV
   components:
@@ -47649,8 +46736,6 @@ entities:
     pos: 42.5,-21.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4666
   type: CableHV
   components:
@@ -47659,8 +46744,6 @@ entities:
     pos: 42.5,-25.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4667
   type: CableHV
   components:
@@ -47669,8 +46752,6 @@ entities:
     pos: 42.5,-26.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4668
   type: CableHV
   components:
@@ -47679,8 +46760,6 @@ entities:
     pos: 42.5,-27.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4669
   type: CableHV
   components:
@@ -47689,8 +46768,6 @@ entities:
     pos: 56.5,-24.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4670
   type: CableHV
   components:
@@ -47699,8 +46776,6 @@ entities:
     pos: 56.5,-23.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4671
   type: CableHV
   components:
@@ -47709,8 +46784,6 @@ entities:
     pos: 56.5,-22.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4672
   type: CableHV
   components:
@@ -47719,8 +46792,6 @@ entities:
     pos: 56.5,-21.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4673
   type: CableHV
   components:
@@ -47729,8 +46800,6 @@ entities:
     pos: 56.5,-25.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4674
   type: CableHV
   components:
@@ -47739,8 +46808,6 @@ entities:
     pos: 56.5,-26.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4675
   type: CableHV
   components:
@@ -47749,8 +46816,6 @@ entities:
     pos: 56.5,-27.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4676
   type: CableHV
   components:
@@ -47759,8 +46824,6 @@ entities:
     pos: 49.5,-16.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4677
   type: CableHV
   components:
@@ -47769,8 +46832,6 @@ entities:
     pos: 49.5,-15.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4678
   type: CableHV
   components:
@@ -47779,8 +46840,6 @@ entities:
     pos: 49.5,-14.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4679
   type: CableHV
   components:
@@ -47789,8 +46848,6 @@ entities:
     pos: 49.5,-13.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4680
   type: Catwalk
   components:
@@ -47815,8 +46872,6 @@ entities:
     pos: 49.5,-31.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4683
   type: CableHV
   components:
@@ -47825,8 +46880,6 @@ entities:
     pos: 48.5,-31.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4684
   type: CableHV
   components:
@@ -47835,8 +46888,6 @@ entities:
     pos: 47.5,-31.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4685
   type: CableHV
   components:
@@ -47845,8 +46896,6 @@ entities:
     pos: 46.5,-31.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4686
   type: CableHV
   components:
@@ -47855,8 +46904,6 @@ entities:
     pos: 50.5,-31.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4687
   type: CableHV
   components:
@@ -47865,8 +46912,6 @@ entities:
     pos: 51.5,-31.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4688
   type: CableHV
   components:
@@ -47875,8 +46920,6 @@ entities:
     pos: 52.5,-31.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4689
   type: CableHV
   components:
@@ -47885,8 +46928,6 @@ entities:
     pos: 49.5,-32.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4690
   type: CableHV
   components:
@@ -47895,8 +46936,6 @@ entities:
     pos: 49.5,-33.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4691
   type: CableHV
   components:
@@ -47905,8 +46944,6 @@ entities:
     pos: 48.5,-33.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4692
   type: CableHV
   components:
@@ -47915,8 +46952,6 @@ entities:
     pos: 47.5,-33.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4693
   type: CableHV
   components:
@@ -47925,8 +46960,6 @@ entities:
     pos: 46.5,-33.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4694
   type: CableHV
   components:
@@ -47935,8 +46968,6 @@ entities:
     pos: 45.5,-33.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4695
   type: CableHV
   components:
@@ -47945,8 +46976,6 @@ entities:
     pos: 44.5,-33.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4696
   type: CableHV
   components:
@@ -47955,8 +46984,6 @@ entities:
     pos: 43.5,-33.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4697
   type: CableHV
   components:
@@ -47965,8 +46992,6 @@ entities:
     pos: 42.5,-33.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4698
   type: CableHV
   components:
@@ -47975,8 +47000,6 @@ entities:
     pos: 41.5,-33.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4699
   type: CableHV
   components:
@@ -47985,8 +47008,6 @@ entities:
     pos: 40.5,-33.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4700
   type: CableHV
   components:
@@ -47995,8 +47016,6 @@ entities:
     pos: 40.5,-32.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4701
   type: CableHV
   components:
@@ -48005,8 +47024,6 @@ entities:
     pos: 40.5,-31.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4702
   type: CableHV
   components:
@@ -48015,8 +47032,6 @@ entities:
     pos: 40.5,-30.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4703
   type: CableHV
   components:
@@ -48025,8 +47040,6 @@ entities:
     pos: 40.5,-29.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4704
   type: CableHV
   components:
@@ -48035,8 +47048,6 @@ entities:
     pos: 40.5,-28.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4705
   type: CableHV
   components:
@@ -48045,8 +47056,6 @@ entities:
     pos: 40.5,-27.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4706
   type: CableHV
   components:
@@ -48055,8 +47064,6 @@ entities:
     pos: 40.5,-26.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4707
   type: CableHV
   components:
@@ -48065,8 +47072,6 @@ entities:
     pos: 40.5,-25.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4708
   type: CableHV
   components:
@@ -48075,8 +47080,6 @@ entities:
     pos: 50.5,-33.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4709
   type: CableHV
   components:
@@ -48085,8 +47088,6 @@ entities:
     pos: 51.5,-33.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4710
   type: LowWall
   components:
@@ -48585,8 +47586,6 @@ entities:
     pos: 5.5,-25.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4772
   type: CableApcExtension
   components:
@@ -48672,8 +47671,6 @@ entities:
     pos: 5.5,-29.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4781
   type: CableApcExtension
   components:
@@ -48716,8 +47713,6 @@ entities:
     pos: 13.5,-23.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4785
   type: CableApcExtension
   components:
@@ -48834,8 +47829,6 @@ entities:
     pos: 12.5,-28.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4795
   type: CableApcExtension
   components:
@@ -48868,8 +47861,6 @@ entities:
     pos: 10.5,-29.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4798
   type: CableApcExtension
   components:
@@ -49693,8 +48684,6 @@ entities:
     pos: 12.5,20.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4891
   type: CableApcExtension
   components:
@@ -49866,8 +48855,7 @@ entities:
 - uid: 4909
   type: KitchenReagentGrinder
   components:
-  - anchored: True
-    pos: 18.5,1.5
+  - pos: 18.5,1.5
     parent: 853
     type: Transform
   - containers:
@@ -50232,4 +49220,11 @@ entities:
   - containers:
       light_bulb: !type:ContainerSlot {}
     type: ContainerContainer
+- uid: 4960
+  type: ChairPilotSeat
+  components:
+  - rot: 3.141592653589793 rad
+    pos: 2.5,31.5
+    parent: 853
+    type: Transform
 ...
diff --git a/Resources/Prototypes/Alerts/alerts.yml b/Resources/Prototypes/Alerts/alerts.yml
index 7729cc82a7..a4fbd86d5c 100644
--- a/Resources/Prototypes/Alerts/alerts.yml
+++ b/Resources/Prototypes/Alerts/alerts.yml
@@ -136,7 +136,7 @@
   alertType: PilotingShuttle
   category: Piloting
   onClick: !type:StopPiloting { }
-  icon: /Textures/Interface/Alerts/Buckle/buckled.png
+  icon: /Textures/Interface/Alerts/piloting.png
   name: Piloting Shuttle
   description: You are piloting a shuttle. Click the alert to stop.
 
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml b/Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml
index c34b5fefc8..1c33d1da13 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml
@@ -3,7 +3,7 @@
   id: AtmosphericsAir
   description: "Air canister"
   icon:
-    sprite: Constructible/Atmos/canister.rsi
+    sprite: Structures/Storage/canister.rsi
     state: grey
   product: AirCanister
   cost: 1000
@@ -15,7 +15,7 @@
   id: AtmosphericsOxygen
   description: "Oxygen canister"
   icon:
-    sprite: Constructible/Atmos/canister.rsi
+    sprite: Structures/Storage/canister.rsi
     state: blue
   product: OxygenCanister
   cost: 1000
@@ -27,7 +27,7 @@
   id: AtmosphericsNitrogen
   description: "Nitrogen canister"
   icon:
-    sprite: Constructible/Atmos/canister.rsi
+    sprite: Structures/Storage/canister.rsi
     state: red
   product: NitrogenCanister
   cost: 1000
@@ -39,7 +39,7 @@
   id: AtmosphericsCarbonDioxide
   description: "Carbon dioxide canister"
   icon:
-    sprite: Constructible/Atmos/canister.rsi
+    sprite: Structures/Storage/canister.rsi
     state: black
   product: CarbonDioxideCanister
   cost: 1000
@@ -51,7 +51,7 @@
   id: AtmosphericsWaterVapor
   description: "Water vapor canister"
   icon:
-    sprite: Constructible/Atmos/canister.rsi
+    sprite: Structures/Storage/canister.rsi
     state: water_vapor
   product: WaterVaporCanister
   cost: 1000
@@ -63,7 +63,7 @@
   id: AtmosphericsPlasma
   description: "Plasma canister"
   icon:
-    sprite: Constructible/Atmos/canister.rsi
+    sprite: Structures/Storage/canister.rsi
     state: orange
   product: PlasmaCanister
   cost: 2000
@@ -75,7 +75,7 @@
   id: AtmosphericsTritium
   description: "Tritium canister"
   icon:
-    sprite: Constructible/Atmos/canister.rsi
+    sprite: Structures/Storage/canister.rsi
     state: green
   product: TritiumCanister
   cost: 2000
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml b/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml
index 994e7b648f..957e91a4ab 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml
@@ -39,7 +39,7 @@
   id: EmergencyRadiation
   description: "Survive the Nuclear Apocalypse and Supermatter Engine alike with two sets of Radiation suits. Each set contains a helmet, suit, and Geiger counter. We'll even throw in a bottle of vodka and some glasses too, considering the life-expectancy of people who order this."
   icon:
-    sprite: Constructible/Misc/decals.rsi
+    sprite: Structures/Wallmounts/signs.rsi
     state: radiation
   product: CrateEmergencyRadiation
   cost: 1000
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml b/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml
index 301095d32e..4e7e91e85f 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml
@@ -27,7 +27,7 @@
   id: EngineAmeControl
   description: "The control unit of an antimatter reactor."
   icon:
-    sprite: Constructible/Power/ame_controller.rsi
+    sprite: Structures/Power/Generation/ame.rsi
     state: control
   product: CrateEngineeringAMEControl
   cost: 500
@@ -39,7 +39,7 @@
   id: EngineSingularityGenerator
   description: "Contains a singularity generator. The mother of the beast."
   icon:
-    sprite: Constructible/Power/Singularity/generator.rsi
+    sprite: Structures/Power/Generation/Singularity/generator.rsi
     state: icon
   product: CrateEngineeringSingularityGenerator
   cost: 4000
@@ -51,7 +51,7 @@
   id: EngineSingularityContainment
   description: "Contains a singularity containment field generator."
   icon:
-    sprite: Constructible/Power/Singularity/containment.rsi
+    sprite: Structures/Power/Generation/Singularity/containment.rsi
     state: icon
   product: CrateEngineeringSingularityContainment
   cost: 1000
@@ -63,7 +63,7 @@
   id: EngineSingularityEmitter
   description: "Contains an emitter. Used only for dangerous applications."
   icon:
-    sprite: Constructible/Power/Singularity/emitter.rsi
+    sprite: Structures/Power/Generation/Singularity/emitter.rsi
     state: emitter2
   product: CrateEngineeringSingularityEmitter
   cost: 1000
@@ -75,7 +75,7 @@
   id: EngineSingularityCollector
   description: "Contains a radiation collector. Safety first!"
   icon:
-    sprite: Constructible/Power/Singularity/collector.rsi
+    sprite: Structures/Power/Generation/Singularity/collector.rsi
     state: ca_on
   product: CrateEngineeringSingularityCollector
   cost: 1000
@@ -87,7 +87,7 @@
   id: EngineParticleAccelerator
   description: "Contains all the boards needed to construct a Particle Accelerator."
   icon:
-    sprite: Constructible/Specific/Engines/PA/control_box.rsi
+    sprite: Structures/Power/Generation/PA/control_box.rsi
     state: boxc
   product: CrateEngineeringParticleAccelerator
   cost: 10000
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml
index 67ea070156..1073a53069 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml
@@ -12,6 +12,10 @@
         amount: 2
       - id: TowercapSeeds
         amount: 2
+      - id: TobaccoSeeds
+        amount: 2
+      - id: CannabisSeeds
+        amount: 2
 #      - id: NettleSeeds
 #        amount: 2
 #      - id: RainbowBunchSeeds
diff --git a/Resources/Prototypes/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
index f67ff53d7c..ff9cbd744a 100644
--- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
@@ -20,8 +20,7 @@
   - type: StorageFill
     contents:
       - id: PowerDrill
-      - id: Wirecutter
-      - id: Crowbar
+      - id: JawsOfLife
       - id: WelderExperimental
       - id: Multitool
       - id: CableApcStack
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/biohazard.yml b/Resources/Prototypes/Catalog/Fills/Lockers/biohazard.yml
new file mode 100644
index 0000000000..b9a6ce5322
--- /dev/null
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/biohazard.yml
@@ -0,0 +1,24 @@
+# - type: entity
+#   id: ClosetL3Filled
+#   suffix: Filled, Generic
+#  parent: ClosetL3
+
+ - type: entity
+   id: ClosetL3VirologyFilled
+   suffix: Filled, Virology
+   parent: ClosetL3Virology
+
+ - type: entity
+   id: ClosetL3SecurityFilled
+   suffix: Filled, Security
+   parent: ClosetL3Security
+
+ - type: entity
+   id: ClosetL3JanitorFilled
+   suffix: Filled, Janitor
+   parent: ClosetL3Janitor
+
+# - type: entity
+#   id: ClosetL3ScienceFilled
+#   suffix: Filled, Science
+#  parent: ClosetL3Virology
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
index c44efffef7..ed6ab1f72e 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
@@ -1,6 +1,6 @@
 - type: entity
-  id: LockerToolFilled
-  parent: LockerTool
+  id: ClosetToolFilled
+  parent: ClosetTool
   suffix: Filled
   components:
   - type: StorageFill
@@ -93,6 +93,6 @@
         prob: 0.15
 
 - type: entity
-  id: LockerRadiationSuitFilled
-  parent: LockerRadiationSuit
+  id: ClosetRadiationSuitFilled
+  parent: ClosetRadiationSuit
   suffix: Filled
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/l3.yml b/Resources/Prototypes/Catalog/Fills/Lockers/l3.yml
deleted file mode 100644
index fdb7259d21..0000000000
--- a/Resources/Prototypes/Catalog/Fills/Lockers/l3.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-# - type: entity
-#   id: LockerL3Filled
-#   suffix: Filled, Generic
-#   parent: LockerL3
-
- - type: entity
-   id: LockerL3VirologyFilled
-   suffix: Filled, Virology
-   parent: LockerL3Virology
-
- - type: entity
-   id: LockerL3SecurityFilled
-   suffix: Filled, Security
-   parent: LockerL3Security
-
- - type: entity
-   id: LockerL3JanitorFilled
-   suffix: Filled, Janitor
-   parent: LockerL3Janitor
-
-# - type: entity
-#   id: LockerL3ScienceFilled
-#   suffix: Filled, Science
-#   parent: LockerL3Virology
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
index cc188f472d..78cb14b62b 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
@@ -4,8 +4,8 @@
 #   parent: LockerSyndicatePersonal
 
 - type: entity
-  id: LockerEmergencyFilledRandom
-  parent: LockerEmergency
+  id: ClosetEmergencyFilledRandom
+  parent: ClosetEmergency
   suffix: Filled, Random
   components:
   - type: StorageFill
@@ -22,8 +22,8 @@
         prob: 0.2
 
 - type: entity
-  id: LockerFireFilled
-  parent: LockerFire
+  id: ClosetFireFilled
+  parent: ClosetFire
   suffix: Filled
   components:
     - type: StorageFill
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
index 469c3113f8..28bbc7effa 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -68,8 +68,8 @@
 
 
 - type: entity
-  id: LockerBombFilled
-  parent: LockerBomb
+  id: ClosetBombFilled
+  parent: ClosetBomb
   suffix: Filled
   components:
   - type: StorageFill
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
index 7029d639f5..b753048f50 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
@@ -24,9 +24,9 @@
 #  parent: LockerFormal
 
 - type: entity
-  id: LockerChefFilled
+  id: ClosetChefFilled
   suffix: Filled
-  parent: LockerChef
+  parent: ClosetChef
   components:
   - type: StorageFill
     contents:
@@ -36,9 +36,9 @@
       - id: ReagentContainerFlour
 
 - type: entity
-  id: LockerJanitorFilled
+  id: ClosetJanitorFilled
   suffix: Filled
-  parent: LockerJanitor
+  parent: ClosetJanitor
   components:
   - type: StorageFill
     contents:
diff --git a/Resources/Prototypes/Catalog/Research/technologies.yml b/Resources/Prototypes/Catalog/Research/technologies.yml
index 2978056ac6..1c39d4178d 100644
--- a/Resources/Prototypes/Catalog/Research/technologies.yml
+++ b/Resources/Prototypes/Catalog/Research/technologies.yml
@@ -8,7 +8,7 @@
   id: BasicResearch
   description: Nanotrasen basic research technologies.
   icon:
-    sprite: Constructible/Power/server.rsi
+    sprite: Structures/Machines/server.rsi
     state: server-on
   requiredPoints: 2500
 
@@ -36,7 +36,7 @@
   id: BiologicalTechnology
   description: Investigations into the natural world.
   icon:
-    sprite: Constructible/Misc/potted_plants.rsi
+    sprite: Structures/Furniture/potted_plants.rsi
     state: applebush
   requiredPoints: 10000
   requiredTechnologies:
@@ -181,7 +181,7 @@
 #   id: DataTheory
 #   description: Just like regular data, but in space!
 #   icon:
-#     sprite: Constructible/Power/computers.rsi
+#     sprite: Structures/Machines/computers.rsi
 #     state: computer-datatheory
 #   requiredPoints: 10000
 #   requiredTechnologies:
@@ -194,7 +194,7 @@
   id: IndustrialEngineering
   description: A refresher course on modern engineering technology.
   icon:
-    sprite: Constructible/Power/protolathe.rsi
+    sprite: Structures/Machines/protolathe.rsi
     state: icon
   requiredPoints: 10000
   requiredTechnologies:
@@ -227,7 +227,7 @@
   id: ElectromagneticTheory
   description: Try not to fry yourself.
   icon:
-    sprite: Constructible/Power/apc.rsi
+    sprite: Structures/Power/apc.rsi
     state: apcewires
   requiredPoints: 10000
   requiredTechnologies:
diff --git a/Resources/Prototypes/Catalog/crayon_decals.yml b/Resources/Prototypes/Catalog/crayon_decals.yml
index b5f04bf6bc..f138f966a1 100644
--- a/Resources/Prototypes/Catalog/crayon_decals.yml
+++ b/Resources/Prototypes/Catalog/crayon_decals.yml
@@ -1,6 +1,6 @@
 - type: crayonDecal
   id: BaseDecals
-  spritePath: "Constructible/Misc/crayondecals.rsi"
+  spritePath: Effects/crayondecals.rsi
   decals:
     - 0
     - 1
diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
index 0de2b383f7..2d96685c81 100644
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -1,72 +1,167 @@
-- type: entity
-  parent: ClothingBeltBase
-  id: ClothingBeltAssault
-  name: assault belt
-  description: "A tactical assault belt."
-  components:
-  - type: Sprite
-    sprite: Clothing/Belt/assault.rsi
-  - type: Clothing
-    sprite: Clothing/Belt/assault.rsi
-  - type: Storage
-    capacity: 40
+# Belts that need/have visualizers
 
 - type: entity
   parent: ClothingBeltBase
-  id: ClothingBeltBandolier
-  name: bandolier
-  description: "A bandolier for holding shotgun ammunition."
+  id: ClothingBeltUtility
+  name: utility belt
+  description: Can hold various things.
   components:
   - type: Sprite
-    sprite: Clothing/Belt/bandolier.rsi
+    sprite: Clothing/Belt/utility.rsi
   - type: Clothing
-    sprite: Clothing/Belt/bandolier.rsi
+    sprite: Clothing/Belt/utility.rsi
   - type: Storage
     capacity: 40
+    # TODO: Fill this out more.
+    # whitelist:
+    #   tags:
+    #     - Wirecutter
+    #     - Crowbar
+    #     - CrowbarRed
+    #     - Screwdriver
+    #     - Flashlight
+    #     - Welder
+    #     - Wrench
+    #     - Painter
+    #     - GeigerCounter
+    #     - Flare
+    #     - Coilsofwire
+    #     -
+    #     -
+    #   components:
+    #     - SignalLinker
+  - type: ItemCounter
+    mapLayers:
+      cutters_red:
+        whitelist:
+          tags:
+          - Wirecutter
+      crowbar:
+        whitelist:
+          tags:
+          - Crowbar
+      crowbar_red:
+        whitelist:
+          tags:
+          - CrowbarRed
+      screwdriver_nuke:
+        whitelist:
+          tags:
+          - Screwdriver
+      wrench:
+        whitelist:
+          tags:
+          - Wrench
+      multitool:
+        whitelist:
+          components:
+          - SignalLinker
+  - type: Appearance
+    visuals:
+    - type: MappedItemVisualizer
+      sprite: Clothing/Belt/belt_overlay.rsi
 
 - type: entity
   parent: ClothingBeltBase
   id: ClothingBeltChiefEngineer
-  name:  chief's toolbelt
-  description: "Holds tools, looks snazzy."
+  name: chief's toolbelt
+  description: Holds tools, looks snazzy.
   components:
   - type: Sprite
     sprite: Clothing/Belt/ce.rsi
   - type: Clothing
     sprite: Clothing/Belt/ce.rsi
   - type: Storage
+    # TODO: Fill this out more.
+    # whitelist:
+    #   tags:
+    #     - Wirecutter
+    #     - Crowbar
+    #     - CrowbarRed
+    #     - Screwdriver
+    #     - Flashlight
+    #     - Welder
+    #     - Wrench
+    #     - Painter
+    #     - GeigerCounter
+    #     - Flare
+    #     - Coilsofwire
+    #     -
+    #     -
+    #   components:
+    #     - SignalLinker
     capacity: 100
+  - type: ItemCounter
+    mapLayers:
+      drill:
+        whitelist:
+          tags:
+          - Powerdrill
+      cutters_red:
+        whitelist:
+          tags:
+          - Wirecutter
+      crowbar:
+        whitelist:
+          tags:
+          - Crowbar
+      crowbar_red:
+        whitelist:
+          tags:
+          - CrowbarRed
+      jaws:
+        whitelist:
+          tags:
+          - JawsOfLife
+      screwdriver_nuke:
+        whitelist:
+          tags:
+          - Screwdriver
+      multitool:
+        whitelist:
+          components:
+          - SignalLinker
+      wrench:
+        whitelist:
+          tags:
+          - Wrench
+  - type: Appearance
+    visuals:
+    - type: MappedItemVisualizer
+      sprite: Clothing/Belt/belt_overlay.rsi
 
 - type: entity
   parent: ClothingBeltBase
-  id: ClothingBeltChampion
-  name:  championship belt
-  description: "Proves to the world that you are the strongest!"
+  id: ClothingBeltAssault
+  name: assault belt
+  description: A tactical assault belt.
   components:
   - type: Sprite
-    sprite: Clothing/Belt/champion.rsi
+    sprite: Clothing/Belt/assault.rsi
   - type: Clothing
-    sprite: Clothing/Belt/champion.rsi
-    QuickEquip: true
-
-- type: entity
-  parent: ClothingBeltBase
-  id: ClothingBeltHolster
-  name:  shoulder holster
-  description: "A holster to carry a handgun and ammo. WARNING: Badasses only."
-  components:
-  - type: Sprite
-    sprite: Clothing/Belt/holster.rsi
-  - type: Clothing
-    sprite: Clothing/Belt/holster.rsi
+    sprite: Clothing/Belt/assault.rsi
   - type: Storage
-    capacity: 20
+    capacity: 40
+  - type: ItemCounter
+    mapLayers:
+      flashbang:
+        whitelist:
+          components:
+          - FlashOnTrigger
+      stunbaton:
+        whitelist:
+          components:
+          - Stunbaton
+  - type: Appearance
+    visuals:
+    - type: MappedItemVisualizer
+      sprite: Clothing/Belt/belt_overlay.rsi
 
 - type: entity
   parent: ClothingBeltBase
   id: ClothingBeltJanitor
-  name:  janibelt
-  description: "A belt used to hold most janitorial supplies."
+  name: janibelt
+  description: A belt used to hold most janitorial supplies.
   components:
   - type: Sprite
     sprite: Clothing/Belt/janitor.rsi
@@ -74,12 +169,26 @@
     sprite: Clothing/Belt/janitor.rsi
   - type: Storage
     capacity: 40
+  - type: ItemCounter
+    mapLayers:
+      bottle:
+        whitelist:
+          tags:
+          - Bottle
+      bottle_spray:
+        whitelist:
+          tags:
+          - Spray
+  - type: Appearance
+    visuals:
+    - type: MappedItemVisualizer
+      sprite: Clothing/Belt/belt_overlay.rsi
 
 - type: entity
   parent: ClothingBeltBase
   id: ClothingBeltMedical
-  name:  medical belt
-  description: "Can hold various medical equipment."
+  name: medical belt
+  description: Can hold various medical equipment.
   components:
   - type: Sprite
     sprite: Clothing/Belt/medical.rsi
@@ -87,12 +196,99 @@
     sprite: Clothing/Belt/medical.rsi
   - type: Storage
     capacity: 40
+  - type: ItemCounter
+    mapLayers:
+      bottle:
+        whitelist:
+          tags:
+          - Bottle
+      hypo:
+        whitelist:
+          components:
+          - Hypospray
+      pill:
+        whitelist:
+          components:
+          - Pill
+      bottle_spray:
+        whitelist:
+          tags:
+          - Spray
+      # spray_med:
+      #   whitelist:
+      #     tags:
+      #     - SprayMedical
+      # wrench_medical:
+      #   whitelist:
+      #     tags:
+      #     - WrenchMedical
+      wrench:
+        whitelist:
+          tags:
+          - Wrench
+  - type: Appearance
+    visuals:
+    - type: MappedItemVisualizer
+      sprite: Clothing/Belt/belt_overlay.rsi
+
+- type: entity
+  parent: ClothingBeltBase
+  id: ClothingBeltPlant
+  name: botanical belt
+  description: A belt used to hold most hydroponics supplies. Suprisingly, not green.
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/plant.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/plant.rsi
+  - type: Storage
+    # whitelist:
+    #   tags:
+    #     - BotanyHoe
+    #     - PlantAnalyzer
+    #     - BotanyHoe
+    #     - BotanyShovel
+    #     - PlantBGone
+    #     - Bottle
+    #   components:
+    #     - Seed
+    capacity: 40
+  - type: ItemCounter
+    mapLayers:
+      hatchet:
+        whitelist:
+          tags:
+          - BotanyHatchet
+      hydro:
+        whitelist:
+          tags:
+          - PlantAnalyzer # Dunno what to put here, should be aight.
+      hoe:
+        whitelist:
+          tags:
+          - BotanyHoe
+      secateurs: # We don't have secateurs and this looks similar enough.
+        whitelist:
+          tags:
+          - BotanyShovel
+      plantbgone:
+        whitelist:
+          tags:
+          - PlantBGone
+      bottle:
+        whitelist:
+          tags:
+          - Bottle
+  - type: Appearance
+    visuals:
+    - type: MappedItemVisualizer
+      sprite: Clothing/Belt/belt_overlay.rsi
 
 - type: entity
   parent: ClothingBeltBase
   id: ClothingBeltSecurity
-  name:  security belt
-  description: "Can hold security gear like handcuffs and flashes."
+  name: security belt
+  description: Can hold security gear like handcuffs and flashes.
   components:
   - type: Sprite
     sprite: Clothing/Belt/security.rsi
@@ -100,38 +296,26 @@
     sprite: Clothing/Belt/security.rsi
   - type: Storage
     capacity: 40
-
-- type: entity
-  parent: ClothingBeltBase
-  id: ClothingBeltSecurityWebbing
-  name:  security webbing
-  description: "Unique and versatile chest rig, can hold security gear."
-  components:
-  - type: Sprite
-    sprite: Clothing/Belt/securitywebbing.rsi
-  - type: Clothing
-    sprite: Clothing/Belt/securitywebbing.rsi
-  - type: Storage
-    capacity: 40
-
-- type: entity
-  parent: ClothingBeltBase
-  id: ClothingBeltMilitaryWebbing
-  name:  chest rig
-  description: "A set of tactical webbing worn by Syndicate boarding parties."
-  components:
-  - type: Sprite
-    sprite: Clothing/Belt/militarywebbing.rsi
-  - type: Clothing
-    sprite: Clothing/Belt/militarywebbing.rsi
-  - type: Storage
-    capacity: 40
+  - type: ItemCounter
+    mapLayers:
+      flashbang:
+        whitelist:
+          components:
+          - FlashOnTrigger
+      stunbaton:
+        whitelist:
+          components:
+          - Stunbaton
+  - type: Appearance
+    visuals:
+    - type: MappedItemVisualizer
+      sprite: Clothing/Belt/belt_overlay.rsi
 
 - type: entity
   parent: ClothingBeltBase
   id: ClothingBeltSheath
-  name:  sabre sheath
-  description: "An ornate sheath designed to hold an officer's blade."
+  name: sabre sheath
+  description: An ornate sheath designed to hold an officer's blade.
   components:
   - type: Sprite
     sprite: Clothing/Belt/sheath.rsi
@@ -143,12 +327,87 @@
   - type: StorageFill
     contents:
       - id: CaptainSabre
+  - type: ItemCounter
+    mapLayers:
+      sheath-sabre:
+        whitelist:
+          tags:
+          - CaptainSabre
+  - type: Appearance
+    visuals:
+    - type: MappedItemVisualizer
+
+# Belts without visualizers
+
+- type: entity
+  parent: ClothingBeltBase
+  id: ClothingBeltBandolier
+  name: bandolier
+  description: A bandolier for holding shotgun ammunition.
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/bandolier.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/bandolier.rsi
+  - type: Storage
+    capacity: 40
+
+- type: entity
+  parent: ClothingBeltBase
+  id: ClothingBeltChampion
+  name: championship belt
+  description: Proves to the world that you are the strongest!
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/champion.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/champion.rsi
+    QuickEquip: true
+
+- type: entity
+  parent: ClothingBeltBase
+  id: ClothingBeltHolster
+  name: shoulder holster
+  description: 'A holster to carry a handgun and ammo. WARNING: Badasses only.'
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/holster.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/holster.rsi
+  - type: Storage
+    capacity: 20
+
+- type: entity
+  parent: ClothingBeltBase
+  id: ClothingBeltSecurityWebbing
+  name: security webbing
+  description: Unique and versatile chest rig, can hold security gear.
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/securitywebbing.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/securitywebbing.rsi
+  - type: Storage
+    capacity: 40
+
+- type: entity
+  parent: ClothingBeltBase
+  id: ClothingBeltMilitaryWebbing
+  name: chest rig
+  description: A set of tactical webbing worn by Syndicate boarding parties.
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/militarywebbing.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/militarywebbing.rsi
+  - type: Storage
+    capacity: 40
 
 - type: entity
   parent: ClothingBeltBase
   id: ClothingBeltSuspenders
   name: suspenders
-  description: "For holding your pants up."
+  description: For holding your pants up.
   components:
   - type: Sprite
     sprite: Clothing/Belt/suspenders.rsi
@@ -156,16 +415,3 @@
   - type: Clothing
     sprite: Clothing/Belt/suspenders.rsi
     QuickEquip: true
-
-- type: entity
-  parent: ClothingBeltBase
-  id: ClothingBeltUtility
-  name: utility belt
-  description: "Can hold various things."
-  components:
-  - type: Sprite
-    sprite: Clothing/Belt/utility.rsi
-  - type: Clothing
-    sprite: Clothing/Belt/utility.rsi
-  - type: Storage
-    capacity: 40
diff --git a/Resources/Prototypes/Entities/Clothing/clothing_base.yml b/Resources/Prototypes/Entities/Clothing/clothing_base.yml
index d5dac994e8..b8b2438ec1 100644
--- a/Resources/Prototypes/Entities/Clothing/clothing_base.yml
+++ b/Resources/Prototypes/Entities/Clothing/clothing_base.yml
@@ -3,5 +3,7 @@
   parent: BaseItem
   id: Clothing
   components:
+  - type: Sprite
+    netsync: false
   - type: Clothing
     size: 5
diff --git a/Resources/Prototypes/Entities/Constructible/Furniture/pilot_chair.yml b/Resources/Prototypes/Entities/Constructible/Furniture/pilot_chair.yml
deleted file mode 100644
index 448f0889cf..0000000000
--- a/Resources/Prototypes/Entities/Constructible/Furniture/pilot_chair.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-- type: entity
-  id: PilotSeatChair
-  parent: BaseConstructible
-  name: pilot seat
-  description: The pilot seat of a prestigious battle cruiser.
-  components:
-  - type: Sprite
-    sprite: Constructible/Misc/furniture.rsi
-    state: shuttle_chair
-  - type: Physics
-    bodyType: Static
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.5,-0.25,0.5,0.25"
-      mask:
-      - Impassable
-      - VaultImpassable
-      - SmallImpassable
-  - type: InteractionOutline
-  - type: Damageable
-    resistances: metallicResistances
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 100
-      behaviors:
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-  - type: ShuttleController
-  - type: Strap
-    position: Stand
diff --git a/Resources/Prototypes/Entities/Constructible/Power/Engines/AME/shielding.yml b/Resources/Prototypes/Entities/Constructible/Power/Engines/AME/shielding.yml
deleted file mode 100644
index c0bcc8e5e4..0000000000
--- a/Resources/Prototypes/Entities/Constructible/Power/Engines/AME/shielding.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-- type: entity
-  id: AMEShielding
-  name: AME shielding
-  description: Keeps the antimatter in and the matter out.
-  placement:
-    mode: SnapgridCenter
-  components:
-  - type: Clickable
-  - type: InteractionOutline
-  - type: Sprite
-    drawdepth: Walls
-    sprite: Constructible/Power/ame_shielding.rsi
-    state: shield_0
-  - type: Physics
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb {}
-      layer:
-      - Opaque
-      - Impassable
-      - MobImpassable
-      - VaultImpassable
-      - SmallImpassable
-  - type: Damageable
-    resistances: metallicResistances
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 100
-      behaviors:
-      - !type:SpawnEntitiesBehavior
-        spawn:
-          SheetSteel1:
-            min: 1
-            max: 2
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-  - type: SnapGrid
-  - type: IconSmooth
-    mode: CardinalFlags
-    base: shield_
-    key: ame_shield
-  - type: AMEShield
-  - type: NodeContainer
-    nodes:
-      ame:
-        !type:AdjacentNode
-        nodeGroupID: AMEngine
-  - type: PointLight
-    enabled: false
-    radius: 5
-    energy: 0.5
-    color: "#00AAFF"
-  - type: Appearance
-    visuals:
-    - type: AMEVisualizer
diff --git a/Resources/Prototypes/Entities/Constructible/Power/cargo_console.yml b/Resources/Prototypes/Entities/Constructible/Power/cargo_console.yml
deleted file mode 100644
index fbbd73a9e1..0000000000
--- a/Resources/Prototypes/Entities/Constructible/Power/cargo_console.yml
+++ /dev/null
@@ -1,81 +0,0 @@
-- type: entity
-  id: ComputerSupplyOrdering
-  parent: ComputerBase
-  name: Cargo ordering computer
-  description: Used to order supplies, approve requests, and control the shuttle.
-  components:
-  - type: Appearance
-    visuals:
-    - type: ComputerVisualizer
-      key: tech_key
-      screen: supply
-  - type: CargoConsole
-  - type: CargoOrderDatabase
-  - type: GalacticMarket
-    products:
-      - EmergencyExplosive
-      - EmergencyFire
-      - EmergencyInternals
-      - EmergencyRadiation
-      - ArmorySmg
-      - ArmoryShotgun
-      - SecurityArmor
-      - SecurityRiot
-      - SecurityLaser
-      - SecurityHelmet
-      - SecuritySupplies
-      - SecurityNonLethal
-      - HydroponicsTools
-      - HydroponicsSeeds
-      - HydroponicsSeedsExotic
-      - ServiceJanitorial
-      - ServiceLightsReplacement
-      - EngineeringCableLv
-      - EngineeringCableMv
-      - EngineeringCableHv
-      - EngineeringCableBulk
-      - EngineAmeShielding
-      - EngineAmeJar
-      - EngineAmeControl
-      - EngineSolar
-      - FunPlushies
-      - FunArtSupplies
-      - FunInstruments
-      - MaterialSteel
-      - MaterialGlass
-      - MaterialPlastic
-      - MaterialPlasteel
-      - EngineSingularityEmitter
-      - EngineSingularityCollector
-      - EngineSingularityGenerator
-      - EngineSingularityContainment
-      - EngineParticleAccelerator
-      - AtmosphericsAir
-      - AtmosphericsOxygen
-      - AtmosphericsNitrogen
-      - AtmosphericsCarbonDioxide
-#      - AtmosphericsWaterVapor
-#      - AtmosphericsPlasma
-#      - AtmosphericsTritium
-  - type: UserInterface
-    interfaces:
-    - key: enum.CargoConsoleUiKey.Key
-      type: CargoConsoleBoundUserInterface
-  - type: Computer
-    board: SupplyComputerCircuitboard
-
-- type: entity
-  id: ComputerSupplyRequest
-  parent: ComputerSupplyOrdering
-  name: cargo request computer
-  description: Used to request supplies from cargo.
-  components:
-  - type: Appearance
-    visuals:
-    - type: ComputerVisualizer
-      key: tech_key
-      screen: request
-  - type: CargoConsole
-    requestOnly: true
-  - type: Computer
-    board: SupplyRequestComputerCircuitboard
diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Conveyor/twoWayLever.yml b/Resources/Prototypes/Entities/Constructible/Specific/Conveyor/twoWayLever.yml
deleted file mode 100644
index 9486116d8a..0000000000
--- a/Resources/Prototypes/Entities/Constructible/Specific/Conveyor/twoWayLever.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-- type: entity
-  id: TwoWayLever
-  name: two way switch
-  description: A two way switch.
-  components:
-    - type: Clickable
-    - type: InteractionOutline
-    - type: Sprite
-      netsync: false
-      sprite: Constructible/Power/conveyor.rsi
-      state: switch-off
-    - type: TwoWayLever
-    - type: Appearance
-      visuals:
-        - type: TwoWayLeverVisualizer
-          state_forward: switch-fwd
-          state_off: switch-off
-          state_reversed: switch-rev
-    - type: Construction
-      graph: leverGraph
-      node: lever
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/bar.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/bar.yml
deleted file mode 100644
index 9eb47b1d76..0000000000
--- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/bar.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-- type: entity
-  id: LockerBooze
-  parent: LockerSecureBase
-  name: "booze storage"
-  description: This is where the bartender keeps the booze.
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: cabinet
-  - type: AccessReader
-    access: [["Bar"]]
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/cargo.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/cargo.yml
deleted file mode 100644
index 17ca50c7dc..0000000000
--- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/cargo.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-- type: entity
-  id: LockerQuarterMaster
-  parent: LockerSecureBase
-  name: "quartermaster's locker"
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: qm
-  - type: AccessReader
-    access: [["Cargo"]] # TODO access [["Quartermaster"]]
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/command.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/command.yml
deleted file mode 100644
index 8f0d58f3ff..0000000000
--- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/command.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-- type: entity
-  id: LockerCaptain
-  parent: LockerSecureBase
-  name: "captain's locker"
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: cap
-  - type: AccessReader
-    access: [["Captain"]]
-
-- type: entity
-  id: LockerHeadOfPersonnel
-  parent: LockerSecureBase
-  name: "head of personnel's locker"
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: hop
-  - type: AccessReader
-    access: [["HeadOfPersonnel"]]
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/engineering.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/engineering.yml
deleted file mode 100644
index dfa5745b63..0000000000
--- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/engineering.yml
+++ /dev/null
@@ -1,66 +0,0 @@
-# CE
-- type: entity
-  id: LockerChiefEngineer
-  parent: LockerSecureBase
-  name: "chief engineer's locker"
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: ce
-  - type: AccessReader
-    access: [ [ "Engineering", "Command" ] ]
-
-# Electrical supplies
-- type: entity
-  id: LockerElectricalSupplies
-  parent: LockerSecureBase
-  name: "electrical supplies locker"
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: eng
-      state_closed: eng_elec_door
-  - type: AccessReader
-    access: [ [ "Engineering" ] ]
-
-# Welding supplies
-- type: entity
-  id: LockerWeldingSupplies
-  parent: LockerSecureBase
-  name: "welding supplies locker"
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: eng
-      state_closed: eng_weld_door
-  - type: AccessReader
-    access: [ [ "Engineering" ] ]
-
-# Atmos tech
-- type: entity
-  id: LockerAtmospherics
-  parent: LockerSecureBase
-  name: "atmospheric technician's locker"
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: atmos
-  - type: AccessReader
-    access: [ [ "Engineering" ] ]
-
-# Engineer
-- type: entity
-  id: LockerEngineer
-  parent: LockerSecureBase
-  name: "engineer's locker"
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: eng_secure
-  - type: AccessReader
-    access: [ [ "Engineering" ] ]
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/freezer.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/freezer.yml
deleted file mode 100644
index 743fc560d7..0000000000
--- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/freezer.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-- type: entity
-  id: LockerFreezer
-  parent: LockerSecureBase
-  name: "freezer"
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: freezer
-  - type: AccessReader
-    access: [ [ "Service" ] ]
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/hydroponics.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/hydroponics.yml
deleted file mode 100644
index 24e5a50fc7..0000000000
--- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/hydroponics.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-- type: entity
-  id: LockerBotanist
-  parent: LockerSecureBase
-  name: "botanist's locker"
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: hydro
-  - type: AccessReader
-    access: [ [ "Service" ] ]
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/medical.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/medical.yml
deleted file mode 100644
index da1b9081a1..0000000000
--- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/medical.yml
+++ /dev/null
@@ -1,53 +0,0 @@
-# Medicine
-- type: entity
-  id: LockerMedicine
-  parent: LockerSecureBase
-  name: "medicine locker"
-  description: "Filled to the brim with medical junk."
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: med
-  - type: AccessReader
-    access: [ [ "Medical" ] ]
-
-# Medical doctor
-- type: entity
-  id: LockerMedical
-  parent: LockerSecureBase
-  name: "medical doctor's locker"
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: med_secure
-  - type: AccessReader
-    access: [ [ "Medical" ] ]
-
-# Chemical
-- type: entity
-  id: LockerChemistry
-  parent: LockerSecureBase
-  name: "chemical closet"
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: med
-      state_closed: chemical_door
-  - type: AccessReader
-    access: [ [ "Medical" ] ]
-
-# CMO
-- type: entity
-  id: LockerChiefMedicalOfficer
-  parent: LockerSecureBase
-  name: "chief medical officer's locker"
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: cmo
-  - type: AccessReader
-    access: [ [ "Medical", "Command" ] ]
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/scientist.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/scientist.yml
deleted file mode 100644
index 1130a31566..0000000000
--- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/scientist.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-- type: entity
-  id: LockerResearchDirector
-  parent: LockerSecureBase
-  name: "research director's locker"
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: rd
-  - type: AccessReader
-    access: [ [ "Research", "Command" ] ]
-
-- type: entity
-  id: LockerScientist
-  parent: LockerSecureBase
-  name: "scientist's locker"
-  components:
-    - type: Appearance
-      visuals:
-        - type: StorageVisualizer
-          state: science
-    - type: AccessReader
-      access: [ [ "Research" ] ]
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/security.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/security.yml
deleted file mode 100644
index 902066a865..0000000000
--- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/security.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-# HoS
-- type: entity
-  id: LockerHeadOfSecurity
-  parent: LockerSecureBase
-  name: "head of security's locker"
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: hos
-  - type: AccessReader
-    access: [["Security", "Command"]]
-
-# Warden
-- type: entity
-  id: LockerWarden
-  parent: LockerSecureBase
-  name: "warden's locker"
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: warden
-  - type: AccessReader
-    access: [["Security"]] # TODO access [["Brig"]]
-
-# Security Officer
-- type: entity
-  id: LockerSecurity
-  parent: LockerSecureBase
-  name: "security officer's locker"
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: sec
-  - type: AccessReader
-    access: [["Security"]]
-
-# Detective
-- type: entity
-  id: LockerDetective
-  parent: LockerSecureBase
-  name: "detective's cabinet"
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: cabinet
-  - type: AccessReader
-    access: [["Service"]] # TODO access [["Detective"]]
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/cursed.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/cursed.yml
deleted file mode 100644
index b82c8d68df..0000000000
--- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/cursed.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-- type: entity
-  id: LockerCursed
-  parent: LockerGeneric
-  name: "closet"
-  suffix: "cursed"
-  description: "A standard-issue Nanotrasen storage unit."
-  components:
-  - type: CursedEntityStorage
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/job_closests.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/job_closests.yml
deleted file mode 100644
index 9d6e2c76eb..0000000000
--- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/job_closests.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-# Security wardrobe
-- type: entity
-  id: WardrobeSecurity
-  parent: WardrobeBase
-  name: "security wardrobe"
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: generic
-      state_closed: red_door
-
-# Atmospherics wardrobe
-- type: entity
-  id: WardrobeAtmospherics
-  parent: WardrobeBase
-  name: "atmospherics wardrobe"
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: generic
-      state_closed: atmos_wardrobe_door
-
-# Janitor locker (moved here from the Fills group because it was being misused)
-- type: entity
-  id: LockerJanitor
-  parent: WardrobeMixed
-  name: "custodial closet"
-  description: "It's a storage unit for janitorial clothes and gear."
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/l3closet.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/l3closet.yml
deleted file mode 100644
index 728f993bd5..0000000000
--- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/l3closet.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-# Base level 3 bio hazard closet
-- type: entity
-  id: LockerL3
-  parent: LockerGeneric
-  name: "level 3 biohazard gear closet"
-  description: "It's a storage unit for level 3 biohazard gear."
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: bio
-
-# Virology variant
-- type: entity
-  id: LockerL3Virology
-  parent: LockerL3
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: bio_viro
-
-# Security variant
-- type: entity
-  id: LockerL3Security
-  parent: LockerL3
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: bio_sec
-
-# Janitor variant
-- type: entity
-  id: LockerL3Janitor
-  parent: LockerL3
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: bio_jan
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/name_variants.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/name_variants.yml
deleted file mode 100644
index a0aef85851..0000000000
--- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/name_variants.yml
+++ /dev/null
@@ -1,73 +0,0 @@
-- type: entity
-  id: LockerFormal
-  parent: WardrobeBlack
-  name: "formal closet"
-  description: "It's a storage unit for formal clothing."
-
-- type: entity
-  id: LockerChef
-  parent: WardrobeBlack
-  name: "chef's closet"
-  description: "It's a storage unit for foodservice garments and mouse traps."
-
-- type: entity
-  id: WardrobeChapel
-  parent: WardrobeBlack
-  name: "chaplain's wardrobe"
-  description: "It's a storage unit for Nanotrasen-approved religious attire."
-
-- type: entity
-  id: LockerLegal
-  parent: WardrobeBlue
-  name: "legal closet"
-  description: "It's a storage unit for courtroom apparel and items."
-
-- type: entity
-  id: WardrobeCargo
-  parent: WardrobePrison
-  name: "cargo wardrobe"
-
-- type: entity
-  id: WardrobeEngineering
-  parent: WardrobeYellow
-  name: "engineering wardrobe"
-
-- type: entity
-  id: WardrobeMedicalDoctor
-  parent: WardrobeWhite
-  name: "medical doctor's wardrobe"
-
-- type: entity
-  id: WardrobeRobotics
-  parent: WardrobeBlack
-  name: "robotics wardrobe"
-
-- type: entity
-  id: WardrobeChemistry
-  parent: WardrobeWhite
-  name: "chemistry wardrobe"
-
-- type: entity
-  id: WardrobeGenetics
-  parent: WardrobeWhite
-  name: "genetics wardrobe"
-
-- type: entity
-  id: WardrobeVirology
-  parent: WardrobeWhite
-  name: "virology wardrobe"
-
-- type: entity
-  id: WardrobeScience
-  parent: WardrobeWhite
-  name: "science wardrobe"
-
-- type: entity
-  id: WardrobeBotanist
-  parent: WardrobeGreen
-  name: "botanist wardrobe"
-
-- type: entity
-  id: LockerSyndicatePersonal
-  parent: LockerSyndicateBase
-  description: "It's a personal storage unit for operative gear."
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/syndicate.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/syndicate.yml
deleted file mode 100644
index c1cedf590b..0000000000
--- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/syndicate.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-# Base syndicate closet
-- type: entity
-  id: LockerSyndicateBase
-  name: armory closet
-  parent: LockerGeneric
-  abstract: true
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: syndicate
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/utility_closets.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/utility_closets.yml
deleted file mode 100644
index 26d56a871e..0000000000
--- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/utility_closets.yml
+++ /dev/null
@@ -1,61 +0,0 @@
-# Tool closet
-- type: entity
-  id: LockerTool
-  name: tool closet
-  parent: LockerGeneric
-  description: "It's a storage unit for tools."
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: eng
-      state_closed: eng_tool_door
-
-# Radiation suit closet
-- type: entity
-  id: LockerRadiationSuit
-  name: radiation suit closet
-  parent: LockerGeneric
-  description: "It's a storage unit for rad-protective suits."
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: eng
-      state_closed: eng_rad_door
-
-# Emergency closet
-- type: entity
-  id: LockerEmergency
-  name: emergency closet
-  parent: LockerGeneric
-  description: "It's a storage unit for emergency breath masks and O2 tanks."
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: emergency
-
-# Fire safety closet
-- type: entity
-  id: LockerFire
-  name: fire-safety closet
-  parent: LockerGeneric
-  description: "It's a storage unit for fire-fighting supplies."
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: fire
-
-# EOD closet
-- type: entity
-  id: LockerBomb
-  name: EOD closet
-  parent: LockerGeneric
-  description: "It's a storage unit for explosion-protective suits."
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: bomb
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/wardrobe.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/wardrobe.yml
deleted file mode 100644
index 9a11101a42..0000000000
--- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/wardrobe.yml
+++ /dev/null
@@ -1,113 +0,0 @@
-- type: entity
-  id: WardrobeBase
-  parent: LockerGeneric
-  abstract: true
-  description: "It's a storage unit for standard-issue Nanotrasen attire."
-
-# Blue wardrobe
-- type: entity
-  id: WardrobeBlue
-  parent: WardrobeBase
-  name: blue wardrobe
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: generic
-      state_closed: blue_door
-
-# Pink wardrobe
-- type: entity
-  id: WardrobePink
-  parent: WardrobeBase
-  name: pink wardrobe
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: generic
-      state_closed: pink_door
-
-# Black wardrobe
-- type: entity
-  id: WardrobeBlack
-  parent: WardrobeBase
-  name: black wardrobe
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: generic
-      state_closed: black_door
-
-# Green wardrobe
-- type: entity
-  id: WardrobeGreen
-  parent: WardrobeBase
-  name: green wardrobe
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: generic
-      state_closed: green_door
-
-# Prison wardrobe
-- type: entity
-  id: WardrobePrison
-  parent: WardrobeBase
-  name: prison wardrobe
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: generic
-      state_closed: orange_door
-
-# Yellow wardrobe
-- type: entity
-  id: WardrobeYellow
-  parent: WardrobeBase
-  name: yellow wardrobe
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: generic
-      state_closed: yellow_door
-
-# White wardrobe
-- type: entity
-  id: WardrobeWhite
-  parent: WardrobeBase
-  name: white wardrobe
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: generic
-      state_closed: white_door
-
-# Grey wardrobe
-- type: entity
-  id: WardrobeGrey
-  parent: WardrobeBase
-  name: grey wardrobe
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: generic
-      state_closed: grey_door
-
-# Mixed wardrobe
-- type: entity
-  id: WardrobeMixed
-  parent: WardrobeBase
-  name: mixed wardrobe
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: generic
-      state_closed: mixed_door
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/water_tank.yml b/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/water_tank.yml
deleted file mode 100644
index 2ee3b28b2d..0000000000
--- a/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/water_tank.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-- type: entity
-  id: WaterTank
-  parent: StorageTank
-  name: water tank
-  suffix: Empty
-  description: "A water tank. It is used to store high amounts of water."
-  components:
-  - type: Sprite
-    sprite: Constructible/Misc/tanks.rsi
-    state: watertank
-
-- type: entity
-  parent: WaterTank
-  id: WaterTankFull
-  suffix: Full
-  components:
-  - type: SolutionContainer
-    contents:
-      reagents:
-      - ReagentId: Water
-        Quantity: 1500
diff --git a/Resources/Prototypes/Entities/Constructible/Walls/windows.yml b/Resources/Prototypes/Entities/Constructible/Walls/windows.yml
deleted file mode 100644
index fcaf1401dc..0000000000
--- a/Resources/Prototypes/Entities/Constructible/Walls/windows.yml
+++ /dev/null
@@ -1,126 +0,0 @@
-- type: entity
-  id: Window
-  parent: BaseConstructible
-  name: window
-  description: Don't smudge up the glass down there.
-  placement:
-    mode: SnapgridCenter
-    snap:
-    - Window
-  components:
-  - type: RCDDeconstructWhitelist
-  - type: Sprite
-    color: "#DDDDDD"
-    netsync: false
-    drawdepth: WallTops
-    sprite: Constructible/Structures/Windows/window.rsi
-  - type: Icon
-    sprite: Constructible/Structures/Windows/window.rsi
-    state: full
-  - type: Physics
-    bodyType: Static
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb {}
-      layer:
-      - Impassable
-      - MobImpassable
-      - VaultImpassable
-      - SmallImpassable
-      mask:
-      - VaultImpassable
-  - type: Damageable
-    resistances: glassResistances
-  - type: Repairable
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 15
-      behaviors:
-      - !type:PlaySoundCollectionBehavior
-        soundCollection: GlassBreak
-      - !type:SpawnEntitiesBehavior
-        spawn:
-          ShardGlass:
-            min: 1
-            max: 2
-      - !type:DoActsBehavior
-        acts: [ "Destruction" ]
-  - type: Airtight
-  - type: Window
-    base: window
-  - type: Construction
-    graph: window
-    node: window
-  - type: Appearance
-    visuals:
-    - type: WindowVisualizer
-
-- type: entity
-  id: ReinforcedWindow
-  name: reinforced window
-  parent: Window
-  components:
-  - type: Sprite
-    drawdepth: WallTops
-    sprite: Constructible/Structures/Windows/reinforced_window.rsi
-  - type: Icon
-    sprite: Constructible/Structures/Windows/reinforced_window.rsi
-  - type: Repairable
-    fuelCost: 10
-    doAfterDelay: 2
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 150
-      behaviors:
-      - !type:PlaySoundCollectionBehavior
-        soundCollection: GlassBreak
-      - !type:SpawnEntitiesBehavior
-        spawn:
-          ShardGlassReinforced:
-            min: 1
-            max: 2
-      - !type:DoActsBehavior
-        acts: [ "Destruction" ]
-  - type: Window
-    base: rwindow
-  - type: Construction
-    graph: window
-    node: reinforcedWindow
-
-- type: entity
-  id: PlasmaWindow
-  name: plasma window
-  parent: Window
-  components:
-  - type: Sprite
-    drawdepth: WallTops
-    sprite: Constructible/Structures/Windows/plasma_window.rsi
-  - type: Icon
-    sprite: Constructible/Structures/Windows/plasma_window.rsi
-  - type: Damageable
-    resistances: glassResistances
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 200
-      behaviors:
-      - !type:PlaySoundCollectionBehavior
-        soundCollection: GlassBreak
-      - !type:SpawnEntitiesBehavior
-        spawn:
-          ShardGlassPlasma:
-            min: 1
-            max: 2
-      - !type:DoActsBehavior
-        acts: [ "Destruction" ]
-    resistances: glassResistances
-  - type: Window
-    base: pwindow
-  - type: Construction
-    graph: window
-    node: plasmaWindow
diff --git a/Resources/Prototypes/Entities/Constructible/Ground/crayondecals.yml b/Resources/Prototypes/Entities/Effects/crayondecals.yml
similarity index 86%
rename from Resources/Prototypes/Entities/Constructible/Ground/crayondecals.yml
rename to Resources/Prototypes/Entities/Effects/crayondecals.yml
index d3142f00c6..b2ffa3862f 100644
--- a/Resources/Prototypes/Entities/Constructible/Ground/crayondecals.yml
+++ b/Resources/Prototypes/Entities/Effects/crayondecals.yml
@@ -8,7 +8,7 @@
   - type: InteractionOutline
   - type: Physics
   - type: Sprite
-    sprite: Constructible/Misc/crayondecals.rsi
+    sprite: Effects/crayondecals.rsi
     state: corgi
   - type: Cleanable
   - type: Appearance
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Conditional/traitordm.yml b/Resources/Prototypes/Entities/Markers/Spawners/Conditional/traitordm.yml
index 3a4b4236ad..331c5502a9 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Conditional/traitordm.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Conditional/traitordm.yml
@@ -6,7 +6,7 @@
     - type: Sprite
       layers:
         - state: blue
-        - texture: Objects/Misc/traitordm.rsi/redemption.png
+        - texture: Structures/Machines/traitordm.rsi/redemption.png
     - type: ConditionalSpawner
       prototypes:
         - TraitorDMRedemptionMachine
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/arcade.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/arcade.yml
index 83786369a0..67c09fb22c 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/arcade.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/arcade.yml
@@ -7,4 +7,4 @@
   - type: Sprite
     layers:
       - state: red
-      - texture: Constructible/Power/computers.rsi/arcade.png
+      - texture: Structures/Machines/computers.rsi/arcade.png
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml b/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml
index 060107e51e..a48d0baef1 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml
@@ -16,10 +16,10 @@
   - type: Hands
   - type: Sprite
     drawdepth: Mobs
-    sprite: Constructible/Power/VendingMachines/cola.rsi
+    sprite: Structures/Machines/VendingMachines/cola.rsi
     state: normal
   - type: Icon
-    sprite: Constructible/Power/VendingMachines/cola.rsi
+    sprite: Structures/Machines/VendingMachines/cola.rsi
     state: normal
   - type: Physics
     bodyType: Dynamic
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
index 7af3c4fe8e..cef117e5da 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
@@ -4,9 +4,6 @@
   id: SimpleMobBase
   suffix: AI
   components:
-  - type: Tag
-    tags:
-    - Teleportable
   - type: Reactive
     reactions:
       - !type:ExtinguishReaction
diff --git a/Resources/Prototypes/Entities/Mobs/Species/human.yml b/Resources/Prototypes/Entities/Mobs/Species/human.yml
index e4ee7b4b08..915d97340a 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/human.yml
@@ -8,7 +8,7 @@
   components:
   - type: Tag
     tags:
-    - Teleportable
+    - CanPilot
     - FootstepSound
   - type: Reactive
     reactions:
@@ -151,7 +151,6 @@
       - SmallImpassable
       layer:
       - Opaque
-      - MobImpassable
   - type: AtmosExposed
   - type: Flammable
     fireSpread: true
@@ -254,6 +253,7 @@
     - type: Sprite
       netsync: false
       drawdepth: Mobs
+      noRot: true
       # TODO BODY Turn these into individual body parts?
       layers:
       - map: ["enum.HumanoidVisualLayers.Chest"]
@@ -340,7 +340,7 @@
         - VaultImpassable
         - SmallImpassable
         layer:
-        - MobImpassable
+        - Opaque
     - type: HumanoidAppearance
     - type: Body
       template: HumanoidTemplate
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
index 230734b03b..b636863570 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
@@ -18,6 +18,9 @@
         Quantity: 15
   - type: SliceableFood
     count: 4
+  - type: Tag
+    tags:
+    - NoSpinOnThrow
 
 - type: entity
   parent: FoodPieBase
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
index bf5e850d3e..51b70bb466 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
@@ -14,7 +14,7 @@
   - type: SolutionContainer
     maxVol: 10
   - type: SolutionTransfer
-    transferAmount: 5
+    maxTransferAmount: 10
   - type: Sprite
     netsync: false
     sprite: Objects/Consumable/Food/condiments.rsi
@@ -313,7 +313,7 @@
   - type: SolutionContainer
     maxVol: 30
   - type: SolutionTransfer
-    transferAmount: 5
+    maxTransferAmount: 30
   - type: Sprite
     netsync: false
     sprite: Objects/Consumable/Food/condiments.rsi
@@ -448,7 +448,7 @@
   - type: SolutionContainer
     maxVol: 15
   - type: SolutionTransfer
-    transferAmount: 5
+    maxTransferAmount: 15
   - type: Sprite
     netsync: false
     sprite: Objects/Consumable/Food/condiments.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
index e3964dc17f..59703f8286 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
@@ -27,7 +27,6 @@
   - type: SolutionContainer
     maxVol: 50
   - type: SolutionTransfer
-    transferAmount: 5
   - type: Drink
     openSounds: packetOpenSounds
     useSound: /Audio/Items/eating_1.ogg
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml
index 40b85500dc..c11de84171 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml
@@ -9,11 +9,15 @@
   - type: SolutionContainer
     maxVol: 50
   - type: SolutionTransfer
-    transferAmount: 5
+    canChangeTransferAmount: true
   - type: Drink
   - type: Sprite
     state: icon
   - type: Spillable
+  - type: UserInterface
+    interfaces:
+    - key: enum.TransferAmountUiKey.Key
+      type: TransferAmountBoundUserInterface
 
 - type: entity
   parent: DrinkBase
@@ -56,8 +60,12 @@
   - type: SolutionContainer
     maxVol: 50
   - type: SolutionTransfer
-    transferAmount: 5
+    canChangeTransferAmount: true
   - type: TransformableContainer
+  - type: UserInterface
+    interfaces:
+    - key: enum.TransferAmountUiKey.Key
+      type: TransferAmountBoundUserInterface
 
 - type: entity
   parent: DrinkGlassBase
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/drinks_bottles.yml b/Resources/Prototypes/Entities/Objects/Consumable/drinks_bottles.yml
index 6404d0b891..fb0c40b4f8 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/drinks_bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks_bottles.yml
@@ -8,7 +8,11 @@
   - type: SolutionContainer
     maxVol: 100
   - type: SolutionTransfer
-    transferAmount: 5
+    canChangeTransferAmount: true
+  - type: UserInterface
+    interfaces:
+    - key: enum.TransferAmountUiKey.Key
+      type: TransferAmountBoundUserInterface
   - type: Sprite
     state: icon
   - type: DamageOnLand
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/drinks_cans.yml
index 74560880ac..0999937871 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/drinks_cans.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks_cans.yml
@@ -14,7 +14,12 @@
       - ReagentId: Cola
         Quantity: 20
   - type: SolutionTransfer
-    transferAmount: 5
+    canChangeTransferAmount: true
+    maxTransferAmount: 10
+  - type: UserInterface
+    interfaces:
+    - key: enum.TransferAmountUiKey.Key
+      type: TransferAmountBoundUserInterface
   - type: Sprite
     state: icon
 
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/drinks_cups.yml
index 2122b384d9..1803334384 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/drinks_cups.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks_cups.yml
@@ -8,7 +8,12 @@
   - type: SolutionContainer
     maxVol: 20
   - type: SolutionTransfer
-    transferAmount: 5
+    canChangeTransferAmount: true
+    maxTransferAmount: 10
+  - type: UserInterface
+    interfaces:
+    - key: enum.TransferAmountUiKey.Key
+      type: TransferAmountBoundUserInterface
   - type: Drink
     isOpen: true
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/trash_drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/trash_drinks.yml
index ab854aa184..25c6f54d7c 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/trash_drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/trash_drinks.yml
@@ -9,14 +9,19 @@
   - type: LoopingSound
   - type: Sprite
     state: icon
-
   - type: SolutionContainer
     maxVol: 10
   - type: SolutionTransfer
-    transferAmount: 5
+    canChangeTransferAmount: true
+    maxTransferAmount: 5
   - type: Drink
     isOpen: true
   - type: Spillable
+  - type: UserInterface
+    interfaces:
+    - key: enum.TransferAmountUiKey.Key
+      type: TransferAmountBoundUserInterface
+
 
 
 # Containers
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/base.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/base.yml
index de5b8c089e..64fadf1ffe 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/base.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/base.yml
@@ -7,5 +7,5 @@
   components:
     - type: MachineBoard
     - type: Sprite
-      sprite: Constructible/Misc/module.rsi
+      sprite: Objects/Misc/module.rsi
       state: id_mod
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
index 1547c75528..b1fcbf8a44 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
@@ -8,7 +8,7 @@
   components:
     - type: ComputerBoard
     - type: Sprite
-      sprite: Constructible/Misc/module.rsi
+      sprite: Objects/Misc/module.rsi
       state: id_mod
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/apc.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/apc.yml
index 69383d00ac..0c0ae550b3 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/apc.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/apc.yml
@@ -5,5 +5,5 @@
   description: Circuit used in APC construction.
   components:
     - type: Sprite
-      sprite: Constructible/Misc/module.rsi
+      sprite: Objects/Misc/module.rsi
       state: charger_APC
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml
index e44eca397b..dc0867488b 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml
@@ -7,6 +7,6 @@
       tags:
       - DoorElectronics
     - type: Sprite
-      sprite: Constructible/Misc/module.rsi
+      sprite: Objects/Misc/module.rsi
       state: door_electronics
     - type: AccessReader
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/firelock.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/firelock.yml
index 9916f3a5e0..cd44d0d755 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/firelock.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/firelock.yml
@@ -8,5 +8,5 @@
       tags:
       - FirelockElectronics
     - type: Sprite
-      sprite: Constructible/Misc/module.rsi
+      sprite: Objects/Misc/module.rsi
       state: mainboard
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/solar.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/solar.yml
index eed1097922..792c69e4ed 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/solar.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/solar.yml
@@ -5,5 +5,5 @@
   description: Advanced circuit board used to detect differences in pressure, temperature and gas concentrations between the two sides of the door.
   components:
     - type: Sprite
-      sprite: Constructible/Misc/module.rsi
+      sprite: Objects/Misc/module.rsi
       state: generic
diff --git a/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml b/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
index 8e7c24eb47..c40ec6ebe6 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
@@ -15,7 +15,7 @@
   - type: ItemCooldown
   - type: EmitSoundOnUse
     sound: 
-      path: /Audio/Items/bikehorn.ogg
+      collection: BikeHorn
     semitoneVariation: 6
   - type: UseDelay
     delay: 0.5
diff --git a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml
index 919fa8056c..9f61b04da0 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml
@@ -1,6 +1,3 @@
-- type: Tag
-  id: Crayon
-
 - type: entity
   abstract: true
   parent: BaseItem
@@ -30,6 +27,9 @@
   - type: Crayon
     color: white
     capacity: 5
+  - type: Tag
+    tags:
+    - CrayonWhite
 
 - type: entity
   parent: Crayon
@@ -42,6 +42,9 @@
   - type: Crayon
     color: white
     capacity: 5
+  - type: Tag
+    tags:
+    - CrayonWhite
 
 - type: entity
   parent: Crayon
@@ -54,6 +57,9 @@
   - type: Crayon
     color: black
     capacity: 5
+  - type: Tag
+    tags:
+    - CrayonBlack
 
 - type: entity
   parent: Crayon
@@ -66,6 +72,9 @@
   - type: Crayon
     color: red
     capacity: 5
+  - type: Tag
+    tags:
+    - CrayonRed
 
 - type: entity
   parent: Crayon
@@ -78,6 +87,9 @@
   - type: Crayon
     color: orange
     capacity: 5
+  - type: Tag
+    tags:
+    - CrayonOrange
 
 - type: entity
   parent: Crayon
@@ -90,6 +102,9 @@
   - type: Crayon
     color: yellow
     capacity: 5
+  - type: Tag
+    tags:
+    - CrayonYellow
 
 - type: entity
   parent: Crayon
@@ -102,6 +117,9 @@
   - type: Crayon
     color: green
     capacity: 5
+  - type: Tag
+    tags:
+    - CrayonGreen
 
 - type: entity
   parent: Crayon
@@ -114,6 +132,9 @@
   - type: Crayon
     color: lightblue
     capacity: 5
+  - type: Tag
+    tags:
+    - CrayonBlue
 
 - type: entity
   parent: Crayon
@@ -126,6 +147,9 @@
   - type: Crayon
     color: purple
     capacity: 5
+  - type: Tag
+    tags:
+    - CrayonPurple
 
 - type: entity
   parent: BaseItem
@@ -152,15 +176,37 @@
     - id: CrayonBlue
     - id: CrayonPurple
     - id: CrayonBlack
+  - type: ItemCounter
+    mapLayers:
+      black_box:
+        whitelist:
+          tags:
+          - CrayonBlack
+      blue_box:
+        whitelist:
+          tags:
+          - CrayonBlue
+      green_box:
+        whitelist:
+          tags:
+          - CrayonGreen
+      orange_box:
+        whitelist:
+          tags:
+          - CrayonOrange
+      purple_box:
+        whitelist:
+          tags:
+          - CrayonPurple
+      red_box:
+        whitelist:
+          tags:
+          - CrayonRed
+      yellow_box:
+        whitelist:
+          tags:
+          - CrayonYellow
+
   - type: Appearance
     visuals:
-    - type: StackVisualizer
-      composite: true
-      stackLayers:
-      - red_box
-      - orange_box
-      - yellow_box
-      - green_box
-      - blue_box
-      - purple_box
-      - black_box
+    - type: MappedItemVisualizer
diff --git a/Resources/Prototypes/Entities/Objects/Fun/instruments.yml b/Resources/Prototypes/Entities/Objects/Fun/instruments.yml
index 07567eaef8..8cc456fa0d 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/instruments.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/instruments.yml
@@ -224,5 +224,5 @@
   - type: Instrument
     program: 13
   - type: Sprite
-    sprite: Objects/Fun/Instruments/otherinstruments.rsi
+    sprite: Structures/Furniture/instruments.rsi
     state: xylophone
diff --git a/Resources/Prototypes/Entities/Constructible/Specific/machine_parts.yml b/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml
similarity index 99%
rename from Resources/Prototypes/Entities/Constructible/Specific/machine_parts.yml
rename to Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml
index 1aa44d6e3c..65c1e85fbb 100644
--- a/Resources/Prototypes/Entities/Constructible/Specific/machine_parts.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml
@@ -7,7 +7,7 @@
   components:
     - type: Sprite
       netsync: false
-      sprite: Constructible/Misc/stock_parts.rsi
+      sprite: Objects/Misc/stock_parts.rsi
     - type: MachinePart
       rating: 1
 
diff --git a/Resources/Prototypes/Entities/Objects/Power/antimatter_part.yml b/Resources/Prototypes/Entities/Objects/Power/antimatter_part.yml
index fbbe1306d6..14da557dca 100644
--- a/Resources/Prototypes/Entities/Objects/Power/antimatter_part.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/antimatter_part.yml
@@ -2,7 +2,7 @@
   parent: BaseItem
   id: AMEPart
   name: AME part
-  description: A flatpack used for constructing an antimatter engine reactor.\nUse a multitool to unpack it.
+  description: A flatpack used for constructing an antimatter engine reactor. Use a multitool to unpack it.
   components:
   - type: Item
     size: 5
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/sprays.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/sprays.yml
index 02a79ceb62..a53113ae72 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/sprays.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/sprays.yml
@@ -5,6 +5,9 @@
   description: Kills those pesky weeds!
   suffix: "Filled"
   components:
+  - type: Tag
+    tags:
+    - PlantBGone
   - type: Sprite
     sprite: Objects/Tools/Hydroponics/sprays.rsi
     state: plantbgone
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
index 4350e841fa..738561200d 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
@@ -7,6 +7,7 @@
   - type: Tag
     tags:
     - Hoe
+    - BotanyHoe
   - type: Sprite
     sprite: Objects/Tools/Hydroponics/hoe.rsi
     state: icon
@@ -40,6 +41,7 @@
   components:
   - type: Tag
     tags:
+    - BotanyHatchet
     - BotanySharp
   - type: Sprite
     sprite: Objects/Tools/Hydroponics/hatchet.rsi
@@ -58,6 +60,7 @@
   - type: Tag
     tags:
     - Shovel
+    - BotanyShovel
   - type: Sprite
     sprite: Objects/Tools/Hydroponics/spade.rsi
     state: icon
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
index bd7595458f..618932fe88 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
@@ -5,6 +5,9 @@
   suffix: Empty
   description: A spray bottle with an unscrewable top.
   components:
+  - type: Tag
+    tags:
+    - Spray
   - type: Sprite
     netsync: false
     sprite: Objects/Specific/Janitorial/janitorial.rsi
@@ -15,7 +18,6 @@
     maxVol: 100
     caps: Refillable, Drainable
   - type: SolutionTransfer
-    transferAmount: 5.0
   - type: Spillable
   - type: ItemCooldown
   - type: Spray
@@ -30,12 +32,12 @@
   suffix: Filled
   parent: SprayBottle
   components:
-    - type: SolutionContainer
-      maxVol: 100
-      contents:
-        reagents:
-          - ReagentId: Water
-            Quantity: 100
+  - type: SolutionContainer
+    maxVol: 100
+    contents:
+      reagents:
+        - ReagentId: Water
+          Quantity: 100
 
 - type: entity
   name: space cleaner
@@ -44,12 +46,12 @@
   parent: SprayBottle
   suffix: ""
   components:
-    - type: SolutionContainer
-      maxVol: 100
-      contents:
-        reagents:
-          - ReagentId: SpaceCleaner
-            Quantity: 100
+  - type: SolutionContainer
+    maxVol: 100
+    contents:
+      reagents:
+        - ReagentId: SpaceCleaner
+          Quantity: 100
 
 # Vapor
 
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
index 77b16231c6..bca4d61823 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
@@ -4,12 +4,12 @@
   description: A sterile injector for rapid administration of drugs to patients.
   id: Hypospray
   components:
-    - type: Sprite
-      sprite: Objects/Specific/Medical/hypospray.rsi
-      state: hypo
-    - type: Item
-      sprite: Objects/Specific/Medical/hypospray.rsi
-    - type: SolutionContainer
-      maxVol: 30
-      caps: Refillable, CanExamine
-    - type: Hypospray
+  - type: Sprite
+    sprite: Objects/Specific/Medical/hypospray.rsi
+    state: hypo
+  - type: Item
+    sprite: Objects/Specific/Medical/hypospray.rsi
+  - type: SolutionContainer
+    maxVol: 30
+    caps: Refillable, CanExamine
+  - type: Hypospray
diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml
index 918ebe9b26..c6ef1a8215 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml
@@ -5,6 +5,9 @@
   abstract: true
   description: A small bottle.
   components:
+  - type: Tag
+    tags:
+    - Bottle
   - type: Sprite
     sprite: Objects/Specific/Chemistry/bottle.rsi
     netsync: false
@@ -15,7 +18,12 @@
     maxVol: 30
     caps: OpenContainer
   - type: SolutionTransfer
-    transferAmount: 5
+    maxTransferAmount: 30
+    canChangeTransferAmount: true
+  - type: UserInterface
+    interfaces:
+    - key: enum.TransferAmountUiKey.Key
+      type: TransferAmountBoundUserInterface
   - type: Item
     sprite: Objects/Specific/Chemistry/beaker.rsi
   - type: Spillable
@@ -29,7 +37,7 @@
     sprite: Objects/Specific/Chemistry/bottle.rsi
     layers:
       - state: bottle-1
-      - state: bottle-1-1  
+      - state: bottle-1-1
         map: ["enum.SolutionContainerLayers.Fill"]
         visible: false
   - type: Appearance
@@ -47,7 +55,7 @@
     sprite: Objects/Specific/Chemistry/bottle.rsi
     layers:
       - state: bottle-2
-      - state: bottle-2-1  
+      - state: bottle-2-1
         map: ["enum.SolutionContainerLayers.Fill"]
         visible: false
   - type: Appearance
@@ -65,7 +73,7 @@
     sprite: Objects/Specific/Chemistry/bottle.rsi
     layers:
       - state: bottle-3
-      - state: bottle-3-1  
+      - state: bottle-3-1
         map: ["enum.SolutionContainerLayers.Fill"]
         visible: false
   - type: Appearance
@@ -83,7 +91,7 @@
     sprite: Objects/Specific/Chemistry/bottle.rsi
     layers:
       - state: bottle-4
-      - state: bottle-4-1  
+      - state: bottle-4-1
         map: ["enum.SolutionContainerLayers.Fill"]
         visible: false
   - type: Appearance
diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
index 246b408fdb..ccde62dfbd 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
@@ -12,7 +12,7 @@
     netsync: false
     layers:
       - state: beaker
-      - state: beaker1  
+      - state: beaker1
         map: ["enum.SolutionContainerLayers.Fill"]
         visible: false
   - type: Item
@@ -21,7 +21,11 @@
     maxVol: 50
     caps: OpenContainer, FitsInDispenser # can add and remove solutions and fits in the chemmaster.
   - type: SolutionTransfer
-    transferAmount: 5.0
+    canChangeTransferAmount: true
+  - type: UserInterface
+    interfaces:
+    - key: enum.TransferAmountUiKey.Key
+      type: TransferAmountBoundUserInterface
   - type: Spillable
   - type: Drink
     isOpen: true
@@ -62,7 +66,7 @@
     sprite: Objects/Specific/Chemistry/beaker_large.rsi
     layers:
       - state: beakerlarge
-      - state: beakerlarge1  
+      - state: beakerlarge1
         map: ["enum.SolutionContainerLayers.Fill"]
         visible: false
   - type: Item
@@ -120,7 +124,14 @@
     caps: OpenContainer
     maxVol: 5
   - type: SolutionTransfer
-    transferAmount: 5.0
+    minTransferAmount: 1
+    transferAmount: 1
+    maxTransferAmount: 5
+    canChangeTransferAmount: true
+  - type: UserInterface
+    interfaces:
+    - key: enum.TransferAmountUiKey.Key
+      type: TransferAmountBoundUserInterface
   - type: Spillable
   - type: Item
     sprite: Objects/Specific/Chemistry/dropper.rsi
@@ -140,7 +151,7 @@
     sprite: Objects/Specific/Chemistry/syringe.rsi
     netsync: false
     layers:
-      - state: syringe1  
+      - state: syringe1
         map: ["enum.SolutionContainerLayers.Fill"]
         visible: false
       - state: syringe_base0
@@ -155,7 +166,7 @@
   - type: Appearance
     visuals:
       # this visualizer used for reagent inside
-    - type: SolutionContainerVisualizer 
+    - type: SolutionContainerVisualizer
       maxFillLevels: 4
       fillBaseName: syringe
       # this one for syrigine itself (plunger)
diff --git a/Resources/Prototypes/Entities/Objects/Tools/bucket.yml b/Resources/Prototypes/Entities/Objects/Tools/bucket.yml
index 893a9baaa2..9646bdce26 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/bucket.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/bucket.yml
@@ -20,6 +20,13 @@
     maxVol: 500
   - type: SolutionTransfer
     transferAmount: 50
+    maxTransferAmount: 100
+    minTransferAmount: 10
+    canChangeTransferAmount: true
+  - type: UserInterface
+    interfaces:
+    - key: enum.TransferAmountUiKey.Key
+      type: TransferAmountBoundUserInterface
   - type: Physics
     bodyType: Dynamic
     fixtures:
diff --git a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
index 79d0dc5eca..532d847ac8 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
@@ -4,30 +4,33 @@
   id: JawsOfLife
   description: A set of jaws of life, compressed through the magic of science.
   components:
-    - type: Sprite
-      sprite: Objects/Tools/jaws_of_life.rsi
-      state: jaws_pry
-    - type: Clothing
-      sprite: Objects/Tools/jaws_of_life.rsi
-      size: 50
-      QuickEquip: false
-      Slots:
-        - Belt
-    - type: TilePrying
-    - type: Tool
-      qualities:
-        - Prying
-      statusShowBehavior: true
-    - type: MultiTool
-      tools:
-        - behavior: Prying
-          state: jaws_pry
-          useSound: /Audio/Items/jaws_pry.ogg
-          changeSound: /Audio/Items/change_jaws.ogg
-        - behavior: Cutting
-          state: jaws_cutter
-          useSound: /Audio/Items/jaws_cut.ogg
-          changeSound: /Audio/Items/change_jaws.ogg
+  - type: Tag
+    tags:
+    - JawsOfLife
+  - type: Sprite
+    sprite: Objects/Tools/jaws_of_life.rsi
+    state: jaws_pry
+  - type: Clothing
+    sprite: Objects/Tools/jaws_of_life.rsi
+    size: 50
+    QuickEquip: false
+    Slots:
+      - Belt
+  - type: TilePrying
+  - type: Tool
+    qualities:
+      - Prying
+    statusShowBehavior: true
+  - type: MultiTool
+    tools:
+      - behavior: Prying
+        state: jaws_pry
+        useSound: /Audio/Items/jaws_pry.ogg
+        changeSound: /Audio/Items/change_jaws.ogg
+      - behavior: Cutting
+        state: jaws_cutter
+        useSound: /Audio/Items/jaws_cut.ogg
+        changeSound: /Audio/Items/change_jaws.ogg
 
 - type: entity
   name: syndicate jaws of life
@@ -35,11 +38,11 @@
   id: SyndicateJawsOfLife
   description: Useful for entering the station or its departments.
   components:
-    - type: Sprite
-      state: syn_jaws_pry
-    - type: MultiTool
-      tools:
-        - behavior: Prying
-          state: syn_jaws_pry
-        - behavior: Cutting
-          state: syn_jaws_cutter
+  - type: Sprite
+    state: syn_jaws_pry
+  - type: MultiTool
+    tools:
+      - behavior: Prying
+        state: syn_jaws_pry
+      - behavior: Cutting
+        state: syn_jaws_cutter
diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
index 396296e439..990ad18342 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   name: wirecutter
   parent: BaseItem
   id: Wirecutter
@@ -7,6 +7,7 @@
   - type: Tag
     tags:
     - PlantSampleTaker
+    - Wirecutter
   - type: Sprite
     sprite: Objects/Tools/wirecutters.rsi
     layers:
@@ -37,6 +38,9 @@
   id: Screwdriver
   description: Industrial grade torque in a small screwdriving package.
   components:
+  - type: Tag
+    tags:
+    - Screwdriver
   - type: Sprite
     sprite: Objects/Tools/screwdriver.rsi
     layers:
@@ -67,6 +71,9 @@
   id: Wrench
   description: A common tool for assembly and disassembly, righty tighty lefty loosey.
   components:
+  - type: Tag
+    tags:
+    - Wrench
   - type: Sprite
     sprite: Objects/Tools/wrench.rsi
     state: icon
@@ -74,6 +81,7 @@
     sprite: Objects/Tools/wrench.rsi
   - type: ItemCooldown
   - type: MeleeWeapon
+    damage: 7
   - type: Tool
     qualities:
       - Anchoring
@@ -85,6 +93,9 @@
   id: Crowbar
   description: A multipurpose tool to pry open doors and fight interdimensional invaders.
   components:
+  - type: Tag
+    tags:
+    - Crowbar
   - type: Sprite
     sprite: Objects/Tools/crowbar.rsi
     state: icon
@@ -93,6 +104,7 @@
     size: 10
   - type: ItemCooldown
   - type: MeleeWeapon
+    damage: 7
   - type: Tool
     qualities:
       - Prying
@@ -105,6 +117,9 @@
   id: CrowbarRed
   description: A multipurpose tool to pry open doors and fight interdimensional invaders.
   components:
+  - type: Tag
+    tags:
+    - CrowbarRed
   - type: Sprite
     sprite: Objects/Tools/crowbar_red.rsi
     state: icon
@@ -113,6 +128,7 @@
     size: 5
   - type: ItemCooldown
   - type: MeleeWeapon
+    damage: 7
   - type: Tool
     qualities:
       - Prying
@@ -148,26 +164,29 @@
   id: PowerDrill
   description: A simple powered hand drill.
   components:
-    - type: Sprite
-      sprite: Objects/Tools/drill.rsi
-      state: drill_screw
-    - type: Item
-      sprite: Objects/Tools/drill.rsi
-      size: 20
-    - type: Tool
-      qualities:
-        - Screwing
-      statusShowBehavior: true
-    - type: MultiTool
-      tools:
-        - behavior: Screwing
-          state: drill_screw
-          useSound: /Audio/Items/drill_use.ogg
-          changeSound: /Audio/Items/change_drill.ogg
-        - behavior: Anchoring
-          state: drill_bolt
-          useSound: /Audio/Items/drill_use.ogg
-          changeSound: /Audio/Items/change_drill.ogg
+  - type: Tag
+    tags:
+    - Powerdrill
+  - type: Sprite
+    sprite: Objects/Tools/drill.rsi
+    state: drill_screw
+  - type: Item
+    sprite: Objects/Tools/drill.rsi
+    size: 20
+  - type: Tool
+    qualities:
+      - Screwing
+    statusShowBehavior: true
+  - type: MultiTool
+    tools:
+      - behavior: Screwing
+        state: drill_screw
+        useSound: /Audio/Items/drill_use.ogg
+        changeSound: /Audio/Items/change_drill.ogg
+      - behavior: Anchoring
+        state: drill_bolt
+        useSound: /Audio/Items/drill_use.ogg
+        changeSound: /Audio/Items/change_drill.ogg
 
 - type: entity
   name: RCD
@@ -205,13 +224,13 @@
   id: Shovel
   description: A large tool for digging and moving dirt.
   components:
-    - type: Tag
-      tags:
-      - Shovel
-    - type: Sprite
-      sprite: Objects/Tools/shovel.rsi
-      state: icon
-    - type: ItemCooldown
-    - type: MeleeWeapon
-    - type: Item
-      sprite: Objects/Tools/shovel.rsi
+  - type: Tag
+    tags:
+    - Shovel
+  - type: Sprite
+    sprite: Objects/Tools/shovel.rsi
+    state: icon
+  - type: ItemCooldown
+  - type: MeleeWeapon
+  - type: Item
+    sprite: Objects/Tools/shovel.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
index 4252beb65c..d8be2765fa 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
@@ -101,3 +101,4 @@
     maxVol: 15
     caps: Refillable, Drainable
   - type: SolutionTransfer
+    maxTransferAmount: 15
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
index d3ed06e0ee..2bfe712a92 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
@@ -23,7 +23,7 @@
   - type: Projectile
     damages:
       Blunt: 10
-  - type: StunnableProjectile
+  - type: StunOnCollide
 
 - type: entity
   id: PelletShotgun
@@ -92,5 +92,5 @@
   - type: SolutionContainer
     maxVol: 15
     caps: Refillable, Drainable
-  - type: ChemicalInjectionProjectile
+  - type: SolutionInjectOnCollide
     transferAmount: 15
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Explosives/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Explosives/grenades.yml
index a731d6394c..2cbb0b05eb 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Explosives/grenades.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Explosives/grenades.yml
@@ -22,6 +22,7 @@
     heavyImpactRange: 2
     lightImpactRange: 4
     flashRange: 7
+  - type: ExplodeOnTrigger
   - type: Damageable
   - type: Destructible
     thresholds:
@@ -55,7 +56,12 @@
     - Belt
   - type: OnUseTimerTrigger
     delay: 3.5
-  - type: FlashExplosive
+  - type: FlashOnTrigger
+    range: 7
+  - type: SoundOnTrigger
+    sound:
+      path: "/Audio/Effects/flash_bang.ogg"
+  - type: DeleteOnTrigger
   - type: Damageable
   - type: Destructible
     thresholds:
@@ -90,6 +96,7 @@
     heavyImpactRange: 3
     lightImpactRange: 5
     flashRange: 10
+  - type: ExplodeOnTrigger
   - type: Damageable
   - type: Destructible
     thresholds:
@@ -123,6 +130,7 @@
     devastationRange: 25
     heavyImpactRange: 25
     flashRange: 50
+  - type: ExplodeOnTrigger
   - type: Damageable
   - type: Destructible
     thresholds:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
index b59bb177f8..6a1d9694b8 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -20,6 +20,7 @@
       hard: false
       mask:
       - Impassable
+      layer:
       - MobImpassable
     linearDamping: 0
     angularDamping: 0
@@ -38,8 +39,13 @@
     soundHit: /Audio/Weapons/Guns/Hits/snap.ogg
     damages:
       Piercing: 10
-  - type: FlashProjectile
+  - type: FlashOnTrigger
     range: 1
+  - type: SoundOnTrigger
+    sound:
+      path: "/Audio/Effects/flash_bang.ogg"
+  - type: TriggerOnCollide
+  - type: DeleteOnTrigger
 
 - type: entity
   id: BulletBaseHV
@@ -71,8 +77,9 @@
     soundHit: /Audio/Weapons/Guns/Hits/snap.ogg
     damages:
       Blunt: 3
-  - type: StunnableProjectile
-    paralyzeAmount: 2
+  - type: StunOnCollide
+    stunAmount: 2
+    knockdownAmount: 2
 
 # Energy projectiles
 - type: entity
@@ -106,7 +113,7 @@
       path: "/Audio/Weapons/Guns/Hits/taser_hit.ogg"
     damages:
       Heat: 5
-  - type: StunnableProjectile
+  - type: StunOnCollide
     stunAmount: 5
     knockdownAmount: 5
 
@@ -118,7 +125,7 @@
   components:
   - type: Sprite
     color: "#ffff33"
-    sprite: Constructible/Power/Singularity/emitter.rsi
+    sprite: Structures/Power/Generation/Singularity/emitter.rsi
     state: 'projectile'
   - type: Physics
     fixtures:
@@ -150,7 +157,9 @@
     netsync: false
     sprite: Objects/Weapons/Guns/Projectiles/rocket.rsi
     state: frag
-  - type: ExplosiveProjectile
+  - type: ExplodeOnTrigger
+  - type: DeleteOnTrigger
+  - type: TriggerOnCollide
   - type: Projectile
     deleteOnCollide: false
   - type: Explosive
@@ -176,8 +185,9 @@
   - type: Projectile
     deleteOnCollide: false
     soundHit: /Audio/Effects/gen_hit.ogg
-  - type: StunnableProjectile
-    paralyzeAmount: 8
+  - type: StunOnCollide
+    stunAmount: 8
+    knockdownAmount: 8
 
 - type: entity
   id: BulletGrenadeBlast
@@ -189,7 +199,9 @@
     netsync: false
     sprite: Objects/Weapons/Guns/Projectiles/grenade.rsi
     state: grenade
-  - type: ExplosiveProjectile
+  - type: ExplodeOnTrigger
+  - type: DeleteOnTrigger
+  - type: TriggerOnCollide
   - type: Projectile
     deleteOnCollide: false
   - type: Explosive
@@ -211,8 +223,13 @@
   - type: Projectile
     deleteOnCollide: false
     soundHit: /Audio/Effects/flash_bang.ogg
-  - type: FlashProjectile
+  - type: FlashOnTrigger
     range: 7
+  - type: SoundOnTrigger
+    sound:
+      path: "/Audio/Effects/flash_bang.ogg"
+  - type: TriggerOnCollide
+  - type: DeleteOnTrigger
 
 # This is supposed to spawn shrapnel and stuff so uhh... TODO?
 - type: entity
@@ -225,7 +242,9 @@
     netsync: false
     sprite: Objects/Weapons/Guns/Projectiles/grenade.rsi
     state: grenade
-  - type: ExplosiveProjectile
+  - type: ExplodeOnTrigger
+  - type: DeleteOnTrigger
+  - type: TriggerOnCollide
   - type: Projectile
     deleteOnCollide: false
   - type: Explosive
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
index 10e1e05e5e..7ccf30b227 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
@@ -8,8 +8,11 @@
     sprite: Objects/Weapons/Melee/baseball_bat.rsi
     state: icon
   - type: MeleeWeapon
-    damage: 20
+    damage: 15
   - type: Item
     size: 24
     sprite: Objects/Weapons/Melee/baseball_bat.rsi
     prefix: inhand
+  - type: Construction
+    graph: WoodenBat
+    node: bat
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
index f28dfe0ff6..343ae38299 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
@@ -27,6 +27,7 @@
     caps: Refillable
     maxVol: 5
   - type: SolutionTransfer
+    maxTransferAmount: 5
 
 - type: MeleeWeaponAnimation
   id: spear
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
index 5cb81d3571..f244df99a5 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
@@ -13,6 +13,9 @@
     size: 15
     sprite: Objects/Weapons/Melee/captain_sabre.rsi
     prefix: inhand
+  - type: Tag
+    tags:
+    - CaptainSabre
 
 - type: entity
   name: katana
diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/reagent_dispenser_base.yml b/Resources/Prototypes/Entities/Structures/Dispensers/base.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Constructible/Specific/Dispensers/reagent_dispenser_base.yml
rename to Resources/Prototypes/Entities/Structures/Dispensers/base.yml
diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/booze_dispenser.yml b/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml
similarity index 86%
rename from Resources/Prototypes/Entities/Constructible/Specific/Dispensers/booze_dispenser.yml
rename to Resources/Prototypes/Entities/Structures/Dispensers/booze.yml
index b238843e9c..e1c4d24682 100644
--- a/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/booze_dispenser.yml
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml
@@ -5,7 +5,7 @@
   parent: ReagentDispenserBase
   components:
   - type: Sprite
-    sprite: Constructible/Power/dispensers.rsi
+    sprite: Structures/dispensers.rsi
     state: booze_dispenser
   - type: ReagentDispenser
     pack: BoozeDispenserInventory
diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/chem_dispenser.yml b/Resources/Prototypes/Entities/Structures/Dispensers/chem.yml
similarity index 77%
rename from Resources/Prototypes/Entities/Constructible/Specific/Dispensers/chem_dispenser.yml
rename to Resources/Prototypes/Entities/Structures/Dispensers/chem.yml
index 84ae79f823..ea409f1bd2 100644
--- a/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/chem_dispenser.yml
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/chem.yml
@@ -5,10 +5,10 @@
   description: An industrial grade chemical dispenser with a sizeable chemical supply.
   components:
   - type: Sprite
-    sprite: Constructible/Power/industrial_dispenser.rsi
+    sprite: Structures/dispensers.rsi
     state: industrial_dispenser
   - type: Icon
-    sprite: Constructible/Power/industrial_dispenser.rsi
+    sprite: Structures/dispensers.rsi
     state: industrial_dispenser
   - type: ReagentDispenser
     pack: ChemDispenserStandardInventory
diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/soda_dispenser.yml b/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml
similarity index 87%
rename from Resources/Prototypes/Entities/Constructible/Specific/Dispensers/soda_dispenser.yml
rename to Resources/Prototypes/Entities/Structures/Dispensers/soda.yml
index 9b70240a9e..bf981ba7e7 100644
--- a/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/soda_dispenser.yml
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml
@@ -5,7 +5,7 @@
   description: A beverage dispenser with a selection of soda and several other common beverages. Has a single fill slot for containers.
   components:
   - type: Sprite
-    sprite: Constructible/Power/dispensers.rsi
+    sprite: Structures/dispensers.rsi
     state: soda_dispenser
   - type: ReagentDispenser
     pack: SodaDispenserInventory
diff --git a/Resources/Prototypes/Entities/Constructible/Doors/airlock_access.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Constructible/Doors/airlock_access.yml
rename to Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
diff --git a/Resources/Prototypes/Entities/Constructible/Doors/airlock_types.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
similarity index 52%
rename from Resources/Prototypes/Entities/Constructible/Doors/airlock_types.yml
rename to Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
index cec0c0d245..b7d264d589 100644
--- a/Resources/Prototypes/Entities/Constructible/Doors/airlock_types.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
@@ -1,30 +1,10 @@
-# Standard
-
-- type: entity
-  parent: Airlock
-  id: AirlockExternal
-  suffix: External
-  description: "It opens, it closes, it might crush you, and there might be only space behind it.\nHas to be manually activated."
-  components:
-  - type: Door
-    bumpOpen: false
-  - type: Sprite
-    sprite: Constructible/Structures/Doors/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
-
 - type: entity
   parent: Airlock
   id: AirlockFreezer
   suffix: Freezer
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Doors/Standard/freezer.rsi
+    sprite: Structures/Doors/Airlocks/Standard/freezer.rsi
 
 - type: entity
   parent: Airlock
@@ -32,7 +12,7 @@
   suffix: Engineering
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Doors/Standard/engineering.rsi
+    sprite: Structures/Doors/Airlocks/Standard/engineering.rsi
 
 - type: entity
   parent: Airlock
@@ -40,7 +20,7 @@
   suffix: Cargo
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Doors/Standard/cargo.rsi
+    sprite: Structures/Doors/Airlocks/Standard/cargo.rsi
 
 - type: entity
   parent: Airlock
@@ -48,7 +28,7 @@
   suffix: Medical
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Doors/Standard/medical.rsi
+    sprite: Structures/Doors/Airlocks/Standard/medical.rsi
 
 - type: entity
   parent: Airlock
@@ -56,7 +36,7 @@
   suffix: Science
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Doors/Standard/science.rsi
+    sprite: Structures/Doors/Airlocks/Standard/science.rsi
 
 - type: entity
   parent: Airlock
@@ -64,7 +44,7 @@
   suffix: Command
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Doors/Standard/command.rsi
+    sprite: Structures/Doors/Airlocks/Standard/command.rsi
 
 - type: entity
   parent: Airlock
@@ -72,7 +52,7 @@
   suffix: Security
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Doors/Standard/security.rsi
+    sprite: Structures/Doors/Airlocks/Standard/security.rsi
 
 - type: entity
   parent: Airlock
@@ -80,7 +60,7 @@
   name: maintenance hatch
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Doors/Standard/maint.rsi
+    sprite: Structures/Doors/Airlocks/Standard/maint.rsi
 
 # Glass
 
@@ -94,7 +74,7 @@
   - type: Occluder
     enabled: false
   - type: Sprite
-    sprite: Constructible/Structures/Doors/Glass/glass.rsi
+    sprite: Structures/Doors/Airlocks/Glass/glass.rsi
 
 - type: entity
   parent: AirlockGlass
@@ -102,7 +82,7 @@
   suffix: Engineering
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Doors/Glass/engineering.rsi
+    sprite: Structures/Doors/Airlocks/Glass/engineering.rsi
 
 - type: entity
   parent: AirlockGlass
@@ -110,7 +90,7 @@
   suffix: Cargo
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Doors/Glass/cargo.rsi
+    sprite: Structures/Doors/Airlocks/Glass/cargo.rsi
 
 - type: entity
   parent: AirlockGlass
@@ -118,7 +98,7 @@
   suffix: Medical
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Doors/Glass/medical.rsi
+    sprite: Structures/Doors/Airlocks/Glass/medical.rsi
 
 - type: entity
   parent: AirlockGlass
@@ -126,7 +106,7 @@
   suffix: Science
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Doors/Glass/science.rsi
+    sprite: Structures/Doors/Airlocks/Glass/science.rsi
 
 - type: entity
   parent: AirlockGlass
@@ -134,7 +114,7 @@
   suffix: Command
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Doors/Glass/command.rsi
+    sprite: Structures/Doors/Airlocks/Glass/command.rsi
 
 - type: entity
   parent: AirlockGlass
@@ -142,4 +122,4 @@
   suffix: Security
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Doors/Glass/security.rsi
+    sprite: Structures/Doors/Airlocks/Glass/security.rsi
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml
new file mode 100644
index 0000000000..4b62f40ffe
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml
@@ -0,0 +1,41 @@
+- type: entity
+  id: AirlockAssembly
+  name: airlock assembly
+  description: It opens, it closes, and maybe crushes you.
+  components:
+  - type: Clickable
+  - type: InteractionOutline
+  - type: Sprite
+    netsync: false
+    drawdepth: Mobs
+    sprite: Structures/Doors/Airlocks/Standard/basic.rsi
+    state: "assembly"
+  - type: Physics
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.49,-0.49,0.49,0.49"
+      mass: 100
+      mask:
+      - MobImpassable
+      layer:
+      - MobImpassable
+      - VaultImpassable
+  - type: Anchorable
+  - type: Pullable
+  - type: SnapGrid
+  - type: Damageable
+    resistances: metallicResistances
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 300
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: Construction
+    graph: airlock
+    node: assembly
+  placement:
+    mode: SnapgridCenter
diff --git a/Resources/Prototypes/Entities/Constructible/Doors/airlock_base.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base.yml
similarity index 65%
rename from Resources/Prototypes/Entities/Constructible/Doors/airlock_base.yml
rename to Resources/Prototypes/Entities/Structures/Doors/Airlocks/base.yml
index 523a1e4c62..7b88ff7002 100644
--- a/Resources/Prototypes/Entities/Constructible/Doors/airlock_base.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: Airlock
-  parent: BaseConstructible
+  parent: BaseStructure
   name: airlock
   description: It opens, it closes, and maybe crushes you.
   components:
@@ -8,7 +8,7 @@
   - type: Sprite
     netsync: false
     drawdepth: Mobs # They're on the same layer as mobs, perspective.
-    sprite: Constructible/Structures/Doors/Standard/basic.rsi
+    sprite: Structures/Doors/Airlocks/Standard/basic.rsi
     layers:
     - state: closed
       map: ["enum.DoorVisualLayers.Base"]
@@ -75,45 +75,3 @@
     mode: NoSprite
   placement:
     mode: SnapgridCenter
-
-- type: entity
-  id: AirlockAssembly
-  name: airlock assembly
-  description: It opens, it closes, and maybe crushes you.
-  components:
-  - type: Clickable
-  - type: InteractionOutline
-  - type: Sprite
-    netsync: false
-    drawdepth: Mobs
-    sprite: Constructible/Structures/Doors/Standard/basic.rsi
-    state: "assembly"
-  - type: Physics
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.49,-0.49,0.49,0.49"
-      mass: 100
-      mask:
-      - MobImpassable
-      layer:
-      - MobImpassable
-      - VaultImpassable
-  - type: Anchorable
-  - type: Pullable
-  - type: SnapGrid
-  - type: Damageable
-    resistances: metallicResistances
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 300
-      behaviors:
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-  - type: Construction
-    graph: airlock
-    node: assembly
-  placement:
-    mode: SnapgridCenter
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml
new file mode 100644
index 0000000000..b33fa434c7
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml
@@ -0,0 +1,17 @@
+- type: entity
+  parent: Airlock
+  id: AirlockExternal
+  suffix: External
+  description: "It opens, it closes, it might crush you, and there might be only space behind it.\nHas to be manually activated."
+  components:
+  - type: Door
+    bumpOpen: false
+  - 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/Constructible/Doors/firelock.yml b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
similarity index 93%
rename from Resources/Prototypes/Entities/Constructible/Doors/firelock.yml
rename to Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
index c52a2f0505..40fad456b0 100644
--- a/Resources/Prototypes/Entities/Constructible/Doors/firelock.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: Firelock
-  parent: BaseConstructible
+  parent: BaseStructure
   name: firelock
   description: Apply crowbar.
   components:
@@ -18,7 +18,7 @@
     - type: Sprite
       netsync: false
       drawdepth: Mobs # They're on the same layer as mobs, perspective.
-      sprite: Constructible/Structures/Doors/Standard/firelock.rsi
+      sprite: Structures/Doors/Airlocks/Standard/firelock.rsi
       layers:
         - state: closed
           map: ["enum.DoorVisualLayers.Base"]
@@ -89,7 +89,7 @@
     - type: Occluder
       enabled: false
     - type: Sprite
-      sprite: Constructible/Structures/Doors/Glass/firelock.rsi
+      sprite: Structures/Doors/Airlocks/Glass/firelock.rsi
 
 - type: entity
   id: FirelockEdge
@@ -100,7 +100,7 @@
       occludes: false
       inhibitCrush: false
     - type: Sprite
-      sprite: Constructible/Structures/Doors/edge_door_hazard.rsi
+      sprite: Structures/Doors/edge_door_hazard.rsi
     - type: Airtight
       fixVacuum: true
       noAirWhenFullyAirBlocked: false
diff --git a/Resources/Prototypes/Entities/Constructible/Doors/firelock_frame.yml b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml
similarity index 87%
rename from Resources/Prototypes/Entities/Constructible/Doors/firelock_frame.yml
rename to Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml
index 825a9a96f9..dd73940b31 100644
--- a/Resources/Prototypes/Entities/Constructible/Doors/firelock_frame.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml
@@ -1,11 +1,11 @@
 - type: entity
   id: FirelockFrame
-  parent: BaseConstructibleDynamic
+  parent: BaseStructureDynamic
   name: Firelock Frame
   description: That is a firelock frame.
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Doors/Standard/firelock.rsi
+    sprite: Structures/Doors/Airlocks/Standard/firelock.rsi
     state: frame1
   - type: Construction
     graph: Firelock
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/Tables/base.yml b/Resources/Prototypes/Entities/Structures/Furniture/Tables/base.yml
new file mode 100644
index 0000000000..8fdc6370cd
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Furniture/Tables/base.yml
@@ -0,0 +1,19 @@
+- type: entity
+  id: TableBase
+  parent: BaseStructure
+  name: table
+  description: A square piece of metal standing on four metal legs.
+  abstract: true
+  components:
+  - type: Damageable
+    resistances: metallicResistances
+  - type: PlaceableSurface
+  - type: Sprite
+    netsync: false
+    drawdepth: FloorTiles
+  - type: Icon
+    state: full
+  - type: IconSmooth
+    key: state
+    base: state_
+  - type: Climbable
diff --git a/Resources/Prototypes/Entities/Constructible/Furniture/tables.yml b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
similarity index 80%
rename from Resources/Prototypes/Entities/Constructible/Furniture/tables.yml
rename to Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
index 4a05fdb46e..e9c2fc3f2a 100644
--- a/Resources/Prototypes/Entities/Constructible/Furniture/tables.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
@@ -1,33 +1,13 @@
 - type: entity
-  id: TableBase
-  parent: BaseConstructible
-  name: table
-  description: A square piece of metal standing on four metal legs.
-  abstract: true
-  components:
-  - type: Damageable
-    resistances: metallicResistances
-  - type: PlaceableSurface
-  - type: Sprite
-    netsync: false
-    drawdepth: FloorTiles
-  - type: Icon
-    state: full
-  - type: IconSmooth
-    key: state
-    base: state_
-  - type: Climbable
-
-- type: entity
   id: TableFrame
   parent: TableBase
   name: table frame
   description: Pieces of metal that make the frame of a table.
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Tables/frame.rsi
+    sprite: Structures/Furniture/Tables/frame.rsi
   - type: Icon
-    sprite: Constructible/Structures/Tables/frame.rsi
+    sprite: Structures/Furniture/Tables/frame.rsi
   - type: Damageable
     resistances: metallicResistances
   - type: Destructible
@@ -56,9 +36,9 @@
   description: A square piece of metal standing on four metal legs.
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Tables/generic.rsi
+    sprite: Structures/Furniture/Tables/generic.rsi
   - type: Icon
-    sprite: Constructible/Structures/Tables/generic.rsi
+    sprite: Structures/Furniture/Tables/generic.rsi
   - type: Damageable
     resistances: metallicResistances
   - type: Destructible
@@ -87,9 +67,9 @@
   description: Fancy table. Perfect for serving drinks.
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Tables/bar.rsi
+    sprite: Structures/Furniture/Tables/bar.rsi
   - type: Icon
-    sprite: Constructible/Structures/Tables/bar.rsi
+    sprite: Structures/Furniture/Tables/bar.rsi
   - type: Destructible
     thresholds:
     - trigger:
@@ -119,9 +99,9 @@
   description: Just a metal table.
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Tables/metal.rsi
+    sprite: Structures/Furniture/Tables/metal.rsi
   - type: Icon
-    sprite: Constructible/Structures/Tables/metal.rsi
+    sprite: Structures/Furniture/Tables/metal.rsi
   - type: Destructible
     thresholds:
     - trigger:
@@ -145,9 +125,9 @@
   description: A square piece of metal standing on four metal legs. Extra robust.
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Tables/reinforced.rsi
+    sprite: Structures/Furniture/Tables/reinforced.rsi
   - type: Icon
-    sprite: Constructible/Structures/Tables/reinforced.rsi
+    sprite: Structures/Furniture/Tables/reinforced.rsi
   - type: Destructible
     thresholds:
     - trigger:
@@ -174,9 +154,9 @@
   description: A square piece of glass, standing on four metal legs.
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Tables/glass.rsi
+    sprite: Structures/Furniture/Tables/glass.rsi
   - type: Icon
-    sprite: Constructible/Structures/Tables/glass.rsi
+    sprite: Structures/Furniture/Tables/glass.rsi
   - type: Destructible
     thresholds:
     - trigger:
@@ -203,9 +183,9 @@
   description: A square piece of glass, standing on four metal legs. Extra robust.
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Tables/r_glass.rsi
+    sprite: Structures/Furniture/Tables/r_glass.rsi
   - type: Icon
-    sprite: Constructible/Structures/Tables/r_glass.rsi
+    sprite: Structures/Furniture/Tables/r_glass.rsi
   - type: Destructible
     thresholds:
     - trigger:
@@ -235,9 +215,9 @@
   description: Do not apply fire to this. Rumour says it burns easily.
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Tables/wood.rsi
+    sprite: Structures/Furniture/Tables/wood.rsi
   - type: Icon
-    sprite: Constructible/Structures/Tables/wood.rsi
+    sprite: Structures/Furniture/Tables/wood.rsi
   - type: Destructible
     thresholds:
     - trigger:
@@ -264,9 +244,9 @@
   description: Play em' cowboy.
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Tables/carpet.rsi
+    sprite: Structures/Furniture/Tables/carpet.rsi
   - type: Icon
-    sprite: Constructible/Structures/Tables/carpet.rsi
+    sprite: Structures/Furniture/Tables/carpet.rsi
   - type: Destructible
     thresholds:
     - trigger:
@@ -296,9 +276,9 @@
   description: Literally the sturdiest thing you have ever seen.
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Tables/stone.rsi
+    sprite: Structures/Furniture/Tables/stone.rsi
   - type: Icon
-    sprite: Constructible/Structures/Tables/stone.rsi
+    sprite: Structures/Furniture/Tables/stone.rsi
   - type: Destructible
     thresholds:
     - trigger:
@@ -318,9 +298,9 @@
   suffix: DEBUG
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Tables/debug.rsi
+    sprite: Structures/Furniture/Tables/debug.rsi
   - type: Icon
-    sprite: Constructible/Structures/Tables/debug.rsi
+    sprite: Structures/Furniture/Tables/debug.rsi
   - type: Destructible
     thresholds:
     - trigger:
diff --git a/Resources/Prototypes/Entities/Constructible/Furniture/beds.yml b/Resources/Prototypes/Entities/Structures/Furniture/beds.yml
similarity index 93%
rename from Resources/Prototypes/Entities/Constructible/Furniture/beds.yml
rename to Resources/Prototypes/Entities/Structures/Furniture/beds.yml
index 49778bb69b..a9ba42a0b7 100644
--- a/Resources/Prototypes/Entities/Constructible/Furniture/beds.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/beds.yml
@@ -1,7 +1,7 @@
 - type: entity
   name: bed
   id: Bed
-  parent: BaseConstructible
+  parent: BaseStructure
   description: This is used to lie in, sleep in or strap on.
   components:
   # So that you can put bedsheets on beds again. Would be cool to have a tag
@@ -18,7 +18,7 @@
       mask:
       - SmallImpassable
   - type: Sprite
-    sprite: Constructible/Misc/furniture.rsi
+    sprite: Structures/Furniture/furniture.rsi
     state: bed
   - type: Strap
     position: Down
diff --git a/Resources/Prototypes/Entities/Constructible/Furniture/bookshelf.yml b/Resources/Prototypes/Entities/Structures/Furniture/bookshelf.yml
similarity index 91%
rename from Resources/Prototypes/Entities/Constructible/Furniture/bookshelf.yml
rename to Resources/Prototypes/Entities/Structures/Furniture/bookshelf.yml
index 728aa67d1d..4e4cf4e074 100644
--- a/Resources/Prototypes/Entities/Constructible/Furniture/bookshelf.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/bookshelf.yml
@@ -1,11 +1,11 @@
 - type: entity
   id: Bookshelf
-  parent: BaseConstructible
+  parent: BaseStructure
   name: "bookshelf"
   description: Mostly filled with erotica.
   components:
   - type: Sprite
-    sprite: Constructible/Misc/bookshelf.rsi
+    sprite: Structures/Furniture/bookshelf.rsi
     layers:
       - state: base
       - state: book-0
diff --git a/Resources/Prototypes/Entities/Constructible/Furniture/carpets.yml b/Resources/Prototypes/Entities/Structures/Furniture/carpets.yml
similarity index 64%
rename from Resources/Prototypes/Entities/Constructible/Furniture/carpets.yml
rename to Resources/Prototypes/Entities/Structures/Furniture/carpets.yml
index 117a2a12e7..17ac1a5ab4 100644
--- a/Resources/Prototypes/Entities/Constructible/Furniture/carpets.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/carpets.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: CarpetBase
-  parent: BaseConstructible
+  parent: BaseStructure
   description: "Fancy walking surface."
   abstract: true
   components:
@@ -34,9 +34,9 @@
   name: "carpet"
   components:
   - type: Sprite
-    sprite: Constructible/Carpets/red_carpet.rsi
+    sprite: Structures/Furniture/Carpets/red_carpet.rsi
   - type: Icon
-    sprite: Constructible/Carpets/red_carpet.rsi
+    sprite: Structures/Furniture/Carpets/red_carpet.rsi
 
 - type: entity
   id: CarpetBlack
@@ -45,9 +45,9 @@
   components:
   - type: Clickable
   - type: Sprite
-    sprite: Constructible/Carpets/black_carpet.rsi
+    sprite: Structures/Furniture/Carpets/black_carpet.rsi
   - type: Icon
-    sprite: Constructible/Carpets/black_carpet.rsi
+    sprite: Structures/Furniture/Carpets/black_carpet.rsi
 
 - type: entity
   id: CarpetGay
@@ -56,9 +56,9 @@
   components:
   - type: Clickable
   - type: Sprite
-    sprite: Constructible/Carpets/gay_carpet.rsi
+    sprite: Structures/Furniture/Carpets/gay_carpet.rsi
   - type: Icon
-    sprite: Constructible/Carpets/gay_carpet.rsi
+    sprite: Structures/Furniture/Carpets/gay_carpet.rsi
 
 - type: entity
   id: CarpetBlue
@@ -67,9 +67,9 @@
   components:
   - type: Clickable
   - type: Sprite
-    sprite: Constructible/Carpets/blue_carpet.rsi
+    sprite: Structures/Furniture/Carpets/blue_carpet.rsi
   - type: Icon
-    sprite: Constructible/Carpets/blue_carpet.rsi
+    sprite: Structures/Furniture/Carpets/blue_carpet.rsi
 
 - type: entity
   id: CarpetGreen
@@ -78,9 +78,9 @@
   components:
   - type: Clickable
   - type: Sprite
-    sprite: Constructible/Carpets/green_carpet.rsi
+    sprite: Structures/Furniture/Carpets/green_carpet.rsi
   - type: Icon
-    sprite: Constructible/Carpets/green_carpet.rsi
+    sprite: Structures/Furniture/Carpets/green_carpet.rsi
 
 - type: entity
   id: CarpetOrange
@@ -89,9 +89,9 @@
   components:
   - type: Clickable
   - type: Sprite
-    sprite: Constructible/Carpets/orange_carpet.rsi
+    sprite: Structures/Furniture/Carpets/orange_carpet.rsi
   - type: Icon
-    sprite: Constructible/Carpets/orange_carpet.rsi
+    sprite: Structures/Furniture/Carpets/orange_carpet.rsi
 
 - type: entity
   id: CarpetSBlue
@@ -100,9 +100,9 @@
   components:
   - type: Clickable
   - type: Sprite
-    sprite: Constructible/Carpets/skyblue_carpet.rsi
+    sprite: Structures/Furniture/Carpets/skyblue_carpet.rsi
   - type: Icon
-    sprite: Constructible/Carpets/skyblue_carpet.rsi
+    sprite: Structures/Furniture/Carpets/skyblue_carpet.rsi
 
 - type: entity
   id: CarpetPurple
@@ -111,6 +111,6 @@
   components:
   - type: Clickable
   - type: Sprite
-    sprite: Constructible/Carpets/purple_carpet.rsi
+    sprite: Structures/Furniture/Carpets/purple_carpet.rsi
   - type: Icon
-    sprite: Constructible/Carpets/purple_carpet.rsi
+    sprite: Structures/Furniture/Carpets/purple_carpet.rsi
diff --git a/Resources/Prototypes/Entities/Constructible/Furniture/instruments.yml b/Resources/Prototypes/Entities/Structures/Furniture/instruments.yml
similarity index 91%
rename from Resources/Prototypes/Entities/Constructible/Furniture/instruments.yml
rename to Resources/Prototypes/Entities/Structures/Furniture/instruments.yml
index d4ecbf7ba4..f3a1f66670 100644
--- a/Resources/Prototypes/Entities/Constructible/Furniture/instruments.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/instruments.yml
@@ -1,7 +1,7 @@
 - type: entity
   name: baseinstrument
   id: BasePlaceableInstrument
-  parent: BaseConstructibleDynamic
+  parent: BaseStructureDynamic
   abstract: true
   components:
   - type: Instrument
@@ -10,7 +10,7 @@
   - type: Rotatable
     rotateWhileAnchored: true
   - type: Sprite
-    sprite: Objects/Fun/Instruments/otherinstruments.rsi
+    sprite: Structures/Furniture/instruments.rsi
   - type: Damageable
     resistances: metallicResistances
   - type: Destructible
@@ -58,4 +58,4 @@
   - type: Instrument
     program: 20
   - type: Sprite
-    state: church_organ
+    state: church-organ
diff --git a/Resources/Prototypes/Entities/Constructible/Furniture/potted_plants.yml b/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml
similarity index 96%
rename from Resources/Prototypes/Entities/Constructible/Furniture/potted_plants.yml
rename to Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml
index e6d8dc2e04..07a2513d2a 100644
--- a/Resources/Prototypes/Entities/Constructible/Furniture/potted_plants.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: PottedPlantBase
-  parent: BaseConstructibleDynamic
+  parent: BaseStructureDynamic
   abstract: true
   components:
   - type: InteractionOutline
@@ -19,7 +19,7 @@
         - SmallImpassable
         - VaultImpassable
   - type: Sprite
-    sprite: Constructible/Misc/potted_plants.rsi
+    sprite: Structures/Furniture/potted_plants.rsi
   - type: PottedPlantHide
   - type: SecretStash
     secretPartName: the plant
diff --git a/Resources/Prototypes/Entities/Constructible/Furniture/seats.yml b/Resources/Prototypes/Entities/Structures/Furniture/seats.yml
similarity index 88%
rename from Resources/Prototypes/Entities/Constructible/Furniture/seats.yml
rename to Resources/Prototypes/Entities/Structures/Furniture/seats.yml
index 617447f05f..4965150328 100644
--- a/Resources/Prototypes/Entities/Constructible/Furniture/seats.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/seats.yml
@@ -19,7 +19,7 @@
       - VaultImpassable
       - SmallImpassable
   - type: Sprite
-    sprite: Constructible/Misc/furniture.rsi
+    sprite: Structures/Furniture/furniture.rsi
   - type: Strap
     position: Stand
   - type: Pullable
@@ -199,3 +199,26 @@
           MaterialWoodPlank:
             min: 1
             max: 1
+
+- type: entity
+  name: pilot seat
+  id: ChairPilotSeat
+  parent: SeatBase
+  description: The pilot seat of a prestigious ship.
+  components:
+  - type: Anchorable
+  - type: Rotatable
+  - type: Sprite
+    sprite: Structures/Furniture/furniture.rsi
+    state: shuttle_chair
+    netsync: false
+  - type: Physics
+    bodyType: Static
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.45, -0.45, 0.05, 0.45"
+      mask:
+      - Impassable
+      - VaultImpassable
+      - SmallImpassable
diff --git a/Resources/Prototypes/Entities/Constructible/Watercloset/toilet.yml b/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
similarity index 94%
rename from Resources/Prototypes/Entities/Constructible/Watercloset/toilet.yml
rename to Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
index 0de11e1e9f..c5a9cc88d0 100644
--- a/Resources/Prototypes/Entities/Constructible/Watercloset/toilet.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
@@ -7,7 +7,7 @@
   components:
   - type: Anchorable
   - type: Sprite
-    sprite: Constructible/Watercloset/toilet.rsi
+    sprite: Structures/Furniture/toilet.rsi
     state: closed_toilet_seat_up
     netsync: false
   - type: Toilet
diff --git a/Resources/Prototypes/Entities/Constructible/Power/arcade.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
similarity index 94%
rename from Resources/Prototypes/Entities/Constructible/Power/arcade.yml
rename to Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
index f0db5e326a..eb167c146e 100644
--- a/Resources/Prototypes/Entities/Constructible/Power/arcade.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
@@ -7,7 +7,7 @@
   components:
   - type: ApcPowerReceiver
   - type: Sprite
-    sprite: Constructible/Power/computers.rsi
+    sprite: Structures/Machines/computers.rsi
     layers:
     - state: arcade
       map: ["enum.ComputerVisualizer+Layers.Body"]
@@ -15,7 +15,7 @@
       shader: unshaded
       map: ["enum.ComputerVisualizer+Layers.Screen"]
   - type: Icon
-    sprite: Constructible/Power/computers.rsi
+    sprite: Structures/Machines/computers.rsi
     state: arcade
   - type: Appearance
     visuals:
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/base.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/base.yml
new file mode 100644
index 0000000000..43fd08eba7
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/base.yml
@@ -0,0 +1,31 @@
+- type: entity
+  abstract: true
+  parent: ComputerFrame
+  id: ComputerBase
+  name: computer
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: Construction
+    graph: computer
+    node: computer
+  - type: Computer
+  - type: ApcPowerReceiver
+  - type: Sprite
+    sprite: Structures/Machines/computers.rsi
+    layers:
+    - state: computer
+      map: ["enum.ComputerVisualizer+Layers.Body"]
+    - state: generic_key_off
+      map: ["enum.ComputerVisualizer+Layers.Keyboard"]
+    - state: generic
+      shader: unshaded
+      map: ["enum.ComputerVisualizer+Layers.Screen"]
+    - state: generic_key
+      shader: unshaded
+      map: ["enum.ComputerVisualizer+Layers.KeyboardOn"]
+  - type: Appearance
+    visuals:
+    - type: ComputerVisualizer
+      key: generic_key
+      screen: generic
diff --git a/Resources/Prototypes/Entities/Constructible/Power/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
similarity index 58%
rename from Resources/Prototypes/Entities/Constructible/Power/computers.yml
rename to Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
index d19ec4cb9e..456b1a2567 100644
--- a/Resources/Prototypes/Entities/Constructible/Power/computers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
@@ -1,108 +1,4 @@
 - type: entity
-  id: ComputerFrame
-  parent: BaseConstructible
-  name: computer frame
-  description: A computer under construction.
-  components:
-  - type: Physics
-    bodyType: Static
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.5,-0.25,0.5,0.25"
-      mass: 25
-      mask:
-        - MobImpassable
-      layer:
-        - Opaque
-        - MobImpassable
-        - SmallImpassable
-        - VaultImpassable
-  - type: InteractionOutline
-  - type: Rotatable
-  - type: Anchorable
-  - type: Construction
-    graph: computer
-    node: frameUnsecured
-  - type: Sprite
-    sprite: "Constructible/Misc/stock_parts.rsi"
-    state: "0"
-  - type: Damageable
-    resistances: metallicResistances
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 100
-      behaviors:
-      - !type:PlaySoundCollectionBehavior
-        soundCollection: GlassBreak
-      - !type:ChangeConstructionNodeBehavior
-        node: monitorBroken
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-
-- type: entity
-  parent: ComputerFrame
-  id: ComputerBroken
-  name: broken computer
-  description: This computer has seen better days.
-  components:
-  - type: Construction
-    graph: computer
-    node: monitorBroken
-  - type: Sprite
-    sprite: "Constructible/Power/computers.rsi"
-    state: "broken"
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 50
-      behaviors:
-      - !type:PlaySoundBehavior
-        sound: /Audio/Effects/metalbreak.ogg
-      - !type:SpawnEntitiesBehavior
-        spawn:
-          SheetSteel1:
-            min: 1
-            max: 1
-      - !type:DoActsBehavior
-        acts: [ "Destruction" ]
-
-- type: entity
-  abstract: true
-  parent: ComputerFrame
-  id: ComputerBase
-  name: computer
-  placement:
-    mode: SnapgridCenter
-  components:
-  - type: Construction
-    graph: computer
-    node: computer
-  - type: Computer
-  - type: ApcPowerReceiver
-  - type: Sprite
-    sprite: Constructible/Power/computers.rsi
-    layers:
-    - state: computer
-      map: ["enum.ComputerVisualizer+Layers.Body"]
-    - state: generic_key_off
-      map: ["enum.ComputerVisualizer+Layers.Keyboard"]
-    - state: generic
-      shader: unshaded
-      map: ["enum.ComputerVisualizer+Layers.Screen"]
-    - state: generic_key
-      shader: unshaded
-      map: ["enum.ComputerVisualizer+Layers.KeyboardOn"]
-  - type: Appearance
-    visuals:
-    - type: ComputerVisualizer
-      key: generic_key
-      screen: generic
-
-- type: entity
   parent: ComputerBase
   id: ComputerAlert
   name: alerts computer
@@ -114,6 +10,41 @@
       key: atmos_key
       screen: "alert-2"
 
+- type: entity
+  parent: ComputerBase
+  id: ComputerShuttleBase
+  name: shuttle console
+  description: Used to pilot a shuttle.
+  abstract: true
+  components:
+  - type: ShuttleConsole
+  - type: ApcPowerReceiver
+    powerLoad: 200
+
+- type: entity
+  parent: ComputerShuttleBase
+  id: ComputerShuttle
+  name: shuttle console
+  description: Used to pilot a shuttle.
+  components:
+  - type: Appearance
+    visuals:
+    - type: ComputerVisualizer
+      key: generic_key
+      screen: shuttle
+
+- type: entity
+  parent: ComputerShuttleBase
+  id: ComputerShuttleSyndie
+  name: syndicate shuttle console
+  description: Used to pilot a syndicate shuttle.
+  components:
+  - type: Appearance
+    visuals:
+    - type: ComputerVisualizer
+      key: syndie_key
+      screen: syndishuttle
+
 - type: entity
   parent: ComputerBase
   id: ComputerPowerMonitoring
@@ -159,7 +90,7 @@
     - key: enum.ResearchClientUiKey.Key
       type: ResearchClientBoundUserInterface
   - type: ApcPowerReceiver
-    load: 200
+    powerLoad: 200
     priority: Low
   - type: Computer
     board: ResearchComputerCircuitboard
@@ -241,3 +172,85 @@
       type: SolarControlConsoleBoundUserInterface
   - type: Computer
     board: SolarControlComputerCircuitboard
+
+- type: entity
+  id: ComputerSupplyOrdering
+  parent: ComputerBase
+  name: Cargo ordering computer
+  description: Used to order supplies, approve requests, and control the shuttle.
+  components:
+  - type: Appearance
+    visuals:
+    - type: ComputerVisualizer
+      key: tech_key
+      screen: supply
+  - type: CargoConsole
+  - type: CargoOrderDatabase
+  - type: GalacticMarket
+    products:
+      - EmergencyExplosive
+      - EmergencyFire
+      - EmergencyInternals
+      - EmergencyRadiation
+      - ArmorySmg
+      - ArmoryShotgun
+      - SecurityArmor
+      - SecurityRiot
+      - SecurityLaser
+      - SecurityHelmet
+      - SecuritySupplies
+      - SecurityNonLethal
+      - HydroponicsTools
+      - HydroponicsSeeds
+      - HydroponicsSeedsExotic
+      - ServiceJanitorial
+      - ServiceLightsReplacement
+      - EngineeringCableLv
+      - EngineeringCableMv
+      - EngineeringCableHv
+      - EngineeringCableBulk
+      - EngineAmeShielding
+      - EngineAmeJar
+      - EngineAmeControl
+      - EngineSolar
+      - FunPlushies
+      - FunArtSupplies
+      - FunInstruments
+      - MaterialSteel
+      - MaterialGlass
+      - MaterialPlastic
+      - MaterialPlasteel
+      - EngineSingularityEmitter
+      - EngineSingularityCollector
+      - EngineSingularityGenerator
+      - EngineSingularityContainment
+      - EngineParticleAccelerator
+      - AtmosphericsAir
+      - AtmosphericsOxygen
+      - AtmosphericsNitrogen
+      - AtmosphericsCarbonDioxide
+#      - AtmosphericsWaterVapor
+#      - AtmosphericsPlasma
+#      - AtmosphericsTritium
+  - type: UserInterface
+    interfaces:
+    - key: enum.CargoConsoleUiKey.Key
+      type: CargoConsoleBoundUserInterface
+  - type: Computer
+    board: SupplyComputerCircuitboard
+
+- type: entity
+  id: ComputerSupplyRequest
+  parent: ComputerSupplyOrdering
+  name: cargo request computer
+  description: Used to request supplies from cargo.
+  components:
+  - type: Appearance
+    visuals:
+    - type: ComputerVisualizer
+      key: tech_key
+      screen: request
+  - type: CargoConsole
+    requestOnly: true
+  - type: Computer
+    board: SupplyRequestComputerCircuitboard
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml
new file mode 100644
index 0000000000..77cba8a15c
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml
@@ -0,0 +1,71 @@
+- type: entity
+  id: ComputerFrame
+  parent: BaseStructure
+  name: computer frame
+  description: A computer under construction.
+  components:
+  - type: Physics
+    bodyType: Static
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.5,-0.25,0.5,0.25"
+      mass: 25
+      mask:
+        - MobImpassable
+      layer:
+        - Opaque
+        - MobImpassable
+        - SmallImpassable
+        - VaultImpassable
+  - type: InteractionOutline
+  - type: Rotatable
+  - type: Anchorable
+  - type: Construction
+    graph: computer
+    node: frameUnsecured
+  - type: Sprite
+    sprite: Structures/Machines/parts.rsi
+    state: 0
+  - type: Damageable
+    resistances: metallicResistances
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 100
+      behaviors:
+      - !type:PlaySoundCollectionBehavior
+        soundCollection: GlassBreak
+      - !type:ChangeConstructionNodeBehavior
+        node: monitorBroken
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+
+- type: entity
+  parent: ComputerFrame
+  id: ComputerBroken
+  name: broken computer
+  description: This computer has seen better days.
+  components:
+  - type: Construction
+    graph: computer
+    node: monitorBroken
+  - type: Sprite
+    sprite: Structures/Machines/computers.rsi
+    state: broken
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 50
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound: /Audio/Effects/metalbreak.ogg
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetSteel1:
+            min: 1
+            max: 1
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
diff --git a/Resources/Prototypes/Entities/Constructible/base_machine.yml b/Resources/Prototypes/Entities/Structures/Machines/base.yml
similarity index 96%
rename from Resources/Prototypes/Entities/Constructible/base_machine.yml
rename to Resources/Prototypes/Entities/Structures/Machines/base.yml
index b19a2a4167..9f7d7faad1 100644
--- a/Resources/Prototypes/Entities/Constructible/base_machine.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/base.yml
@@ -1,6 +1,6 @@
 - type: entity
   abstract: true
-  parent: BaseConstructible
+  parent: BaseStructure
   id: BaseMachine
   components:
   - type: InteractionOutline
diff --git a/Resources/Prototypes/Entities/Constructible/Specific/chem_master.yml b/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
similarity index 90%
rename from Resources/Prototypes/Entities/Constructible/Specific/chem_master.yml
rename to Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
index 08526a09de..0deb23f6d4 100644
--- a/Resources/Prototypes/Entities/Constructible/Specific/chem_master.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
@@ -1,19 +1,19 @@
 - type: entity
   id: chem_master
-  parent: BaseConstructible
+  parent: BaseStructure
   name: ChemMaster 4000
   description: An industrial grade chemical manipulator with pill and bottle production included.
   placement:
     mode: SnapgridCenter
   components:
   - type: Sprite
-    sprite: Constructible/Power/mixer.rsi
+    sprite: Structures/Machines/mixer.rsi
     layers:
     - state: mixer_empty
     - state: mixer_screens
       shader: unshaded
   - type: Icon
-    sprite: Constructible/Power/mixer.rsi
+    sprite: Structures/Machines/mixer.rsi
     state: mixer_loaded
   - type: ChemMaster
   - type: ApcPowerReceiver
@@ -52,20 +52,20 @@
 
 - type: entity
   id: chem_master_broken
-  parent: BaseConstructibleDynamic
+  parent: BaseStructureDynamic
   name: ChemMaster 4000
   description: "An industrial grade chemical manipulator with pill and bottle production included. It's broken."
   abstract: true
   suffix: Broken
   components:
   - type: Sprite
-    sprite: Constructible/Power/mixer.rsi
+    sprite: Structures/Machines/mixer.rsi
     layers:
     - state: mixer_empty
     - state: mixer_screen_broken
       shader: unshaded
   - type: Icon
-    sprite: Constructible/Power/mixer.rsi
+    sprite: Structures/Machines/mixer.rsi
     state: mixer_broken
   - type: InteractionOutline
   - type: Physics
diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Medical/cloning_machine.yml b/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml
similarity index 92%
rename from Resources/Prototypes/Entities/Constructible/Specific/Medical/cloning_machine.yml
rename to Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml
index c0365ff0f7..95154b771d 100644
--- a/Resources/Prototypes/Entities/Constructible/Specific/Medical/cloning_machine.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml
@@ -7,7 +7,7 @@
   - type: CloningPod
   - type: Sprite
     netsync: false
-    sprite: Constructible/Specific/Medical/cloning.rsi
+    sprite: Structures/Machines/cloning.rsi
     layers:
       - state: pod_0
         map: ["enum.CloningPodVisualLayers.Machine"]
diff --git a/Resources/Prototypes/Entities/Constructible/Power/machine_frame.yml b/Resources/Prototypes/Entities/Structures/Machines/frame.yml
similarity index 91%
rename from Resources/Prototypes/Entities/Constructible/Power/machine_frame.yml
rename to Resources/Prototypes/Entities/Structures/Machines/frame.yml
index a973737234..a96523dd78 100644
--- a/Resources/Prototypes/Entities/Constructible/Power/machine_frame.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/frame.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: UnfinishedMachineFrame
   name: machine frame
-  description: "A machine under construction. Needs more parts."
+  description: A machine under construction. Needs more parts.
   suffix: Unfinished
   placement:
     mode: SnapgridCenter
@@ -43,8 +43,8 @@
         - !type:DoActsBehavior
           acts: ["Destruction"]
     - type: Sprite
-      sprite: "Constructible/Misc/stock_parts.rsi"
-      state: "box_0"
+      sprite: Structures/Machines/parts.rsi
+      state: box_0
 
 - type: entity
   id: MachineFrame
@@ -92,8 +92,8 @@
     - type: MachineFrame
     - type: Sprite
       netsync: false
-      sprite: "Constructible/Misc/stock_parts.rsi"
-      state: "box_1"
+      sprite: Structures/Machines/parts.rsi
+      state: box_1
     - type: Appearance
       visuals:
       - type: MachineFrameVisualizer
diff --git a/Resources/Prototypes/Entities/Constructible/Specific/gravity_generator.yml b/Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml
similarity index 84%
rename from Resources/Prototypes/Entities/Constructible/Specific/gravity_generator.yml
rename to Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml
index 527bcade39..bfbeb05fb5 100644
--- a/Resources/Prototypes/Entities/Constructible/Specific/gravity_generator.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml
@@ -1,15 +1,18 @@
 - type: entity
   id: GravityGenerator
+  parent: BaseMachinePowered
   name: gravity generator
   description: It's what keeps you to the floor.
+  placement:
+    mode: AlignTileAny
   components:
   - type: Sprite
     netsync: false
-    sprite: Constructible/Power/gravity_generator.rsi
+    sprite: Structures/Machines/gravity_generator.rsi
     layers:
       - state: on
         map: ["enum.GravityGeneratorVisualLayers.Base"]
-      - sprite: Constructible/Power/gravity_generator_core.rsi
+      - sprite: Structures/Machines/gravity_generator_core.rsi
         state: activated
         shader: unshaded
         map: ["enum.GravityGeneratorVisualLayers.Core"]
@@ -17,6 +20,7 @@
   - type: ApcPowerReceiver
     powerLoad: 500
   - type: Physics
+    bodyType: Static
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -26,10 +30,6 @@
       - Impassable
       - MobImpassable
       - VaultImpassable
-  - type: Clickable
-  - type: InteractionOutline
-  - type: Damageable
-    resistances: metallicResistances
   - type: Repairable
     fuelCost: 10
     doAfterDelay: 5
@@ -54,6 +54,3 @@
         unpowered: "off"
         off: "off"
         on: "on"
-
-  placement:
-    mode: AlignTileAny
diff --git a/Resources/Prototypes/Entities/Constructible/Power/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
similarity index 87%
rename from Resources/Prototypes/Entities/Constructible/Power/lathe.yml
rename to Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 7202bd93f7..c43572e7f4 100644
--- a/Resources/Prototypes/Entities/Constructible/Power/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -1,12 +1,21 @@
-- type: entity
-  id: BaseLathe
-  name: "lathe"
-  abstract: true
-  placement:
-    mode: SnapgridCenter
+- type: entity
+  parent: BaseMachinePowered
+  id: Autolathe
+  name: autolathe
+  description: It produces items using metal and glass.
   components:
-  - type: Clickable
-  - type: InteractionOutline
+  - type: Sprite
+    sprite: Structures/Machines/autolathe.rsi
+    layers:
+    - state: icon
+      map: ["enum.AutolatheVisualLayers.Base"]
+    - state: unlit
+      shader: unshaded
+      map: ["enum.AutolatheVisualLayers.BaseUnlit"]
+    - state: icon
+      map: ["enum.AutolatheVisualLayers.AnimationLayer"]
+    - state: panel
+      map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: Physics
     bodyType: Static
     fixtures:
@@ -21,40 +30,9 @@
       layer:
       - Opaque
       - MobImpassable
-  - type: SnapGrid
-  - type: Lathe
-  - type: MaterialStorage
-  - type: Anchorable
-  - type: Pullable
-  - type: UserInterface
-    interfaces:
-    - key: enum.LatheUiKey.Key
-      type: LatheBoundUserInterface
-  - type: ApcPowerReceiver
-
-- type: entity
-  parent: BaseLathe
-  id: Autolathe
-  name: "autolathe"
-  description: It produces items using metal and glass.
-  components:
-  - type: Sprite
-    sprite: Constructible/Power/autolathe.rsi
-    layers:
-    - state: icon
-      map: ["enum.AutolatheVisualLayers.Base"]
-    - state: unlit
-      shader: unshaded
-      map: ["enum.AutolatheVisualLayers.BaseUnlit"]
-    - state: icon
-      map: ["enum.AutolatheVisualLayers.AnimationLayer"]
-    - state: panel
-      map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: Construction
     graph: machine
     node: machine
-  - type: Damageable
-    resistances: metallicResistances
   - type: Destructible
     thresholds:
     - trigger:
@@ -67,6 +45,7 @@
         acts: ["Destruction"]
   - type: Machine
     board: AutolatheMachineCircuitboard
+  - type: MaterialStorage
   - type: Wires
     BoardName: "Autolathe"
     LayoutId: Autolathe
@@ -88,15 +67,22 @@
     visuals:
     - type: AutolatheVisualizer
     - type: WiresVisualizer
+  - type: UserInterface
+    interfaces:
+    - key: enum.LatheUiKey.Key
+      type: LatheBoundUserInterface
+  - type: SnapGrid
+  - type: Pullable
+  - type: Lathe
 
 - type: entity
-  parent: BaseLathe
+  parent: BaseMachinePowered
   id: Protolathe
-  name: "protolathe"
+  name: protolathe
   description: Converts raw materials into useful objects.
   components:
   - type: Sprite
-    sprite: Constructible/Power/protolathe.rsi
+    sprite: Structures/Machines/protolathe.rsi
     layers:
     - state: icon
       map: ["enum.ProtolatheVisualLayers.Base"]
@@ -107,12 +93,24 @@
       map: ["enum.ProtolatheVisualLayers.AnimationLayer"]
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
+  - type: Physics
+    bodyType: Static
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.4,-0.4,0.4,0.4"
+      mass: 25
+      mask:
+      - Impassable
+      - VaultImpassable
+      - SmallImpassable
+      layer:
+      - Opaque
+      - MobImpassable
   - type: ResearchClient
   - type: Construction
     graph: machine
     node: machine
-  - type: Damageable
-    resistances: metallicResistances
   - type: Destructible
     thresholds:
     - trigger:
@@ -129,6 +127,7 @@
     BoardName: "Protolathe"
     LayoutId: Protolathe
   - type: TechnologyDatabase
+  - type: MaterialStorage
   - type: ProtolatheDatabase
     protolatherecipes:
       - LightTube
@@ -174,7 +173,6 @@
       - KitchenKnife
       - ButchCleaver
       - FlashlightLantern
-
   - type: UserInterface
     interfaces:
     - key: enum.LatheUiKey.Key
@@ -185,3 +183,6 @@
     visuals:
     - type: ProtolatheVisualizer
     - type: WiresVisualizer
+  - type: SnapGrid
+  - type: Pullable
+  - type: Lathe
diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Medical/medical_scanner.yml b/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml
similarity index 91%
rename from Resources/Prototypes/Entities/Constructible/Specific/Medical/medical_scanner.yml
rename to Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml
index 9e31fd109a..f83802bdba 100644
--- a/Resources/Prototypes/Entities/Constructible/Specific/Medical/medical_scanner.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml
@@ -8,7 +8,7 @@
   - type: Sprite
     netsync: false
     noRot: true
-    sprite: Constructible/Specific/Medical/scanner.rsi
+    sprite: Structures/Machines/scanner.rsi
     layers:
     - state: open
       map: ["enum.MedicalScannerVisualLayers.Machine"]
diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Kitchen/microwave.yml b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
similarity index 76%
rename from Resources/Prototypes/Entities/Constructible/Specific/Kitchen/microwave.yml
rename to Resources/Prototypes/Entities/Structures/Machines/microwave.yml
index 38c3bae6c9..aa9093711a 100644
--- a/Resources/Prototypes/Entities/Constructible/Specific/Kitchen/microwave.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
@@ -1,14 +1,10 @@
 - type: entity
   id: KitchenMicrowave
+  parent: BaseMachinePowered
   name: microwave
   description: It's magic.
-  placement:
-    mode: SnapgridCenter
   components:
-  - type: SnapGrid
   - type: Microwave
-  - type: Clickable
-  - type: InteractionOutline
   - type: SolutionContainer
     maxVol: 100
     caps: Refillable
@@ -25,13 +21,15 @@
     - shape:
         !type:PhysShapeAabb
           bounds: "-0.16,-0.3,0.16,0.3"
+      mass: 25
       layer:
-      - SmallImpassable
+      - MobMask
+      - Opaque
       mask:
-      - VaultImpassable
+      - MobMask
   - type: Sprite
     netsync: false
-    sprite: Constructible/Power/microwave.rsi
+    sprite: Structures/Machines/microwave.rsi
     drawdepth: WallMountedItems
     layers:
     - state: mw0
@@ -39,9 +37,6 @@
     - state: mw_unlit
       shader: unshaded
       map: ["enum.MicrowaveVisualizerLayers.BaseUnlit"]
-  - type: ApcPowerReceiver
-  - type: Damageable
-    resistances: metallicResistances
   - type: Destructible
     thresholds:
     - trigger:
diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Kitchen/reagent_grinder.yml b/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml
similarity index 54%
rename from Resources/Prototypes/Entities/Constructible/Specific/Kitchen/reagent_grinder.yml
rename to Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml
index 1261dcbebb..4a9a89d5a2 100644
--- a/Resources/Prototypes/Entities/Constructible/Specific/Kitchen/reagent_grinder.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml
@@ -1,10 +1,9 @@
 - type: entity
   id: KitchenReagentGrinder
+  parent: BaseMachinePowered
   name: reagent grinder
-  description: "From BlenderTech. Will It Blend? Let's find out!"
+  description: From BlenderTech. Will It Blend? Let's find out!
   suffix: grinder/juicer
-  placement:
-    mode: SnapgridCenter
   components:
   - type: SnapGrid
   - type: ReagentGrinder
@@ -15,9 +14,6 @@
   - type: Appearance
     visuals:
     - type: ReagentGrinderVisualizer
-  - type: Clickable
-  - type: InteractionOutline
-  - type: ApcPowerReceiver
   - type: LoopingSound
   - type: Physics
     fixtures:
@@ -30,18 +26,6 @@
       - VaultImpassable
   - type: Sprite
     netsync: false
-    sprite: Constructible/Power/juicer.rsi
+    sprite: Structures/Machines/juicer.rsi
     state: juicer0
     drawdepth: Items
-  - type: Damageable
-    resistances: metallicResistances
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 100
-      behaviors:
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-      - !type:PlaySoundBehavior
-        sound: /Audio/Effects/metalbreak.ogg
diff --git a/Resources/Prototypes/Entities/Constructible/Specific/recycler.yml b/Resources/Prototypes/Entities/Structures/Machines/recycler.yml
similarity index 81%
rename from Resources/Prototypes/Entities/Constructible/Specific/recycler.yml
rename to Resources/Prototypes/Entities/Structures/Machines/recycler.yml
index 683b59074d..92cd7d374e 100644
--- a/Resources/Prototypes/Entities/Constructible/Specific/recycler.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/recycler.yml
@@ -1,12 +1,9 @@
 - type: entity
   id: Recycler
+  parent: BaseMachinePowered
   name: recycler
   description: A large crushing machine used to recycle small items inefficiently. There are lights on the side.
-  placement:
-    mode: SnapgridCenter
   components:
-  - type: Clickable
-  - type: InteractionOutline
   - type: Physics
     fixtures:
     - shape:
@@ -21,15 +18,13 @@
   - type: SnapGrid
   - type: Sprite
     netsync: false
-    sprite: Constructible/Power/recycling.rsi
+    sprite: Structures/Machines/recycling.rsi
     layers:
     - state: grinder-o1
       map: ["enum.RecyclerVisualLayers.Bloody"]
-
   - type: Appearance
     visuals:
     - type: RecyclerVisualizer
       state_clean: grinder-o1
       state_bloody: grinder-o1bld
   - type: Recycler
-  - type: ApcPowerReceiver
diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Research/research.yml b/Resources/Prototypes/Entities/Structures/Machines/research.yml
similarity index 66%
rename from Resources/Prototypes/Entities/Constructible/Specific/Research/research.yml
rename to Resources/Prototypes/Entities/Structures/Machines/research.yml
index 68ce5a5646..2ac286ab18 100644
--- a/Resources/Prototypes/Entities/Constructible/Specific/Research/research.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/research.yml
@@ -1,31 +1,17 @@
 - type: entity
   id: ResearchAndDevelopmentServer
-  parent: BaseConstructibleDynamic
-  name: "R&D server"
-  description: 'Thats a R&D server.'
+  parent: BaseMachinePowered
+  name: R&D server
+  description: Contains the collective knowledge of the station's scientists. Destroying it would send them back to the stone age. You don't want that do you?
   components:
   - type: Sprite
-    sprite: Constructible/Power/server.rsi
+    sprite: Structures/Machines/server.rsi
     state: server
-  - type: InteractionOutline
-  - type: Physics
-    bodyType: Static
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb {}
-      mass: 25
-      mask:
-        - SmallImpassable
-      layer:
-        - Opaque
-        - MobImpassable
   - type: ResearchServer
   - type: TechnologyDatabase
   - type: ApcPowerReceiver
     powerLoad: 200
     priority: Low
-  - type: Damageable
-    resistances: metallicResistances
   - type: Destructible
     thresholds:
     - trigger:
@@ -44,29 +30,17 @@
 
 - type: entity
   id: BaseResearchAndDevelopmentPointSource
-  parent: BaseConstructibleDynamic
+  parent: BaseMachinePowered
   name: "base R&D point source"
   # We should make this abstract once there are actual point sources.
   components:
   - type: Sprite
-    sprite: Constructible/Power/rndpointsource.rsi
+    sprite: Structures/Machines/rndpointsource.rsi
     layers:
     - state: rndpointsource-off
     - state: rndpointsource
       shader: unshaded
       map: ["enum.PowerDeviceVisualLayers.Powered"]
-  - type: InteractionOutline
-  - type: Physics
-    bodyType: Static
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb {}
-      mass: 25
-      mask:
-        - SmallImpassable
-      layer:
-        - Opaque
-        - MobImpassable
   - type: ResearchPointSource
     pointspersecond: 100
     active: true
@@ -77,7 +51,6 @@
   - type: Appearance
     visuals:
     - type: PowerDeviceVisualizer
-  - type: ApcPowerReceiver
   - type: Destructible
     thresholds:
     - trigger:
diff --git a/Resources/Prototypes/Entities/Constructible/Power/seed_extractor.yml b/Resources/Prototypes/Entities/Structures/Machines/seed_extractor.yml
similarity index 91%
rename from Resources/Prototypes/Entities/Constructible/Power/seed_extractor.yml
rename to Resources/Prototypes/Entities/Structures/Machines/seed_extractor.yml
index ea36f6c59c..2fd55b34f7 100644
--- a/Resources/Prototypes/Entities/Constructible/Power/seed_extractor.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/seed_extractor.yml
@@ -5,7 +5,7 @@
   description: Extracts seeds from produce.
   components:
   - type: Sprite
-    sprite: Constructible/Hydroponics/machines.rsi
+    sprite: Structures/Machines/seed_extractor.rsi
     layers:
     - state: seedextractor-off
     - state: seedextractor-unlit
diff --git a/Resources/Prototypes/Entities/Constructible/Specific/traitordm.yml b/Resources/Prototypes/Entities/Structures/Machines/traitordm.yml
similarity index 81%
rename from Resources/Prototypes/Entities/Constructible/Specific/traitordm.yml
rename to Resources/Prototypes/Entities/Structures/Machines/traitordm.yml
index 003f29a4b0..4127d3f695 100644
--- a/Resources/Prototypes/Entities/Constructible/Specific/traitordm.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/traitordm.yml
@@ -1,17 +1,16 @@
 - type: entity
   id: TraitorDMRedemptionMachine
+  parent: BaseMachinePowered
   name: traitor deathmatch pda redemption machine
   description: Put someone else's PDA into this to get telecrystals.
   components:
   - type: Sprite
     layers:
-      - sprite: Objects/Misc/traitordm.rsi
+      - sprite: Structures/Machines/traitordm.rsi
         state: redemption
-      - sprite: Objects/Misc/traitordm.rsi
+      - sprite: Structures/Machines/traitordm.rsi
         state: redemption-unshaded
         shader: unshaded
-  - type: Clickable
-  - type: InteractionOutline
   - type: Physics
     bodyType: Static
     fixtures:
diff --git a/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
similarity index 89%
rename from Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml
rename to Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
index 5b11907247..a768916885 100644
--- a/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
@@ -1,13 +1,12 @@
 # Vending machine descriptions are stored in vendingMachineInventory YAML files.
 - type: entity
   id: VendingMachine
-  parent: BaseConstructible
-  name: Vending machine
+  parent: BaseMachinePowered
+  name: vending machine
   abstract: true
   components:
-  - type: InteractionOutline
   - type: Sprite
-    sprite: Constructible/Power/VendingMachines/empty.rsi
+    sprite: Structures/Machines/VendingMachines/empty.rsi
     netsync: false
   - type: Physics
     bodyType: Static
@@ -22,13 +21,12 @@
       layer:
       - Opaque
       - MobImpassable
-  - type: Damageable
-    resistances: metallicResistances
+      mass: 100
   - type: Destructible
     thresholds:
     - trigger:
         !type:DamageTrigger
-        damage: 50
+        damage: 100
       behaviors:
       - !type:DoActsBehavior
         acts: ["Breakage"]
@@ -38,7 +36,6 @@
       type: VendingMachineBoundUserInterface
     - key: enum.WiresUiKey.Key
       type: WiresBoundUserInterface
-  - type: ApcPowerReceiver
   - type: Wires
     BoardName: "Vending Machine"
     LayoutId: Vending
@@ -56,7 +53,7 @@
     pack: AmmoVendAds
   - type: Speech
   - type: Sprite
-    sprite: Constructible/Power/VendingMachines/ammo.rsi
+    sprite: Structures/Machines/VendingMachines/ammo.rsi
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Unlit"]
@@ -84,7 +81,7 @@
     pack: BoozeOMatAds
   - type: Speech
   - type: Sprite
-    sprite: Constructible/Power/VendingMachines/boozeomat.rsi
+    sprite: Structures/Machines/VendingMachines/boozeomat.rsi
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Unlit"]
@@ -113,7 +110,7 @@
   - type: Advertise
     pack: BarDrobeAds
   - type: Sprite
-    sprite: Constructible/Power/VendingMachines/bardrobe.rsi
+    sprite: Structures/Machines/VendingMachines/bardrobe.rsi
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Unlit"]
@@ -140,7 +137,7 @@
   - type: VendingMachine
     pack: PTechInventory
   - type: Sprite
-    sprite: Constructible/Power/VendingMachines/cart.rsi
+    sprite: Structures/Machines/VendingMachines/cart.rsi
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Unlit"]
@@ -170,7 +167,7 @@
     pack: CigaretteMachineAds
   - type: Speech
   - type: Sprite
-    sprite: Constructible/Power/VendingMachines/cigs.rsi
+    sprite: Structures/Machines/VendingMachines/cigs.rsi
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Unlit"]
@@ -200,7 +197,7 @@
     pack: ClothesMateAds
   - type: Speech
   - type: Sprite
-    sprite: Constructible/Power/VendingMachines/clothing.rsi
+    sprite: Structures/Machines/VendingMachines/clothing.rsi
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Unlit"]
@@ -229,7 +226,7 @@
     pack: HotDrinksMachineAds
   - type: Speech
   - type: Sprite
-    sprite: Constructible/Power/VendingMachines/coffee.rsi
+    sprite: Structures/Machines/VendingMachines/coffee.rsi
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Unlit"]
@@ -239,7 +236,7 @@
     - state: "screen"
       map: ["enum.VendingMachineVisualLayers.Screen"]
       shader: unshaded
-    - texture: Constructible/Power/VendingMachines/maintenance_panel.png
+    - texture: Structures/Machines/VendingMachines/maintenance_panel.png
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: Appearance
     visuals:
@@ -263,7 +260,7 @@
     pack: RobustSoftdrinksAds
   - type: Speech
   - type: Sprite
-    sprite: Constructible/Power/VendingMachines/cola.rsi
+    sprite: Structures/Machines/VendingMachines/cola.rsi
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Unlit"]
@@ -292,14 +289,14 @@
   - type: Advertise
     pack: DinnerwareAds
   - type: Sprite
-    sprite: Constructible/Power/VendingMachines/dinnerware.rsi
+    sprite: Structures/Machines/VendingMachines/dinnerware.rsi
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Unlit"]
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.BaseUnshaded"]
       shader: unshaded
-    - texture: Constructible/Power/VendingMachines/maintenance_panel.png
+    - texture: Structures/Machines/VendingMachines/maintenance_panel.png
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: Appearance
     visuals:
@@ -322,14 +319,14 @@
     pack: DiscountDansAds
   - type: Speech
   - type: Sprite
-    sprite: Constructible/Power/VendingMachines/discount.rsi
+    sprite: Structures/Machines/VendingMachines/discount.rsi
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Unlit"]
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.BaseUnshaded"]
       shader: unshaded
-    - texture: Constructible/Power/VendingMachines/maintenance_panel.png
+    - texture: Structures/Machines/VendingMachines/maintenance_panel.png
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: Appearance
     visuals:
@@ -347,7 +344,7 @@
   - type: VendingMachine
     pack: EngiVendInventory
   - type: Sprite
-    sprite: Constructible/Power/VendingMachines/engivend.rsi
+    sprite: Structures/Machines/VendingMachines/engivend.rsi
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Unlit"]
@@ -378,7 +375,7 @@
   - type: Advertise
     pack: NanoMedAds
   - type: Sprite
-    sprite: Constructible/Power/VendingMachines/medical.rsi
+    sprite: Structures/Machines/VendingMachines/medical.rsi
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Unlit"]
@@ -409,14 +406,14 @@
   - type: Advertise
     pack: NutriMaxAds
   - type: Sprite
-    sprite: Constructible/Power/VendingMachines/nutri.rsi
+    sprite: Structures/Machines/VendingMachines/nutri.rsi
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Unlit"]
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.BaseUnshaded"]
       shader: unshaded
-    - texture: Constructible/Power/VendingMachines/maintenance_panel.png
+    - texture: Structures/Machines/VendingMachines/maintenance_panel.png
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: Appearance
     visuals:
@@ -439,7 +436,7 @@
   - type: Advertise
     pack: SecTechAds
   - type: Sprite
-    sprite: Constructible/Power/VendingMachines/sec.rsi
+    sprite: Structures/Machines/VendingMachines/sec.rsi
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Unlit"]
@@ -468,14 +465,14 @@
   - type: Advertise
     pack: MegaSeedAds
   - type: Sprite
-    sprite: Constructible/Power/VendingMachines/seeds.rsi
+    sprite: Structures/Machines/VendingMachines/seeds.rsi
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Unlit"]
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.BaseUnshaded"]
       shader: unshaded
-    - texture: Constructible/Power/VendingMachines/maintenance_panel.png
+    - texture: Structures/Machines/VendingMachines/maintenance_panel.png
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: Appearance
     visuals:
@@ -498,14 +495,14 @@
     pack: SmartFridgeAds
   - type: Speech
   - type: Sprite
-    sprite: Constructible/Power/VendingMachines/smartfridge.rsi
+    sprite: Structures/Machines/VendingMachines/smartfridge.rsi
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Unlit"]
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.BaseUnshaded"]
       shader: unshaded
-    - texture: Constructible/Power/VendingMachines/maintenance_panel.png
+    - texture: Structures/Machines/VendingMachines/maintenance_panel.png
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: Appearance
     visuals:
@@ -525,7 +522,7 @@
     pack: GetmoreChocolateCorpAds
   - type: Speech
   - type: Sprite
-    sprite: Constructible/Power/VendingMachines/snack.rsi
+    sprite: Structures/Machines/VendingMachines/snack.rsi
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Unlit"]
@@ -554,7 +551,7 @@
     pack: BodaAds
   - type: Speech
   - type: Sprite
-    sprite: Constructible/Power/VendingMachines/sovietsoda.rsi
+    sprite: Structures/Machines/VendingMachines/sovietsoda.rsi
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Unlit"]
@@ -583,7 +580,7 @@
     pack: AutoDrobeAds
   - type: Speech
   - type: Sprite
-    sprite: Constructible/Power/VendingMachines/theater.rsi
+    sprite: Structures/Machines/VendingMachines/theater.rsi
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Unlit"]
@@ -616,7 +613,7 @@
     pack: VendomatAds
   - type: Speech
   - type: Sprite
-    sprite: Constructible/Power/VendingMachines/vendomat.rsi
+    sprite: Structures/Machines/VendingMachines/vendomat.rsi
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Unlit"]
@@ -643,14 +640,14 @@
   - type: VendingMachine
     pack: NanoMedInventory
   - type: Sprite
-    sprite: Constructible/Power/VendingMachines/wallmed.rsi
+    sprite: Structures/Machines/VendingMachines/wallmed.rsi
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Unlit"]
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.BaseUnshaded"]
       shader: unshaded
-    - texture: Constructible/Power/VendingMachines/maintenance_panel.png
+    - texture: Structures/Machines/VendingMachines/maintenance_panel.png
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: Appearance
     visuals:
@@ -670,7 +667,7 @@
   - type: VendingMachine
     pack: YouToolInventory
   - type: Sprite
-    sprite: Constructible/Power/VendingMachines/youtool.rsi
+    sprite: Structures/Machines/VendingMachines/youtool.rsi
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Unlit"]
diff --git a/Resources/Prototypes/Entities/Constructible/Piping/Atmospherics/binary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml
similarity index 61%
rename from Resources/Prototypes/Entities/Constructible/Piping/Atmospherics/binary.yml
rename to Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml
index 5abc5f036f..f7d23a40a4 100644
--- a/Resources/Prototypes/Entities/Constructible/Piping/Atmospherics/binary.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml
@@ -27,14 +27,16 @@
   components:
   - type: Sprite
     netsync: false
-    sprite: Constructible/Atmos/pump.rsi
+    sprite: Structures/Piping/Atmospherics/pump.rsi
     layers:
-    - sprite: Constructible/Atmos/pipe.rsi
+    - sprite: Structures/Piping/Atmospherics/pipe.rsi
       state: pipeStraight
+      map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
     - state: pumpPressure
   - type: Appearance
     visuals:
     - type: PipeConnectorVisualizer
+    - type: PipeColorVisualizer
     - type: PressurePumpVisualizer
       enabledState: pumpPressureOn
   - type: GasPressurePump
@@ -49,14 +51,12 @@
   components:
     - type: Sprite
       netsync: false
-      sprite: Constructible/Atmos/pump.rsi
+      sprite: Structures/Piping/Atmospherics/pump.rsi
       layers:
-        - sprite: Constructible/Atmos/pipe.rsi
+        - sprite: Structures/Piping/Atmospherics/pipe.rsi
           state: pipeStraight
+          map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
         - state: pumpVolume
-    - type: Appearance
-      visuals:
-        - type: PipeConnectorVisualizer
     - type: GasVolumePump
 
 - type: entity
@@ -69,14 +69,12 @@
   components:
     - type: Sprite
       netsync: false
-      sprite: Constructible/Atmos/pump.rsi
+      sprite: Structures/Piping/Atmospherics/pump.rsi
       layers:
-        - sprite: Constructible/Atmos/pipe.rsi
+        - sprite: Structures/Piping/Atmospherics/pipe.rsi
           state: pipeStraight
+          map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
         - state: pumpPassiveGate
-    - type: Appearance
-      visuals:
-        - type: PipeConnectorVisualizer
     - type: GasPassiveGate
 
 - type: entity
@@ -90,14 +88,12 @@
     # TODO ATMOS: Give unique sprite.
     - type: Sprite
       netsync: false
-      sprite: Constructible/Atmos/pump.rsi
+      sprite: Structures/Piping/Atmospherics/pump.rsi
       layers:
-        - sprite: Constructible/Atmos/pipe.rsi
+        - sprite: Structures/Piping/Atmospherics/pipe.rsi
           state: pipeStraight
+          map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
         - state: pumpPassiveGate
-    - type: Appearance
-      visuals:
-        - type: PipeConnectorVisualizer
     - type: GasValve
     - type: NodeContainer
       nodes:
@@ -116,18 +112,40 @@
   components:
     - type: Sprite
       netsync: false
-      sprite: Constructible/Atmos/gascanisterport.rsi
+      sprite: Structures/Piping/Atmospherics/gascanisterport.rsi
       layers:
-        - sprite: Constructible/Atmos/pipe.rsi
+        - sprite: Structures/Piping/Atmospherics/pipe.rsi
           state: pipeHalf
+          map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
         - state: gasCanisterPort
-    - type: Appearance
-      visuals:
-        - type: PipeConnectorVisualizer
     - type: GasPort
     - type: NodeContainer
       nodes:
         connected:
-          !type:PipeNode
+          !type:PortPipeNode
           nodeGroupID: Pipe
-          pipeDirection: SPBend
+          pipeDirection: South
+
+- type: entity
+  parent: GasUnaryBase
+  id: GasDualPortVentPump
+  name: dual-port air vent
+  description: Has a valve and a pump attached to it. There are two ports.
+  placement:
+    mode: SnapgridCenter
+  components:
+    - type: Sprite
+      netsync: false
+      sprite: Structures/Piping/Atmospherics/vent.rsi
+      layers:
+        - sprite: Structures/Piping/Atmospherics/pipe.rsi
+          state: pipeStraight
+          map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
+        - state: vent_off
+          map: ["enum.VentVisualLayers.Vent"]
+    - type: Appearance
+      visuals:
+        - type: PipeConnectorVisualizer
+        - type: PipeColorVisualizer
+        - type: VentPumpVisualizer
+    - type: GasVentPump
diff --git a/Resources/Prototypes/Entities/Constructible/Piping/Atmospherics/miners.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml
similarity index 96%
rename from Resources/Prototypes/Entities/Constructible/Piping/Atmospherics/miners.yml
rename to Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml
index c72bc79341..4261cb48ce 100644
--- a/Resources/Prototypes/Entities/Constructible/Piping/Atmospherics/miners.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml
@@ -21,7 +21,7 @@
               acts: ["Destruction"]
     - type: Sprite
       netsync: false
-      sprite: Constructible/Atmos/miners.rsi
+      sprite: Structures/Piping/Atmospherics/miners.rsi
       state: miner
     - type: AtmosDevice
     - type: GasMiner
diff --git a/Resources/Prototypes/Entities/Constructible/Piping/Atmospherics/pipes.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
similarity index 77%
rename from Resources/Prototypes/Entities/Constructible/Piping/Atmospherics/pipes.yml
rename to Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
index ac0c0e30f6..df3534b3d3 100644
--- a/Resources/Prototypes/Entities/Constructible/Piping/Atmospherics/pipes.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
@@ -23,14 +23,16 @@
       - !type:DoActsBehavior
         acts: ["Destruction"]
   - type: Sprite
-    sprite: Constructible/Atmos/pipe.rsi
+    sprite: Structures/Piping/Atmospherics/pipe.rsi
     drawdepth: BelowFloor
     netsync: false
   - type: Appearance
     visuals:
     - type: PipeConnectorVisualizer
+    - type: PipeColorVisualizer
   - type: NodeContainer
   - type: AtmosUnsafeUnanchor
+  - type: AtmosPipeColor
 
 #Note: The PipeDirection of the PipeNode should be the south-facing version, because the entity starts at an angle of 0 (south)
 
@@ -46,7 +48,9 @@
         nodeGroupID: Pipe
         pipeDirection: South
   - type: Sprite
-    state: pipeHalf
+    layers:
+      - state: pipeHalf
+        map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
 
 - type: entity
   parent: GasPipeBase
@@ -60,7 +64,9 @@
         nodeGroupID: Pipe
         pipeDirection: Longitudinal
   - type: Sprite
-    state: pipeStraight
+    layers:
+      - state: pipeStraight
+        map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
 
 - type: entity
   parent: GasPipeBase
@@ -74,7 +80,9 @@
         nodeGroupID: Pipe
         pipeDirection: SWBend
   - type: Sprite
-    state: pipeBend
+    layers:
+      - state: pipeBend
+        map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
 
 - type: entity
   parent: GasPipeBase
@@ -88,7 +96,9 @@
         nodeGroupID: Pipe
         pipeDirection: TSouth
   - type: Sprite
-    state: pipeTJunction
+    layers:
+      - state: pipeTJunction
+        map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
 
 - type: entity
   parent: GasPipeBase
@@ -102,4 +112,6 @@
         nodeGroupID: Pipe
         pipeDirection: Fourway
   - type: Sprite
-    state: pipeFourway
+    layers:
+      - state: pipeFourway
+        map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
diff --git a/Resources/Prototypes/Entities/Constructible/Piping/Atmospherics/trinary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml
similarity index 78%
rename from Resources/Prototypes/Entities/Constructible/Piping/Atmospherics/trinary.yml
rename to Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml
index 641ad7247e..916ba7302e 100644
--- a/Resources/Prototypes/Entities/Constructible/Piping/Atmospherics/trinary.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml
@@ -32,14 +32,12 @@
     # TODO ATMOS Improve this sprite and appearance...
     - type: Sprite
       netsync: false
-      sprite: Constructible/Atmos/gasfilter.rsi
+      sprite: Structures/Piping/Atmospherics/gasfilter.rsi
       layers:
-        - sprite: Constructible/Atmos/pipe.rsi
+        - sprite: Structures/Piping/Atmospherics/pipe.rsi
           state: pipeTJunction
+          map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
         - state: gasFilter
-    - type: Appearance
-      visuals:
-        - type: PipeConnectorVisualizer
     - type: GasFilter
 
 - type: entity
@@ -53,14 +51,12 @@
     # TODO ATMOS Give this its actual sprite...
     - type: Sprite
       netsync: false
-      sprite: Constructible/Atmos/gasfilter.rsi
+      sprite: Structures/Piping/Atmospherics/gasfilter.rsi
       layers:
-        - sprite: Constructible/Atmos/pipe.rsi
+        - sprite: Structures/Piping/Atmospherics/pipe.rsi
           state: pipeTJunction
+          map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
         - state: gasFilter
-    - type: Appearance
-      visuals:
-        - type: PipeConnectorVisualizer
     - type: GasMixer
       inletOne: inlet
       inletTwo: filter
diff --git a/Resources/Prototypes/Entities/Constructible/Piping/Atmospherics/unary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
similarity index 77%
rename from Resources/Prototypes/Entities/Constructible/Piping/Atmospherics/unary.yml
rename to Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
index e46f0bfdb5..14be2b9c3a 100644
--- a/Resources/Prototypes/Entities/Constructible/Piping/Atmospherics/unary.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
@@ -23,15 +23,17 @@
   components:
     - type: Sprite
       netsync: false
-      sprite: Constructible/Atmos/vent.rsi
+      sprite: Structures/Piping/Atmospherics/vent.rsi
       layers:
-        - sprite: Constructible/Atmos/pipe.rsi
+        - sprite: Structures/Piping/Atmospherics/pipe.rsi
           state: pipeHalf
+          map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
         - state: vent_off
           map: ["enum.VentVisualLayers.Vent"]
     - type: Appearance
       visuals:
         - type: PipeConnectorVisualizer
+        - type: PipeColorVisualizer
         - type: VentPumpVisualizer
     - type: GasVentPump
 
@@ -46,14 +48,16 @@
     # TODO ATMOS: Find sprite for this.
     - type: Sprite
       netsync: false
-      sprite: Constructible/Atmos/vent.rsi
+      sprite: Structures/Piping/Atmospherics/vent.rsi
       layers:
-        - sprite: Constructible/Atmos/pipe.rsi
+        - sprite: Structures/Piping/Atmospherics/pipe.rsi
           state: pipeHalf
+          map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
         - state: vent_off
     - type: Appearance
       visuals:
         - type: PipeConnectorVisualizer
+        - type: PipeColorVisualizer
     - type: GasPassiveVent
 
 - type: entity
@@ -66,15 +70,17 @@
   components:
     - type: Sprite
       netsync: false
-      sprite: Constructible/Atmos/scrubber.rsi
+      sprite: Structures/Piping/Atmospherics/scrubber.rsi
       layers:
-        - sprite: Constructible/Atmos/pipe.rsi
+        - sprite: Structures/Piping/Atmospherics/pipe.rsi
           state: pipeHalf
+          map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
         - state: scrub_off
           map: ["enum.ScrubberVisualLayers.Scrubber"]
     - type: Appearance
       visuals:
         - type: PipeConnectorVisualizer
+        - type: PipeColorVisualizer
         - type: ScrubberVisualizer
     - type: AtmosDevice
     - type: GasVentScrubber
@@ -91,9 +97,10 @@
     # TODO ATMOS: Actual sprite for this.
     - type: Sprite
       netsync: false
-      sprite: Constructible/Atmos/pipe.rsi
-      state: pipeHalf
-
+      layers:
+        - state: pipeHalf
+          sprite: Structures/Piping/Atmospherics/pipe.rsi
+          map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
 
 - type: entity
   parent: GasUnaryBase
@@ -106,7 +113,7 @@
   components:
     - type: Sprite
       netsync: false
-      sprite: Constructible/Atmos/thermomachine.rsi
+      sprite: Structures/Piping/Atmospherics/thermomachine.rsi
     - type: Appearance
       visuals:
         - type: PipeConnectorVisualizer
@@ -125,6 +132,7 @@
         - state: pipe
     - type: Appearance
       visuals:
+        - type: PipeConnectorVisualizer
         - type: ThermoMachineVisualizer
           enabledState: freezer_on
     - type: GasThermoMachine
@@ -144,9 +152,9 @@
         - state: pipe
     - type: Appearance
       visuals:
+        - type: PipeConnectorVisualizer
         - type: ThermoMachineVisualizer
           enabledState: heater_on
     - type: GasThermoMachine
       mode: Heater
       maxTemperature: 573.15 # This is changed when parts are refreshed.
-
diff --git a/Resources/Prototypes/Entities/Constructible/Piping/Disposal/pipes.yml b/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml
similarity index 93%
rename from Resources/Prototypes/Entities/Constructible/Piping/Disposal/pipes.yml
rename to Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml
index 638301f040..f7d51bf2c7 100644
--- a/Resources/Prototypes/Entities/Constructible/Piping/Disposal/pipes.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml
@@ -44,7 +44,7 @@
   components:
   - type: Sprite
     drawdepth: BelowFloor
-    sprite: Constructible/Power/disposal.rsi
+    sprite: Structures/Piping/disposal.rsi
     state: conpipe-s
   - type: DisposalTransit
   - type: Appearance
@@ -68,7 +68,7 @@
   components:
   - type: Sprite
     drawdepth: BelowFloor
-    sprite: Constructible/Power/disposal.rsi
+    sprite: Structures/Piping/disposal.rsi
     state: conpipe-tagger
   - type: DisposalTagger
   - type: Appearance
@@ -96,7 +96,7 @@
   components:
   - type: Sprite
     drawdepth: BelowFloor
-    sprite: Constructible/Power/disposal.rsi
+    sprite: Structures/Piping/disposal.rsi
     state: conpipe-t
   - type: DisposalEntry
   - type: Appearance
@@ -120,7 +120,7 @@
   components:
   - type: Sprite
     drawdepth: BelowFloor
-    sprite: Constructible/Power/disposal.rsi
+    sprite: Structures/Piping/disposal.rsi
     state: conpipe-j1s
   - type: DisposalRouter
     degrees:
@@ -153,7 +153,7 @@
   components:
   - type: Sprite
     drawdepth: BelowFloor
-    sprite: Constructible/Power/disposal.rsi
+    sprite: Structures/Piping/disposal.rsi
     state: conpipe-j2s
   - type: DisposalRouter
     degrees:
@@ -183,7 +183,7 @@
   components:
   - type: Sprite
     drawdepth: BelowFloor
-    sprite: Constructible/Power/disposal.rsi
+    sprite: Structures/Piping/disposal.rsi
     state: conpipe-j1
   - type: DisposalJunction
     degrees:
@@ -212,7 +212,7 @@
   components:
   - type: Sprite
     drawdepth: BelowFloor
-    sprite: Constructible/Power/disposal.rsi
+    sprite: Structures/Piping/disposal.rsi
     state: conpipe-j2
   - type: DisposalJunction
     degrees:
@@ -242,7 +242,7 @@
   components:
   - type: Sprite
     drawdepth: BelowFloor
-    sprite: Constructible/Power/disposal.rsi
+    sprite: Structures/Piping/disposal.rsi
     state: conpipe-y
   - type: DisposalJunction
     degrees:
@@ -270,7 +270,7 @@
   components:
   - type: Sprite
     drawdepth: BelowFloor
-    sprite: Constructible/Power/disposal.rsi
+    sprite: Structures/Piping/disposal.rsi
     state: conpipe-c
   - type: DisposalBend
   - type: Appearance
diff --git a/Resources/Prototypes/Entities/Constructible/Piping/Disposal/units.yml b/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml
similarity index 98%
rename from Resources/Prototypes/Entities/Constructible/Piping/Disposal/units.yml
rename to Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml
index 77543a62e5..d8cb9c3f48 100644
--- a/Resources/Prototypes/Entities/Constructible/Piping/Disposal/units.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml
@@ -10,7 +10,7 @@
   components:
   - type: Sprite
     netsync: false
-    sprite: Constructible/Power/disposal.rsi
+    sprite: Structures/Piping/disposal.rsi
     layers:
     - state: condisposal
       map: ["enum.DisposalUnitVisualLayers.Base"]
diff --git a/Resources/Prototypes/Entities/Constructible/Power/Engines/PA/base.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/base.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Constructible/Power/Engines/PA/base.yml
rename to Resources/Prototypes/Entities/Structures/Power/Generation/PA/base.yml
diff --git a/Resources/Prototypes/Entities/Constructible/Power/Engines/PA/control_box.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/control_box.yml
similarity index 92%
rename from Resources/Prototypes/Entities/Constructible/Power/Engines/PA/control_box.yml
rename to Resources/Prototypes/Entities/Structures/Power/Generation/PA/control_box.yml
index 14494511f7..4b003dd5f4 100644
--- a/Resources/Prototypes/Entities/Constructible/Power/Engines/PA/control_box.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/control_box.yml
@@ -5,7 +5,7 @@
   description: This controls the density of the particles.
   components:
     - type: Sprite
-      sprite: Constructible/Specific/Engines/PA/control_box.rsi
+      sprite: Structures/Power/Generation/PA/control_box.rsi
       layers:
         - state: boxc
           map: [ "enum.ParticleAcceleratorVisualLayers.Base" ]
@@ -44,7 +44,7 @@
     - type: Physics
       bodyType: Dynamic
     - type: Sprite
-      sprite: Constructible/Specific/Engines/PA/control_box.rsi
+      sprite: Structures/Power/Generation/PA/control_box.rsi
       state: box
     - type: Construction
       graph: particleAcceleratorControlBox
diff --git a/Resources/Prototypes/Entities/Constructible/Power/Engines/PA/emitter.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/emitter.yml
similarity index 90%
rename from Resources/Prototypes/Entities/Constructible/Power/Engines/PA/emitter.yml
rename to Resources/Prototypes/Entities/Structures/Power/Generation/PA/emitter.yml
index 83b24de757..930fa0a1f4 100644
--- a/Resources/Prototypes/Entities/Constructible/Power/Engines/PA/emitter.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/emitter.yml
@@ -5,7 +5,7 @@
   description: This launchs the Alpha particles, might not want to stand near this end.
   components:
     - type: Sprite
-      sprite: Constructible/Specific/Engines/PA/emitter_left.rsi
+      sprite: Structures/Power/Generation/PA/emitter_left.rsi
       layers:
         - state: leftc
           map: [ "enum.ParticleAcceleratorVisualLayers.Base" ]
@@ -30,7 +30,7 @@
   description: This launchs the Alpha particles, might not want to stand near this end.
   components:
     - type: Sprite
-      sprite: Constructible/Specific/Engines/PA/emitter_center.rsi
+      sprite: Structures/Power/Generation/PA/emitter_center.rsi
       layers:
         - state: centerc
           map: [ "enum.ParticleAcceleratorVisualLayers.Base" ]
@@ -55,7 +55,7 @@
   description: This launchs the Alpha particles, might not want to stand near this end.
   components:
     - type: Sprite
-      sprite: Constructible/Specific/Engines/PA/emitter_right.rsi
+      sprite: Structures/Power/Generation/PA/emitter_right.rsi
       layers:
         - state: rightc
           map: [ "enum.ParticleAcceleratorVisualLayers.Base" ]
@@ -85,7 +85,7 @@
     - type: Physics
       bodyType: Dynamic
     - type: Sprite
-      sprite: Constructible/Specific/Engines/PA/emitter_left.rsi
+      sprite: Structures/Power/Generation/PA/emitter_left.rsi
       state: left
     - type: Construction
       graph: particleAcceleratorEmitterLeft
@@ -102,7 +102,7 @@
     - type: Physics
       bodyType: Dynamic
     - type: Sprite
-      sprite: Constructible/Specific/Engines/PA/emitter_center.rsi
+      sprite: Structures/Power/Generation/PA/emitter_center.rsi
       state: center
     - type: Construction
       graph: particleAcceleratorEmitterCenter
@@ -119,7 +119,7 @@
     - type: Physics
       bodyType: Dynamic
     - type: Sprite
-      sprite: Constructible/Specific/Engines/PA/emitter_right.rsi
+      sprite: Structures/Power/Generation/PA/emitter_right.rsi
       state: right
     - type: Construction
       graph: particleAcceleratorEmitterRight
diff --git a/Resources/Prototypes/Entities/Constructible/Power/Engines/PA/end_cap.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/end_cap.yml
similarity index 88%
rename from Resources/Prototypes/Entities/Constructible/Power/Engines/PA/end_cap.yml
rename to Resources/Prototypes/Entities/Structures/Power/Generation/PA/end_cap.yml
index fd97a8b0ac..76b5967d7b 100644
--- a/Resources/Prototypes/Entities/Constructible/Power/Engines/PA/end_cap.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/end_cap.yml
@@ -5,7 +5,7 @@
   description: Formally known as the Alpha Particle Generation Array. This is where Alpha particles are generated from [REDACTED].
   components:
     - type: Sprite
-      sprite: Constructible/Specific/Engines/PA/end_cap.rsi
+      sprite: Structures/Power/Generation/PA/end_cap.rsi
       state: capc
     - type: ParticleAcceleratorEndCap
     - type: Construction
@@ -24,7 +24,7 @@
     - type: Physics
       bodyType: Dynamic
     - type: Sprite
-      sprite: Constructible/Specific/Engines/PA/end_cap.rsi
+      sprite: Structures/Power/Generation/PA/end_cap.rsi
       state: cap
     - type: Construction
       graph: particleAcceleratorEndCap
diff --git a/Resources/Prototypes/Entities/Constructible/Power/Engines/PA/fuel_chamber.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/fuel_chamber.yml
similarity index 90%
rename from Resources/Prototypes/Entities/Constructible/Power/Engines/PA/fuel_chamber.yml
rename to Resources/Prototypes/Entities/Structures/Power/Generation/PA/fuel_chamber.yml
index 760ec86d34..160feea36f 100644
--- a/Resources/Prototypes/Entities/Constructible/Power/Engines/PA/fuel_chamber.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/fuel_chamber.yml
@@ -5,7 +5,7 @@
   description: Formally known as the EM Acceleration Chamber. This is where the Alpha particles are accelerated to radical speeds.
   components:
     - type: Sprite
-      sprite: Constructible/Specific/Engines/PA/fuel_chamber.rsi
+      sprite: Structures/Power/Generation/PA/fuel_chamber.rsi
       layers:
         - state: chamberc
           map: [ "enum.ParticleAcceleratorVisualLayers.Base" ]
@@ -34,7 +34,7 @@
     - type: Physics
       bodyType: Dynamic
     - type: Sprite
-      sprite: Constructible/Specific/Engines/PA/fuel_chamber.rsi
+      sprite: Structures/Power/Generation/PA/fuel_chamber.rsi
       state: chamber
     - type: Construction
       graph: particleAcceleratorFuelChamber
diff --git a/Resources/Prototypes/Entities/Constructible/Power/Engines/PA/particles.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/particles.yml
similarity index 92%
rename from Resources/Prototypes/Entities/Constructible/Power/Engines/PA/particles.yml
rename to Resources/Prototypes/Entities/Structures/Power/Generation/PA/particles.yml
index 7e653b1d84..146ba2fa58 100644
--- a/Resources/Prototypes/Entities/Constructible/Power/Engines/PA/particles.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/particles.yml
@@ -6,7 +6,7 @@
   components:
     - type: Sprite
       layers:
-      - sprite: Constructible/Specific/Engines/PA/particle.rsi
+      - sprite: Structures/Power/Generation/PA/particle.rsi
         state: particle0
         shader: unshaded
     - type: Projectile
@@ -28,4 +28,3 @@
     - type: ParticleProjectile
     - type: SinguloFood
       # Energy is setup by the PA particle fire function.
-
diff --git a/Resources/Prototypes/Entities/Constructible/Power/Engines/PA/power_box.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/power_box.yml
similarity index 91%
rename from Resources/Prototypes/Entities/Constructible/Power/Engines/PA/power_box.yml
rename to Resources/Prototypes/Entities/Structures/Power/Generation/PA/power_box.yml
index b9b24c7d43..ccb9ae55e2 100644
--- a/Resources/Prototypes/Entities/Constructible/Power/Engines/PA/power_box.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/power_box.yml
@@ -5,7 +5,7 @@
   description: Formally known as the Particle Focusing EM Lens. This uses electromagnetic waves to focus the Alpha-Particles.
   components:
     - type: Sprite
-      sprite: Constructible/Specific/Engines/PA/power_box.rsi
+      sprite: Structures/Power/Generation/PA/power_box.rsi
       layers:
         - state: boxc
           map: [ "enum.ParticleAcceleratorVisualLayers.Base" ]
@@ -40,7 +40,7 @@
     - type: Physics
       bodyType: Dynamic
     - type: Sprite
-      sprite: Constructible/Specific/Engines/PA/power_box.rsi
+      sprite: Structures/Power/Generation/PA/power_box.rsi
       state: box
     - type: Construction
       graph: particleAcceleratorPowerBox
diff --git a/Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/collector.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/collector.yml
similarity index 95%
rename from Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/collector.yml
rename to Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/collector.yml
index b5e8c6ea33..b7ba19a4f5 100644
--- a/Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/collector.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/collector.yml
@@ -25,7 +25,7 @@
       - VaultImpassable
   - type: SnapGrid
   - type: Sprite
-    sprite: Constructible/Power/Singularity/collector.rsi
+    sprite: Structures/Power/Generation/Singularity/collector.rsi
     layers:
       - state: ca_on
         map: ["enum.RadiationCollectorVisualLayers.Main"]
@@ -53,4 +53,3 @@
   - type: PowerNetworkBattery
     maxSupply: 1000000000
     supplyRampTolerance: 1000000000
-
diff --git a/Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/containment.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/containment.yml
similarity index 84%
rename from Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/containment.yml
rename to Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/containment.yml
index 4488cbb3bf..d0654ead03 100644
--- a/Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/containment.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/containment.yml
@@ -25,10 +25,10 @@
       - VaultImpassable
   - type: SnapGrid
   - type: Sprite
-    sprite: Constructible/Power/Singularity/containment.rsi
+    sprite: Structures/Power/Generation/Singularity/containment.rsi
     state: icon
   - type: Icon
-    sprite: Constructible/Power/Singularity/containment.rsi
+    sprite: Structures/Power/Generation/Singularity/containment.rsi
     state: icon
   - type: ContainmentFieldGenerator
   - type: Anchorable
@@ -66,9 +66,9 @@
       - VaultImpassable
   - type: SnapGrid
   - type: Sprite
-    sprite: Constructible/Power/Singularity/containment_field.rsi
+    sprite: Structures/Power/Generation/Singularity/containment_field.rsi
     state: field
   - type: Icon
-    sprite: Constructible/Power/Singularity/containment_field.rsi
+    sprite: Structures/Power/Generation/Singularity/containment_field.rsi
     state: field
   - type: ContainmentField
diff --git a/Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/emitter.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
similarity index 96%
rename from Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/emitter.yml
rename to Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
index c8ba2e3832..ba39a44907 100644
--- a/Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/emitter.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
@@ -25,7 +25,7 @@
       - VaultImpassable
   - type: SnapGrid
   - type: Sprite
-    sprite: Constructible/Power/Singularity/emitter.rsi
+    sprite: Structures/Power/Generation/Singularity/emitter.rsi
     layers:
     - state: emitter2
     - state: beam
diff --git a/Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/generator.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/generator.yml
similarity index 91%
rename from Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/generator.yml
rename to Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/generator.yml
index 82d64806be..1953e5d8ab 100644
--- a/Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/generator.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/generator.yml
@@ -6,7 +6,7 @@
     mode: SnapgridCenter
   components:
   - type: Sprite
-    sprite: Constructible/Power/Singularity/generator.rsi
+    sprite: Structures/Power/Generation/Singularity/generator.rsi
     state: icon
   - type: SingularityGenerator
   - type: InteractionOutline
diff --git a/Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/singularity.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/singularity.yml
similarity index 84%
rename from Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/singularity.yml
rename to Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/singularity.yml
index 36fec026c9..3f6629d99f 100644
--- a/Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/singularity.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/singularity.yml
@@ -23,10 +23,10 @@
     range: 15
     decay: false
   - type: Sprite
-    sprite: Constructible/Power/Singularity/singularity_1.rsi
+    sprite: Structures/Power/Generation/Singularity/singularity_1.rsi
     state: singularity_1
   - type: Icon
-    sprite: Constructible/Power/Singularity/singularity_1.rsi
+    sprite: Structures/Power/Generation/Singularity/singularity_1.rsi
     state: singularity_1
     drawdepth: Items
   - type: Appearance
diff --git a/Resources/Prototypes/Entities/Constructible/Power/Engines/AME/controller.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml
similarity index 59%
rename from Resources/Prototypes/Entities/Constructible/Power/Engines/AME/controller.yml
rename to Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml
index c34c0821b9..92c68b637f 100644
--- a/Resources/Prototypes/Entities/Constructible/Power/Engines/AME/controller.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml
@@ -8,7 +8,7 @@
   - type: Clickable
   - type: InteractionOutline
   - type: Sprite
-    sprite: Constructible/Power/ame_controller.rsi
+    sprite: Structures/Power/Generation/ame.rsi
     state: control
   - type: Physics
     fixtures:
@@ -84,3 +84,61 @@
       - Opaque
       - MobImpassable
       - SmallImpassable
+
+- type: entity
+  id: AMEShielding
+  name: AME shielding
+  description: Keeps the antimatter in and the matter out.
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: Clickable
+  - type: InteractionOutline
+  - type: Sprite
+    drawdepth: Walls
+    sprite: Structures/Power/Generation/ame.rsi
+    state: shield_0
+  - type: Physics
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb {}
+      layer:
+      - Opaque
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
+      - SmallImpassable
+  - type: Damageable
+    resistances: metallicResistances
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 100
+      behaviors:
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetSteel1:
+            min: 1
+            max: 2
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: SnapGrid
+  - type: IconSmooth
+    mode: CardinalFlags
+    base: shield_
+    key: ame_shield
+  - type: AMEShield
+  - type: NodeContainer
+    nodes:
+      ame:
+        !type:AdjacentNode
+        nodeGroupID: AMEngine
+  - type: PointLight
+    enabled: false
+    radius: 5
+    energy: 0.5
+    color: "#00AAFF"
+  - type: Appearance
+    visuals:
+    - type: AMEVisualizer
diff --git a/Resources/Prototypes/Entities/Constructible/Power/Generation/generator.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/generator.yml
similarity index 95%
rename from Resources/Prototypes/Entities/Constructible/Power/Generation/generator.yml
rename to Resources/Prototypes/Entities/Structures/Power/Generation/generator.yml
index 6772432f48..1c73587d4c 100644
--- a/Resources/Prototypes/Entities/Constructible/Power/Generation/generator.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/generator.yml
@@ -27,7 +27,7 @@
       - SmallImpassable
   - type: SnapGrid
   - type: Sprite
-    sprite: Constructible/Power/power.rsi
+    sprite: Structures/Power/power.rsi
     state: generator
   - type: NodeContainer
     examinable: true
diff --git a/Resources/Prototypes/Entities/Constructible/Power/Generation/solar.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml
similarity index 94%
rename from Resources/Prototypes/Entities/Constructible/Power/Generation/solar.yml
rename to Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml
index 0daea56341..bc3a7ec9b6 100644
--- a/Resources/Prototypes/Entities/Constructible/Power/Generation/solar.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml
@@ -23,7 +23,7 @@
       - VaultImpassable
       - SmallImpassable
   - type: Sprite
-    sprite: Constructible/Power/solar_panel.rsi
+    sprite: Structures/Power/Generation/solar_panel.rsi
     state: normal
   - type: NodeContainer
     examinable: true
@@ -73,7 +73,7 @@
       layer:
       - VaultImpassable
   - type: Sprite
-    sprite: Constructible/Power/solar_panel.rsi
+    sprite: Structures/Power/Generation/solar_panel.rsi
     state: solar_assembly
   - type: SnapGrid
   - type: Damageable
@@ -117,7 +117,7 @@
       - VaultImpassable
       - SmallImpassable
   - type: Sprite
-    sprite: Constructible/Power/solar_panel.rsi
+    sprite: Structures/Power/Generation/solar_panel.rsi
     state: solar_tracker
   - type: SnapGrid
   - type: Damageable
diff --git a/Resources/Prototypes/Entities/Constructible/Power/cable_terminal.yml b/Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml
similarity index 93%
rename from Resources/Prototypes/Entities/Constructible/Power/cable_terminal.yml
rename to Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml
index ef3c90a1cb..b3b6e042bb 100644
--- a/Resources/Prototypes/Entities/Constructible/Power/cable_terminal.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml
@@ -1,11 +1,11 @@
-- type: entity
+- type: entity
   id: CableTerminal
   name: cable terminal
   placement:
     mode: SnapgridCenter
   components:
     - type: Sprite
-      sprite: Constructible/Power/wire_terminal.rsi
+      sprite: Structures/Power/cable_terminal.rsi
       state: term
       netsync: false
       drawdepth: BelowFloor
diff --git a/Resources/Prototypes/Entities/Constructible/Power/cables.yml b/Resources/Prototypes/Entities/Structures/Power/cables.yml
similarity index 90%
rename from Resources/Prototypes/Entities/Constructible/Power/cables.yml
rename to Resources/Prototypes/Entities/Structures/Power/cables.yml
index 4970d246cb..774af10e32 100644
--- a/Resources/Prototypes/Entities/Constructible/Power/cables.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/cables.yml
@@ -38,10 +38,10 @@
   description: An orange high voltage power cable.
   components:
   - type: Sprite
-    sprite: Constructible/Power/Wires/hv_cable.rsi
+    sprite: Structures/Power/Cables/hv_cable.rsi
     state: hvcable_0
   - type: Icon
-    sprite: Constructible/Power/Wires/hv_cable.rsi
+    sprite: Structures/Power/Cables/hv_cable.rsi
     state: hvcable_4
   - type: NodeContainer
     nodes:
@@ -80,11 +80,11 @@
   components:
   - type: Sprite
     color: Yellow
-    sprite: Constructible/Power/Wires/mv_cable.rsi
+    sprite: Structures/Power/Cables/mv_cable.rsi
     state: mvcable_0
   - type: Icon
     color: Yellow
-    sprite: Constructible/Power/Wires/mv_cable.rsi
+    sprite: Structures/Power/Cables/mv_cable.rsi
     state: mvcable_4
   - type: NodeContainer
     nodes:
@@ -119,15 +119,15 @@
   parent: CableBase
   id: CableApcExtension
   name: LV power cable
-  description: A cable used to connect machines to an APC. #ACPs aren't area defined anymore so need this cable to connect things to the APC. This description should be dynamic in future.
+  description: A cable used to connect machines to an APC. #APCs aren't area defined anymore so need this cable to connect things to the APC. This description should be dynamic in future.
   components:
   - type: Sprite
     color: Green
-    sprite: Constructible/Power/Wires/lv_cable.rsi
+    sprite: Structures/Power/Cables/lv_cable.rsi
     state: lvcable_0
   - type: Icon
     color: Green
-    sprite: Constructible/Power/Wires/lv_cable.rsi
+    sprite: Structures/Power/Cables/lv_cable.rsi
     state: lvcable_4
   - type: NodeContainer
     nodes:
diff --git a/Resources/Prototypes/Entities/Constructible/Power/chargers.yml b/Resources/Prototypes/Entities/Structures/Power/chargers.yml
similarity index 79%
rename from Resources/Prototypes/Entities/Constructible/Power/chargers.yml
rename to Resources/Prototypes/Entities/Structures/Power/chargers.yml
index 017ebeeac9..bc02c847fa 100644
--- a/Resources/Prototypes/Entities/Constructible/Power/chargers.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/chargers.yml
@@ -4,10 +4,10 @@
   components:
   - type: Sprite
     netsync: false
-    sprite: Constructible/Power/cell_recharger.rsi
+    sprite: Structures/Power/cell_recharger.rsi
     drawdepth: Items
   - type: Icon
-    sprite: Constructible/Power/cell_recharger.rsi
+    sprite: Structures/Power/cell_recharger.rsi
     state: empty
   - type: PowerCellCharger
     transfer_efficiency: 0.85
@@ -25,10 +25,10 @@
   components:
   - type: Sprite
     netsync: false
-    sprite: Constructible/Power/recharger.rsi
+    sprite: Structures/Power/recharger.rsi
     drawdepth: Items
   - type: Icon
-    sprite: Constructible/Power/recharger.rsi
+    sprite: Structures/Power/recharger.rsi
     state: empty
   - type: WeaponCapacitorCharger
     transfer_efficiency: 0.85
@@ -46,10 +46,10 @@
   components:
   - type: Sprite
     netsync: false
-    sprite: Constructible/Power/wall_recharger.rsi
+    sprite: Structures/Power/wall_recharger.rsi
     drawdepth: Items
   - type: Icon
-    sprite: Constructible/Power/wall_recharger.rsi
+    sprite: Structures/Power/wall_recharger.rsi
     state: empty
   - type: WeaponCapacitorCharger
     transfer_efficiency: 0.95
diff --git a/Resources/Prototypes/Entities/Constructible/Power/Specific/debug_power.yml b/Resources/Prototypes/Entities/Structures/Power/debug_power.yml
similarity index 93%
rename from Resources/Prototypes/Entities/Constructible/Power/Specific/debug_power.yml
rename to Resources/Prototypes/Entities/Structures/Power/debug_power.yml
index 24f55dfcfa..e07aff409c 100644
--- a/Resources/Prototypes/Entities/Constructible/Power/Specific/debug_power.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/debug_power.yml
@@ -20,7 +20,7 @@
       layer: [MobMask, Opaque]
   - type: SnapGrid
   - type: Sprite
-    sprite: Constructible/Power/power.rsi
+    sprite: Structures/Power/power.rsi
     state: wiredmachine
   - type: NodeContainer
     nodes:
@@ -58,7 +58,7 @@
       layer: [MobMask, Opaque]
   - type: SnapGrid
   - type: Sprite
-    sprite: Constructible/Power/power.rsi
+    sprite: Structures/Power/power.rsi
     state: provider
   - type: Battery
   - type: NodeContainer
@@ -85,7 +85,7 @@
       layer: [MobMask, Opaque]
   - type: SnapGrid
   - type: Sprite
-    sprite: Constructible/Power/power.rsi
+    sprite: Structures/Power/power.rsi
     state: provider
   - type: Battery
   - type: NodeContainer
@@ -128,7 +128,7 @@
       layer: [MobMask, Opaque]
   - type: SnapGrid
   - type: Sprite
-    sprite: Constructible/Power/power.rsi
+    sprite: Structures/Power/power.rsi
     state: wirelessmachine
   - type: ApcPowerReceiver
   - type: Anchorable
diff --git a/Resources/Prototypes/Entities/Constructible/Power/parts.yml b/Resources/Prototypes/Entities/Structures/Power/parts.yml
similarity index 96%
rename from Resources/Prototypes/Entities/Constructible/Power/parts.yml
rename to Resources/Prototypes/Entities/Structures/Power/parts.yml
index f80f119e3d..2905bb612e 100644
--- a/Resources/Prototypes/Entities/Constructible/Power/parts.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/parts.yml
@@ -8,7 +8,7 @@
     mode: SnapgridCenter
   components:
   - type: Sprite
-    sprite: Constructible/Power/substation.rsi
+    sprite: Structures/Power/substation.rsi
     layers:
     - state: substation
     - state: screen
@@ -37,6 +37,7 @@
     maxChargeRate: 5000
     supplyRampTolerance: 5000
     supplyRampRate: 1000
+
 - type: entity
   abstract: true
   id: BaseApc
@@ -59,7 +60,7 @@
   - type: Sprite
     drawdepth: WallMountedItems
     netsync: false
-    sprite: "Constructible/Power/apc.rsi"
+    sprite: Structures/Power/apc.rsi
     state: apc0
   - type: Appearance
     visuals:
@@ -95,4 +96,3 @@
     maxChargeRate: 5000
     supplyRampTolerance: 1000
     supplyRampRate: 500
-
diff --git a/Resources/Prototypes/Entities/Constructible/Power/Specific/saltern_power.yml b/Resources/Prototypes/Entities/Structures/Power/saltern_power.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Constructible/Power/Specific/saltern_power.yml
rename to Resources/Prototypes/Entities/Structures/Power/saltern_power.yml
diff --git a/Resources/Prototypes/Entities/Constructible/Power/smes.yml b/Resources/Prototypes/Entities/Structures/Power/smes.yml
similarity index 94%
rename from Resources/Prototypes/Entities/Constructible/Power/smes.yml
rename to Resources/Prototypes/Entities/Structures/Power/smes.yml
index cce3cbebf2..6c3796f1ef 100644
--- a/Resources/Prototypes/Entities/Constructible/Power/smes.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/smes.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   abstract: true
   id: BaseSmes
   parent: BaseMachine
@@ -9,7 +9,7 @@
   components:
     - type: Sprite
       netsync: false
-      sprite: Constructible/Power/smes.rsi
+      sprite: Structures/Power/smes.rsi
       layers:
         - state: smes
         - state: smes-display
@@ -34,11 +34,9 @@
     - type: BatteryCharger
       voltage: High
       node: output
-
     - type: BatteryDischarger
       voltage: High
       node: input
-
     - type: PowerNetworkBattery
       maxSupply: 150000
       maxChargeRate: 5000
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Canisters/base.yml b/Resources/Prototypes/Entities/Structures/Storage/Canisters/base.yml
new file mode 100644
index 0000000000..2be102cc95
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Storage/Canisters/base.yml
@@ -0,0 +1,72 @@
+- 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/Constructible/Piping/Atmospherics/gas_canisters.yml b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
similarity index 80%
rename from Resources/Prototypes/Entities/Constructible/Piping/Atmospherics/gas_canisters.yml
rename to Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
index c4dcba4396..7144edd6f1 100644
--- a/Resources/Prototypes/Entities/Constructible/Piping/Atmospherics/gas_canisters.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
@@ -1,79 +1,3 @@
-- 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: BaseConstructibleDynamic
-  components:
-  - type: InteractionOutline
-  - type: Sprite
-    netsync: false
-    sprite: Constructible/Atmos/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:PipeNode
-        nodeGroupID: Pipe
-        pipeDirection: Connector
-        connectionsEnabled: false
-        needAnchored: false
-        rotationsEnabled: false
-        volume: 1000
-  - type: GasPortable
-  - type: GasCanister
-
 - type: entity
   parent: GasCanister
   id: StorageCanister
@@ -332,7 +256,7 @@
 # Broke Entities
 
 - type: entity
-  parent: BaseConstructible
+  parent: BaseStructure
   id: GasCanisterBrokenBase
   name: broken gas canister
   description: A broken gas canister. Not useless yet, as it can be salvaged for high quality materials.
@@ -357,7 +281,7 @@
       resistances: metallicResistances
     - type: InteractionOutline
     - type: Sprite
-      sprite: Constructible/Atmos/canister.rsi
+      sprite: Structures/Storage/canister.rsi
       state: grey-1
     - type: Physics
       bodyType: Dynamic
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/closet_secure.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base.yml
similarity index 89%
rename from Resources/Prototypes/Entities/Constructible/Storage/Closets/closet_secure.yml
rename to Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base.yml
index 5655c8c250..1b33400a9f 100644
--- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/closet_secure.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base.yml
@@ -1,13 +1,14 @@
 - type: entity
-  id: LockerSecureBase
-  parent: LockerGeneric
+  id: LockerBase
+  parent: ClosetBase
   abstract: true
   components:
   - type: AccessReader
   - type: SecureEntityStorage
   - type: Sprite
     netsync: false
-    sprite: Constructible/Structures/closet.rsi
+    sprite: Structures/Storage/closet.rsi
+    noRot: true
     layers:
     - state: generic
     - state: generic_door
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
new file mode 100644
index 0000000000..7d497e0535
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
@@ -0,0 +1,288 @@
+- type: entity
+  id: LockerBooze
+  parent: LockerBase
+  name: booze storage
+  description: This is where the bartender keeps the booze.
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state: cabinet
+  - type: AccessReader
+    access: [["Bar"]]
+
+# Cargo
+- type: entity
+  id: LockerQuarterMaster
+  parent: LockerBase
+  name: quartermaster's locker
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state: qm
+  - type: AccessReader
+    access: [["Cargo"]] # TODO access [["Quartermaster"]]
+
+# Command
+- type: entity
+  id: LockerCaptain
+  parent: LockerBase
+  name: captain's locker
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state: cap
+  - type: AccessReader
+    access: [["Captain"]]
+
+- type: entity
+  id: LockerHeadOfPersonnel
+  parent: LockerBase
+  name: head of personnel's locker
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state: hop
+  - type: AccessReader
+    access: [["HeadOfPersonnel"]]
+
+# CE
+- type: entity
+  id: LockerChiefEngineer
+  parent: LockerBase
+  name: chief engineer's locker
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state: ce
+  - type: AccessReader
+    access: [ [ "Engineering", "Command" ] ]
+
+# Electrical supplies
+- type: entity
+  id: LockerElectricalSupplies
+  parent: LockerBase
+  name: electrical supplies locker
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state: eng
+      state_closed: eng_elec_door
+  - type: AccessReader
+    access: [ [ "Engineering" ] ]
+
+# Welding supplies
+- type: entity
+  id: LockerWeldingSupplies
+  parent: LockerBase
+  name: welding supplies locker
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state: eng
+      state_closed: eng_weld_door
+  - type: AccessReader
+    access: [ [ "Engineering" ] ]
+
+# Atmos tech
+- type: entity
+  id: LockerAtmospherics
+  parent: LockerBase
+  name: atmospheric technician's locker
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state: atmos
+  - type: AccessReader
+    access: [ [ "Engineering" ] ]
+
+# Engineer
+- type: entity
+  id: LockerEngineer
+  parent: LockerBase
+  name: engineer's locker
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state: eng_secure
+  - type: AccessReader
+    access: [ [ "Engineering" ] ]
+
+# Freezer
+- type: entity
+  id: LockerFreezer
+  parent: LockerBase
+  name: freezer
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state: freezer
+  - type: AccessReader
+    access: [ [ "Service" ] ]
+
+# Botanist
+- type: entity
+  id: LockerBotanist
+  parent: LockerBase
+  name: botanist's locker
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state: hydro
+  - type: AccessReader
+    access: [ [ "Service" ] ]
+
+# Medicine
+- type: entity
+  id: LockerMedicine
+  parent: LockerBase
+  name: medicine locker
+  description: Filled to the brim with medical junk.
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state: med
+  - type: AccessReader
+    access: [ [ "Medical" ] ]
+
+# Medical doctor
+- type: entity
+  id: LockerMedical
+  parent: LockerBase
+  name: medical doctor's locker
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state: med_secure
+  - type: AccessReader
+    access: [ [ "Medical" ] ]
+
+# Chemical
+- type: entity
+  id: LockerChemistry
+  parent: LockerBase
+  name: chemical locker
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state: med
+      state_closed: chemical_door
+  - type: AccessReader
+    access: [ [ "Medical" ] ]
+
+# CMO
+- type: entity
+  id: LockerChiefMedicalOfficer
+  parent: LockerBase
+  name: chief medical officer's locker
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state: cmo
+  - type: AccessReader
+    access: [ [ "Medical", "Command" ] ]
+
+# Science
+
+- type: entity
+  id: LockerResearchDirector
+  parent: LockerBase
+  name: research director's locker
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state: rd
+  - type: AccessReader
+    access: [ [ "Research", "Command" ] ]
+
+- type: entity
+  id: LockerScientist
+  parent: LockerBase
+  name: scientist's locker
+  components:
+    - type: Appearance
+      visuals:
+        - type: StorageVisualizer
+          state: science
+    - type: AccessReader
+      access: [ [ "Research" ] ]
+
+# HoS
+- type: entity
+  id: LockerHeadOfSecurity
+  parent: LockerBase
+  name: head of security's locker
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state: hos
+  - type: AccessReader
+    access: [["Security", "Command"]]
+
+# Warden
+- type: entity
+  id: LockerWarden
+  parent: LockerBase
+  name: warden's locker
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state: warden
+  - type: AccessReader
+    access: [["Security"]] # TODO access [["Brig"]]
+
+# Security Officer
+- type: entity
+  id: LockerSecurity
+  parent: LockerBase
+  name: security officer's locker
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state: sec
+  - type: AccessReader
+    access: [["Security"]]
+
+# Detective
+- type: entity
+  id: LockerDetective
+  parent: LockerBase
+  name: detective's cabinet
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state: cabinet
+  - type: AccessReader
+    access: [["Service"]] # TODO access [["Detective"]]
+
+# Syndicate
+
+- type: entity
+  id: LockerSyndicatePersonal
+  name: armory closet
+  parent: LockerBase
+  description: It's a personal storage unit for operative gear.
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state: syndicate
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/closet.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/base.yml
similarity index 91%
rename from Resources/Prototypes/Entities/Constructible/Storage/Closets/closet.yml
rename to Resources/Prototypes/Entities/Structures/Storage/Closets/base.yml
index 66f9fc8910..7c387a93d4 100644
--- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/closet.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/base.yml
@@ -1,12 +1,12 @@
-- type: entity
-  id: LockerGeneric
-  parent: BaseConstructibleDynamic
+- type: entity
+  id: ClosetBase
+  parent: BaseStructureDynamic
   name: closet
   description: A standard-issue Nanotrasen storage unit.
   components:
   - type: Sprite
     netsync: false
-    sprite: Constructible/Structures/closet.rsi
+    sprite: Structures/Storage/closet.rsi
     layers:
     - state: generic
     - state: generic_door
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/closets.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/closets.yml
new file mode 100644
index 0000000000..ad7a284db0
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/closets.yml
@@ -0,0 +1,105 @@
+# Tool closet
+- type: entity
+  id: ClosetTool
+  name: tool closet
+  parent: ClosetBase
+  description: It's a storage unit for tools.
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state: eng
+      state_closed: eng_tool_door
+
+# Radiation suit closet
+- type: entity
+  id: ClosetRadiationSuit
+  name: radiation suit closet
+  parent: ClosetBase
+  description: It's a storage unit for rad-protective suits.
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state: eng
+      state_closed: eng_rad_door
+
+# Emergency closet
+- type: entity
+  id: ClosetEmergency
+  name: emergency closet
+  parent: ClosetBase
+  description: It's a storage unit for emergency breath masks and O2 tanks.
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state: emergency
+
+# Fire safety closet
+- type: entity
+  id: ClosetFire
+  name: fire-safety closet
+  parent: ClosetBase
+  description: It's a storage unit for fire-fighting supplies.
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state: fire
+
+# EOD closet
+- type: entity
+  id: ClosetBomb
+  name: EOD closet
+  parent: ClosetBase
+  description: It's a storage unit for explosion-protective suits.
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state: bomb
+
+# Biohazard
+
+# Base level 3 bio hazard closet
+- type: entity
+  id: ClosetL3
+  parent: ClosetBase
+  name: level 3 biohazard gear closet
+  description: It's a storage unit for level 3 biohazard gear.
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state: bio
+
+# Virology variant
+- type: entity
+  id: ClosetL3Virology
+  parent: ClosetL3
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state: bio_viro
+
+# Security variant
+- type: entity
+  id: ClosetL3Security
+  parent: ClosetL3
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state: bio_sec
+
+# Janitor variant
+- type: entity
+  id: ClosetL3Janitor
+  parent: ClosetL3
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state: bio_jan
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/cursed.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/cursed.yml
new file mode 100644
index 0000000000..573c593fc2
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/cursed.yml
@@ -0,0 +1,8 @@
+- type: entity
+  id: ClosetCursed
+  parent: ClosetBase
+  name: closet
+  suffix: cursed
+  description: A standard-issue Nanotrasen storage unit.
+  components:
+  - type: CursedEntityStorage
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/wardrobe.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/wardrobe.yml
new file mode 100644
index 0000000000..c288d5641a
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/wardrobe.yml
@@ -0,0 +1,215 @@
+# Base
+- type: entity
+  id: WardrobeBase
+  parent: ClosetBase
+  abstract: true
+  description: It's a storage unit for standard-issue Nanotrasen attire.
+
+# Colored
+
+# Blue wardrobe
+- type: entity
+  id: WardrobeBlue
+  parent: WardrobeBase
+  name: blue wardrobe
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state: generic
+      state_closed: blue_door
+
+# Pink wardrobe
+- type: entity
+  id: WardrobePink
+  parent: WardrobeBase
+  name: pink wardrobe
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state: generic
+      state_closed: pink_door
+
+# Black wardrobe
+- type: entity
+  id: WardrobeBlack
+  parent: WardrobeBase
+  name: black wardrobe
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state: generic
+      state_closed: black_door
+
+# Green wardrobe
+- type: entity
+  id: WardrobeGreen
+  parent: WardrobeBase
+  name: green wardrobe
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state: generic
+      state_closed: green_door
+
+# Prison wardrobe
+- type: entity
+  id: WardrobePrison
+  parent: WardrobeBase
+  name: prison wardrobe
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state: generic
+      state_closed: orange_door
+
+# Yellow wardrobe
+- type: entity
+  id: WardrobeYellow
+  parent: WardrobeBase
+  name: yellow wardrobe
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state: generic
+      state_closed: yellow_door
+
+# White wardrobe
+- type: entity
+  id: WardrobeWhite
+  parent: WardrobeBase
+  name: white wardrobe
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state: generic
+      state_closed: white_door
+
+# Grey wardrobe
+- type: entity
+  id: WardrobeGrey
+  parent: WardrobeBase
+  name: grey wardrobe
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state: generic
+      state_closed: grey_door
+
+# Mixed wardrobe
+- type: entity
+  id: WardrobeMixed
+  parent: WardrobeBase
+  name: mixed wardrobe
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state: generic
+      state_closed: mixed_door
+
+# Jobs
+
+- type: entity
+  id: WardrobeSecurity
+  parent: WardrobeBase
+  name: security wardrobe
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state: generic
+      state_closed: red_door
+
+- type: entity
+  id: WardrobeAtmospherics
+  parent: WardrobeBase
+  name: atmospherics wardrobe
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state: generic
+      state_closed: atmos_wardrobe_door
+
+- type: entity
+  id: ClosetJanitor
+  parent: WardrobeMixed
+  name: custodial closet
+  description: It's a storage unit for janitorial clothes and gear.
+
+- type: entity
+  id: WardrobeFormal
+  parent: WardrobeBlack
+  name: formal closet
+  description: It's a storage unit for formal clothing.
+
+- type: entity
+  id: ClosetChef
+  parent: WardrobeBlack
+  name: chef's closet
+  description: It's a storage unit for foodservice garments and mouse traps.
+
+- type: entity
+  id: WardrobeChapel
+  parent: WardrobeBlack
+  name: chaplain's wardrobe
+  description: It's a storage unit for Nanotrasen-approved religious attire.
+
+- type: entity
+  id: ClosetLegal
+  parent: WardrobeBlue
+  name: legal closet
+  description: It's a storage unit for courtroom apparel and items.
+
+- type: entity
+  id: WardrobeCargo
+  parent: WardrobePrison
+  name: cargo wardrobe
+
+- type: entity
+  id: WardrobeEngineering
+  parent: WardrobeYellow
+  name: engineering wardrobe
+
+- type: entity
+  id: WardrobeMedicalDoctor
+  parent: WardrobeWhite
+  name: medical doctor's wardrobe
+
+- type: entity
+  id: WardrobeRobotics
+  parent: WardrobeBlack
+  name: robotics wardrobe
+
+- type: entity
+  id: WardrobeChemistry
+  parent: WardrobeWhite
+  name: chemistry wardrobe
+
+- type: entity
+  id: WardrobeGenetics
+  parent: WardrobeWhite
+  name: genetics wardrobe
+
+- type: entity
+  id: WardrobeVirology
+  parent: WardrobeWhite
+  name: virology wardrobe
+
+- type: entity
+  id: WardrobeScience
+  parent: WardrobeWhite
+  name: science wardrobe
+
+- type: entity
+  id: WardrobeBotanist
+  parent: WardrobeGreen
+  name: botanist wardrobe
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Crates/crate_base.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/base.yml
similarity index 92%
rename from Resources/Prototypes/Entities/Constructible/Storage/Crates/crate_base.yml
rename to Resources/Prototypes/Entities/Structures/Storage/Crates/base.yml
index 954d529693..eec102958c 100644
--- a/Resources/Prototypes/Entities/Constructible/Storage/Crates/crate_base.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/base.yml
@@ -1,13 +1,13 @@
 - type: entity
   id: CrateGeneric
-  parent: BaseConstructibleDynamic
+  parent: BaseStructureDynamic
   abstract: true
   name: crate
   description: A large container for items.
   components:
   - type: Sprite
     netsync: false
-    sprite: Constructible/Storage/Crates/generic.rsi
+    sprite: Structures/Storage/Crates/generic.rsi
     layers:
     - state: crate
     - state: crate_door
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Crates/crate_types.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
similarity index 84%
rename from Resources/Prototypes/Entities/Constructible/Storage/Crates/crate_types.yml
rename to Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
index 56a7239462..dae7bc4c1c 100644
--- a/Resources/Prototypes/Entities/Constructible/Storage/Crates/crate_types.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
@@ -4,7 +4,7 @@
   parent: CrateGeneric
   components:
   - type: Sprite
-    sprite: Constructible/Storage/Crates/generic.rsi
+    sprite: Structures/Storage/Crates/generic.rsi
     layers:
     - state: crate
     - state: crate_door
@@ -13,7 +13,7 @@
       visible: false
       map: ["enum.StorageVisualLayers.Welded"]
   - type: Icon
-    sprite: Constructible/Storage/Crates/generic.rsi
+    sprite: Structures/Storage/Crates/generic.rsi
     state: crate_icon
   - type: Appearance
     visuals:
@@ -27,7 +27,7 @@
   parent: CrateGeneric
   components:
   - type: Sprite
-    sprite: Constructible/Storage/Crates/plastic.rsi
+    sprite: Structures/Storage/Crates/plastic.rsi
     layers:
     - state: plasticcrate
     - state: plasticcrate_door
@@ -36,7 +36,7 @@
       visible: false
       map: ["enum.StorageVisualLayers.Welded"]
   - type: Icon
-    sprite: Constructible/Storage/Crates/plastic.rsi
+    sprite: Structures/Storage/Crates/plastic.rsi
     state: plasticcrate_icon
   - type: Appearance
     visuals:
@@ -50,7 +50,7 @@
   parent: CrateGeneric
   components:
   - type: Sprite
-    sprite: Constructible/Storage/Crates/freezer.rsi
+    sprite: Structures/Storage/Crates/freezer.rsi
     layers:
     - state: freezer
     - state: freezer_door
@@ -59,7 +59,7 @@
       visible: false
       map: ["enum.StorageVisualLayers.Welded"]
   - type: Icon
-    sprite: Constructible/Storage/Crates/freezer.rsi
+    sprite: Structures/Storage/Crates/freezer.rsi
     state: freezer_icon
   - type: Appearance
     visuals:
@@ -73,7 +73,7 @@
   parent: CrateGeneric
   components:
   - type: Sprite
-    sprite: Constructible/Storage/Crates/hydro.rsi
+    sprite: Structures/Storage/Crates/hydro.rsi
     layers:
     - state: hydrocrate
     - state: hydrocrate_door
@@ -82,7 +82,7 @@
       visible: false
       map: ["enum.StorageVisualLayers.Welded"]
   - type: Icon
-    sprite: Constructible/Storage/Crates/hydro.rsi
+    sprite: Structures/Storage/Crates/hydro.rsi
     state: hydrocrate_icon
   - type: Appearance
     visuals:
@@ -96,7 +96,7 @@
   parent: CrateGeneric
   components:
   - type: Sprite
-    sprite: Constructible/Storage/Crates/medical.rsi
+    sprite: Structures/Storage/Crates/medical.rsi
     layers:
     - state: medicalcrate
     - state: medicalcrate_door
@@ -105,7 +105,7 @@
       visible: false
       map: ["enum.StorageVisualLayers.Welded"]
   - type: Icon
-    sprite: Constructible/Storage/Crates/medical.rsi
+    sprite: Structures/Storage/Crates/medical.rsi
     state: medicalcrate_icon
   - type: Appearance
     visuals:
@@ -120,7 +120,7 @@
   parent: CrateGeneric
   components:
   - type: Sprite
-    sprite: Constructible/Storage/Crates/radiation.rsi
+    sprite: Structures/Storage/Crates/radiation.rsi
     layers:
     - state: radiationcrate
     - state: radiationcrate_door
@@ -129,7 +129,7 @@
       visible: false
       map: ["enum.StorageVisualLayers.Welded"]
   - type: Icon
-    sprite: Constructible/Storage/Crates/radiation.rsi
+    sprite: Structures/Storage/Crates/radiation.rsi
     state: radiationcrate_icon
   - type: Appearance
     visuals:
@@ -143,7 +143,7 @@
   parent: CrateGeneric
   components:
   - type: Sprite
-    sprite: Constructible/Storage/Crates/o2.rsi
+    sprite: Structures/Storage/Crates/o2.rsi
     layers:
     - state: o2crate
     - state: o2crate_door
@@ -152,7 +152,7 @@
       visible: false
       map: ["enum.StorageVisualLayers.Welded"]
   - type: Icon
-    sprite: Constructible/Storage/Crates/o2.rsi
+    sprite: Structures/Storage/Crates/o2.rsi
     state: o2crate_icon
   - type: Appearance
     visuals:
@@ -166,7 +166,7 @@
   parent: CrateGeneric
   components:
   - type: Sprite
-    sprite: Constructible/Storage/Crates/electricalcrate.rsi
+    sprite: Structures/Storage/Crates/electricalcrate.rsi
     layers:
     - state: electricalcrate
     - state: electricalcrate_door
@@ -175,7 +175,7 @@
       visible: false
       map: ["enum.StorageVisualLayers.Welded"]
   - type: Icon
-    sprite: Constructible/Storage/Crates/electricalcrate.rsi
+    sprite: Structures/Storage/Crates/electricalcrate.rsi
     state: electricalcrate_icon
   - type: Appearance
     visuals:
@@ -189,7 +189,7 @@
   parent: CrateGeneric
   components:
   - type: Sprite
-    sprite: Constructible/Storage/Crates/engicrate.rsi
+    sprite: Structures/Storage/Crates/engicrate.rsi
     layers:
     - state: engicrate
     - state: engicrate_door
@@ -198,7 +198,7 @@
       visible: false
       map: ["enum.StorageVisualLayers.Welded"]
   - type: Icon
-    sprite: Constructible/Storage/Crates/engicrate.rsi
+    sprite: Structures/Storage/Crates/engicrate.rsi
     state: engicrate_icon
   - type: Appearance
     visuals:
@@ -212,7 +212,7 @@
   parent: CrateGeneric
   components:
   - type: Sprite
-    sprite: Constructible/Storage/Crates/scicrate.rsi
+    sprite: Structures/Storage/Crates/scicrate.rsi
     layers:
     - state: scicrate
     - state: scicrate_door
@@ -221,7 +221,7 @@
       visible: false
       map: ["enum.StorageVisualLayers.Welded"]
   - type: Icon
-    sprite: Constructible/Storage/Crates/scicrate.rsi
+    sprite: Structures/Storage/Crates/scicrate.rsi
     state: scicrate_icon
   - type: Appearance
     visuals:
@@ -235,7 +235,7 @@
   parent: CrateGeneric
   components:
   - type: Sprite
-    sprite: Constructible/Storage/Crates/surgerycrate.rsi
+    sprite: Structures/Storage/Crates/surgerycrate.rsi
     layers:
     - state: surgerycrate
     - state: surgerycrate_door
@@ -244,7 +244,7 @@
       visible: false
       map: ["enum.StorageVisualLayers.Welded"]
   - type: Icon
-    sprite: Constructible/Storage/Crates/surgerycrate.rsi
+    sprite: Structures/Storage/Crates/surgerycrate.rsi
     state: surgerycrate_icon
   - type: Appearance
     visuals:
@@ -263,7 +263,7 @@
     access: [["Security"]]
   - type: SecureEntityStorage
   - type: Sprite
-    sprite: Constructible/Storage/Crates/sec_gear.rsi
+    sprite: Structures/Storage/Crates/sec_gear.rsi
     layers:
     - state: secgearcrate
     - state: secgearcrate_door
@@ -275,7 +275,7 @@
       map: ["enum.StorageVisualLayers.Lock"]
       shader: unshaded
   - type: Icon
-    sprite: Constructible/Storage/Crates/sec_gear.rsi
+    sprite: Structures/Storage/Crates/sec_gear.rsi
     state: secgearcrate_icon
   - type: Appearance
     visuals:
@@ -292,7 +292,7 @@
     access: [["Engineering"]]
   - type: SecureEntityStorage
   - type: Sprite
-    sprite: Constructible/Storage/Crates/engicrate_secure.rsi
+    sprite: Structures/Storage/Crates/engicrate_secure.rsi
     layers:
     - state: engicratesecure
     - state: engicratesecure_door
@@ -304,7 +304,7 @@
       map: ["enum.StorageVisualLayers.Lock"]
       shader: unshaded
   - type: Icon
-    sprite: Constructible/Storage/Crates/engicrate_secure.rsi
+    sprite: Structures/Storage/Crates/engicrate_secure.rsi
     state: engicratesecure_icon
   - type: Appearance
     visuals:
@@ -321,7 +321,7 @@
     access: [["Medical"]]
   - type: SecureEntityStorage
   - type: Sprite
-    sprite: Constructible/Storage/Crates/medicalcrate_secure.rsi
+    sprite: Structures/Storage/Crates/medicalcrate_secure.rsi
     layers:
     - state: medicalcratesecure
     - state: medicalcratesecure_door
@@ -333,7 +333,7 @@
       map: ["enum.StorageVisualLayers.Lock"]
       shader: unshaded
   - type: Icon
-    sprite: Constructible/Storage/Crates/medicalcrate_secure.rsi
+    sprite: Structures/Storage/Crates/medicalcrate_secure.rsi
     state: medicalcratesecure_icon
   - type: Appearance
     visuals:
@@ -349,7 +349,7 @@
   - type: AccessReader
   - type: SecureEntityStorage
   - type: Sprite
-    sprite: Constructible/Storage/Crates/privatecrate_secure.rsi
+    sprite: Structures/Storage/Crates/privatecrate_secure.rsi
     layers:
     - state: privatecrate
     - state: privatecrate_door
@@ -361,7 +361,7 @@
       map: ["enum.StorageVisualLayers.Lock"]
       shader: unshaded
   - type: Icon
-    sprite: Constructible/Storage/Crates/privatecrate_secure.rsi
+    sprite: Structures/Storage/Crates/privatecrate_secure.rsi
     state: privatecrate_icon
   - type: Appearance
     visuals:
@@ -378,7 +378,7 @@
     access: [["Research"]]
   - type: SecureEntityStorage
   - type: Sprite
-    sprite: Constructible/Storage/Crates/scicrate_secure.rsi
+    sprite: Structures/Storage/Crates/scicrate_secure.rsi
     layers:
     - state: scicratesecure
     - state: scicratesecure_door
@@ -390,7 +390,7 @@
       map: ["enum.StorageVisualLayers.Lock"]
       shader: unshaded
   - type: Icon
-    sprite: Constructible/Storage/Crates/scicrate_secure.rsi
+    sprite: Structures/Storage/Crates/scicrate_secure.rsi
     state: scicratesecure_icon
   - type: Appearance
     visuals:
@@ -407,7 +407,7 @@
     access: [["Engineering"]]
   - type: SecureEntityStorage
   - type: Sprite
-    sprite: Constructible/Storage/Crates/plasma.rsi
+    sprite: Structures/Storage/Crates/plasma.rsi
     layers:
     - state: plasmacrate
     - state: plasmacrate_door
@@ -419,7 +419,7 @@
       map: ["enum.StorageVisualLayers.Lock"]
       shader: unshaded
   - type: Icon
-    sprite: Constructible/Storage/Crates/plasma.rsi
+    sprite: Structures/Storage/Crates/plasma.rsi
     state: plasmacrate_icon
   - type: Appearance
     visuals:
@@ -435,7 +435,7 @@
   - type: AccessReader
   - type: SecureEntityStorage
   - type: Sprite
-    sprite: Constructible/Storage/Crates/secure.rsi
+    sprite: Structures/Storage/Crates/secure.rsi
     layers:
     - state: securecrate
     - state: securecrate_door
@@ -447,7 +447,7 @@
       map: ["enum.StorageVisualLayers.Lock"]
       shader: unshaded
   - type: Icon
-    sprite: Constructible/Storage/Crates/secure.rsi
+    sprite: Structures/Storage/Crates/secure.rsi
     state: securecrate_icon
   - type: Appearance
     visuals:
@@ -464,7 +464,7 @@
     access: [["Service"]]
   - type: SecureEntityStorage
   - type: Sprite
-    sprite: Constructible/Storage/Crates/hydro_secure.rsi
+    sprite: Structures/Storage/Crates/hydro_secure.rsi
     layers:
     - state: hydrocratesecure
     - state: hydrocratesecure_door
@@ -476,7 +476,7 @@
       map: ["enum.StorageVisualLayers.Lock"]
       shader: unshaded
   - type: Icon
-    sprite: Constructible/Storage/Crates/hydro_secure.rsi
+    sprite: Structures/Storage/Crates/hydro_secure.rsi
     state: hydrocratesecure_icon
   - type: Appearance
     visuals:
@@ -493,7 +493,7 @@
     access: [["Security"]]
   - type: SecureEntityStorage
   - type: Sprite
-    sprite: Constructible/Storage/Crates/weapon.rsi
+    sprite: Structures/Storage/Crates/weapon.rsi
     layers:
     - state: weaponcrate
     - state: weaponcrate_door
@@ -502,7 +502,7 @@
       map: ["enum.StorageVisualLayers.Lock"]
       shader: unshaded
   - type: Icon
-    sprite: Constructible/Storage/Crates/weapon.rsi
+    sprite: Structures/Storage/Crates/weapon.rsi
     state: weaponcrate_icon
   - type: Appearance
     visuals:
@@ -516,13 +516,13 @@
   parent: CrateGeneric
   components:
   - type: Sprite
-    sprite: Constructible/Storage/Crates/livestock.rsi
+    sprite: Structures/Storage/Crates/livestock.rsi
     layers:
     - state: livestockcrate
     - state: livestockcrate_door
       map: ["enum.StorageVisualLayers.Door"]
   - type: Icon
-    sprite: Constructible/Storage/Crates/livestock.rsi
+    sprite: Structures/Storage/Crates/livestock.rsi
     state: livestockcrate
   - type: Appearance
     visuals:
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/base_tank.yml b/Resources/Prototypes/Entities/Structures/Storage/Tanks/base.yml
similarity index 95%
rename from Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/base_tank.yml
rename to Resources/Prototypes/Entities/Structures/Storage/Tanks/base.yml
index 45dc455272..536a020c93 100644
--- a/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/base_tank.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Tanks/base.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: StorageTank
-  parent: BaseConstructibleDynamic
+  parent: BaseStructureDynamic
   name: storage tank
   description: "A liquids storage tank."
   abstract: true
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/fuel_tank.yml b/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
similarity index 55%
rename from Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/fuel_tank.yml
rename to Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
index 92b306a59d..ef0c53bfd0 100644
--- a/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/fuel_tank.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
@@ -1,3 +1,5 @@
+# Welding
+
 - type: entity
   id: WeldingFuelTank
   parent: StorageTank
@@ -6,7 +8,7 @@
   description: A fuel tank. It is used to store high amounts of fuel.
   components:
   - type: Sprite
-    sprite: Constructible/Misc/tanks.rsi
+    sprite: Structures/Storage/tanks.rsi
     state: fueltank
   - type: ReagentTank
     tankType: Fuel
@@ -27,3 +29,27 @@
       reagents:
       - ReagentId: WeldingFuel
         Quantity: 1500
+
+# Water
+
+- type: entity
+  id: WaterTank
+  parent: StorageTank
+  name: water tank
+  suffix: Empty
+  description: "A water tank. It is used to store high amounts of water."
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/tanks.rsi
+    state: watertank
+
+- type: entity
+  parent: WaterTank
+  id: WaterTankFull
+  suffix: Full
+  components:
+  - type: SolutionContainer
+    contents:
+      reagents:
+      - ReagentId: Water
+        Quantity: 1500
diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Medical/morgue.yml b/Resources/Prototypes/Entities/Structures/Storage/morgue.yml
similarity index 93%
rename from Resources/Prototypes/Entities/Constructible/Specific/Medical/morgue.yml
rename to Resources/Prototypes/Entities/Structures/Storage/morgue.yml
index af4fa47dae..a4dab64e39 100644
--- a/Resources/Prototypes/Entities/Constructible/Specific/Medical/morgue.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/morgue.yml
@@ -5,7 +5,7 @@
   components:
   - type: Sprite
     netsync: false
-    sprite: Objects/Specific/Medical/Morgue/morgue.rsi
+    sprite: Structures/Storage/morgue.rsi
     layers:
     - state: morgue_closed
       map: ["enum.MorgueVisualLayers.Base"]
@@ -56,7 +56,7 @@
   components:
   - type: Sprite
     netsync: false
-    sprite: Objects/Specific/Medical/Morgue/morgue.rsi
+    sprite: Structures/Storage/morgue.rsi
     state: morgue_tray
   - type: Clickable
   - type: InteractionOutline
@@ -70,7 +70,7 @@
   components:
   - type: Sprite
     netsync: false
-    sprite: Objects/Specific/Medical/Morgue/morgue.rsi
+    sprite: Structures/Storage/morgue.rsi
     layers:
     - state: crema_closed
       map: ["enum.CrematoriumVisualLayers.Base"]
@@ -122,5 +122,5 @@
   components:
   - type: Sprite
     netsync: false
-    sprite: Objects/Specific/Medical/Morgue/morgue.rsi
+    sprite: Structures/Storage/morgue.rsi
     state: crema_tray
diff --git a/Resources/Prototypes/Entities/Constructible/Furniture/storage.yml b/Resources/Prototypes/Entities/Structures/Storage/storage.yml
similarity index 95%
rename from Resources/Prototypes/Entities/Constructible/Furniture/storage.yml
rename to Resources/Prototypes/Entities/Structures/Storage/storage.yml
index 9bf1bace6c..c2704fb71d 100644
--- a/Resources/Prototypes/Entities/Constructible/Furniture/storage.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/storage.yml
@@ -9,7 +9,7 @@
   - type: InteractionOutline
   - type: PlaceableSurface
   - type: Sprite
-    sprite: Constructible/Misc/furniture.rsi
+    sprite: Structures/Furniture/furniture.rsi
     state: rack
     drawdepth: FloorObjects
   - type: Physics
diff --git a/Resources/Prototypes/Entities/Constructible/Walls/atmos_plaque.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/atmos_plaque.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Constructible/Walls/atmos_plaque.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/Signs/atmos_plaque.yml
diff --git a/Resources/Prototypes/Entities/Constructible/Walls/bar_sign.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml
similarity index 88%
rename from Resources/Prototypes/Entities/Constructible/Walls/bar_sign.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml
index 9cf0b64ab5..cb47972448 100644
--- a/Resources/Prototypes/Entities/Constructible/Walls/bar_sign.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: BarSign
-  parent: BaseConstructible
+  parent: BaseStructure
   name: bar sign
   components:
   - type: Physics
@@ -12,7 +12,7 @@
       - Passable
   - type: Sprite
     drawdepth: WallTops
-    sprite: Constructible/Misc/barsign.rsi
+    sprite: Structures/Wallmounts/barsign.rsi
     state: empty
   - type: ApcPowerReceiver
   - type: BarSign
@@ -35,7 +35,7 @@
   - type: Physics
   - type: Sprite
     drawdepth: WallTops
-    sprite: Constructible/Misc/sylphs.rsi
+    sprite: Structures/Wallmounts/sylphs.rsi
     state: sylph
   - type: ApcPowerReceiver
   - type: BarSign
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base.yml
new file mode 100644
index 0000000000..ec988ce0cc
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base.yml
@@ -0,0 +1,26 @@
+- type: entity
+  id: BaseSign
+  name: base sign
+  abstract: true
+  components:
+  - type: Clickable
+  - type: InteractionOutline
+  - type: Physics
+    bodyType: Static
+    canCollide: false
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb {}
+  - type: Damageable
+    resistances: metallicResistances
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 5
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: Sprite
+    drawdepth: WallTops
+    sprite: Structures/Wallmounts/signs.rsi
diff --git a/Resources/Prototypes/Entities/Constructible/Walls/signs.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml
similarity index 96%
rename from Resources/Prototypes/Entities/Constructible/Walls/signs.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml
index 1b2960f6a2..436fe4d48c 100644
--- a/Resources/Prototypes/Entities/Constructible/Walls/signs.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml
@@ -1,30 +1,3 @@
-- type: entity
-  id: BaseSign
-  name: base sign
-  abstract: true
-  components:
-  - type: Clickable
-  - type: InteractionOutline
-  - type: Physics
-    bodyType: Static
-    canCollide: false
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb {}
-  - type: Damageable
-    resistances: metallicResistances
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 5
-      behaviors:
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-  - type: Sprite
-    drawdepth: WallTops
-    sprite: Constructible/Misc/decals.rsi
-
 # These signs would not have collision otherwise, they simply
 # need collision in order for them to be destructible. Once the
 # SmallImpassable etc. stuff actually gets implemented in this
diff --git a/Resources/Prototypes/Entities/Constructible/Walls/emergency_light.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/emergency_light.yml
similarity index 91%
rename from Resources/Prototypes/Entities/Constructible/Walls/emergency_light.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/emergency_light.yml
index f4e6bb0181..c72b60f25e 100644
--- a/Resources/Prototypes/Entities/Constructible/Walls/emergency_light.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/emergency_light.yml
@@ -17,13 +17,12 @@
     startingCharge: 0
   - type: EmergencyLight
   - type: Sprite
-    sprite: Constructible/Lighting/emergency_light.rsi
+    sprite: Structures/Wallmounts/Lighting/emergency_light.rsi
     layers:
     - state: emergency_light_off
   - type: Appearance
     visuals:
     - type: EmergencyLightVisualizer
-
   placement:
     snap:
     - Wallmount
diff --git a/Resources/Prototypes/Entities/Constructible/Walls/extinguisher_cabinet.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml
similarity index 94%
rename from Resources/Prototypes/Entities/Constructible/Walls/extinguisher_cabinet.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml
index f4e7e8ce3d..40e5c08394 100644
--- a/Resources/Prototypes/Entities/Constructible/Walls/extinguisher_cabinet.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml
@@ -6,7 +6,7 @@
     - type: Clickable
     - type: InteractionOutline
     - type: Sprite
-      sprite: Constructible/Storage/Cabinets/extinguisher_cabinet.rsi
+      sprite: Structures/Wallmounts/extinguisher_cabinet.rsi
       netsync: false
       state: extinguisher_closed
     - type: ItemCabinet
diff --git a/Resources/Prototypes/Entities/Constructible/Walls/fireaxe_cabinet.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml
similarity index 94%
rename from Resources/Prototypes/Entities/Constructible/Walls/fireaxe_cabinet.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml
index 1eff1df28e..2314d4dcfc 100644
--- a/Resources/Prototypes/Entities/Constructible/Walls/fireaxe_cabinet.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml
@@ -6,7 +6,7 @@
     - type: Clickable
     - type: InteractionOutline
     - type: Sprite
-      sprite: Constructible/Storage/Cabinets/fireaxe_cabinet.rsi
+      sprite: Structures/Wallmounts/fireaxe_cabinet.rsi
       netsync: false
       state: cabinet-filled-closed
     - type: ItemCabinet
diff --git a/Resources/Prototypes/Entities/Constructible/Walls/lighting.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/lighting.yml
similarity index 93%
rename from Resources/Prototypes/Entities/Constructible/Walls/lighting.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/lighting.yml
index 3a1c355533..620f13a43d 100644
--- a/Resources/Prototypes/Entities/Constructible/Walls/lighting.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/lighting.yml
@@ -18,7 +18,7 @@
       layer: [ Passable ]
   - type: LoopingSound
   - type: Sprite
-    sprite: Constructible/Lighting/light_tube.rsi
+    sprite: Structures/Wallmounts/Lighting/light_tube.rsi
     layers:
     - state: on
       map: ["enum.PoweredLightLayers.Base"]
@@ -57,7 +57,7 @@
   parent: WallLight
   components:
   - type: Sprite
-    sprite: Constructible/Lighting/light_tube.rsi
+    sprite: Structures/Wallmounts/Lighting/light_tube.rsi
     state: off
   - type: PointLight
     enabled: false
@@ -88,7 +88,7 @@
   parent: WallLight
   components:
     - type: Sprite
-      sprite: Constructible/Lighting/light_small.rsi
+      sprite: Structures/Wallmounts/Lighting/light_small.rsi
       state: on
     - type: PointLight
       energy: 1.0
@@ -122,7 +122,7 @@
   parent: SmallLight
   components:
   - type: Sprite
-    sprite: Constructible/Lighting/light_small.rsi
+    sprite: Structures/Wallmounts/Lighting/light_small.rsi
     state: off
   - type: PointLight
     enabled: false
diff --git a/Resources/Prototypes/Entities/Constructible/Walls/mirror.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/mirror.yml
similarity index 83%
rename from Resources/Prototypes/Entities/Constructible/Walls/mirror.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/mirror.yml
index 6730a0c73d..82dd590bae 100644
--- a/Resources/Prototypes/Entities/Constructible/Walls/mirror.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/mirror.yml
@@ -1,11 +1,11 @@
 - type: entity
   id: Mirror
-  parent: BaseConstructible
+  parent: BaseStructure
   name: mirror
   description: 'Mirror mirror on the wall , who''s the most robust of them all?'
   components:
   - type: Sprite
-    sprite: Constructible/Misc/mirror.rsi
+    sprite: Structures/Wallmounts/mirror.rsi
     state: mirror
   - type: InteractionOutline
   - type: MagicMirror
diff --git a/Resources/Prototypes/Entities/Constructible/Walls/linking.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
similarity index 88%
rename from Resources/Prototypes/Entities/Constructible/Walls/linking.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
index 6fd8acb01d..66abc219af 100644
--- a/Resources/Prototypes/Entities/Constructible/Walls/linking.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
@@ -7,7 +7,7 @@
   - type: InteractionOutline
   - type: Physics
   - type: Sprite
-    sprite: Constructible/Power/switch.rsi
+    sprite: Structures/Wallmounts/switch.rsi
     state: on
   - type: SignalSwitch
   - type: Rotatable
@@ -25,7 +25,7 @@
   - type: InteractionOutline
   - type: Physics
   - type: Sprite
-    sprite: Constructible/Power/switch.rsi
+    sprite: Structures/Wallmounts/switch.rsi
     state: dead
   - type: SignalButton
   - type: Rotatable
diff --git a/Resources/Prototypes/Entities/Constructible/Walls/asteroid.yml b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
similarity index 83%
rename from Resources/Prototypes/Entities/Constructible/Walls/asteroid.yml
rename to Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
index 981b10fe84..da2a7bf71d 100644
--- a/Resources/Prototypes/Entities/Constructible/Walls/asteroid.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
@@ -1,13 +1,13 @@
-- type: entity
+- type: entity
   id: AsteroidRock
-  parent: BaseConstructible
+  parent: BaseStructure
   name: asteroid rock
   description: That's an asteroid
   components:
   - type: AsteroidRock
   - type: InteractionOutline
   - type: Sprite
-    sprite: Constructible/Structures/Walls/asteroid_rock.rsi
+    sprite: Structures/Walls/asteroid_rock.rsi
     state: 0
   - type: Damageable
     resistances: metallicResistances
diff --git a/Resources/Prototypes/Entities/Constructible/Specific/barricades.yml b/Resources/Prototypes/Entities/Structures/Walls/barricades.yml
similarity index 94%
rename from Resources/Prototypes/Entities/Constructible/Specific/barricades.yml
rename to Resources/Prototypes/Entities/Structures/Walls/barricades.yml
index 3ae0b467e9..e79c7dfeac 100644
--- a/Resources/Prototypes/Entities/Constructible/Specific/barricades.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/barricades.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: Barricade
-  parent: BaseConstructible
+  parent: BaseStructure
   name: barricade
   components:
   - type: InteractionOutline
@@ -8,7 +8,7 @@
     graph: barricade
     node: barricadewooden
   - type: Sprite
-    sprite: Constructible/Structures/barricades.rsi
+    sprite: Structures/Walls/barricades.rsi
     state: barricadewooden
   - type: Physics
     fixtures:
diff --git a/Resources/Prototypes/Entities/Structures/Walls/base.yml b/Resources/Prototypes/Entities/Structures/Walls/base.yml
new file mode 100644
index 0000000000..d78e81c5fe
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Walls/base.yml
@@ -0,0 +1,40 @@
+- type: entity
+  abstract: true
+  parent: BaseStructure
+  id: WallBase
+  name: basewall
+  description: Keeps the air in and the greytide out.
+  placement:
+    mode: SnapgridCenter
+    snap:
+    - Wall
+  components:
+  - type: Tag
+    tags:
+    - Wall
+  - type: Sprite
+    netsync: false
+    drawdepth: Walls
+  - type: Icon
+    state: full
+  - type: Damageable
+    resistances: metallicResistances
+  - type: Physics
+    bodyType: Static
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.5, -0.5, 0.5, 0.5"
+      layer:
+      - Opaque
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
+      - SmallImpassable
+  - type: Occluder
+    sizeX: 32
+    sizeY: 32
+  - type: Airtight
+  - type: IconSmooth
+    key: walls
+    base: solid
diff --git a/Resources/Prototypes/Entities/Constructible/Walls/girder.yml b/Resources/Prototypes/Entities/Structures/Walls/girder.yml
similarity index 91%
rename from Resources/Prototypes/Entities/Constructible/Walls/girder.yml
rename to Resources/Prototypes/Entities/Structures/Walls/girder.yml
index b4d2401e14..6e357f0f9f 100644
--- a/Resources/Prototypes/Entities/Constructible/Walls/girder.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/girder.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: Girder
-  parent: BaseConstructibleDynamic
+  parent: BaseStructureDynamic
   name: girder
   description: A large structural assembly made out of metal; It requires a layer of metal before it can be considered a wall.
   components:
@@ -22,7 +22,7 @@
     graph: girder
     node: girder
   - type: Sprite
-    sprite: Constructible/Structures/Walls/solid.rsi
+    sprite: Structures/Walls/solid.rsi
     state: wall_girder
   - type: Tag
     tags:
diff --git a/Resources/Prototypes/Entities/Constructible/Walls/low_wall.yml b/Resources/Prototypes/Entities/Structures/Walls/low.yml
similarity index 81%
rename from Resources/Prototypes/Entities/Constructible/Walls/low_wall.yml
rename to Resources/Prototypes/Entities/Structures/Walls/low.yml
index b1c0d9546b..0ac03fead4 100644
--- a/Resources/Prototypes/Entities/Constructible/Walls/low_wall.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/low.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: LowWall
-  parent: BaseConstructible
+  parent: BaseStructure
   name: low wall
   description: Goes up to about your waist.
   components:
@@ -10,9 +10,9 @@
     netsync: false
     color: "#889192"
     drawdepth: Walls
-    sprite: Constructible/Structures/Walls/low_wall.rsi
+    sprite: Structures/Walls/low_wall.rsi
   - type: Icon
-    sprite: Constructible/Structures/Walls/low_wall.rsi
+    sprite: Structures/Walls/low_wall.rsi
     state: metal
   - type: Damageable
     resistances: metallicResistances
@@ -42,4 +42,5 @@
   - type: Sprite
     color: "#889192"
     drawdepth: WallMountedItems
-    sprite: Constructible/Structures/Walls/low_wall.rsi
+    sprite: Structures/Walls/low_wall.rsi
+  - type: HideContextMenu
diff --git a/Resources/Prototypes/Entities/Constructible/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
similarity index 77%
rename from Resources/Prototypes/Entities/Constructible/Walls/walls.yml
rename to Resources/Prototypes/Entities/Structures/Walls/walls.yml
index 83ef87ce68..365ecd9b81 100644
--- a/Resources/Prototypes/Entities/Constructible/Walls/walls.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
@@ -1,44 +1,3 @@
-- type: entity
-  abstract: true
-  parent: BaseConstructible
-  id: WallBase
-  name: basewall
-  description: Keeps the air in and the greytide out.
-  placement:
-    mode: SnapgridCenter
-    snap:
-    - Wall
-  components:
-  - type: Tag
-    tags:
-    - Wall
-  - type: Sprite
-    netsync: false
-    drawdepth: Walls
-  - type: Icon
-    state: full
-  - type: Damageable
-    resistances: metallicResistances
-  - type: Physics
-    bodyType: Static
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.5, -0.5, 0.5, 0.5"
-      layer:
-      - Opaque
-      - Impassable
-      - MobImpassable
-      - VaultImpassable
-      - SmallImpassable
-  - type: Occluder
-    sizeX: 32
-    sizeY: 32
-  - type: Airtight
-  - type: IconSmooth
-    key: walls
-    base: solid
-
 - type: entity
   parent: WallBase
   id: WallBrick
@@ -46,9 +5,9 @@
   components:
   - type: RCDDeconstructWhitelist
   - type: Sprite
-    sprite: Constructible/Structures/Walls/brick.rsi
+    sprite: Structures/Walls/brick.rsi
   - type: Icon
-    sprite: Constructible/Structures/Walls/brick.rsi
+    sprite: Structures/Walls/brick.rsi
   - type: Destructible
     thresholds:
     - trigger:
@@ -73,9 +32,9 @@
   components:
   - type: RCDDeconstructWhitelist
   - type: Sprite
-    sprite: Constructible/Structures/Walls/clock.rsi
+    sprite: Structures/Walls/clock.rsi
   - type: Icon
-    sprite: Constructible/Structures/Walls/clock.rsi
+    sprite: Structures/Walls/clock.rsi
   - type: Destructible
     thresholds:
     - trigger:
@@ -100,9 +59,9 @@
   components:
   - type: RCDDeconstructWhitelist
   - type: Sprite
-    sprite: Constructible/Structures/Walls/clown.rsi
+    sprite: Structures/Walls/clown.rsi
   - type: Icon
-    sprite: Constructible/Structures/Walls/clown.rsi
+    sprite: Structures/Walls/clown.rsi
   - type: Destructible
     thresholds:
     - trigger:
@@ -128,9 +87,9 @@
   components:
   - type: RCDDeconstructWhitelist
   - type: Sprite
-    sprite: Constructible/Structures/Walls/cult.rsi
+    sprite: Structures/Walls/cult.rsi
   - type: Icon
-    sprite: Constructible/Structures/Walls/cult.rsi
+    sprite: Structures/Walls/cult.rsi
   - type: Destructible
     thresholds:
     - trigger:
@@ -155,9 +114,9 @@
   components:
   - type: RCDDeconstructWhitelist
   - type: Sprite
-    sprite: Constructible/Structures/Walls/debug.rsi
+    sprite: Structures/Walls/debug.rsi
   - type: Icon
-    sprite: Constructible/Structures/Walls/debug.rsi
+    sprite: Structures/Walls/debug.rsi
   - type: Destructible
     thresholds:
     - trigger:
@@ -182,9 +141,9 @@
   components:
   - type: RCDDeconstructWhitelist
   - type: Sprite
-    sprite: Constructible/Structures/Walls/diamond.rsi
+    sprite: Structures/Walls/diamond.rsi
   - type: Icon
-    sprite: Constructible/Structures/Walls/diamond.rsi
+    sprite: Structures/Walls/diamond.rsi
   - type: Destructible
     thresholds:
     - trigger:
@@ -209,9 +168,9 @@
   components:
   - type: RCDDeconstructWhitelist
   - type: Sprite
-    sprite: Constructible/Structures/Walls/gold.rsi
+    sprite: Structures/Walls/gold.rsi
   - type: Icon
-    sprite: Constructible/Structures/Walls/gold.rsi
+    sprite: Structures/Walls/gold.rsi
   - type: Destructible
     thresholds:
     - trigger:
@@ -236,9 +195,9 @@
   components:
   - type: RCDDeconstructWhitelist
   - type: Sprite
-    sprite: Constructible/Structures/Walls/ice.rsi
+    sprite: Structures/Walls/ice.rsi
   - type: Icon
-    sprite: Constructible/Structures/Walls/ice.rsi
+    sprite: Structures/Walls/ice.rsi
   - type: Destructible
     thresholds:
     - trigger:
@@ -263,9 +222,9 @@
   components:
   - type: RCDDeconstructWhitelist
   - type: Sprite
-    sprite: Constructible/Structures/Walls/metal.rsi
+    sprite: Structures/Walls/metal.rsi
   - type: Icon
-    sprite: Constructible/Structures/Walls/metal.rsi
+    sprite: Structures/Walls/metal.rsi
   - type: Destructible
     thresholds:
     - trigger:
@@ -290,9 +249,9 @@
   components:
   - type: RCDDeconstructWhitelist
   - type: Sprite
-    sprite: Constructible/Structures/Walls/plasma.rsi
+    sprite: Structures/Walls/plasma.rsi
   - type: Icon
-    sprite: Constructible/Structures/Walls/plasma.rsi
+    sprite: Structures/Walls/plasma.rsi
   - type: Destructible
     thresholds:
     - trigger:
@@ -317,9 +276,9 @@
   components:
   - type: RCDDeconstructWhitelist
   - type: Sprite
-    sprite: Constructible/Structures/Walls/plastic.rsi
+    sprite: Structures/Walls/plastic.rsi
   - type: Icon
-    sprite: Constructible/Structures/Walls/plastic.rsi
+    sprite: Structures/Walls/plastic.rsi
   - type: Destructible
     thresholds:
     - trigger:
@@ -344,9 +303,9 @@
   components:
   - type: Sprite
     color: "#889192"
-    sprite: Constructible/Structures/Walls/solid.rsi
+    sprite: Structures/Walls/solid.rsi
   - type: Icon
-    sprite: Constructible/Structures/Walls/solid.rsi
+    sprite: Structures/Walls/solid.rsi
     state: rgeneric
   - type: Construction
     graph: girder
@@ -377,9 +336,9 @@
   components:
   - type: RCDDeconstructWhitelist
   - type: Sprite
-    sprite: Constructible/Structures/Walls/riveted.rsi
+    sprite: Structures/Walls/riveted.rsi
   - type: Icon
-    sprite: Constructible/Structures/Walls/riveted.rsi
+    sprite: Structures/Walls/riveted.rsi
   - type: Destructible
     thresholds:
     - trigger:
@@ -404,9 +363,9 @@
   components:
   - type: RCDDeconstructWhitelist
   - type: Sprite
-    sprite: Constructible/Structures/Walls/sandstone.rsi
+    sprite: Structures/Walls/sandstone.rsi
   - type: Icon
-    sprite: Constructible/Structures/Walls/sandstone.rsi
+    sprite: Structures/Walls/sandstone.rsi
   - type: Destructible
     thresholds:
     - trigger:
@@ -431,9 +390,9 @@
   components:
   - type: RCDDeconstructWhitelist
   - type: Sprite
-    sprite: Constructible/Structures/Walls/silver.rsi
+    sprite: Structures/Walls/silver.rsi
   - type: Icon
-    sprite: Constructible/Structures/Walls/silver.rsi
+    sprite: Structures/Walls/silver.rsi
   - type: Destructible
     thresholds:
     - trigger:
@@ -459,12 +418,12 @@
   - type: RCDDeconstructWhitelist
   - type: Sprite
     color: "#889192"
-    sprite: Constructible/Structures/Walls/solid.rsi
+    sprite: Structures/Walls/solid.rsi
   - type: Construction
     graph: girder
     node: wall
   - type: Icon
-    sprite: Constructible/Structures/Walls/solid.rsi
+    sprite: Structures/Walls/solid.rsi
   - type: Destructible
     thresholds:
     - trigger:
@@ -488,9 +447,9 @@
   name: uranium wall
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Walls/uranium.rsi
+    sprite: Structures/Walls/uranium.rsi
   - type: Icon
-    sprite: Constructible/Structures/Walls/uranium.rsi
+    sprite: Structures/Walls/uranium.rsi
   - type: Destructible
     thresholds:
     - trigger:
@@ -515,9 +474,9 @@
   components:
   - type: RCDDeconstructWhitelist
   - type: Sprite
-    sprite: Constructible/Structures/Walls/wood.rsi
+    sprite: Structures/Walls/wood.rsi
   - type: Icon
-    sprite: Constructible/Structures/Walls/wood.rsi
+    sprite: Structures/Walls/wood.rsi
   - type: Destructible
     thresholds:
     - trigger:
diff --git a/Resources/Prototypes/Entities/Structures/Windows/plasma.yml b/Resources/Prototypes/Entities/Structures/Windows/plasma.yml
new file mode 100644
index 0000000000..1672f3ac9a
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Windows/plasma.yml
@@ -0,0 +1,33 @@
+- type: entity
+  id: PlasmaWindow
+  name: plasma window
+  parent: Window
+  components:
+  - type: Sprite
+    drawdepth: WallTops
+    sprite: Structures/Windows/plasma_window.rsi
+  - type: Icon
+    sprite: Structures/Windows/plasma_window.rsi
+  - type: Damageable
+    resistances: glassResistances
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 200
+      behaviors:
+      - !type:PlaySoundCollectionBehavior
+        soundCollection: GlassBreak
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          ShardGlassPlasma:
+            min: 1
+            max: 2
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+    resistances: glassResistances
+  - type: Window
+    base: pwindow
+  - type: Construction
+    graph: window
+    node: plasmaWindow
diff --git a/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml b/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml
new file mode 100644
index 0000000000..2b34fc4eee
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml
@@ -0,0 +1,33 @@
+- type: entity
+  id: ReinforcedWindow
+  name: reinforced window
+  parent: Window
+  components:
+  - type: Sprite
+    drawdepth: WallTops
+    sprite: Structures/Windows/reinforced_window.rsi
+  - type: Icon
+    sprite: Structures/Windows/reinforced_window.rsi
+  - type: Repairable
+    fuelCost: 10
+    doAfterDelay: 2
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 150
+      behaviors:
+      - !type:PlaySoundCollectionBehavior
+        soundCollection: GlassBreak
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          ShardGlassReinforced:
+            min: 1
+            max: 2
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: Window
+    base: rwindow
+  - type: Construction
+    graph: window
+    node: reinforcedWindow
diff --git a/Resources/Prototypes/Entities/Structures/Windows/window.yml b/Resources/Prototypes/Entities/Structures/Windows/window.yml
new file mode 100644
index 0000000000..49aff00bc0
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Windows/window.yml
@@ -0,0 +1,58 @@
+- type: entity
+  id: Window
+  parent: BaseStructure
+  name: window
+  description: Don't smudge up the glass down there.
+  placement:
+    mode: SnapgridCenter
+    snap:
+    - Window
+  components:
+  - type: RCDDeconstructWhitelist
+  - type: Sprite
+    color: "#DDDDDD"
+    netsync: false
+    drawdepth: WallTops
+    sprite: Structures/Windows/window.rsi
+  - type: Icon
+    sprite: Structures/Windows/window.rsi
+    state: full
+  - type: Physics
+    bodyType: Static
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb {}
+      layer:
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
+      - SmallImpassable
+      mask:
+      - VaultImpassable
+  - type: Damageable
+    resistances: glassResistances
+  - type: Repairable
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 15
+      behaviors:
+      - !type:PlaySoundCollectionBehavior
+        soundCollection: GlassBreak
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          ShardGlass:
+            min: 1
+            max: 2
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: Airtight
+  - type: Window
+    base: window
+  - type: Construction
+    graph: window
+    node: window
+  - type: Appearance
+    visuals:
+    - type: WindowVisualizer
diff --git a/Resources/Prototypes/Entities/Constructible/base.yml b/Resources/Prototypes/Entities/Structures/base.yml
similarity index 91%
rename from Resources/Prototypes/Entities/Constructible/base.yml
rename to Resources/Prototypes/Entities/Structures/base.yml
index 2df3e4b3e8..d34140b087 100644
--- a/Resources/Prototypes/Entities/Constructible/base.yml
+++ b/Resources/Prototypes/Entities/Structures/base.yml
@@ -1,5 +1,5 @@
 - type: entity
-  id: BaseConstructible
+  id: BaseStructure
   abstract: true
   placement:
     mode: SnapgridCenter
@@ -22,8 +22,8 @@
 
 - type: entity
   # This means that it's not anchored on spawn.
-  id: BaseConstructibleDynamic
-  parent: BaseConstructible
+  id: BaseStructureDynamic
+  parent: BaseStructure
   abstract: true
   components:
 # These might/might not be a good idea
diff --git a/Resources/Prototypes/Entities/Constructible/Specific/cargo_telepad.yml b/Resources/Prototypes/Entities/Structures/cargo_telepad.yml
similarity index 81%
rename from Resources/Prototypes/Entities/Constructible/Specific/cargo_telepad.yml
rename to Resources/Prototypes/Entities/Structures/cargo_telepad.yml
index aefaaff479..e33853fe32 100644
--- a/Resources/Prototypes/Entities/Constructible/Specific/cargo_telepad.yml
+++ b/Resources/Prototypes/Entities/Structures/cargo_telepad.yml
@@ -1,8 +1,8 @@
 - type: entity
   id: cargoTelepad
-  parent: BaseConstructibleDynamic
+  parent: BaseStructureDynamic
   name: cargo telepad
-  description: "Temporary cargo delivery for developing Nanotrasen stations! Warning: destroying this while goods are in transit will lose them forever!"
+  description: 'Temporary cargo delivery for developing Nanotrasen stations! Warning: destroying this while goods are in transit will lose them forever!'
   components:
   - type: InteractionOutline
   - type: Physics
@@ -15,7 +15,7 @@
       layer:
       - Passable
   - type: Sprite
-    sprite: Constructible/Specific/Cargo/teleporter.rsi
+    sprite: Structures/cargo_telepad.rsi
     state: offline
     drawdepth: FloorObjects
   - type: Damageable
diff --git a/Resources/Prototypes/Entities/Constructible/Ground/catwalk.yml b/Resources/Prototypes/Entities/Structures/catwalk.yml
similarity index 88%
rename from Resources/Prototypes/Entities/Constructible/Ground/catwalk.yml
rename to Resources/Prototypes/Entities/Structures/catwalk.yml
index 3c57331279..fcb1cfc7e6 100644
--- a/Resources/Prototypes/Entities/Constructible/Ground/catwalk.yml
+++ b/Resources/Prototypes/Entities/Structures/catwalk.yml
@@ -15,10 +15,10 @@
         layer: [ Passable ]
   - type: Sprite
     netsync: false
-    sprite: Constructible/Tiles/catwalk.rsi
+    sprite: Structures/catwalk.rsi
     drawdepth: FloorTiles
   - type: Icon
-    sprite: Constructible/Tiles/catwalk.rsi
+    sprite: Structures/catwalk.rsi
     state: catwalk_preview
   - type: SnapGrid
   - type: IconSmooth
diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Conveyor/conveyor.yml b/Resources/Prototypes/Entities/Structures/conveyor.yml
similarity index 69%
rename from Resources/Prototypes/Entities/Constructible/Specific/Conveyor/conveyor.yml
rename to Resources/Prototypes/Entities/Structures/conveyor.yml
index 0aa313a130..1dc2a9088f 100644
--- a/Resources/Prototypes/Entities/Constructible/Specific/Conveyor/conveyor.yml
+++ b/Resources/Prototypes/Entities/Structures/conveyor.yml
@@ -22,7 +22,7 @@
   - type: SnapGrid
   - type: Sprite
     netsync: false
-    sprite: Constructible/Power/conveyor.rsi
+    sprite: Structures/conveyor.rsi
     state: conveyor_started_cw
     drawdepth: FloorObjects
   - type: SignalReceiver
@@ -51,8 +51,30 @@
     - ConveyorAssembly
   - type: Sprite
     netsync: false
-    sprite: Constructible/Power/conveyor.rsi
+    sprite: Structures/conveyor.rsi
     state: conveyor_loose
   - type: Construction
     graph: ConveyorGraph
     node: item
+
+- type: entity
+  id: TwoWayLever
+  name: two way lever
+  description: A two way lever.
+  components:
+    - type: Clickable
+    - type: InteractionOutline
+    - type: Sprite
+      netsync: false
+      sprite: Structures/conveyor.rsi
+      state: switch-off
+    - type: TwoWayLever
+    - type: Appearance
+      visuals:
+        - type: TwoWayLeverVisualizer
+          state_forward: switch-fwd
+          state_off: switch-off
+          state_reversed: switch-rev
+    - type: Construction
+      graph: leverGraph
+      node: lever
diff --git a/Resources/Prototypes/Entities/Structures/hydro_tray.yml b/Resources/Prototypes/Entities/Structures/hydro_tray.yml
new file mode 100644
index 0000000000..35972093ed
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/hydro_tray.yml
@@ -0,0 +1,22 @@
+- type: entity
+  name: hydroponics tray
+  parent: hydroponicsSoil
+  id: hydroponicsTray
+  description: An interstellar-grade space farmplot allowing for rapid growth and selective breeding of crops. Just... keep in mind the space weeds.
+  components:
+  - type: Physics
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb {}
+      mass: 25
+      hard: true
+      mask:
+      - Impassable
+  - type: Anchorable
+  - type: Pullable
+  - type: Sprite
+    sprite: Structures/Hydroponics/containers.rsi
+    state: hydrotray3
+    drawdepth: FloorObjects
+  - type: PlantHolder
+    drawWarnings: true
diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Kitchen/meat_spike.yml b/Resources/Prototypes/Entities/Structures/meat_spike.yml
similarity index 91%
rename from Resources/Prototypes/Entities/Constructible/Specific/Kitchen/meat_spike.yml
rename to Resources/Prototypes/Entities/Structures/meat_spike.yml
index 5b9aee0f82..c5ac6e35f1 100644
--- a/Resources/Prototypes/Entities/Constructible/Specific/Kitchen/meat_spike.yml
+++ b/Resources/Prototypes/Entities/Structures/meat_spike.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: KitchenSpike
-  parent: BaseConstructible
+  parent: BaseStructure
   name: meat spike
   description: A spike for collecting meat from animals.
   components:
@@ -8,7 +8,7 @@
   - type: Sprite
     netsync: false
     # temp to make clickmask work
-    sprite: Constructible/Misc/kitchen.rsi
+    sprite: Structures/meat_spike.rsi
     state: spike
   - type: Damageable
     resistances: metallicResistances
diff --git a/Resources/Prototypes/Entities/Constructible/Specific/hydroponics.yml b/Resources/Prototypes/Entities/Structures/soil.yml
similarity index 62%
rename from Resources/Prototypes/Entities/Constructible/Specific/hydroponics.yml
rename to Resources/Prototypes/Entities/Structures/soil.yml
index 906b1bfe06..3090d7c0e8 100644
--- a/Resources/Prototypes/Entities/Constructible/Specific/hydroponics.yml
+++ b/Resources/Prototypes/Entities/Structures/soil.yml
@@ -35,7 +35,7 @@
       - !type:DoActsBehavior
         acts: ["Destruction"]
   - type: Sprite
-    sprite: Constructible/Hydroponics/misc.rsi
+    sprite: Structures/Hydroponics/misc.rsi
     state: soil
     drawdepth: FloorObjects
   - type: PlantHolder
@@ -50,26 +50,3 @@
   - type: Appearance
     visuals:
       - type: PlantHolderVisualizer
-
-- type: entity
-  name: hydroponics tray
-  parent: hydroponicsSoil
-  id: hydroponicsTray
-  description: An interstellar-grade space farmplot allowing for rapid growth and selective breeding of crops. Just... keep in mind the space weeds.
-  components:
-  - type: Physics
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb {}
-      mass: 25
-      hard: true
-      mask:
-      - Impassable
-  - type: Anchorable
-  - type: Pullable
-  - type: Sprite
-    sprite: Constructible/Hydroponics/containers.rsi
-    state: hydrotray3
-    drawdepth: FloorObjects
-  - type: PlantHolder
-    drawWarnings: true
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/airlock.yml b/Resources/Prototypes/Recipes/Construction/Graphs/airlock.yml
index 32c5c8c337..9642326a0e 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/airlock.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/airlock.yml
@@ -52,7 +52,7 @@
               store: board
               name: "door electronics circuit board"
               icon:
-                sprite: "Constructible/Misc/module.rsi"
+                sprite: "Objects/Misc/module.rsi"
                 state: "door_electronics"
               doAfter: 1
         - to: assembly
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/computer.yml b/Resources/Prototypes/Recipes/Construction/Graphs/computer.yml
index 3de0a915fd..1a19bcb024 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/computer.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/computer.yml
@@ -26,7 +26,7 @@
               store: board
               name: any computer circuit board
               icon:
-                sprite: "Constructible/Misc/module.rsi"
+                sprite: "Objects/Misc/module.rsi"
                 state: "id_mod"
 
         - to: start
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/conveyor.yml b/Resources/Prototypes/Recipes/Construction/Graphs/conveyor.yml
index f39bdaad21..bb3c343a40 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/conveyor.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/conveyor.yml
@@ -8,7 +8,7 @@
           steps:
             - tag: ConveyorAssembly
               icon:
-                sprite: Constructible/Power/conveyor.rsi
+                sprite: Structures/conveyor.rsi
                 state: conveyor_loose
               name: conveyor belt assembly
               doAfter: 2
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/firelock.yml b/Resources/Prototypes/Recipes/Construction/Graphs/firelock.yml
index 000dfdda8c..c3f8973d94 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/firelock.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/firelock.yml
@@ -53,7 +53,7 @@
             - tag: FirelockElectronics
               name: Firelock Electronics
               icon:
-                sprite: "Constructible/Misc/module.rsi"
+                sprite: "Objects/Misc/module.rsi"
                 state: "mainboard"
 
         - to: frame1
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/girder.yml b/Resources/Prototypes/Recipes/Construction/Graphs/girder.yml
index ffffa99ef6..aced558d85 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/girder.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/girder.yml
@@ -18,7 +18,7 @@
       actions:
         - !type:SpriteChange
           specifier:
-            sprite: /Textures/Constructible/Structures/Walls/solid.rsi
+            sprite: /Textures/Structures/Walls/solid.rsi
             state: wall_girder
       edges:
         - to: start
@@ -70,7 +70,7 @@
       actions:
         - !type:SpriteChange
           specifier:
-            sprite: /Textures/Constructible/Structures/Walls/solid.rsi
+            sprite: /Textures/Structures/Walls/solid.rsi
             state: reinforced_wall_girder
       edges:
         - to: reinforcedWall
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/solarpanel.yml b/Resources/Prototypes/Recipes/Construction/Graphs/solarpanel.yml
index 29d61a6358..f33bd8444c 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/solarpanel.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/solarpanel.yml
@@ -44,7 +44,7 @@
             - prototype: SolarTrackerElectronics
               name: Solar Tracker Electronics
               icon: 
-                sprite: Constructible/Misc/module.rsi
+                sprite: Objects/Misc/module.rsi
                 state: id_mod
               doAfter: 1
             - material: Glass
diff --git a/Resources/Prototypes/Recipes/Construction/conveyor.yml b/Resources/Prototypes/Recipes/Construction/conveyor.yml
index 30abd3ca51..314745146e 100644
--- a/Resources/Prototypes/Recipes/Construction/conveyor.yml
+++ b/Resources/Prototypes/Recipes/Construction/conveyor.yml
@@ -10,7 +10,7 @@
   placementMode: SnapgridCenter
   canBuildInImpassable: false
   icon:
-    sprite: Constructible/Power/conveyor.rsi
+    sprite: Structures/conveyor.rsi
     state: conveyor_stopped_cw
   conditions:
     - !type:TileNotBlocked {}
@@ -26,7 +26,7 @@
   objectType: Structure
   canBuildInImpassable: false
   icon:
-    sprite: Constructible/Power/conveyor.rsi
+    sprite: Structures/conveyor.rsi
     state: switch-off
   conditions:
     - !type:TileNotBlocked {}
diff --git a/Resources/Prototypes/Recipes/Construction/furniture.yml b/Resources/Prototypes/Recipes/Construction/furniture.yml
index 7b2e6f5419..a3c6ef90ff 100644
--- a/Resources/Prototypes/Recipes/Construction/furniture.yml
+++ b/Resources/Prototypes/Recipes/Construction/furniture.yml
@@ -7,7 +7,7 @@
   category: Furniture
   description: You sit in this. Either by will or force.
   icon:
-    sprite: Constructible/Misc/furniture.rsi
+    sprite: Structures/Furniture/furniture.rsi
     state: chair
   objectType: Structure
   placementMode: SnapgridCenter
@@ -24,7 +24,7 @@
   category: Furniture
   description: You sit in this. Either by will or force.
   icon:
-    sprite: Constructible/Misc/furniture.rsi
+    sprite: Structures/Furniture/furniture.rsi
     state: stool_base
   objectType: Structure
   placementMode: SnapgridCenter
@@ -41,7 +41,7 @@
   category: Furniture
   description: You sit in this. Either by will or force.
   icon:
-    sprite: Constructible/Misc/furniture.rsi
+    sprite: Structures/Furniture/furniture.rsi
     state: bar_stool
   objectType: Structure
   placementMode: SnapgridCenter
@@ -58,7 +58,7 @@
   category: Furniture
   description: You sit in this. Either by will or force.
   icon:
-    sprite: Constructible/Misc/furniture.rsi
+    sprite: Structures/Furniture/furniture.rsi
     state: officechair_white
   objectType: Structure
   placementMode: SnapgridCenter
@@ -75,7 +75,7 @@
   category: Furniture
   description: You sit in this. Either by will or force.
   icon:
-    sprite: Constructible/Misc/furniture.rsi
+    sprite: Structures/Furniture/furniture.rsi
     state: officechair_dark
   objectType: Structure
   placementMode: SnapgridCenter
@@ -92,7 +92,7 @@
   category: Furniture
   description: It looks comfy.
   icon:
-    sprite: Constructible/Misc/furniture.rsi
+    sprite: Structures/Furniture/furniture.rsi
     state: comfychair_preview
   objectType: Structure
   placementMode: SnapgridCenter
@@ -109,7 +109,7 @@
   category: Furniture
   description: You sit in this. Either by will or force.
   icon:
-    sprite: Constructible/Misc/furniture.rsi
+    sprite: Structures/Furniture/furniture.rsi
     state: wooden_chair
   objectType: Structure
   placementMode: SnapgridCenter
diff --git a/Resources/Prototypes/Recipes/Construction/lighting.yml b/Resources/Prototypes/Recipes/Construction/lighting.yml
index 6fc5ddc8b2..adf9d8cbff 100644
--- a/Resources/Prototypes/Recipes/Construction/lighting.yml
+++ b/Resources/Prototypes/Recipes/Construction/lighting.yml
@@ -7,7 +7,7 @@
   category: Structures
   description: A wall light fixture. Use light tubes.
   icon:
-    sprite: Constructible/Lighting/light_tube.rsi
+    sprite: Structures/Wallmounts/Lighting/light_tube.rsi
     state: off
   objectType: Structure
   placementMode: WallmountLight
@@ -25,7 +25,7 @@
   category: Structures
   description: A wall light fixture. Use light bulbs.
   icon:
-    sprite: Constructible/Lighting/light_small.rsi
+    sprite: Structures/Wallmounts/Lighting/light_small.rsi
     state: off
   objectType: Structure
   placementMode: WallmountLight
diff --git a/Resources/Prototypes/Recipes/Construction/machines.yml b/Resources/Prototypes/Recipes/Construction/machines.yml
index 29af78de42..5853767457 100644
--- a/Resources/Prototypes/Recipes/Construction/machines.yml
+++ b/Resources/Prototypes/Recipes/Construction/machines.yml
@@ -8,7 +8,7 @@
   placementMode: SnapgridCenter
   canBuildInImpassable: false
   icon:
-    sprite: Constructible/Misc/stock_parts.rsi
+    sprite: Structures/Machines/parts.rsi
     state: 4
 
 - type: construction
@@ -21,5 +21,5 @@
   placementMode: SnapgridCenter
   canBuildInImpassable: false
   icon:
-    sprite: Constructible/Misc/stock_parts.rsi
+    sprite: Structures/Machines/parts.rsi
     state: "box_0"
diff --git a/Resources/Prototypes/Recipes/Construction/power.yml b/Resources/Prototypes/Recipes/Construction/power.yml
index 4375e042be..c048be0aa4 100644
--- a/Resources/Prototypes/Recipes/Construction/power.yml
+++ b/Resources/Prototypes/Recipes/Construction/power.yml
@@ -7,7 +7,7 @@
   category: Utility
   description: "Area Power Controller (APC). Controls power. In an area."
   icon:
-    sprite: Constructible/Power/apc.rsi
+    sprite: Structures/Power/apc.rsi
     state: apc0
   objectType: Structure
   placementMode: AlignWallProper
@@ -22,7 +22,7 @@
   category: Utility
   description: "Can be turned into a solar panel or solar tracker."
   icon:
-    sprite: Constructible/Power/solar_panel.rsi
+    sprite: Structures/Power/Generation/solar_panel.rsi
     state: solar_assembly
   objectType: Structure
   placementMode: SnapgridCenter
diff --git a/Resources/Prototypes/Recipes/Construction/structures.yml b/Resources/Prototypes/Recipes/Construction/structures.yml
index 99a47ea608..2e52a35875 100644
--- a/Resources/Prototypes/Recipes/Construction/structures.yml
+++ b/Resources/Prototypes/Recipes/Construction/structures.yml
@@ -7,7 +7,7 @@
   category: Structures
   description: A large structural assembly made out of metal.
   icon:
-    sprite: /Textures/Constructible/Structures/Walls/solid.rsi
+    sprite: /Textures/Structures/Walls/solid.rsi
     state: wall_girder
   objectType: Structure
   placementMode: SnapgridCenter
@@ -25,7 +25,7 @@
   category: Structures
   description: Keeps the air in and the greytide out.
   icon:
-    sprite: Constructible/Structures/Walls/solid.rsi
+    sprite: Structures/Walls/solid.rsi
     state: full
   objectType: Structure
   placementMode: SnapgridCenter
@@ -43,7 +43,7 @@
   category: Structures
   description: Keeps the air in and the greytide out.
   icon:
-    sprite: Constructible/Structures/Walls/solid.rsi
+    sprite: Structures/Walls/solid.rsi
     state: rgeneric
   objectType: Structure
   placementMode: SnapgridCenter
@@ -64,7 +64,7 @@
     - !type:NoWindowsInTile {}
     - !type:TileNotBlocked {}
   icon:
-    sprite: Constructible/Structures/Walls/low_wall.rsi
+    sprite: Structures/Walls/low_wall.rsi
     state: metal
   objectType: Structure
   placementMode: SnapgridCenter
@@ -82,7 +82,7 @@
     - !type:LowWallInTile {}
     - !type:NoWindowsInTile {}
   icon:
-    sprite: Constructible/Structures/Windows/window.rsi
+    sprite: Structures/Windows/window.rsi
     state: full
   objectType: Structure
   placementMode: SnapgridCenter
@@ -100,7 +100,7 @@
     - !type:LowWallInTile {}
     - !type:NoWindowsInTile {}
   icon:
-    sprite: Constructible/Structures/Windows/reinforced_window.rsi
+    sprite: Structures/Windows/reinforced_window.rsi
     state: full
   objectType: Structure
   placementMode: SnapgridCenter
@@ -118,7 +118,7 @@
     - !type:LowWallInTile {}
     - !type:NoWindowsInTile {}
   icon:
-    sprite: Constructible/Structures/Windows/plasma_window.rsi
+    sprite: Structures/Windows/plasma_window.rsi
     state: full
   objectType: Structure
   placementMode: SnapgridCenter
@@ -133,7 +133,7 @@
   category: Structures
   description: This is a firelock - it locks an area when a fire alarm in the area is triggered. Don't get squished!
   icon:
-    sprite: Constructible/Structures/Doors/Standard/firelock.rsi
+    sprite: Structures/Doors/Airlocks/Standard/firelock.rsi
     state: closed
   objectType: Structure
   placementMode: SnapgridCenter
@@ -157,7 +157,7 @@
         - plating
         - underplating
   icon:
-    sprite: Constructible/Tiles/catwalk.rsi
+    sprite: Structures/catwalk.rsi
     state: catwalk_preview
   objectType: Structure
   placementMode: SnapgridCenter
@@ -172,7 +172,7 @@
   category: Structures
   description: An improvised barricade made out of wooden planks.
   icon:
-    sprite: Constructible/Structures/barricades.rsi
+    sprite: Structures/Walls/barricades.rsi
     state: barricadewooden
   objectType: Structure
   placementMode: SnapgridCenter
@@ -189,7 +189,7 @@
   category: Structures
   description: It opens, it closes, and maybe crushes you.
   icon:
-    sprite: Constructible/Structures/Doors/Standard/basic.rsi
+    sprite: Structures/Doors/Airlocks/Standard/basic.rsi
     state: assembly
   objectType: Structure
   placementMode: SnapgridCenter
diff --git a/Resources/Prototypes/Recipes/Construction/tables.yml b/Resources/Prototypes/Recipes/Construction/tables.yml
index 20099df80d..9c1f1afeeb 100644
--- a/Resources/Prototypes/Recipes/Construction/tables.yml
+++ b/Resources/Prototypes/Recipes/Construction/tables.yml
@@ -7,7 +7,7 @@
   category: Structures
   description: A square piece of metal standing on four metal legs.
   icon:
-    sprite: Constructible/Structures/Tables/carpet.rsi
+    sprite: Structures/Furniture/Tables/carpet.rsi
     state: full
   objectType: Structure
   placementMode: SnapgridCenter
@@ -24,7 +24,7 @@
   category: Structures
   description: A fancy table. Perfect for serving drinks.
   icon:
-    sprite: Constructible/Structures/Tables/bar.rsi
+    sprite: Structures/Furniture/Tables/bar.rsi
     state: full
   objectType: Structure
   placementMode: SnapgridCenter
@@ -41,7 +41,7 @@
   category: Structures
   description: A square piece of metal standing on four metal legs. Extra robust.
   icon:
-    sprite: Constructible/Structures/Tables/reinforced.rsi
+    sprite: Structures/Furniture/Tables/reinforced.rsi
     state: full
   objectType: Structure
   placementMode: SnapgridCenter
@@ -58,7 +58,7 @@
   category: Structures
   description: A square piece of glass, standing on four metal legs.
   icon:
-    sprite: Constructible/Structures/Tables/glass.rsi
+    sprite: Structures/Furniture/Tables/glass.rsi
     state: full
   objectType: Structure
   placementMode: SnapgridCenter
@@ -75,7 +75,7 @@
   category: Structures
   description: A square piece of glass, standing on four metal legs. Extra robust.
   icon:
-    sprite: Constructible/Structures/Tables/r_glass.rsi
+    sprite: Structures/Furniture/Tables/r_glass.rsi
     state: full
   objectType: Structure
   placementMode: SnapgridCenter
@@ -92,7 +92,7 @@
   category: Structures
   description: Do not apply fire to this. Rumour says it burns easily.
   icon:
-    sprite: Constructible/Structures/Tables/wood.rsi
+    sprite: Structures/Furniture/Tables/wood.rsi
     state: full
   objectType: Structure
   placementMode: SnapgridCenter
@@ -109,7 +109,7 @@
   category: Structures
   description: A square piece of wood standing on four legs covered by a cloth. (What did you expect?)
   icon:
-    sprite: Constructible/Structures/Tables/carpet.rsi
+    sprite: Structures/Furniture/Tables/carpet.rsi
     state: full
   objectType: Structure
   placementMode: SnapgridCenter
diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/bat.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/bat.yml
new file mode 100644
index 0000000000..56530f443e
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/bat.yml
@@ -0,0 +1,13 @@
+- type: constructionGraph
+  id: WoodenBat
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: bat
+          steps:
+            - material: WoodPlank
+              amount: 5
+              doAfter: 4
+    - node: bat
+      entity: BaseBallBat
diff --git a/Resources/Prototypes/Recipes/Crafting/bat.yml b/Resources/Prototypes/Recipes/Crafting/bat.yml
new file mode 100644
index 0000000000..dcfc03a8bb
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Crafting/bat.yml
@@ -0,0 +1,12 @@
+- type: construction
+  name: baseball bat
+  id: bat
+  graph: WoodenBat
+  startNode: start
+  targetNode: bat
+  category: Weapons
+  description: A robust baseball bat.
+  icon: 
+    sprite: Objects/Weapons/Melee/baseball_bat.rsi
+    state: icon
+  objectType: Item
diff --git a/Resources/Prototypes/Recipes/Crafting/crates.yml b/Resources/Prototypes/Recipes/Crafting/crates.yml
index 79a4d02bfc..51ca15e03c 100644
--- a/Resources/Prototypes/Recipes/Crafting/crates.yml
+++ b/Resources/Prototypes/Recipes/Crafting/crates.yml
@@ -6,6 +6,6 @@
   targetNode: cratelivestock
   category: Storage
   description: "A wooden crate for holding livestock"
-  icon: Constructible/Storage/Crates/livestock.rsi/livestockcrate.png
+  icon: Structures/Storage/Crates/livestock.rsi/livestockcrate.png
   objectType: Item
   
\ No newline at end of file
diff --git a/Resources/Prototypes/Recipes/Lathes/cargo.yml b/Resources/Prototypes/Recipes/Lathes/cargo.yml
index 8a31b89198..b312b807c2 100644
--- a/Resources/Prototypes/Recipes/Lathes/cargo.yml
+++ b/Resources/Prototypes/Recipes/Lathes/cargo.yml
@@ -1,7 +1,7 @@
 - type: latheRecipe
   id: ConveyorAssembly
   icon:
-    sprite: Constructible/Power/conveyor.rsi
+    sprite: Structures/conveyor.rsi
     state: conveyor_loose
   result: ConveyorBeltAssembly
   completetime: 1000
diff --git a/Resources/Prototypes/Recipes/Lathes/electronics.yml b/Resources/Prototypes/Recipes/Lathes/electronics.yml
index d5a2361a11..69b7503055 100644
--- a/Resources/Prototypes/Recipes/Lathes/electronics.yml
+++ b/Resources/Prototypes/Recipes/Lathes/electronics.yml
@@ -1,6 +1,6 @@
 - type: latheRecipe
   id: FirelockElectronics
-  icon: Constructible/Misc/module.rsi/mainboard.png
+  icon: Objects/Misc/module.rsi/mainboard.png
   result: FirelockElectronics
   completetime: 500
   materials:
@@ -9,7 +9,7 @@
 
 - type: latheRecipe
   id: DoorElectronics
-  icon: Constructible/Misc/module.rsi/door_electronics.png
+  icon: Objects/Misc/module.rsi/door_electronics.png
   result: DoorElectronics
   completetime: 500
   materials:
@@ -18,7 +18,7 @@
 
 - type: latheRecipe
   id: APCElectronics
-  icon: Constructible/Misc/module.rsi/charger_APC.png
+  icon: Objects/Misc/module.rsi/charger_APC.png
   result: APCElectronics
   completetime: 500
   materials:
diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
index 6eb7a707ff..ebf9fa4ddc 100644
--- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
@@ -19,6 +19,7 @@
     innerclothing: ClothingUniformJumpsuitResearchDirector
     backpack: ClothingBackpackScienceFilled
     shoes: ClothingShoesColorBrown
+    outerclothing: ClothingOuterCoatLab
     idcard: RnDPDA
     ears: ClothingHeadsetScience
   innerclothingskirt: ClothingUniformJumpskirtResearchDirector
diff --git a/Resources/Prototypes/SoundCollections/bike_horn.yml b/Resources/Prototypes/SoundCollections/bike_horn.yml
new file mode 100644
index 0000000000..ff6c75ff53
--- /dev/null
+++ b/Resources/Prototypes/SoundCollections/bike_horn.yml
@@ -0,0 +1,4 @@
+- type: soundCollection
+  id: BikeHorn
+  files:
+  - /Audio/Items/bikehorn.ogg
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 793b0de8e1..07adc2a9fc 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -1,6 +1,57 @@
+- type: Tag
+  id: BotanyHatchet
+
+- type: Tag
+  id: BotanyHoe
+
 - type: Tag
   id: BotanySharp
 
+- type: Tag
+  id: BotanyShovel
+
+- type: Tag
+  id: Bottle
+
+- type: Tag
+  id: CanPilot
+
+- type: Tag
+  id: CaptainSabre
+
+- type: Tag
+  id: Crayon
+
+- type: Tag
+  id: CrayonBlack
+
+- type: Tag
+  id: CrayonBlue
+
+- type: Tag
+  id: CrayonGreen
+
+- type: Tag
+  id: CrayonOrange
+
+- type: Tag
+  id: CrayonPurple
+
+- type: Tag
+  id: CrayonRed
+
+- type: Tag
+  id: CrayonWhite
+
+- type: Tag
+  id: CrayonYellow
+
+- type: Tag
+  id: Crowbar
+
+- type: Tag
+  id: CrowbarRed
+
 - type: Tag
   id: ConveyorAssembly
 
@@ -31,12 +82,30 @@
 - type: Tag
   id: Ingot
 
+- type: Tag
+  id: JawsOfLife
+  
+- type: Tag
+  id: NoSpinOnThrow
+
 - type: Tag
   id: Ore
 
+- type: Tag
+  id: PlantAnalyzer
+
+- type: Tag
+  id: PlantBGone
+
 - type: Tag
   id: PlantSampleTaker
 
+- type: Tag
+  id: Powerdrill
+
+- type: Tag
+  id: Screwdriver
+
 - type: Tag
   id: Sheet
 
@@ -44,11 +113,17 @@
   id: Shovel
 
 - type: Tag
-  id: Teleportable
+  id: Spray
 
 - type: Tag
   id: Wall
 
+- type: Tag
+  id: Wirecutter
+
+- type: Tag
+  id: Wrench
+
 - type: Tag
   id: Write
 
diff --git a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/crowbar_large.png b/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/crowbar_large.png
deleted file mode 100644
index f5e98598fa..0000000000
Binary files a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/crowbar_large.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/drill_screw.png b/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/drill_screw.png
deleted file mode 100644
index 1be285ec4f..0000000000
Binary files a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/drill_screw.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/jaws_pry.png b/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/jaws_pry.png
deleted file mode 100644
index ba81110284..0000000000
Binary files a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/jaws_pry.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/meta.json b/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/meta.json
deleted file mode 100644
index 9f6a2130c7..0000000000
--- a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/meta.json
+++ /dev/null
@@ -1,86 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/dc89ef0239830774bd3d9d7d6c8da2856da2b869",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "crowbar"
-    },
-    {
-      "name": "crowbar_brass"
-    },
-    {
-      "name": "crowbar_large"
-    },
-    {
-      "name": "crowbar_red"
-    },
-    {
-      "name": "cutters_brass"
-    },
-    {
-      "name": "cutters_red"
-    },
-    {
-      "name": "cutters_yellow"
-    },
-    {
-      "name": "drill_bolt"
-    },
-    {
-      "name": "drill_screw"
-    },
-    {
-      "name": "flashbang"
-    },
-    {
-      "name": "jaws_cutter"
-    },
-    {
-      "name": "jaws_pry"
-    },
-    {
-      "name": "multitool"
-    },
-    {
-      "name": "multitool_red"
-    },
-    {
-      "name": "multitool_yellow"
-    },
-    {
-      "name": "screwdriver"
-    },
-    {
-      "name": "screwdriver_brass"
-    },
-    {
-      "name": "screwdriver_head"
-    },
-    {
-      "name": "screwdriver_nuke"
-    },
-    {
-      "name": "stunbaton"
-    },
-    {
-      "name": "stunbaton_active"
-    },
-    {
-      "name": "stunbaton_nocell"
-    },
-    {
-      "name": "wrench"
-    },
-    {
-      "name": "wrench_brass"
-    },
-    {
-      "name": "wrench_medical"
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/multitool_red.png b/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/multitool_red.png
deleted file mode 100644
index 008bd7995f..0000000000
Binary files a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/multitool_red.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/multitool_yellow.png b/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/multitool_yellow.png
deleted file mode 100644
index 008bd7995f..0000000000
Binary files a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/multitool_yellow.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/stunbaton_active.png b/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/stunbaton_active.png
deleted file mode 100644
index 784617bd4f..0000000000
Binary files a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/stunbaton_active.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/stunbaton_nocell.png b/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/stunbaton_nocell.png
deleted file mode 100644
index 784617bd4f..0000000000
Binary files a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/stunbaton_nocell.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/baton.png b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/baton.png
deleted file mode 100644
index dbd600edbb..0000000000
Binary files a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/baton.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/cutters.png b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/cutters.png
deleted file mode 100644
index 5f5347c2c5..0000000000
Binary files a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/cutters.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/handcuff.png b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/handcuff.png
deleted file mode 100644
index f22fd5cb89..0000000000
Binary files a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/handcuff.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/horn.png b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/horn.png
deleted file mode 100644
index 4cd6eea346..0000000000
Binary files a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/horn.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/horn_gold.png b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/horn_gold.png
deleted file mode 100644
index 95ff4de420..0000000000
Binary files a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/horn_gold.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/meta.json b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/meta.json
deleted file mode 100644
index 4930783ae7..0000000000
--- a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/meta.json
+++ /dev/null
@@ -1,183 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f3fdb19c606ea11786ebcad0350198f52ede17a3",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "analyzer",
-      "directions": 4
-    },
-    {
-      "name": "baton",
-      "directions": 4
-    },
-    {
-      "name": "beaker",
-      "directions": 4
-    },
-    {
-      "name": "c4",
-      "directions": 4
-    },
-    {
-      "name": "cigpack",
-      "directions": 4
-    },
-    {
-      "name": "clipboard",
-      "directions": 4
-    },
-    {
-      "name": "coil",
-      "directions": 4
-    },
-    {
-      "name": "crowbar",
-      "directions": 4
-    },
-    {
-      "name": "crowbar_red",
-      "directions": 4
-    },
-    {
-      "name": "cutters",
-      "directions": 4
-    },
-    {
-      "name": "drill",
-      "directions": 4
-    },
-    {
-      "name": "electronic",
-      "directions": 4
-    },
-    {
-      "name": "flare",
-      "directions": 4
-    },
-    {
-      "name": "flashbang",
-      "directions": 4
-    },
-    {
-      "name": "flashlight",
-      "directions": 4
-    },
-    {
-      "name": "geiger_counter",
-      "directions": 4
-    },
-    {
-      "name": "grenade",
-      "directions": 4
-    },
-    {
-      "name": "gun",
-      "directions": 4
-    },
-    {
-      "name": "handcuff",
-      "directions": 4
-    },
-    {
-      "name": "horn",
-      "directions": 4
-    },
-    {
-      "name": "horn_gold",
-      "directions": 4
-    },
-    {
-      "name": "hypo",
-      "directions": 4
-    },
-    {
-      "name": "injector",
-      "directions": 4
-    },
-    {
-      "name": "jawsoflife",
-      "directions": 4
-    },
-    {
-      "name": "knife",
-      "directions": 4
-    },
-    {
-      "name": "lighter",
-      "directions": 4
-    },
-    {
-      "name": "medipen",
-      "directions": 4
-    },
-    {
-      "name": "minibomb",
-      "directions": 4
-    },
-    {
-      "name": "painter",
-      "directions": 4
-    },
-    {
-      "name": "plasmatank",
-      "directions": 4
-    },
-    {
-      "name": "rcd",
-      "directions": 4
-    },
-    {
-      "name": "rolling_pin",
-      "directions": 4
-    },
-    {
-      "name": "rpd",
-      "directions": 4
-    },
-    {
-      "name": "rped",
-      "directions": 4
-    },
-    {
-      "name": "screwdriver",
-      "directions": 4
-    },
-    {
-      "name": "spade",
-      "directions": 4
-    },
-    {
-      "name": "spraybottle",
-      "directions": 4
-    },
-    {
-      "name": "spraycan",
-      "directions": 4
-    },
-    {
-      "name": "tele_baton",
-      "directions": 4
-    },
-    {
-      "name": "tray",
-      "directions": 4
-    },
-    {
-      "name": "welder",
-      "directions": 4
-    },
-    {
-      "name": "wrench",
-      "directions": 4
-    },
-    {
-      "name": "x4",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/rcd.png b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/rcd.png
deleted file mode 100644
index 0b6ed65457..0000000000
Binary files a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/rcd.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/analyzer.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/analyzer-equipped-BELT.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/analyzer.png
rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/analyzer-equipped-BELT.png
diff --git a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/bottle.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/bottle.png
new file mode 100644
index 0000000000..ba92aff420
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/bottle.png differ
diff --git a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/bottle_spray.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/bottle_spray.png
new file mode 100644
index 0000000000..c32081513d
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/bottle_spray.png differ
diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/c4.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/c4-equipped-BELT.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/c4.png
rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/c4-equipped-BELT.png
diff --git a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/crowbar.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/crowbar.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/crowbar.png
rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/crowbar.png
diff --git a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/crowbar_brass.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/crowbar_brass.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/crowbar_brass.png
rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/crowbar_brass.png
diff --git a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/crowbar_red.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/crowbar_red.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/crowbar_red.png
rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/crowbar_red.png
diff --git a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/cutters_blade.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/cutters_blade.png
new file mode 100644
index 0000000000..9f22b439c4
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/cutters_blade.png differ
diff --git a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/cutters_brass.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/cutters_brass.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/cutters_brass.png
rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/cutters_brass.png
diff --git a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/cutters_handle.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/cutters_handle.png
new file mode 100644
index 0000000000..eb50f2ce67
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/cutters_handle.png differ
diff --git a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/cutters_red.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/cutters_red.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/cutters_red.png
rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/cutters_red.png
diff --git a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/cutters_yellow.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/cutters_yellow.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/cutters_yellow.png
rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/cutters_yellow.png
diff --git a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/drill_bolt.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/drill.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/drill_bolt.png
rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/drill.png
diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/electronic.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/electronic-equipped-BELT.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/electronic.png
rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/electronic-equipped-BELT.png
diff --git a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/flashbang.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/flashbang.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/flashbang.png
rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/flashbang.png
diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/geiger_counter.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/geiger_counter-equipped-BELT.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/geiger_counter.png
rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/geiger_counter-equipped-BELT.png
diff --git a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/hatchet.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/hatchet.png
new file mode 100644
index 0000000000..af8a113900
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/hatchet.png differ
diff --git a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/hoe.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/hoe.png
new file mode 100644
index 0000000000..e700e7be27
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/hoe.png differ
diff --git a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/hydro.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/hydro.png
new file mode 100644
index 0000000000..bb8b2d7f83
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/hydro.png differ
diff --git a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/hypo.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/hypo.png
new file mode 100644
index 0000000000..0c4b98709f
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/hypo.png differ
diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/injector.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/injector-equipped-BELT.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/injector.png
rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/injector-equipped-BELT.png
diff --git a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/jaws_cutter.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/jaws.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/jaws_cutter.png
rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/jaws.png
diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/lighter.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/lighter-equipped-BELT.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/lighter.png
rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/lighter-equipped-BELT.png
diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/medipen.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/medipen-equipped-BELT.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/medipen.png
rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/medipen-equipped-BELT.png
diff --git a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/meta.json b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/meta.json
new file mode 100644
index 0000000000..e9e604644d
--- /dev/null
+++ b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/meta.json
@@ -0,0 +1,166 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/dc89ef0239830774bd3d9d7d6c8da2856da2b869",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "bottle"
+    },
+    {
+      "name": "bottle_spray"
+    },
+    {
+      "name": "crowbar"
+    },
+    {
+      "name": "crowbar_brass"
+    },
+    {
+      "name": "crowbar_red"
+    },
+    {
+      "name": "cutters_brass"
+    },
+    {
+      "name": "cutters_red"
+    },
+    {
+      "name": "cutters_handle"
+    },
+    {
+      "name": "cutters_blade"
+    },
+    {
+      "name": "cutters_yellow"
+    },
+    {
+      "name": "drill"
+    },
+    {
+      "name": "flashbang"
+    },
+    {
+      "name": "hatchet"
+    },
+    {
+      "name": "hoe"
+    },
+    {
+      "name": "hydro"
+    },
+    {
+      "name": "hypo"
+    },
+    {
+      "name": "jaws"
+    },
+    {
+      "name": "multitool"
+    },
+    {
+      "name": "pill"
+    },
+    {
+      "name": "plantbgone"
+    },
+    {
+      "name": "screwdriver"
+    },
+    {
+      "name": "screwdriver_brass"
+    },
+    {
+      "name": "screwdriver_head"
+    },
+    {
+      "name": "screwdriver_nuke"
+    },
+    {
+      "name": "secateurs"
+    },
+    {
+      "name": "spray_med"
+    },
+    {
+      "name": "spray_brute"
+    },
+    {
+      "name": "spray_burn"
+    },
+    {
+      "name": "spray_synth"
+    },
+    {
+      "name": "stunbaton"
+    },
+    {
+      "name": "wrench"
+    },
+    {
+      "name": "wrench_brass"
+    },
+    {
+      "name": "wrench_medical"
+    },
+    {
+      "name": "analyzer-equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "c4-equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "electronic-equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "geiger_counter-equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "injector-equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "lighter-equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "medipen-equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "painter-equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "plasmatank-equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "rolling_pin-equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "rpd-equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "rped-equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "tele_baton-equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "tray-equipped-BELT",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/multitool.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/multitool.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/multitool.png
rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/multitool.png
diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/painter.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/painter-equipped-BELT.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/painter.png
rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/painter-equipped-BELT.png
diff --git a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/pill.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/pill.png
new file mode 100644
index 0000000000..58ea92e1ff
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/pill.png differ
diff --git a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/plantbgone.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/plantbgone.png
new file mode 100644
index 0000000000..955b07b643
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/plantbgone.png differ
diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/plasmatank.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/plasmatank-equipped-BELT.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/plasmatank.png
rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/plasmatank-equipped-BELT.png
diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/rolling_pin.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/rolling_pin-equipped-BELT.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/rolling_pin.png
rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/rolling_pin-equipped-BELT.png
diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/rpd.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/rpd-equipped-BELT.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/rpd.png
rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/rpd-equipped-BELT.png
diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/rped.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/rped-equipped-BELT.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/rped.png
rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/rped-equipped-BELT.png
diff --git a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/screwdriver.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/screwdriver.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/screwdriver.png
rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/screwdriver.png
diff --git a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/screwdriver_brass.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/screwdriver_brass.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/screwdriver_brass.png
rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/screwdriver_brass.png
diff --git a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/screwdriver_head.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/screwdriver_head.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/screwdriver_head.png
rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/screwdriver_head.png
diff --git a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/screwdriver_nuke.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/screwdriver_nuke.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/screwdriver_nuke.png
rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/screwdriver_nuke.png
diff --git a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/secateurs.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/secateurs.png
new file mode 100644
index 0000000000..214a8893a8
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/secateurs.png differ
diff --git a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/spray_brute.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/spray_brute.png
new file mode 100644
index 0000000000..e16a364c2e
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/spray_brute.png differ
diff --git a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/spray_burn.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/spray_burn.png
new file mode 100644
index 0000000000..06934b8c01
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/spray_burn.png differ
diff --git a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/spray_med.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/spray_med.png
new file mode 100644
index 0000000000..7adc899fe5
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/spray_med.png differ
diff --git a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/spray_synth.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/spray_synth.png
new file mode 100644
index 0000000000..eb56ecbdff
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/spray_synth.png differ
diff --git a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/stunbaton.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/stunbaton.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/stunbaton.png
rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/stunbaton.png
diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/tele_baton.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/tele_baton-equipped-BELT.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/tele_baton.png
rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/tele_baton-equipped-BELT.png
diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/tray.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/tray-equipped-BELT.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/tray.png
rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/tray-equipped-BELT.png
diff --git a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/wrench.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/wrench.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/wrench.png
rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/wrench.png
diff --git a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/wrench_brass.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/wrench_brass.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/wrench_brass.png
rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/wrench_brass.png
diff --git a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/wrench_medical.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/wrench_medical.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/wrench_medical.png
rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/wrench_medical.png
diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/x4.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/x4-equipped-BELT.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/x4.png
rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/x4-equipped-BELT.png
diff --git a/Resources/Textures/Clothing/Belt/plant.rsi/equipped-BELT.png b/Resources/Textures/Clothing/Belt/plant.rsi/equipped-BELT.png
new file mode 100644
index 0000000000..fef3d8dd0c
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/plant.rsi/equipped-BELT.png differ
diff --git a/Resources/Textures/Clothing/Belt/plant.rsi/icon.png b/Resources/Textures/Clothing/Belt/plant.rsi/icon.png
new file mode 100644
index 0000000000..3bf8ef0e3c
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/plant.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Belt/plant.rsi/inhand-left.png b/Resources/Textures/Clothing/Belt/plant.rsi/inhand-left.png
new file mode 100644
index 0000000000..cee67a711c
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/plant.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Belt/plant.rsi/inhand-right.png b/Resources/Textures/Clothing/Belt/plant.rsi/inhand-right.png
new file mode 100644
index 0000000000..9397945917
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/plant.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Belt/plant.rsi/meta.json b/Resources/Textures/Clothing/Belt/plant.rsi/meta.json
new file mode 100644
index 0000000000..bdd8cab3bf
--- /dev/null
+++ b/Resources/Textures/Clothing/Belt/plant.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3fd95ab2a061459c881eeab6dbecaae5a8884f0a",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-sabre.png b/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-sabre.png
index 4a7ce37df2..462d997cf3 100644
Binary files a/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-sabre.png and b/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-sabre.png differ
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/meta.json b/Resources/Textures/Constructible/Misc/stock_parts.rsi/meta.json
deleted file mode 100644
index 364722dfa7..0000000000
--- a/Resources/Textures/Constructible/Misc/stock_parts.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/tgstation/tgstation at 0d9c9a8233dfc3fc55edc538955a761a6328bee0", "states": [{"name": "0", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "1", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "2", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "3", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "4", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "adv_capacitor", "delays": [[1.0]]}, {"name": "adv_electrolite", "delays": [[0.13, 0.13]]}, {"name": "adv_scan_module", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "advanced_matter_bin", "delays": [[1.0]]}, {"name": "ansible_crystal", "delays": [[1.0]]}, {"name": "bluespace_electrolite", "delays": [[0.1, 0.1]]}, {"name": "bluespace_matter_bin", "delays": [[0.1, 0.1]]}, {"name": "box_0", "delays": [[1.0]]}, {"name": "box_1", "delays": [[1.0]]}, {"name": "box_2", "delays": [[1.0]]}, {"name": "capacitor", "delays": [[1.0]]}, {"name": "card_reader", "delays": [[1.0]]}, {"name": "datadisk0", "delays": [[0.1, 0.1, 0.1]]}, {"name": "datadisk1", "delays": [[0.1, 0.1, 0.1]]}, {"name": "datadisk2", "delays": [[0.1, 0.1, 0.1]]}, {"name": "datadisk3", "delays": [[0.1, 0.1, 0.1]]}, {"name": "datadisk4", "delays": [[0.1, 0.1, 0.1]]}, {"name": "datadisk5", "delays": [[0.1, 0.1, 0.1]]}, {"name": "datadisk6", "delays": [[0.1, 0.1, 0.1]]}, {"name": "electrolite", "delays": [[0.16, 0.16]]}, {"name": "femto_mani", "delays": [[0.1, 0.1]]}, {"name": "hdd1", "delays": [[1.0]]}, {"name": "hdd2", "delays": [[1.0]]}, {"name": "high_micro_laser", "delays": [[1.0]]}, {"name": "hyperwave_filter", "delays": [[1.0]]}, {"name": "matter_bin", "delays": [[1.0]]}, {"name": "micro_laser", "delays": [[1.0]]}, {"name": "micro_mani", "delays": [[1.0]]}, {"name": "nano_mani", "delays": [[1.0]]}, {"name": "pico_mani", "delays": [[1.0]]}, {"name": "quadratic_capacitor", "delays": [[0.1, 0.1, 0.1, 0.1]]}, {"name": "quadultra_micro_laser", "delays": [[0.1, 0.1]]}, {"name": "rom1", "delays": [[1.0]]}, {"name": "rom2", "delays": [[1.0]]}, {"name": "romos1", "delays": [[1.0]]}, {"name": "romos2", "delays": [[1.0]]}, {"name": "scan_module", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "subspace_amplifier", "delays": [[0.2, 0.4, 0.2, 0.4]]}, {"name": "subspace_ansible", "delays": [[1.0]]}, {"name": "subspace_transmitter", "delays": [[1.0]]}, {"name": "super_capacitor", "delays": [[1.0]]}, {"name": "super_electrolite", "delays": [[0.1, 0.1]]}, {"name": "super_matter_bin", "delays": [[1.0]]}, {"name": "super_scan_module", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "treatment_disk", "delays": [[1.0]]}, {"name": "triphasic_scan_module", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "ultra_high_micro_laser", "delays": [[1.0]]}, {"name": "vbox_0", "delays": [[1.0]]}, {"name": "vbox_1", "delays": [[1.0]]}, {"name": "vbox_2", "delays": [[1.0]]}, {"name": "vbox_3", "delays": [[1.0]]}, {"name": "wavelength_analyzer", "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Constructible/Power/ame_controller.rsi/meta.json b/Resources/Textures/Constructible/Power/ame_controller.rsi/meta.json
deleted file mode 100644
index 92dbb97139..0000000000
--- a/Resources/Textures/Constructible/Power/ame_controller.rsi/meta.json
+++ /dev/null
@@ -1,112 +0,0 @@
-{
-    "version": 1,
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-	"license": "CC-BY-SA-3.0",
-	"copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/Bleeding-Edge/icons/obj/machines/new_ame.dmi at 1b7952787c06c21ef1623e494dcfe7cb1f46e041",
-    "states": [
-        {
-            "name": "control",
-
-        },
-        {
-            "name": "control_critical",
-            "delays": [
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
-                ]
-            ]
-        },
-        {
-            "name": "control_fuck",
-            "delays": [
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
-                ]
-            ]
-        },
-        {
-            "name": "control_on",
-            "delays": [
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
-                ]
-            ]
-        }
-    ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Constructible/Power/ame_shielding.rsi/meta.json b/Resources/Textures/Constructible/Power/ame_shielding.rsi/meta.json
deleted file mode 100644
index 93fb103cdd..0000000000
--- a/Resources/Textures/Constructible/Power/ame_shielding.rsi/meta.json
+++ /dev/null
@@ -1,105 +0,0 @@
-{
-    "version": 1,
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-	"license": "CC-BY-SA-3.0",
-	"copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/Bleeding-Edge/icons/obj/machines/new_ame.dmi at 1b7952787c06c21ef1623e494dcfe7cb1f46e041",
-    "states": [
-        {
-            "name": "shield_0",
-
-        },
-        {
-            "name": "shield_1",
-
-        },
-        {
-            "name": "shield_10",
-
-        },
-        {
-            "name": "shield_11",
-
-        },
-        {
-            "name": "shield_12",
-
-        },
-        {
-            "name": "shield_13",
-
-        },
-        {
-            "name": "shield_14",
-
-        },
-        {
-            "name": "shield_15",
-
-        },
-        {
-            "name": "shield_2",
-
-        },
-        {
-            "name": "shield_3",
-
-        },
-        {
-            "name": "shield_4",
-
-        },
-        {
-            "name": "shield_5",
-
-        },
-        {
-            "name": "shield_6",
-
-        },
-        {
-            "name": "shield_7",
-
-        },
-        {
-            "name": "shield_8",
-
-        },
-        {
-            "name": "core",
-
-        },
-        {
-            "name": "shield_9",
-
-        },        
-	{
-            "name": "core_weak",
-            "delays": [
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
-                ]
-            ]
-        },
-        {
-            "name": "core_strong",
-            "delays": [
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
-                ]
-            ]
-        }
-    ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Constructible/Power/circuit_printer.rsi/circuit_imprinter.png b/Resources/Textures/Constructible/Power/circuit_printer.rsi/circuit_imprinter.png
deleted file mode 100644
index c147a0743a..0000000000
Binary files a/Resources/Textures/Constructible/Power/circuit_printer.rsi/circuit_imprinter.png and /dev/null differ
diff --git a/Resources/Textures/Constructible/Power/circuit_printer.rsi/circuit_imprinter_ani.png b/Resources/Textures/Constructible/Power/circuit_printer.rsi/circuit_imprinter_ani.png
deleted file mode 100644
index c598e271b2..0000000000
Binary files a/Resources/Textures/Constructible/Power/circuit_printer.rsi/circuit_imprinter_ani.png and /dev/null differ
diff --git a/Resources/Textures/Constructible/Power/circuit_printer.rsi/circuit_imprinter_t.png b/Resources/Textures/Constructible/Power/circuit_printer.rsi/circuit_imprinter_t.png
deleted file mode 100644
index 9177717715..0000000000
Binary files a/Resources/Textures/Constructible/Power/circuit_printer.rsi/circuit_imprinter_t.png and /dev/null differ
diff --git a/Resources/Textures/Constructible/Power/circuit_printer.rsi/meta.json b/Resources/Textures/Constructible/Power/circuit_printer.rsi/meta.json
deleted file mode 100644
index 1515c2951b..0000000000
--- a/Resources/Textures/Constructible/Power/circuit_printer.rsi/meta.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-    "version": 1,
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/machines/excelsior/autolathe.dmi at 40b254106b46981b8ad95ccd5589deb8fa56e765",
-    "states": [
-        {
-            "name": "circuit_imprinter",
-
-        },
-        {
-            "name": "circuit_imprinter_ani",
-            "delays": [
-                [
-                    0.08,
-                    0.08,
-                    0.08,
-                    0.08,
-                    0.08,
-                    0.08,
-                    0.08,
-                    0.08,
-                    0.08,
-                    0.08,
-                    0.08,
-                    0.08,
-                    0.08,
-                    0.08,
-                    0.08,
-                    0.08,
-                    0.08,
-                    0.08,
-                    0.08,
-                    0.08,
-                    0.08,
-                    0.08,
-                    0.08,
-                    0.08,
-                    0.08
-                ]
-            ]
-        },
-        {
-            "name": "circuit_imprinter_t",
-
-        }
-    ]
-}
diff --git a/Resources/Textures/Constructible/Power/d_analyzer.rsi/d_analyzer.png b/Resources/Textures/Constructible/Power/d_analyzer.rsi/d_analyzer.png
deleted file mode 100644
index 54fbf13c18..0000000000
Binary files a/Resources/Textures/Constructible/Power/d_analyzer.rsi/d_analyzer.png and /dev/null differ
diff --git a/Resources/Textures/Constructible/Power/d_analyzer.rsi/d_analyzer_l.png b/Resources/Textures/Constructible/Power/d_analyzer.rsi/d_analyzer_l.png
deleted file mode 100644
index 86c82e87df..0000000000
Binary files a/Resources/Textures/Constructible/Power/d_analyzer.rsi/d_analyzer_l.png and /dev/null differ
diff --git a/Resources/Textures/Constructible/Power/d_analyzer.rsi/d_analyzer_la.png b/Resources/Textures/Constructible/Power/d_analyzer.rsi/d_analyzer_la.png
deleted file mode 100644
index 54342922f8..0000000000
Binary files a/Resources/Textures/Constructible/Power/d_analyzer.rsi/d_analyzer_la.png and /dev/null differ
diff --git a/Resources/Textures/Constructible/Power/d_analyzer.rsi/d_analyzer_process.png b/Resources/Textures/Constructible/Power/d_analyzer.rsi/d_analyzer_process.png
deleted file mode 100644
index c18ad48f9a..0000000000
Binary files a/Resources/Textures/Constructible/Power/d_analyzer.rsi/d_analyzer_process.png and /dev/null differ
diff --git a/Resources/Textures/Constructible/Power/d_analyzer.rsi/d_analyzer_t.png b/Resources/Textures/Constructible/Power/d_analyzer.rsi/d_analyzer_t.png
deleted file mode 100644
index 27179ba0f7..0000000000
Binary files a/Resources/Textures/Constructible/Power/d_analyzer.rsi/d_analyzer_t.png and /dev/null differ
diff --git a/Resources/Textures/Constructible/Power/d_analyzer.rsi/meta.json b/Resources/Textures/Constructible/Power/d_analyzer.rsi/meta.json
deleted file mode 100644
index d8e78fe6d3..0000000000
--- a/Resources/Textures/Constructible/Power/d_analyzer.rsi/meta.json
+++ /dev/null
@@ -1,74 +0,0 @@
-{
-    "version": 1,
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/machines/excelsior/autolathe.dmi at 40b254106b46981b8ad95ccd5589deb8fa56e765",
-    "states": [
-        {
-            "name": "d_analyzer",
-
-        },
-        {
-            "name": "d_analyzer_l",
-
-        },
-        {
-            "name": "d_analyzer_la",
-            "delays": [
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
-                ]
-            ]
-        },
-        {
-            "name": "d_analyzer_process",
-            "delays": [
-                [
-                    0.09,
-                    0.09,
-                    0.09,
-                    0.09,
-                    0.09,
-                    0.09,
-                    0.09,
-                    0.09,
-                    0.09,
-                    0.09,
-                    0.09,
-                    0.09,
-                    0.09,
-                    0.09,
-                    0.09,
-                    0.09,
-                    0.09,
-                    0.09,
-                    0.09,
-                    0.09,
-                    0.09,
-                    0.09,
-                    0.09,
-                    0.09,
-                    0.09,
-                    0.09,
-                    0.09
-                ]
-            ]
-        },
-        {
-            "name": "d_analyzer_t",
-
-        }
-    ]
-}
diff --git a/Resources/Textures/Constructible/Power/industrial_dispenser.rsi/meta.json b/Resources/Textures/Constructible/Power/industrial_dispenser.rsi/meta.json
deleted file mode 100644
index 34a7df8d8e..0000000000
--- a/Resources/Textures/Constructible/Power/industrial_dispenser.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version":1,"size":{"x":32,"y":32},"license":"CC-BY-SA-3.0","copyright":"Taken from https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi","states":[{"name":"industrial_dispenser","directions":1,"delays":[[1.0]]}]}
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/0.png b/Resources/Textures/Effects/crayondecals.rsi/0.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/0.png
rename to Resources/Textures/Effects/crayondecals.rsi/0.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/1.png b/Resources/Textures/Effects/crayondecals.rsi/1.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/1.png
rename to Resources/Textures/Effects/crayondecals.rsi/1.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/2.png b/Resources/Textures/Effects/crayondecals.rsi/2.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/2.png
rename to Resources/Textures/Effects/crayondecals.rsi/2.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/3.png b/Resources/Textures/Effects/crayondecals.rsi/3.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/3.png
rename to Resources/Textures/Effects/crayondecals.rsi/3.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/4.png b/Resources/Textures/Effects/crayondecals.rsi/4.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/4.png
rename to Resources/Textures/Effects/crayondecals.rsi/4.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/5.png b/Resources/Textures/Effects/crayondecals.rsi/5.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/5.png
rename to Resources/Textures/Effects/crayondecals.rsi/5.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/6.png b/Resources/Textures/Effects/crayondecals.rsi/6.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/6.png
rename to Resources/Textures/Effects/crayondecals.rsi/6.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/7.png b/Resources/Textures/Effects/crayondecals.rsi/7.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/7.png
rename to Resources/Textures/Effects/crayondecals.rsi/7.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/8.png b/Resources/Textures/Effects/crayondecals.rsi/8.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/8.png
rename to Resources/Textures/Effects/crayondecals.rsi/8.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/9.png b/Resources/Textures/Effects/crayondecals.rsi/9.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/9.png
rename to Resources/Textures/Effects/crayondecals.rsi/9.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/Blasto.png b/Resources/Textures/Effects/crayondecals.rsi/Blasto.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/Blasto.png
rename to Resources/Textures/Effects/crayondecals.rsi/Blasto.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/Clandestine.png b/Resources/Textures/Effects/crayondecals.rsi/Clandestine.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/Clandestine.png
rename to Resources/Textures/Effects/crayondecals.rsi/Clandestine.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/Cyber.png b/Resources/Textures/Effects/crayondecals.rsi/Cyber.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/Cyber.png
rename to Resources/Textures/Effects/crayondecals.rsi/Cyber.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/Diablo.png b/Resources/Textures/Effects/crayondecals.rsi/Diablo.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/Diablo.png
rename to Resources/Textures/Effects/crayondecals.rsi/Diablo.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/Donk.png b/Resources/Textures/Effects/crayondecals.rsi/Donk.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/Donk.png
rename to Resources/Textures/Effects/crayondecals.rsi/Donk.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/Gene.png b/Resources/Textures/Effects/crayondecals.rsi/Gene.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/Gene.png
rename to Resources/Textures/Effects/crayondecals.rsi/Gene.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/Gib.png b/Resources/Textures/Effects/crayondecals.rsi/Gib.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/Gib.png
rename to Resources/Textures/Effects/crayondecals.rsi/Gib.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/Max.png b/Resources/Textures/Effects/crayondecals.rsi/Max.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/Max.png
rename to Resources/Textures/Effects/crayondecals.rsi/Max.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/Newton.png b/Resources/Textures/Effects/crayondecals.rsi/Newton.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/Newton.png
rename to Resources/Textures/Effects/crayondecals.rsi/Newton.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/North.png b/Resources/Textures/Effects/crayondecals.rsi/North.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/North.png
rename to Resources/Textures/Effects/crayondecals.rsi/North.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/Omni.png b/Resources/Textures/Effects/crayondecals.rsi/Omni.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/Omni.png
rename to Resources/Textures/Effects/crayondecals.rsi/Omni.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/Osiron.png b/Resources/Textures/Effects/crayondecals.rsi/Osiron.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/Osiron.png
rename to Resources/Textures/Effects/crayondecals.rsi/Osiron.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/Prima.png b/Resources/Textures/Effects/crayondecals.rsi/Prima.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/Prima.png
rename to Resources/Textures/Effects/crayondecals.rsi/Prima.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/Psyke.png b/Resources/Textures/Effects/crayondecals.rsi/Psyke.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/Psyke.png
rename to Resources/Textures/Effects/crayondecals.rsi/Psyke.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/Sirius.png b/Resources/Textures/Effects/crayondecals.rsi/Sirius.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/Sirius.png
rename to Resources/Textures/Effects/crayondecals.rsi/Sirius.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/Sleeping Carp.png b/Resources/Textures/Effects/crayondecals.rsi/Sleeping Carp.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/Sleeping Carp.png
rename to Resources/Textures/Effects/crayondecals.rsi/Sleeping Carp.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/Tunnel.png b/Resources/Textures/Effects/crayondecals.rsi/Tunnel.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/Tunnel.png
rename to Resources/Textures/Effects/crayondecals.rsi/Tunnel.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/Waffle.png b/Resources/Textures/Effects/crayondecals.rsi/Waffle.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/Waffle.png
rename to Resources/Textures/Effects/crayondecals.rsi/Waffle.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/Zero-G.png b/Resources/Textures/Effects/crayondecals.rsi/Zero-G.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/Zero-G.png
rename to Resources/Textures/Effects/crayondecals.rsi/Zero-G.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/a.png b/Resources/Textures/Effects/crayondecals.rsi/a.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/a.png
rename to Resources/Textures/Effects/crayondecals.rsi/a.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/ampersand.png b/Resources/Textures/Effects/crayondecals.rsi/ampersand.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/ampersand.png
rename to Resources/Textures/Effects/crayondecals.rsi/ampersand.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/amyjon.png b/Resources/Textures/Effects/crayondecals.rsi/amyjon.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/amyjon.png
rename to Resources/Textures/Effects/crayondecals.rsi/amyjon.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/antilizard.png b/Resources/Textures/Effects/crayondecals.rsi/antilizard.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/antilizard.png
rename to Resources/Textures/Effects/crayondecals.rsi/antilizard.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/arrow.png b/Resources/Textures/Effects/crayondecals.rsi/arrow.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/arrow.png
rename to Resources/Textures/Effects/crayondecals.rsi/arrow.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/b.png b/Resources/Textures/Effects/crayondecals.rsi/b.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/b.png
rename to Resources/Textures/Effects/crayondecals.rsi/b.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/beepsky.png b/Resources/Textures/Effects/crayondecals.rsi/beepsky.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/beepsky.png
rename to Resources/Textures/Effects/crayondecals.rsi/beepsky.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/biohazard.png b/Resources/Textures/Effects/crayondecals.rsi/biohazard.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/biohazard.png
rename to Resources/Textures/Effects/crayondecals.rsi/biohazard.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/blueprint.png b/Resources/Textures/Effects/crayondecals.rsi/blueprint.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/blueprint.png
rename to Resources/Textures/Effects/crayondecals.rsi/blueprint.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/body.png b/Resources/Textures/Effects/crayondecals.rsi/body.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/body.png
rename to Resources/Textures/Effects/crayondecals.rsi/body.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/bottle.png b/Resources/Textures/Effects/crayondecals.rsi/bottle.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/bottle.png
rename to Resources/Textures/Effects/crayondecals.rsi/bottle.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/brush.png b/Resources/Textures/Effects/crayondecals.rsi/brush.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/brush.png
rename to Resources/Textures/Effects/crayondecals.rsi/brush.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/c.png b/Resources/Textures/Effects/crayondecals.rsi/c.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/c.png
rename to Resources/Textures/Effects/crayondecals.rsi/c.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/carp.png b/Resources/Textures/Effects/crayondecals.rsi/carp.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/carp.png
rename to Resources/Textures/Effects/crayondecals.rsi/carp.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/cat.png b/Resources/Textures/Effects/crayondecals.rsi/cat.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/cat.png
rename to Resources/Textures/Effects/crayondecals.rsi/cat.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/chevron.png b/Resources/Textures/Effects/crayondecals.rsi/chevron.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/chevron.png
rename to Resources/Textures/Effects/crayondecals.rsi/chevron.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/clawprint.png b/Resources/Textures/Effects/crayondecals.rsi/clawprint.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/clawprint.png
rename to Resources/Textures/Effects/crayondecals.rsi/clawprint.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/clown.png b/Resources/Textures/Effects/crayondecals.rsi/clown.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/clown.png
rename to Resources/Textures/Effects/crayondecals.rsi/clown.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/comma.png b/Resources/Textures/Effects/crayondecals.rsi/comma.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/comma.png
rename to Resources/Textures/Effects/crayondecals.rsi/comma.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/corgi.png b/Resources/Textures/Effects/crayondecals.rsi/corgi.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/corgi.png
rename to Resources/Textures/Effects/crayondecals.rsi/corgi.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/credit.png b/Resources/Textures/Effects/crayondecals.rsi/credit.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/credit.png
rename to Resources/Textures/Effects/crayondecals.rsi/credit.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/cyka.png b/Resources/Textures/Effects/crayondecals.rsi/cyka.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/cyka.png
rename to Resources/Textures/Effects/crayondecals.rsi/cyka.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/d.png b/Resources/Textures/Effects/crayondecals.rsi/d.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/d.png
rename to Resources/Textures/Effects/crayondecals.rsi/d.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/danger.png b/Resources/Textures/Effects/crayondecals.rsi/danger.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/danger.png
rename to Resources/Textures/Effects/crayondecals.rsi/danger.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/disk.png b/Resources/Textures/Effects/crayondecals.rsi/disk.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/disk.png
rename to Resources/Textures/Effects/crayondecals.rsi/disk.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/dot.png b/Resources/Textures/Effects/crayondecals.rsi/dot.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/dot.png
rename to Resources/Textures/Effects/crayondecals.rsi/dot.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/dwarf.png b/Resources/Textures/Effects/crayondecals.rsi/dwarf.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/dwarf.png
rename to Resources/Textures/Effects/crayondecals.rsi/dwarf.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/e.png b/Resources/Textures/Effects/crayondecals.rsi/e.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/e.png
rename to Resources/Textures/Effects/crayondecals.rsi/e.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/electricdanger.png b/Resources/Textures/Effects/crayondecals.rsi/electricdanger.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/electricdanger.png
rename to Resources/Textures/Effects/crayondecals.rsi/electricdanger.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/end.png b/Resources/Textures/Effects/crayondecals.rsi/end.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/end.png
rename to Resources/Textures/Effects/crayondecals.rsi/end.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/engie.png b/Resources/Textures/Effects/crayondecals.rsi/engie.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/engie.png
rename to Resources/Textures/Effects/crayondecals.rsi/engie.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/equals.png b/Resources/Textures/Effects/crayondecals.rsi/equals.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/equals.png
rename to Resources/Textures/Effects/crayondecals.rsi/equals.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/evac.png b/Resources/Textures/Effects/crayondecals.rsi/evac.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/evac.png
rename to Resources/Textures/Effects/crayondecals.rsi/evac.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/exclamationmark.png b/Resources/Textures/Effects/crayondecals.rsi/exclamationmark.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/exclamationmark.png
rename to Resources/Textures/Effects/crayondecals.rsi/exclamationmark.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/f.png b/Resources/Textures/Effects/crayondecals.rsi/f.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/f.png
rename to Resources/Textures/Effects/crayondecals.rsi/f.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/face.png b/Resources/Textures/Effects/crayondecals.rsi/face.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/face.png
rename to Resources/Textures/Effects/crayondecals.rsi/face.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/fireaxe.png b/Resources/Textures/Effects/crayondecals.rsi/fireaxe.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/fireaxe.png
rename to Resources/Textures/Effects/crayondecals.rsi/fireaxe.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/firedanger.png b/Resources/Textures/Effects/crayondecals.rsi/firedanger.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/firedanger.png
rename to Resources/Textures/Effects/crayondecals.rsi/firedanger.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/food.png b/Resources/Textures/Effects/crayondecals.rsi/food.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/food.png
rename to Resources/Textures/Effects/crayondecals.rsi/food.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/footprint.png b/Resources/Textures/Effects/crayondecals.rsi/footprint.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/footprint.png
rename to Resources/Textures/Effects/crayondecals.rsi/footprint.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/g.png b/Resources/Textures/Effects/crayondecals.rsi/g.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/g.png
rename to Resources/Textures/Effects/crayondecals.rsi/g.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/ghost.png b/Resources/Textures/Effects/crayondecals.rsi/ghost.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/ghost.png
rename to Resources/Textures/Effects/crayondecals.rsi/ghost.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/guy.png b/Resources/Textures/Effects/crayondecals.rsi/guy.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/guy.png
rename to Resources/Textures/Effects/crayondecals.rsi/guy.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/h.png b/Resources/Textures/Effects/crayondecals.rsi/h.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/h.png
rename to Resources/Textures/Effects/crayondecals.rsi/h.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/heart.png b/Resources/Textures/Effects/crayondecals.rsi/heart.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/heart.png
rename to Resources/Textures/Effects/crayondecals.rsi/heart.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/i.png b/Resources/Textures/Effects/crayondecals.rsi/i.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/i.png
rename to Resources/Textures/Effects/crayondecals.rsi/i.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/j.png b/Resources/Textures/Effects/crayondecals.rsi/j.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/j.png
rename to Resources/Textures/Effects/crayondecals.rsi/j.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/k.png b/Resources/Textures/Effects/crayondecals.rsi/k.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/k.png
rename to Resources/Textures/Effects/crayondecals.rsi/k.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/l.png b/Resources/Textures/Effects/crayondecals.rsi/l.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/l.png
rename to Resources/Textures/Effects/crayondecals.rsi/l.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/largebrush.png b/Resources/Textures/Effects/crayondecals.rsi/largebrush.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/largebrush.png
rename to Resources/Textures/Effects/crayondecals.rsi/largebrush.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/like.png b/Resources/Textures/Effects/crayondecals.rsi/like.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/like.png
rename to Resources/Textures/Effects/crayondecals.rsi/like.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/line.png b/Resources/Textures/Effects/crayondecals.rsi/line.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/line.png
rename to Resources/Textures/Effects/crayondecals.rsi/line.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/m.png b/Resources/Textures/Effects/crayondecals.rsi/m.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/m.png
rename to Resources/Textures/Effects/crayondecals.rsi/m.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/matt.png b/Resources/Textures/Effects/crayondecals.rsi/matt.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/matt.png
rename to Resources/Textures/Effects/crayondecals.rsi/matt.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/med.png b/Resources/Textures/Effects/crayondecals.rsi/med.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/med.png
rename to Resources/Textures/Effects/crayondecals.rsi/med.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/meta.json b/Resources/Textures/Effects/crayondecals.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/meta.json
rename to Resources/Textures/Effects/crayondecals.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/minus.png b/Resources/Textures/Effects/crayondecals.rsi/minus.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/minus.png
rename to Resources/Textures/Effects/crayondecals.rsi/minus.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/n.png b/Resources/Textures/Effects/crayondecals.rsi/n.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/n.png
rename to Resources/Textures/Effects/crayondecals.rsi/n.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/nay.png b/Resources/Textures/Effects/crayondecals.rsi/nay.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/nay.png
rename to Resources/Textures/Effects/crayondecals.rsi/nay.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/o.png b/Resources/Textures/Effects/crayondecals.rsi/o.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/o.png
rename to Resources/Textures/Effects/crayondecals.rsi/o.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/p.png b/Resources/Textures/Effects/crayondecals.rsi/p.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/p.png
rename to Resources/Textures/Effects/crayondecals.rsi/p.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/pawprint.png b/Resources/Textures/Effects/crayondecals.rsi/pawprint.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/pawprint.png
rename to Resources/Textures/Effects/crayondecals.rsi/pawprint.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/peace.png b/Resources/Textures/Effects/crayondecals.rsi/peace.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/peace.png
rename to Resources/Textures/Effects/crayondecals.rsi/peace.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/percent.png b/Resources/Textures/Effects/crayondecals.rsi/percent.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/percent.png
rename to Resources/Textures/Effects/crayondecals.rsi/percent.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/plus.png b/Resources/Textures/Effects/crayondecals.rsi/plus.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/plus.png
rename to Resources/Textures/Effects/crayondecals.rsi/plus.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/pound.png b/Resources/Textures/Effects/crayondecals.rsi/pound.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/pound.png
rename to Resources/Textures/Effects/crayondecals.rsi/pound.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/prolizard.png b/Resources/Textures/Effects/crayondecals.rsi/prolizard.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/prolizard.png
rename to Resources/Textures/Effects/crayondecals.rsi/prolizard.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/q.png b/Resources/Textures/Effects/crayondecals.rsi/q.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/q.png
rename to Resources/Textures/Effects/crayondecals.rsi/q.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/questionmark.png b/Resources/Textures/Effects/crayondecals.rsi/questionmark.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/questionmark.png
rename to Resources/Textures/Effects/crayondecals.rsi/questionmark.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/r.png b/Resources/Textures/Effects/crayondecals.rsi/r.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/r.png
rename to Resources/Textures/Effects/crayondecals.rsi/r.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/radiation.png b/Resources/Textures/Effects/crayondecals.rsi/radiation.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/radiation.png
rename to Resources/Textures/Effects/crayondecals.rsi/radiation.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/revolution.png b/Resources/Textures/Effects/crayondecals.rsi/revolution.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/revolution.png
rename to Resources/Textures/Effects/crayondecals.rsi/revolution.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/rune1.png b/Resources/Textures/Effects/crayondecals.rsi/rune1.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/rune1.png
rename to Resources/Textures/Effects/crayondecals.rsi/rune1.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/rune2.png b/Resources/Textures/Effects/crayondecals.rsi/rune2.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/rune2.png
rename to Resources/Textures/Effects/crayondecals.rsi/rune2.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/rune3.png b/Resources/Textures/Effects/crayondecals.rsi/rune3.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/rune3.png
rename to Resources/Textures/Effects/crayondecals.rsi/rune3.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/rune4.png b/Resources/Textures/Effects/crayondecals.rsi/rune4.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/rune4.png
rename to Resources/Textures/Effects/crayondecals.rsi/rune4.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/rune5.png b/Resources/Textures/Effects/crayondecals.rsi/rune5.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/rune5.png
rename to Resources/Textures/Effects/crayondecals.rsi/rune5.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/rune6.png b/Resources/Textures/Effects/crayondecals.rsi/rune6.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/rune6.png
rename to Resources/Textures/Effects/crayondecals.rsi/rune6.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/s.png b/Resources/Textures/Effects/crayondecals.rsi/s.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/s.png
rename to Resources/Textures/Effects/crayondecals.rsi/s.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/safe.png b/Resources/Textures/Effects/crayondecals.rsi/safe.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/safe.png
rename to Resources/Textures/Effects/crayondecals.rsi/safe.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/scroll.png b/Resources/Textures/Effects/crayondecals.rsi/scroll.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/scroll.png
rename to Resources/Textures/Effects/crayondecals.rsi/scroll.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/shop.png b/Resources/Textures/Effects/crayondecals.rsi/shop.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/shop.png
rename to Resources/Textures/Effects/crayondecals.rsi/shop.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/shortline.png b/Resources/Textures/Effects/crayondecals.rsi/shortline.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/shortline.png
rename to Resources/Textures/Effects/crayondecals.rsi/shortline.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/shotgun.png b/Resources/Textures/Effects/crayondecals.rsi/shotgun.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/shotgun.png
rename to Resources/Textures/Effects/crayondecals.rsi/shotgun.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/skull.png b/Resources/Textures/Effects/crayondecals.rsi/skull.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/skull.png
rename to Resources/Textures/Effects/crayondecals.rsi/skull.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/slash.png b/Resources/Textures/Effects/crayondecals.rsi/slash.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/slash.png
rename to Resources/Textures/Effects/crayondecals.rsi/slash.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/smallbrush.png b/Resources/Textures/Effects/crayondecals.rsi/smallbrush.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/smallbrush.png
rename to Resources/Textures/Effects/crayondecals.rsi/smallbrush.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/snake.png b/Resources/Textures/Effects/crayondecals.rsi/snake.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/snake.png
rename to Resources/Textures/Effects/crayondecals.rsi/snake.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/space.png b/Resources/Textures/Effects/crayondecals.rsi/space.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/space.png
rename to Resources/Textures/Effects/crayondecals.rsi/space.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/splatter.png b/Resources/Textures/Effects/crayondecals.rsi/splatter.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/splatter.png
rename to Resources/Textures/Effects/crayondecals.rsi/splatter.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/star.png b/Resources/Textures/Effects/crayondecals.rsi/star.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/star.png
rename to Resources/Textures/Effects/crayondecals.rsi/star.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/stickman.png b/Resources/Textures/Effects/crayondecals.rsi/stickman.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/stickman.png
rename to Resources/Textures/Effects/crayondecals.rsi/stickman.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/t.png b/Resources/Textures/Effects/crayondecals.rsi/t.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/t.png
rename to Resources/Textures/Effects/crayondecals.rsi/t.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/taser.png b/Resources/Textures/Effects/crayondecals.rsi/taser.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/taser.png
rename to Resources/Textures/Effects/crayondecals.rsi/taser.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/thinline.png b/Resources/Textures/Effects/crayondecals.rsi/thinline.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/thinline.png
rename to Resources/Textures/Effects/crayondecals.rsi/thinline.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/toilet.png b/Resources/Textures/Effects/crayondecals.rsi/toilet.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/toilet.png
rename to Resources/Textures/Effects/crayondecals.rsi/toilet.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/toolbox.png b/Resources/Textures/Effects/crayondecals.rsi/toolbox.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/toolbox.png
rename to Resources/Textures/Effects/crayondecals.rsi/toolbox.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/trade.png b/Resources/Textures/Effects/crayondecals.rsi/trade.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/trade.png
rename to Resources/Textures/Effects/crayondecals.rsi/trade.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/u.png b/Resources/Textures/Effects/crayondecals.rsi/u.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/u.png
rename to Resources/Textures/Effects/crayondecals.rsi/u.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/uboa.png b/Resources/Textures/Effects/crayondecals.rsi/uboa.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/uboa.png
rename to Resources/Textures/Effects/crayondecals.rsi/uboa.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/v.png b/Resources/Textures/Effects/crayondecals.rsi/v.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/v.png
rename to Resources/Textures/Effects/crayondecals.rsi/v.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/w.png b/Resources/Textures/Effects/crayondecals.rsi/w.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/w.png
rename to Resources/Textures/Effects/crayondecals.rsi/w.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/x.png b/Resources/Textures/Effects/crayondecals.rsi/x.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/x.png
rename to Resources/Textures/Effects/crayondecals.rsi/x.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/y.png b/Resources/Textures/Effects/crayondecals.rsi/y.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/y.png
rename to Resources/Textures/Effects/crayondecals.rsi/y.png
diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/z.png b/Resources/Textures/Effects/crayondecals.rsi/z.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/z.png
rename to Resources/Textures/Effects/crayondecals.rsi/z.png
diff --git a/Resources/Textures/Interface/Alerts/piloting.png b/Resources/Textures/Interface/Alerts/piloting.png
new file mode 100644
index 0000000000..cd3dd9f8b3
Binary files /dev/null and b/Resources/Textures/Interface/Alerts/piloting.png differ
diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/cigpack.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/equipped-BELT.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/cigpack.png
rename to Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/equipped-BELT.png
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/meta.json
index 0da0f0cd38..892cbe9a31 100644
--- a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/meta.json
@@ -23,6 +23,10 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/equipped-BELT.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/equipped-BELT.png
new file mode 100644
index 0000000000..d49b6f112c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/equipped-BELT.png differ
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/meta.json
index 0da0f0cd38..892cbe9a31 100644
--- a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/meta.json
@@ -23,6 +23,10 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/equipped-BELT.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/equipped-BELT.png
new file mode 100644
index 0000000000..d49b6f112c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/equipped-BELT.png differ
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/meta.json
index 0da0f0cd38..892cbe9a31 100644
--- a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/meta.json
@@ -23,6 +23,10 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/equipped-BELT.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/equipped-BELT.png
new file mode 100644
index 0000000000..d49b6f112c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/equipped-BELT.png differ
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/meta.json
index 0da0f0cd38..892cbe9a31 100644
--- a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/meta.json
@@ -23,6 +23,10 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/meta.json b/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/meta.json
index cccb2a2d42..ddafbbb98b 100644
--- a/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/meta.json
@@ -18,34 +18,6 @@
     },
     {
       "name": "drum_makeshift"
-    },
-    {
-      "name": "minimoog",
-      "directions": 4
-    },
-    {
-      "name": "minimoog-broken",
-      "directions": 4
-    },
-    {
-      "name": "church_organ",
-      "directions": 4
-    },
-    {
-      "name": "piano",
-      "directions": 4
-    },
-    {
-      "name": "piano-broken",
-      "directions": 4
-    },
-    {
-      "name": "xylophone",
-      "directions": 4
-    },
-    {
-      "name": "xylophone-broken",
-      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/minimoogbroken.png b/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/minimoogbroken.png
deleted file mode 100644
index 71ca879106..0000000000
Binary files a/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/minimoogbroken.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/synthesizer.png b/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/synthesizer.png
deleted file mode 100644
index 91c1c253de..0000000000
Binary files a/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/synthesizer.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/spraycan.png b/Resources/Textures/Objects/Fun/spraycans.rsi/equipped-BELT.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/spraycan.png
rename to Resources/Textures/Objects/Fun/spraycans.rsi/equipped-BELT.png
diff --git a/Resources/Textures/Objects/Fun/spraycans.rsi/meta.json b/Resources/Textures/Objects/Fun/spraycans.rsi/meta.json
index e6b752420d..8efba5e0dc 100644
--- a/Resources/Textures/Objects/Fun/spraycans.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/spraycans.rsi/meta.json
@@ -54,6 +54,10 @@
     },
     {
       "name": "spray_colors"
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/clipboard.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/clipboard-equipped-BELT.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/clipboard.png
rename to Resources/Textures/Objects/Misc/bureaucracy.rsi/clipboard-equipped-BELT.png
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
index c0ce516165..32ed9fd76b 100644
--- a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
@@ -296,6 +296,10 @@
           0.1
         ]
       ]
+    },
+    {
+      "name": "clipboard-equipped-BELT",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/flare.png b/Resources/Textures/Objects/Misc/flare.rsi/equipped-BELT.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/flare.png
rename to Resources/Textures/Objects/Misc/flare.rsi/equipped-BELT.png
diff --git a/Resources/Textures/Objects/Misc/flare.rsi/meta.json b/Resources/Textures/Objects/Misc/flare.rsi/meta.json
index 8df37b582f..83f2a049b8 100644
--- a/Resources/Textures/Objects/Misc/flare.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/flare.rsi/meta.json
@@ -45,6 +45,10 @@
     {
       "name": "unlit-inhand-right",
       "directions": 4
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/abductor_mod.png b/Resources/Textures/Objects/Misc/module.rsi/abductor_mod.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/abductor_mod.png
rename to Resources/Textures/Objects/Misc/module.rsi/abductor_mod.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/airalarm_electronics.png b/Resources/Textures/Objects/Misc/module.rsi/airalarm_electronics.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/airalarm_electronics.png
rename to Resources/Textures/Objects/Misc/module.rsi/airalarm_electronics.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/ash_plating.png b/Resources/Textures/Objects/Misc/module.rsi/ash_plating.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/ash_plating.png
rename to Resources/Textures/Objects/Misc/module.rsi/ash_plating.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/beaker_holder.png b/Resources/Textures/Objects/Misc/module.rsi/beaker_holder.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/beaker_holder.png
rename to Resources/Textures/Objects/Misc/module.rsi/beaker_holder.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/blank_mod.png b/Resources/Textures/Objects/Misc/module.rsi/blank_mod.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/blank_mod.png
rename to Resources/Textures/Objects/Misc/module.rsi/blank_mod.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/bluespacearray.png b/Resources/Textures/Objects/Misc/module.rsi/bluespacearray.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/bluespacearray.png
rename to Resources/Textures/Objects/Misc/module.rsi/bluespacearray.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/boris.png b/Resources/Textures/Objects/Misc/module.rsi/boris.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/boris.png
rename to Resources/Textures/Objects/Misc/module.rsi/boris.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/boris_recharging.png b/Resources/Textures/Objects/Misc/module.rsi/boris_recharging.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/boris_recharging.png
rename to Resources/Textures/Objects/Misc/module.rsi/boris_recharging.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/card_mini.png b/Resources/Textures/Objects/Misc/module.rsi/card_mini.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/card_mini.png
rename to Resources/Textures/Objects/Misc/module.rsi/card_mini.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/card_mod.png b/Resources/Textures/Objects/Misc/module.rsi/card_mod.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/card_mod.png
rename to Resources/Textures/Objects/Misc/module.rsi/card_mod.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/cargodisk.png b/Resources/Textures/Objects/Misc/module.rsi/cargodisk.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/cargodisk.png
rename to Resources/Textures/Objects/Misc/module.rsi/cargodisk.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/cart_connector.png b/Resources/Textures/Objects/Misc/module.rsi/cart_connector.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/cart_connector.png
rename to Resources/Textures/Objects/Misc/module.rsi/cart_connector.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/cddrive.png b/Resources/Textures/Objects/Misc/module.rsi/cddrive.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/cddrive.png
rename to Resources/Textures/Objects/Misc/module.rsi/cddrive.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/cell.png b/Resources/Textures/Objects/Misc/module.rsi/cell.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/cell.png
rename to Resources/Textures/Objects/Misc/module.rsi/cell.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/cell_con.png b/Resources/Textures/Objects/Misc/module.rsi/cell_con.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/cell_con.png
rename to Resources/Textures/Objects/Misc/module.rsi/cell_con.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/cell_con_micro.png b/Resources/Textures/Objects/Misc/module.rsi/cell_con_micro.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/cell_con_micro.png
rename to Resources/Textures/Objects/Misc/module.rsi/cell_con_micro.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/cell_micro.png b/Resources/Textures/Objects/Misc/module.rsi/cell_micro.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/cell_micro.png
rename to Resources/Textures/Objects/Misc/module.rsi/cell_micro.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/cell_mini.png b/Resources/Textures/Objects/Misc/module.rsi/cell_mini.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/cell_mini.png
rename to Resources/Textures/Objects/Misc/module.rsi/cell_mini.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/charger_APC.png b/Resources/Textures/Objects/Misc/module.rsi/charger_APC.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/charger_APC.png
rename to Resources/Textures/Objects/Misc/module.rsi/charger_APC.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/charger_lambda.png b/Resources/Textures/Objects/Misc/module.rsi/charger_lambda.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/charger_lambda.png
rename to Resources/Textures/Objects/Misc/module.rsi/charger_lambda.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/charger_pda.png b/Resources/Textures/Objects/Misc/module.rsi/charger_pda.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/charger_pda.png
rename to Resources/Textures/Objects/Misc/module.rsi/charger_pda.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/charger_wire.png b/Resources/Textures/Objects/Misc/module.rsi/charger_wire.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/charger_wire.png
rename to Resources/Textures/Objects/Misc/module.rsi/charger_wire.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/clock_mod.png b/Resources/Textures/Objects/Misc/module.rsi/clock_mod.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/clock_mod.png
rename to Resources/Textures/Objects/Misc/module.rsi/clock_mod.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/command.png b/Resources/Textures/Objects/Misc/module.rsi/command.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/command.png
rename to Resources/Textures/Objects/Misc/module.rsi/command.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/cpu.png b/Resources/Textures/Objects/Misc/module.rsi/cpu.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/cpu.png
rename to Resources/Textures/Objects/Misc/module.rsi/cpu.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/cpu_adv.png b/Resources/Textures/Objects/Misc/module.rsi/cpu_adv.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/cpu_adv.png
rename to Resources/Textures/Objects/Misc/module.rsi/cpu_adv.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/cpu_super.png b/Resources/Textures/Objects/Misc/module.rsi/cpu_super.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/cpu_super.png
rename to Resources/Textures/Objects/Misc/module.rsi/cpu_super.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/cpuboard.png b/Resources/Textures/Objects/Misc/module.rsi/cpuboard.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/cpuboard.png
rename to Resources/Textures/Objects/Misc/module.rsi/cpuboard.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/cpuboard_adv.png b/Resources/Textures/Objects/Misc/module.rsi/cpuboard_adv.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/cpuboard_adv.png
rename to Resources/Textures/Objects/Misc/module.rsi/cpuboard_adv.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/cpuboard_super.png b/Resources/Textures/Objects/Misc/module.rsi/cpuboard_super.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/cpuboard_super.png
rename to Resources/Textures/Objects/Misc/module.rsi/cpuboard_super.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/cyborg_upgrade.png b/Resources/Textures/Objects/Misc/module.rsi/cyborg_upgrade.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/cyborg_upgrade.png
rename to Resources/Textures/Objects/Misc/module.rsi/cyborg_upgrade.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/cyborg_upgrade1.png b/Resources/Textures/Objects/Misc/module.rsi/cyborg_upgrade1.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/cyborg_upgrade1.png
rename to Resources/Textures/Objects/Misc/module.rsi/cyborg_upgrade1.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/cyborg_upgrade2.png b/Resources/Textures/Objects/Misc/module.rsi/cyborg_upgrade2.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/cyborg_upgrade2.png
rename to Resources/Textures/Objects/Misc/module.rsi/cyborg_upgrade2.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/cyborg_upgrade3.png b/Resources/Textures/Objects/Misc/module.rsi/cyborg_upgrade3.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/cyborg_upgrade3.png
rename to Resources/Textures/Objects/Misc/module.rsi/cyborg_upgrade3.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/cyborg_upgrade4.png b/Resources/Textures/Objects/Misc/module.rsi/cyborg_upgrade4.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/cyborg_upgrade4.png
rename to Resources/Textures/Objects/Misc/module.rsi/cyborg_upgrade4.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/cyborg_upgrade5.png b/Resources/Textures/Objects/Misc/module.rsi/cyborg_upgrade5.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/cyborg_upgrade5.png
rename to Resources/Textures/Objects/Misc/module.rsi/cyborg_upgrade5.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/datadisk0.png b/Resources/Textures/Objects/Misc/module.rsi/datadisk0.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/datadisk0.png
rename to Resources/Textures/Objects/Misc/module.rsi/datadisk0.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/datadisk1.png b/Resources/Textures/Objects/Misc/module.rsi/datadisk1.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/datadisk1.png
rename to Resources/Textures/Objects/Misc/module.rsi/datadisk1.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/datadisk2.png b/Resources/Textures/Objects/Misc/module.rsi/datadisk2.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/datadisk2.png
rename to Resources/Textures/Objects/Misc/module.rsi/datadisk2.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/datadisk3.png b/Resources/Textures/Objects/Misc/module.rsi/datadisk3.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/datadisk3.png
rename to Resources/Textures/Objects/Misc/module.rsi/datadisk3.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/datadisk4.png b/Resources/Textures/Objects/Misc/module.rsi/datadisk4.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/datadisk4.png
rename to Resources/Textures/Objects/Misc/module.rsi/datadisk4.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/datadisk5.png b/Resources/Textures/Objects/Misc/module.rsi/datadisk5.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/datadisk5.png
rename to Resources/Textures/Objects/Misc/module.rsi/datadisk5.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/datadisk6.png b/Resources/Textures/Objects/Misc/module.rsi/datadisk6.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/datadisk6.png
rename to Resources/Textures/Objects/Misc/module.rsi/datadisk6.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/datadisk_gene.png b/Resources/Textures/Objects/Misc/module.rsi/datadisk_gene.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/datadisk_gene.png
rename to Resources/Textures/Objects/Misc/module.rsi/datadisk_gene.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/datadisk_hydro.png b/Resources/Textures/Objects/Misc/module.rsi/datadisk_hydro.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/datadisk_hydro.png
rename to Resources/Textures/Objects/Misc/module.rsi/datadisk_hydro.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/depositbox.png b/Resources/Textures/Objects/Misc/module.rsi/depositbox.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/depositbox.png
rename to Resources/Textures/Objects/Misc/module.rsi/depositbox.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/door_electronics.png b/Resources/Textures/Objects/Misc/module.rsi/door_electronics.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/door_electronics.png
rename to Resources/Textures/Objects/Misc/module.rsi/door_electronics.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/engineering.png b/Resources/Textures/Objects/Misc/module.rsi/engineering.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/engineering.png
rename to Resources/Textures/Objects/Misc/module.rsi/engineering.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/flopdrive.png b/Resources/Textures/Objects/Misc/module.rsi/flopdrive.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/flopdrive.png
rename to Resources/Textures/Objects/Misc/module.rsi/flopdrive.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/generic.png b/Resources/Textures/Objects/Misc/module.rsi/generic.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/generic.png
rename to Resources/Textures/Objects/Misc/module.rsi/generic.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/harddisk.png b/Resources/Textures/Objects/Misc/module.rsi/harddisk.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/harddisk.png
rename to Resources/Textures/Objects/Misc/module.rsi/harddisk.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/harddisk_micro.png b/Resources/Textures/Objects/Misc/module.rsi/harddisk_micro.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/harddisk_micro.png
rename to Resources/Textures/Objects/Misc/module.rsi/harddisk_micro.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/harddisk_mini.png b/Resources/Textures/Objects/Misc/module.rsi/harddisk_mini.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/harddisk_mini.png
rename to Resources/Textures/Objects/Misc/module.rsi/harddisk_mini.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/holodisk.png b/Resources/Textures/Objects/Misc/module.rsi/holodisk.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/holodisk.png
rename to Resources/Textures/Objects/Misc/module.rsi/holodisk.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/id_mod.png b/Resources/Textures/Objects/Misc/module.rsi/id_mod.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/id_mod.png
rename to Resources/Textures/Objects/Misc/module.rsi/id_mod.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/mainboard.png b/Resources/Textures/Objects/Misc/module.rsi/mainboard.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/mainboard.png
rename to Resources/Textures/Objects/Misc/module.rsi/mainboard.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/mcontroller.png b/Resources/Textures/Objects/Misc/module.rsi/mcontroller.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/mcontroller.png
rename to Resources/Textures/Objects/Misc/module.rsi/mcontroller.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/medical.png b/Resources/Textures/Objects/Misc/module.rsi/medical.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/medical.png
rename to Resources/Textures/Objects/Misc/module.rsi/medical.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/meta.json b/Resources/Textures/Objects/Misc/module.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/meta.json
rename to Resources/Textures/Objects/Misc/module.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/net_wired.png b/Resources/Textures/Objects/Misc/module.rsi/net_wired.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/net_wired.png
rename to Resources/Textures/Objects/Misc/module.rsi/net_wired.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/nucleardisk.png b/Resources/Textures/Objects/Misc/module.rsi/nucleardisk.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/nucleardisk.png
rename to Resources/Textures/Objects/Misc/module.rsi/nucleardisk.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/power_mod.png b/Resources/Textures/Objects/Misc/module.rsi/power_mod.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/power_mod.png
rename to Resources/Textures/Objects/Misc/module.rsi/power_mod.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/printer.png b/Resources/Textures/Objects/Misc/module.rsi/printer.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/printer.png
rename to Resources/Textures/Objects/Misc/module.rsi/printer.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/printer_mini.png b/Resources/Textures/Objects/Misc/module.rsi/printer_mini.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/printer_mini.png
rename to Resources/Textures/Objects/Misc/module.rsi/printer_mini.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/prizevendor.png b/Resources/Textures/Objects/Misc/module.rsi/prizevendor.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/prizevendor.png
rename to Resources/Textures/Objects/Misc/module.rsi/prizevendor.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/radio.png b/Resources/Textures/Objects/Misc/module.rsi/radio.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/radio.png
rename to Resources/Textures/Objects/Misc/module.rsi/radio.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/radio_micro.png b/Resources/Textures/Objects/Misc/module.rsi/radio_micro.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/radio_micro.png
rename to Resources/Textures/Objects/Misc/module.rsi/radio_micro.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/radio_mini.png b/Resources/Textures/Objects/Misc/module.rsi/radio_mini.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/radio_mini.png
rename to Resources/Textures/Objects/Misc/module.rsi/radio_mini.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/ram.png b/Resources/Textures/Objects/Misc/module.rsi/ram.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/ram.png
rename to Resources/Textures/Objects/Misc/module.rsi/ram.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/rndmajordisk.png b/Resources/Textures/Objects/Misc/module.rsi/rndmajordisk.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/rndmajordisk.png
rename to Resources/Textures/Objects/Misc/module.rsi/rndmajordisk.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/science.png b/Resources/Textures/Objects/Misc/module.rsi/science.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/science.png
rename to Resources/Textures/Objects/Misc/module.rsi/science.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/secmodschematic.png b/Resources/Textures/Objects/Misc/module.rsi/secmodschematic.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/secmodschematic.png
rename to Resources/Textures/Objects/Misc/module.rsi/secmodschematic.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/security.png b/Resources/Textures/Objects/Misc/module.rsi/security.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/security.png
rename to Resources/Textures/Objects/Misc/module.rsi/security.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/selfrepair_off.png b/Resources/Textures/Objects/Misc/module.rsi/selfrepair_off.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/selfrepair_off.png
rename to Resources/Textures/Objects/Misc/module.rsi/selfrepair_off.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/selfrepair_on.png b/Resources/Textures/Objects/Misc/module.rsi/selfrepair_on.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/selfrepair_on.png
rename to Resources/Textures/Objects/Misc/module.rsi/selfrepair_on.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/service.png b/Resources/Textures/Objects/Misc/module.rsi/service.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/service.png
rename to Resources/Textures/Objects/Misc/module.rsi/service.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/servo.png b/Resources/Textures/Objects/Misc/module.rsi/servo.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/servo.png
rename to Resources/Textures/Objects/Misc/module.rsi/servo.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/ssd.png b/Resources/Textures/Objects/Misc/module.rsi/ssd.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/ssd.png
rename to Resources/Textures/Objects/Misc/module.rsi/ssd.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/ssd_large.png b/Resources/Textures/Objects/Misc/module.rsi/ssd_large.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/ssd_large.png
rename to Resources/Textures/Objects/Misc/module.rsi/ssd_large.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/ssd_micro.png b/Resources/Textures/Objects/Misc/module.rsi/ssd_micro.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/ssd_micro.png
rename to Resources/Textures/Objects/Misc/module.rsi/ssd_micro.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/ssd_mini.png b/Resources/Textures/Objects/Misc/module.rsi/ssd_mini.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/ssd_mini.png
rename to Resources/Textures/Objects/Misc/module.rsi/ssd_mini.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/std_mod.png b/Resources/Textures/Objects/Misc/module.rsi/std_mod.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/std_mod.png
rename to Resources/Textures/Objects/Misc/module.rsi/std_mod.png
diff --git a/Resources/Textures/Constructible/Misc/module.rsi/supply.png b/Resources/Textures/Objects/Misc/module.rsi/supply.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/module.rsi/supply.png
rename to Resources/Textures/Objects/Misc/module.rsi/supply.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/adv_capacitor.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/adv_capacitor.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/adv_capacitor.png
rename to Resources/Textures/Objects/Misc/stock_parts.rsi/adv_capacitor.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/adv_electrolite.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/adv_electrolite.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/adv_electrolite.png
rename to Resources/Textures/Objects/Misc/stock_parts.rsi/adv_electrolite.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/adv_scan_module.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/adv_scan_module.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/adv_scan_module.png
rename to Resources/Textures/Objects/Misc/stock_parts.rsi/adv_scan_module.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/advanced_matter_bin.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/advanced_matter_bin.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/advanced_matter_bin.png
rename to Resources/Textures/Objects/Misc/stock_parts.rsi/advanced_matter_bin.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/ansible_crystal.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/ansible_crystal.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/ansible_crystal.png
rename to Resources/Textures/Objects/Misc/stock_parts.rsi/ansible_crystal.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/bluespace_electrolite.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/bluespace_electrolite.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/bluespace_electrolite.png
rename to Resources/Textures/Objects/Misc/stock_parts.rsi/bluespace_electrolite.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/bluespace_matter_bin.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/bluespace_matter_bin.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/bluespace_matter_bin.png
rename to Resources/Textures/Objects/Misc/stock_parts.rsi/bluespace_matter_bin.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/capacitor.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/capacitor.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/capacitor.png
rename to Resources/Textures/Objects/Misc/stock_parts.rsi/capacitor.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/card_reader.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/card_reader.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/card_reader.png
rename to Resources/Textures/Objects/Misc/stock_parts.rsi/card_reader.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/datadisk0.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk0.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/datadisk0.png
rename to Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk0.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/datadisk1.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk1.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/datadisk1.png
rename to Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk1.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/datadisk2.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk2.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/datadisk2.png
rename to Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk2.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/datadisk3.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk3.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/datadisk3.png
rename to Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk3.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/datadisk4.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk4.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/datadisk4.png
rename to Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk4.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/datadisk5.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk5.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/datadisk5.png
rename to Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk5.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/datadisk6.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk6.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/datadisk6.png
rename to Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk6.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/electrolite.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/electrolite.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/electrolite.png
rename to Resources/Textures/Objects/Misc/stock_parts.rsi/electrolite.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/femto_mani.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/femto_mani.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/femto_mani.png
rename to Resources/Textures/Objects/Misc/stock_parts.rsi/femto_mani.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/hdd1.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/hdd1.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/hdd1.png
rename to Resources/Textures/Objects/Misc/stock_parts.rsi/hdd1.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/hdd2.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/hdd2.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/hdd2.png
rename to Resources/Textures/Objects/Misc/stock_parts.rsi/hdd2.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/high_micro_laser.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/high_micro_laser.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/high_micro_laser.png
rename to Resources/Textures/Objects/Misc/stock_parts.rsi/high_micro_laser.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/hyperwave_filter.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/hyperwave_filter.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/hyperwave_filter.png
rename to Resources/Textures/Objects/Misc/stock_parts.rsi/hyperwave_filter.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/matter_bin.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/matter_bin.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/matter_bin.png
rename to Resources/Textures/Objects/Misc/stock_parts.rsi/matter_bin.png
diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/meta.json b/Resources/Textures/Objects/Misc/stock_parts.rsi/meta.json
new file mode 100644
index 0000000000..5636b3e436
--- /dev/null
+++ b/Resources/Textures/Objects/Misc/stock_parts.rsi/meta.json
@@ -0,0 +1,414 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/tgstation/tgstation at 0d9c9a8233dfc3fc55edc538955a761a6328bee0",
+  "states": [
+    {
+      "name": "adv_capacitor",
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "adv_electrolite",
+      "delays": [
+        [
+          0.13,
+          0.13
+        ]
+      ]
+    },
+    {
+      "name": "adv_scan_module",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "advanced_matter_bin",
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "ansible_crystal",
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "bluespace_electrolite",
+      "delays": [
+        [
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "bluespace_matter_bin",
+      "delays": [
+        [
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "capacitor",
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "card_reader",
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "datadisk0",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "datadisk1",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "datadisk2",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "datadisk3",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "datadisk4",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "datadisk5",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "datadisk6",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "electrolite",
+      "delays": [
+        [
+          0.16,
+          0.16
+        ]
+      ]
+    },
+    {
+      "name": "femto_mani",
+      "delays": [
+        [
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "hdd1",
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "hdd2",
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "high_micro_laser",
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "hyperwave_filter",
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "matter_bin",
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "micro_laser",
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "micro_mani",
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "nano_mani",
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "pico_mani",
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "quadratic_capacitor",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "quadultra_micro_laser",
+      "delays": [
+        [
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "rom1",
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "rom2",
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "romos1",
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "romos2",
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "scan_module",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "subspace_amplifier",
+      "delays": [
+        [
+          0.2,
+          0.4,
+          0.2,
+          0.4
+        ]
+      ]
+    },
+    {
+      "name": "subspace_ansible",
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "subspace_transmitter",
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "super_capacitor",
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "super_electrolite",
+      "delays": [
+        [
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "super_matter_bin",
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "super_scan_module",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "treatment_disk",
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "triphasic_scan_module",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "ultra_high_micro_laser",
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "wavelength_analyzer",
+      "delays": [
+        [
+          1
+        ]
+      ]
+    }
+  ]
+}
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/micro_laser.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/micro_laser.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/micro_laser.png
rename to Resources/Textures/Objects/Misc/stock_parts.rsi/micro_laser.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/micro_mani.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/micro_mani.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/micro_mani.png
rename to Resources/Textures/Objects/Misc/stock_parts.rsi/micro_mani.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/nano_mani.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/nano_mani.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/nano_mani.png
rename to Resources/Textures/Objects/Misc/stock_parts.rsi/nano_mani.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/pico_mani.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/pico_mani.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/pico_mani.png
rename to Resources/Textures/Objects/Misc/stock_parts.rsi/pico_mani.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/quadratic_capacitor.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/quadratic_capacitor.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/quadratic_capacitor.png
rename to Resources/Textures/Objects/Misc/stock_parts.rsi/quadratic_capacitor.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/quadultra_micro_laser.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/quadultra_micro_laser.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/quadultra_micro_laser.png
rename to Resources/Textures/Objects/Misc/stock_parts.rsi/quadultra_micro_laser.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/rom1.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/rom1.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/rom1.png
rename to Resources/Textures/Objects/Misc/stock_parts.rsi/rom1.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/rom2.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/rom2.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/rom2.png
rename to Resources/Textures/Objects/Misc/stock_parts.rsi/rom2.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/romos1.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/romos1.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/romos1.png
rename to Resources/Textures/Objects/Misc/stock_parts.rsi/romos1.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/romos2.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/romos2.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/romos2.png
rename to Resources/Textures/Objects/Misc/stock_parts.rsi/romos2.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/scan_module.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/scan_module.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/scan_module.png
rename to Resources/Textures/Objects/Misc/stock_parts.rsi/scan_module.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/subspace_amplifier.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/subspace_amplifier.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/subspace_amplifier.png
rename to Resources/Textures/Objects/Misc/stock_parts.rsi/subspace_amplifier.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/subspace_ansible.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/subspace_ansible.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/subspace_ansible.png
rename to Resources/Textures/Objects/Misc/stock_parts.rsi/subspace_ansible.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/subspace_transmitter.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/subspace_transmitter.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/subspace_transmitter.png
rename to Resources/Textures/Objects/Misc/stock_parts.rsi/subspace_transmitter.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/super_capacitor.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/super_capacitor.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/super_capacitor.png
rename to Resources/Textures/Objects/Misc/stock_parts.rsi/super_capacitor.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/super_electrolite.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/super_electrolite.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/super_electrolite.png
rename to Resources/Textures/Objects/Misc/stock_parts.rsi/super_electrolite.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/super_matter_bin.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/super_matter_bin.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/super_matter_bin.png
rename to Resources/Textures/Objects/Misc/stock_parts.rsi/super_matter_bin.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/super_scan_module.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/super_scan_module.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/super_scan_module.png
rename to Resources/Textures/Objects/Misc/stock_parts.rsi/super_scan_module.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/treatment_disk.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/treatment_disk.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/treatment_disk.png
rename to Resources/Textures/Objects/Misc/stock_parts.rsi/treatment_disk.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/triphasic_scan_module.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/triphasic_scan_module.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/triphasic_scan_module.png
rename to Resources/Textures/Objects/Misc/stock_parts.rsi/triphasic_scan_module.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/ultra_high_micro_laser.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/ultra_high_micro_laser.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/ultra_high_micro_laser.png
rename to Resources/Textures/Objects/Misc/stock_parts.rsi/ultra_high_micro_laser.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/wavelength_analyzer.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/wavelength_analyzer.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/wavelength_analyzer.png
rename to Resources/Textures/Objects/Misc/stock_parts.rsi/wavelength_analyzer.png
diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/beaker.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/equipped-BELT.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/beaker.png
rename to Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/equipped-BELT.png
diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/meta.json
index 9310fc8467..6403659e68 100644
--- a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/meta.json
@@ -38,6 +38,10 @@
     },
     {
       "name": "beaker6"
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/spraybottle.png b/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/equipped-BELT.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/spraybottle.png
rename to Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/equipped-BELT.png
diff --git a/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/meta.json b/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/meta.json
index 80d57ef5eb..a52e53539a 100644
--- a/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/meta.json
@@ -23,6 +23,10 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/hypo.png b/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/equipped-BELT.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/hypo.png
rename to Resources/Textures/Objects/Specific/Medical/hypospray.rsi/equipped-BELT.png
diff --git a/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/meta.json
index 4ee2261384..0095919b63 100644
--- a/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/meta.json
@@ -26,6 +26,10 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/spade.png b/Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/equipped-BELT.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/spade.png
rename to Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/equipped-BELT.png
diff --git a/Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/meta.json b/Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/meta.json
index ab98f8e78a..bb2b1a2866 100644
--- a/Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/meta.json
@@ -17,6 +17,10 @@
     },
     {
       "name": "icon"
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/coil.png b/Resources/Textures/Objects/Tools/cable-coils.rsi/coil-equipped-BELT.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/coil.png
rename to Resources/Textures/Objects/Tools/cable-coils.rsi/coil-equipped-BELT.png
diff --git a/Resources/Textures/Objects/Tools/cable-coils.rsi/coilhv-equipped-BELT.png b/Resources/Textures/Objects/Tools/cable-coils.rsi/coilhv-equipped-BELT.png
new file mode 100644
index 0000000000..90d0917741
Binary files /dev/null and b/Resources/Textures/Objects/Tools/cable-coils.rsi/coilhv-equipped-BELT.png differ
diff --git a/Resources/Textures/Objects/Tools/cable-coils.rsi/coillv-equipped-BELT.png b/Resources/Textures/Objects/Tools/cable-coils.rsi/coillv-equipped-BELT.png
new file mode 100644
index 0000000000..f6d9e49bc9
Binary files /dev/null and b/Resources/Textures/Objects/Tools/cable-coils.rsi/coillv-equipped-BELT.png differ
diff --git a/Resources/Textures/Objects/Tools/cable-coils.rsi/coilmv-equipped-BELT.png b/Resources/Textures/Objects/Tools/cable-coils.rsi/coilmv-equipped-BELT.png
new file mode 100644
index 0000000000..1f7b0e8f69
Binary files /dev/null and b/Resources/Textures/Objects/Tools/cable-coils.rsi/coilmv-equipped-BELT.png differ
diff --git a/Resources/Textures/Objects/Tools/cable-coils.rsi/meta.json b/Resources/Textures/Objects/Tools/cable-coils.rsi/meta.json
index 9bda8c2580..97ce32a860 100644
--- a/Resources/Textures/Objects/Tools/cable-coils.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/cable-coils.rsi/meta.json
@@ -69,6 +69,22 @@
     },
     {
       "name": "coilall-30"
+    },
+    {
+      "name": "coil-equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "coillv-equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "coilmv-equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "coilhv-equipped-BELT",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/crowbar.png b/Resources/Textures/Objects/Tools/crowbar.rsi/equipped-BELT.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/crowbar.png
rename to Resources/Textures/Objects/Tools/crowbar.rsi/equipped-BELT.png
diff --git a/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json b/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json
index 53afd4d476..0fa78806cf 100644
--- a/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json
@@ -17,6 +17,10 @@
     },
     {
       "name": "icon"
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/crowbar_red.png b/Resources/Textures/Objects/Tools/crowbar_red.rsi/equipped-BELT.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/crowbar_red.png
rename to Resources/Textures/Objects/Tools/crowbar_red.rsi/equipped-BELT.png
diff --git a/Resources/Textures/Objects/Tools/crowbar_red.rsi/meta.json b/Resources/Textures/Objects/Tools/crowbar_red.rsi/meta.json
index 670262b2a6..0244c0470e 100644
--- a/Resources/Textures/Objects/Tools/crowbar_red.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/crowbar_red.rsi/meta.json
@@ -15,6 +15,10 @@
     },
     {
       "name": "icon"
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/drill.png b/Resources/Textures/Objects/Tools/drill.rsi/equipped-BELT.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/drill.png
rename to Resources/Textures/Objects/Tools/drill.rsi/equipped-BELT.png
diff --git a/Resources/Textures/Objects/Tools/drill.rsi/meta.json b/Resources/Textures/Objects/Tools/drill.rsi/meta.json
index cc1eaf2707..61e637a46a 100644
--- a/Resources/Textures/Objects/Tools/drill.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/drill.rsi/meta.json
@@ -20,6 +20,10 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/flashlight.png b/Resources/Textures/Objects/Tools/flashlight.rsi/equipped-BELT.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/flashlight.png
rename to Resources/Textures/Objects/Tools/flashlight.rsi/equipped-BELT.png
diff --git a/Resources/Textures/Objects/Tools/flashlight.rsi/meta.json b/Resources/Textures/Objects/Tools/flashlight.rsi/meta.json
index f12b27f709..9214fb0c88 100644
--- a/Resources/Textures/Objects/Tools/flashlight.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/flashlight.rsi/meta.json
@@ -31,6 +31,10 @@
     {
       "name": "on-inhand-right",
       "directions": 4
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/jawsoflife.png b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/equipped-BELT.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/jawsoflife.png
rename to Resources/Textures/Objects/Tools/jaws_of_life.rsi/equipped-BELT.png
diff --git a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/meta.json b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/meta.json
index e6bc717f1c..f244507fa7 100644
--- a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/meta.json
@@ -26,6 +26,10 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/screwdriver.png b/Resources/Textures/Objects/Tools/screwdriver.rsi/equipped-BELT.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/screwdriver.png
rename to Resources/Textures/Objects/Tools/screwdriver.rsi/equipped-BELT.png
diff --git a/Resources/Textures/Objects/Tools/screwdriver.rsi/meta.json b/Resources/Textures/Objects/Tools/screwdriver.rsi/meta.json
index 5a96c2337b..17ec25991a 100644
--- a/Resources/Textures/Objects/Tools/screwdriver.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/screwdriver.rsi/meta.json
@@ -23,6 +23,10 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/welder.png b/Resources/Textures/Objects/Tools/welder.rsi/equipped-BELT.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/welder.png
rename to Resources/Textures/Objects/Tools/welder.rsi/equipped-BELT.png
diff --git a/Resources/Textures/Objects/Tools/welder.rsi/meta.json b/Resources/Textures/Objects/Tools/welder.rsi/meta.json
index d6adbc81ac..ad660c7299 100644
--- a/Resources/Textures/Objects/Tools/welder.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/welder.rsi/meta.json
@@ -70,6 +70,10 @@
           0.1
         ]
       ]
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-equipped-BELT.png b/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-equipped-BELT.png
new file mode 100644
index 0000000000..5808754981
Binary files /dev/null and b/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-equipped-BELT.png differ
diff --git a/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-inhand-left.png b/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-inhand-left.png
new file mode 100644
index 0000000000..84cbd4a0f2
Binary files /dev/null and b/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-inhand-right.png b/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-inhand-right.png
new file mode 100644
index 0000000000..6a26de375d
Binary files /dev/null and b/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tools/wirecutters.rsi/handle-equipped-BELT.png b/Resources/Textures/Objects/Tools/wirecutters.rsi/handle-equipped-BELT.png
new file mode 100644
index 0000000000..06f82e1b54
Binary files /dev/null and b/Resources/Textures/Objects/Tools/wirecutters.rsi/handle-equipped-BELT.png differ
diff --git a/Resources/Textures/Objects/Tools/wirecutters.rsi/handle-inhand-left.png b/Resources/Textures/Objects/Tools/wirecutters.rsi/handle-inhand-left.png
new file mode 100644
index 0000000000..dee5a83227
Binary files /dev/null and b/Resources/Textures/Objects/Tools/wirecutters.rsi/handle-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tools/wirecutters.rsi/handle-inhand-right.png b/Resources/Textures/Objects/Tools/wirecutters.rsi/handle-inhand-right.png
new file mode 100644
index 0000000000..f48633761c
Binary files /dev/null and b/Resources/Textures/Objects/Tools/wirecutters.rsi/handle-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tools/wirecutters.rsi/meta.json b/Resources/Textures/Objects/Tools/wirecutters.rsi/meta.json
index f0d83902d1..cd29490826 100644
--- a/Resources/Textures/Objects/Tools/wirecutters.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/wirecutters.rsi/meta.json
@@ -23,6 +23,30 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "cutters-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "cutters-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "handle-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "handle-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "cutters-equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "handle-equipped-BELT",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/wrench.png b/Resources/Textures/Objects/Tools/wrench.rsi/equipped-BELT.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/wrench.png
rename to Resources/Textures/Objects/Tools/wrench.rsi/equipped-BELT.png
diff --git a/Resources/Textures/Objects/Tools/wrench.rsi/meta.json b/Resources/Textures/Objects/Tools/wrench.rsi/meta.json
index 4845380cc0..9f7b9badd5 100644
--- a/Resources/Textures/Objects/Tools/wrench.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/wrench.rsi/meta.json
@@ -17,6 +17,10 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/flashbang.png b/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/equipped-BELT.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/flashbang.png
rename to Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/equipped-BELT.png
diff --git a/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json
index 67a112dc09..28d3e6969a 100644
--- a/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json
@@ -18,6 +18,10 @@
           0.1
         ]
       ]
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/grenade.png b/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/equipped-BELT.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/grenade.png
rename to Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/equipped-BELT.png
diff --git a/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/meta.json
index 67a112dc09..28d3e6969a 100644
--- a/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/meta.json
@@ -18,6 +18,10 @@
           0.1
         ]
       ]
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/minibomb.png b/Resources/Textures/Objects/Weapons/Grenades/syndgrenade.rsi/equipped-BELT.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/minibomb.png
rename to Resources/Textures/Objects/Weapons/Grenades/syndgrenade.rsi/equipped-BELT.png
diff --git a/Resources/Textures/Objects/Weapons/Grenades/syndgrenade.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/syndgrenade.rsi/meta.json
index 708cdc54de..a7f808a399 100644
--- a/Resources/Textures/Objects/Weapons/Grenades/syndgrenade.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Grenades/syndgrenade.rsi/meta.json
@@ -19,6 +19,10 @@
           0.2
         ]
       ]
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/gun.png b/Resources/Textures/Objects/Weapons/Guns/Battery/taser.rsi/equipped-BELT.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/gun.png
rename to Resources/Textures/Objects/Weapons/Guns/Battery/taser.rsi/equipped-BELT.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/taser.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/taser.rsi/meta.json
index 0a9e915eb0..f0d5f9dfc9 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Battery/taser.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/taser.rsi/meta.json
@@ -73,6 +73,10 @@
     {
       "name": "taser4-inhand-right",
       "directions": 4
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/knife.png b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/equipped-BELT.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/knife.png
rename to Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/equipped-BELT.png
diff --git a/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json
index 4da2fb5bd2..87686c8a63 100644
--- a/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json
@@ -17,6 +17,10 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/equipped-BELT.png
new file mode 100644
index 0000000000..288f9fbce5
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/equipped-BELT.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/meta.json
index 8e9c566c5c..9fac57fa05 100644
--- a/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/meta.json
@@ -17,6 +17,10 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/assembly.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/assembly.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/assembly.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/bolted_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/bolted_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/bolted_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closed.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/closed.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closed.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closed_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/closed_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closed_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closing.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/closing.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closing.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closing_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/closing_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closing_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/deny_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/deny_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/deny_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/locked.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/locked.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/locked.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/meta.json
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/opening.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/opening.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/opening.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/opening_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/opening_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/opening_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/panel_closing.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/panel_closing.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/panel_closing.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/panel_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/panel_open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/panel_open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/panel_opening.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/panel_opening.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/panel_opening.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/spark.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/spark.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/spark.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/spark.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/sparks_broken.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/sparks_broken.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/sparks_broken.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/sparks_damaged.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/sparks_damaged.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/sparks_damaged.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/sparks_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/sparks_open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/sparks_open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/welded.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/welded.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/welded.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/assembly.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/assembly.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/assembly.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/bolted_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/bolted_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/bolted_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closed.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/closed.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closed.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closed_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/closed_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closed_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closing.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/closing.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closing.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closing_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/closing_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closing_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/deny_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/deny_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/deny_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/locked.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/locked.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/locked.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/meta.json
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/opening.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/opening.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/opening.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/opening_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/opening_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/opening_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/panel_closing.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/panel_closing.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/panel_closing.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/panel_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/panel_open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/panel_open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/panel_opening.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/panel_opening.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/panel_opening.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/spark.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/spark.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/spark.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/spark.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/sparks_broken.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/sparks_broken.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/sparks_broken.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/sparks_damaged.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/sparks_damaged.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/sparks_damaged.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/sparks_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/sparks_open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/sparks_open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/welded.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/welded.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/welded.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/assembly.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/assembly.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/assembly.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/bolted_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/bolted_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/bolted_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closed.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/closed.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closed.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closed_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/closed_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closed_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closing.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/closing.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closing.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closing_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/closing_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closing_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/deny_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/deny_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/deny_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/locked.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/locked.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/locked.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/meta.json
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/opening.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/opening.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/opening.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/opening_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/opening_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/opening_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/panel_closing.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/panel_closing.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/panel_closing.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/panel_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/panel_open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/panel_open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/panel_opening.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/panel_opening.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/panel_opening.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/spark.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/spark.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/spark.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/spark.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/sparks_broken.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/sparks_broken.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/sparks_broken.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/sparks_damaged.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/sparks_damaged.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/sparks_damaged.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/sparks_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/sparks_open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/sparks_open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/welded.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/welded.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/welded.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/bolted_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/bolted_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/bolted_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/closed.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/closed.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/closed.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/closed_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/closed_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/closed_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/closing.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/closing.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/closing.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/closing_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/closing_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/closing_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/deny.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/deny.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/deny.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/deny.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/deny_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/deny_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/deny_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/locked.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/locked.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/locked.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/meta.json
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/opening.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/opening.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/opening.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/opening_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/opening_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/opening_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/panel_closing.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/panel_closing.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/panel_closing.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/panel_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/panel_open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/panel_open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/panel_opening.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/panel_opening.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/panel_opening.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/welded.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/welded.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/welded.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/welded_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/welded_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/welded_open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/welded_open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/assembly.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/assembly.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/assembly.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/bolted_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/bolted_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/bolted_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closed.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/closed.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closed.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closed_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/closed_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closed_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closing.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/closing.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closing.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closing_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/closing_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closing_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/deny_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/deny_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/deny_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/locked.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/locked.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/locked.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/meta.json
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/opening.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/opening.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/opening.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/opening_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/opening_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/opening_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/panel_closing.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/panel_closing.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/panel_closing.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/panel_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/panel_open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/panel_open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/panel_opening.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/panel_opening.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/panel_opening.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/spark.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/spark.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/spark.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/spark.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/sparks_broken.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/sparks_broken.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/sparks_broken.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/sparks_damaged.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/sparks_damaged.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/sparks_damaged.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/sparks_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/sparks_open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/sparks_open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/welded.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/welded.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/welded.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/assembly.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/assembly.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/assembly.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/bolted_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/bolted_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/bolted_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closed.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/closed.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closed.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closed_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/closed_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closed_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closing.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/closing.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closing.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closing_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/closing_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closing_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/deny_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/deny_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/deny_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/locked.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/locked.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/locked.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/meta.json
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/opening.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/opening.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/opening.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/opening_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/opening_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/opening_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/panel_closing.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/panel_closing.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/panel_closing.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/panel_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/panel_open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/panel_open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/panel_opening.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/panel_opening.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/panel_opening.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/spark.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/spark.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/spark.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/spark.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/sparks_broken.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/sparks_broken.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/sparks_broken.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/sparks_damaged.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/sparks_damaged.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/sparks_damaged.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/sparks_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/sparks_open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/sparks_open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/welded.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/welded.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/welded.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/assembly.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/assembly.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/assembly.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/bolted_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/bolted_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/bolted_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closed.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/closed.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closed.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closed_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/closed_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closed_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closing.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/closing.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closing.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closing_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/closing_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closing_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/deny_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/deny_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/deny_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/locked.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/locked.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/locked.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/meta.json
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/opening.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/opening.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/opening.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/opening_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/opening_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/opening_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/panel_closing.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/panel_closing.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/panel_closing.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/panel_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/panel_open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/panel_open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/panel_opening.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/panel_opening.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/panel_opening.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/spark.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/spark.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/spark.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/spark.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/sparks_broken.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/sparks_broken.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/sparks_broken.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/sparks_damaged.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/sparks_damaged.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/sparks_damaged.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/sparks_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/sparks_open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/sparks_open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/welded.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/welded.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/welded.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/assembly.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/assembly.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/assembly.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/bolted_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/bolted_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/bolted_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closed.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/closed.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closed.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closed_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/closed_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closed_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closing.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/closing.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closing.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closing_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/closing_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closing_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/deny_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/deny_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/deny_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/locked.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/locked.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/locked.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/meta.json
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/opening.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/opening.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/opening.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/opening_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/opening_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/opening_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/panel_closing.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/panel_closing.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/panel_closing.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/panel_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/panel_open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/panel_open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/panel_opening.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/panel_opening.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/panel_opening.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/spark.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/spark.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/spark.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/spark.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/sparks_broken.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/sparks_broken.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/sparks_broken.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/sparks_damaged.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/sparks_damaged.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/sparks_damaged.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/sparks_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/sparks_open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/sparks_open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/welded.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/welded.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/welded.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/assembly.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/assembly.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/assembly.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/bolted_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/bolted_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/bolted_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closed.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/closed.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closed.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closed_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/closed_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closed_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closing.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/closing.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closing.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closing_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/closing_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closing_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/deny_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/deny_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/deny_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/locked.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/locked.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/locked.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/meta.json
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/opening.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/opening.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/opening.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/opening_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/opening_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/opening_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/panel_closing.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/panel_closing.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/panel_closing.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/panel_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/panel_open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/panel_open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/panel_opening.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/panel_opening.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/panel_opening.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/spark.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/spark.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/spark.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/spark.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/sparks_broken.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/sparks_broken.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/sparks_broken.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/sparks_damaged.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/sparks_damaged.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/sparks_damaged.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/sparks_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/sparks_open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/sparks_open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/welded.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/welded.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/welded.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/assembly.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/assembly.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/assembly.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/bolted_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/bolted_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/bolted_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closed.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/closed.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closed.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closed_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/closed_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closed_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closing.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/closing.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closing.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closing_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/closing_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closing_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/deny_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/deny_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/deny_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/locked.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/locked.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/locked.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/meta.json
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/opening.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/opening.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/opening.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/opening_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/opening_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/opening_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/panel_closing.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/panel_closing.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/panel_closing.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/panel_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/panel_open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/panel_open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/panel_opening.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/panel_opening.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/panel_opening.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/spark.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/spark.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/spark.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/spark.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/sparks_broken.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/sparks_broken.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/sparks_broken.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/sparks_damaged.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/sparks_damaged.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/sparks_damaged.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/sparks_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/sparks_open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/sparks_open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/welded.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/welded.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/welded.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/assembly.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/assembly.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/assembly.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/bolted_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/bolted_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/bolted_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closed.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/closed.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closed.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closed_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/closed_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closed_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closing.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/closing.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closing.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closing_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/closing_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closing_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/deny_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/deny_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/deny_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/locked.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/locked.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/locked.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/meta.json
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/opening.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/opening.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/opening.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/opening_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/opening_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/opening_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/panel_closing.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/panel_closing.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/panel_closing.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/panel_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/panel_open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/panel_open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/panel_opening.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/panel_opening.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/panel_opening.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/spark.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/spark.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/spark.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/spark.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/sparks_broken.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/sparks_broken.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/sparks_broken.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/sparks_damaged.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/sparks_damaged.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/sparks_damaged.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/sparks_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/sparks_open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/sparks_open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/welded.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/welded.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/welded.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/assembly.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/assembly.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/assembly.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/bolted_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/bolted_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/bolted_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closed.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/closed.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closed.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closed_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/closed_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closed_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closing.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/closing.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closing.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closing_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/closing_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closing_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/deny_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/deny_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/deny_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/locked.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/locked.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/locked.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/meta.json
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/opening.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/opening.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/opening.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/opening_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/opening_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/opening_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/panel_closing.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/panel_closing.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/panel_closing.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/panel_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/panel_open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/panel_open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/panel_opening.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/panel_opening.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/panel_opening.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/spark.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/spark.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/spark.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/spark.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/sparks_broken.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/sparks_broken.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/sparks_broken.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/sparks_damaged.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/sparks_damaged.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/sparks_damaged.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/sparks_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/sparks_open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/sparks_open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/welded.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/welded.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/welded.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/bolted_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/bolted_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/bolted_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closed.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/closed.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closed.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closed_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/closed_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closed_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closing.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/closing.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closing.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closing_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/closing_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closing_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/deny_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/deny_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/deny_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/locked.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/locked.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/locked.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/meta.json
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/opening.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/opening.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/opening.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/opening_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/opening_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/opening_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/panel_closing.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/panel_closing.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/panel_closing.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/panel_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/panel_open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/panel_open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/panel_opening.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/panel_opening.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/panel_opening.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/spark.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/spark.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/spark.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/spark.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/sparks_broken.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/sparks_broken.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/sparks_broken.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/sparks_damaged.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/sparks_damaged.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/sparks_damaged.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/sparks_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/sparks_open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/sparks_open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/welded.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/welded.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/welded.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/assembly.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/assembly.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/assembly.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/bolted_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/bolted_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/bolted_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closed.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/closed.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closed.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closed_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/closed_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closed_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closing.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/closing.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closing.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closing_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/closing_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closing_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/deny.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/deny.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/deny.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/deny.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/deny_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/deny_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/deny_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/frame1.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame1.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/frame1.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame1.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/frame2.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame2.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/frame2.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame2.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/frame3.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame3.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/frame3.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame3.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/frame4.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame4.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/frame4.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame4.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/locked.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/locked.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/locked.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/meta.json
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/opening.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/opening.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/opening.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/opening_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/opening_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/opening_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/panel_closing.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/panel_closing.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/panel_closing.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/panel_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/panel_open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/panel_open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/panel_opening.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/panel_opening.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/panel_opening.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/welded.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/welded.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/welded.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/welded_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/welded_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/welded_open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/welded_open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/assembly.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/assembly.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/assembly.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/bolted_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/bolted_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/bolted_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closed.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/closed.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closed.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closed_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/closed_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closed_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closing.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/closing.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closing.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closing_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/closing_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closing_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/deny_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/deny_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/deny_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/locked.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/locked.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/locked.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/meta.json
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/opening.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/opening.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/opening.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/opening_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/opening_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/opening_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/panel_closing.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/panel_closing.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/panel_closing.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/panel_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/panel_open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/panel_open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/panel_opening.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/panel_opening.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/panel_opening.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/spark.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/spark.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/spark.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/spark.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/sparks_broken.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/sparks_broken.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/sparks_broken.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/sparks_damaged.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/sparks_damaged.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/sparks_damaged.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/sparks_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/sparks_open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/sparks_open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/welded.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/welded.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/welded.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/assembly.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/assembly.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/assembly.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/bolted_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/bolted_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/bolted_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closed.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/closed.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closed.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closed_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/closed_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closed_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closing.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/closing.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closing.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closing_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/closing_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closing_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/deny_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/deny_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/deny_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/locked.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/locked.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/locked.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/meta.json
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/opening.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/opening.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/opening.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/opening_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/opening_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/opening_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/panel_closing.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/panel_closing.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/panel_closing.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/panel_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/panel_open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/panel_open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/panel_opening.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/panel_opening.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/panel_opening.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/spark.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/spark.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/spark.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/spark.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/sparks_broken.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/sparks_broken.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/sparks_broken.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/sparks_damaged.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/sparks_damaged.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/sparks_damaged.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/sparks_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/sparks_open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/sparks_open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/welded.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/welded.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/welded.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/assembly.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/assembly.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/assembly.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/bolted_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/bolted_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/bolted_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closed.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/closed.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closed.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closed_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/closed_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closed_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closing.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/closing.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closing.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closing_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/closing_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closing_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/deny_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/deny_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/deny_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/locked.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/locked.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/locked.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/meta.json
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/opening.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/opening.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/opening.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/opening_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/opening_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/opening_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/panel_closing.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/panel_closing.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/panel_closing.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/panel_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/panel_open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/panel_open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/panel_opening.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/panel_opening.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/panel_opening.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/spark.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/spark.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/spark.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/spark.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/sparks_broken.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/sparks_broken.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/sparks_broken.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/sparks_damaged.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/sparks_damaged.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/sparks_damaged.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/sparks_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/sparks_open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/sparks_open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/welded.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/welded.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/welded.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/assembly.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/assembly.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/assembly.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/bolted_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/bolted_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/bolted_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closed.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/closed.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closed.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closed_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/closed_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closed_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closing.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/closing.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closing.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closing_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/closing_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closing_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/deny_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/deny_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/deny_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/locked.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/locked.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/locked.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/meta.json
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/opening.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/opening.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/opening.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/opening_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/opening_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/opening_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/panel_closing.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/panel_closing.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/panel_closing.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/panel_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/panel_open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/panel_open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/panel_opening.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/panel_opening.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/panel_opening.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/spark.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/spark.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/spark.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/spark.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/sparks_broken.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/sparks_broken.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/sparks_broken.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/sparks_damaged.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/sparks_damaged.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/sparks_damaged.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/sparks_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/sparks_open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/sparks_open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/welded.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/welded.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/welded.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/assembly.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/assembly.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/assembly.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/bolted_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/bolted_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/bolted_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closed.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/closed.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closed.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closed_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/closed_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closed_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closing.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/closing.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closing.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closing_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/closing_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closing_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/deny_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/deny_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/deny_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/locked.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/locked.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/locked.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/meta.json
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/opening.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/opening.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/opening.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/opening_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/opening_unlit.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/opening_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/panel_closing.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/panel_closing.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/panel_closing.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/panel_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/panel_open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/panel_open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/panel_opening.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/panel_opening.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/panel_opening.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/spark.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/spark.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/spark.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/spark.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/sparks_broken.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/sparks_broken.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/sparks_broken.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/sparks_damaged.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/sparks_damaged.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/sparks_damaged.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/sparks_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/sparks_open.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/sparks_open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/welded.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/welded.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/welded.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/assembly.rsi/assembly_0.png b/Resources/Textures/Structures/Doors/assembly.rsi/assembly_0.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/assembly.rsi/assembly_0.png
rename to Resources/Textures/Structures/Doors/assembly.rsi/assembly_0.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/assembly.rsi/assembly_1.png b/Resources/Textures/Structures/Doors/assembly.rsi/assembly_1.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/assembly.rsi/assembly_1.png
rename to Resources/Textures/Structures/Doors/assembly.rsi/assembly_1.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/assembly.rsi/assembly_2.png b/Resources/Textures/Structures/Doors/assembly.rsi/assembly_2.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/assembly.rsi/assembly_2.png
rename to Resources/Textures/Structures/Doors/assembly.rsi/assembly_2.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/assembly.rsi/fire_0.png b/Resources/Textures/Structures/Doors/assembly.rsi/fire_0.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/assembly.rsi/fire_0.png
rename to Resources/Textures/Structures/Doors/assembly.rsi/fire_0.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/assembly.rsi/fire_1.png b/Resources/Textures/Structures/Doors/assembly.rsi/fire_1.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/assembly.rsi/fire_1.png
rename to Resources/Textures/Structures/Doors/assembly.rsi/fire_1.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/assembly.rsi/fire_2.png b/Resources/Textures/Structures/Doors/assembly.rsi/fire_2.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/assembly.rsi/fire_2.png
rename to Resources/Textures/Structures/Doors/assembly.rsi/fire_2.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/assembly.rsi/fire_3.png b/Resources/Textures/Structures/Doors/assembly.rsi/fire_3.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/assembly.rsi/fire_3.png
rename to Resources/Textures/Structures/Doors/assembly.rsi/fire_3.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/assembly.rsi/meta.json b/Resources/Textures/Structures/Doors/assembly.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/assembly.rsi/meta.json
rename to Resources/Textures/Structures/Doors/assembly.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/alert_cold.png b/Resources/Textures/Structures/Doors/edge_door_hazard.rsi/alert_cold.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/alert_cold.png
rename to Resources/Textures/Structures/Doors/edge_door_hazard.rsi/alert_cold.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/alert_hot.png b/Resources/Textures/Structures/Doors/edge_door_hazard.rsi/alert_hot.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/alert_hot.png
rename to Resources/Textures/Structures/Doors/edge_door_hazard.rsi/alert_hot.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/edge_door_hazard.rsi/bolted_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/bolted_unlit.png
rename to Resources/Textures/Structures/Doors/edge_door_hazard.rsi/bolted_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/closed.png b/Resources/Textures/Structures/Doors/edge_door_hazard.rsi/closed.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/closed.png
rename to Resources/Textures/Structures/Doors/edge_door_hazard.rsi/closed.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/edge_door_hazard.rsi/closed_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/closed_unlit.png
rename to Resources/Textures/Structures/Doors/edge_door_hazard.rsi/closed_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/closing.png b/Resources/Textures/Structures/Doors/edge_door_hazard.rsi/closing.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/closing.png
rename to Resources/Textures/Structures/Doors/edge_door_hazard.rsi/closing.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/edge_door_hazard.rsi/closing_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/closing_unlit.png
rename to Resources/Textures/Structures/Doors/edge_door_hazard.rsi/closing_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/deny.png b/Resources/Textures/Structures/Doors/edge_door_hazard.rsi/deny.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/deny.png
rename to Resources/Textures/Structures/Doors/edge_door_hazard.rsi/deny.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/edge_door_hazard.rsi/deny_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/deny_unlit.png
rename to Resources/Textures/Structures/Doors/edge_door_hazard.rsi/deny_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/door_spark.png b/Resources/Textures/Structures/Doors/edge_door_hazard.rsi/door_spark.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/door_spark.png
rename to Resources/Textures/Structures/Doors/edge_door_hazard.rsi/door_spark.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/locked.png b/Resources/Textures/Structures/Doors/edge_door_hazard.rsi/locked.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/locked.png
rename to Resources/Textures/Structures/Doors/edge_door_hazard.rsi/locked.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/meta.json b/Resources/Textures/Structures/Doors/edge_door_hazard.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/meta.json
rename to Resources/Textures/Structures/Doors/edge_door_hazard.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/open.png b/Resources/Textures/Structures/Doors/edge_door_hazard.rsi/open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/open.png
rename to Resources/Textures/Structures/Doors/edge_door_hazard.rsi/open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/opening.png b/Resources/Textures/Structures/Doors/edge_door_hazard.rsi/opening.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/opening.png
rename to Resources/Textures/Structures/Doors/edge_door_hazard.rsi/opening.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/edge_door_hazard.rsi/opening_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/opening_unlit.png
rename to Resources/Textures/Structures/Doors/edge_door_hazard.rsi/opening_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/palert.png b/Resources/Textures/Structures/Doors/edge_door_hazard.rsi/palert.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/palert.png
rename to Resources/Textures/Structures/Doors/edge_door_hazard.rsi/palert.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/edge_door_hazard.rsi/panel_closing.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/panel_closing.png
rename to Resources/Textures/Structures/Doors/edge_door_hazard.rsi/panel_closing.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/panel_open.png b/Resources/Textures/Structures/Doors/edge_door_hazard.rsi/panel_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/panel_open.png
rename to Resources/Textures/Structures/Doors/edge_door_hazard.rsi/panel_open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/edge_door_hazard.rsi/panel_opening.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/panel_opening.png
rename to Resources/Textures/Structures/Doors/edge_door_hazard.rsi/panel_opening.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/welded.png b/Resources/Textures/Structures/Doors/edge_door_hazard.rsi/welded.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/welded.png
rename to Resources/Textures/Structures/Doors/edge_door_hazard.rsi/welded.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/welded_open.png b/Resources/Textures/Structures/Doors/edge_door_hazard.rsi/welded_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/welded_open.png
rename to Resources/Textures/Structures/Doors/edge_door_hazard.rsi/welded_open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/effects.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/effects.rsi/bolted_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/effects.rsi/bolted_unlit.png
rename to Resources/Textures/Structures/Doors/effects.rsi/bolted_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/effects.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/effects.rsi/closed_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/effects.rsi/closed_unlit.png
rename to Resources/Textures/Structures/Doors/effects.rsi/closed_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/effects.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/effects.rsi/closing_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/effects.rsi/closing_unlit.png
rename to Resources/Textures/Structures/Doors/effects.rsi/closing_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/effects.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/effects.rsi/deny_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/effects.rsi/deny_unlit.png
rename to Resources/Textures/Structures/Doors/effects.rsi/deny_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/effects.rsi/meta.json b/Resources/Textures/Structures/Doors/effects.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/effects.rsi/meta.json
rename to Resources/Textures/Structures/Doors/effects.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Doors/effects.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/effects.rsi/opening_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/effects.rsi/opening_unlit.png
rename to Resources/Textures/Structures/Doors/effects.rsi/opening_unlit.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/effects.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/effects.rsi/panel_closing.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/effects.rsi/panel_closing.png
rename to Resources/Textures/Structures/Doors/effects.rsi/panel_closing.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/effects.rsi/panel_open.png b/Resources/Textures/Structures/Doors/effects.rsi/panel_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/effects.rsi/panel_open.png
rename to Resources/Textures/Structures/Doors/effects.rsi/panel_open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/effects.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/effects.rsi/panel_opening.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/effects.rsi/panel_opening.png
rename to Resources/Textures/Structures/Doors/effects.rsi/panel_opening.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/effects.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/effects.rsi/sparks_broken.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/effects.rsi/sparks_broken.png
rename to Resources/Textures/Structures/Doors/effects.rsi/sparks_broken.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/effects.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/effects.rsi/sparks_damaged.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/effects.rsi/sparks_damaged.png
rename to Resources/Textures/Structures/Doors/effects.rsi/sparks_damaged.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/effects.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/effects.rsi/sparks_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/effects.rsi/sparks_open.png
rename to Resources/Textures/Structures/Doors/effects.rsi/sparks_open.png
diff --git a/Resources/Textures/Constructible/Structures/Doors/effects.rsi/welded.png b/Resources/Textures/Structures/Doors/effects.rsi/welded.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Doors/effects.rsi/welded.png
rename to Resources/Textures/Structures/Doors/effects.rsi/welded.png
diff --git a/Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_0.png b/Resources/Textures/Structures/Furniture/Carpets/black_carpet.rsi/carpet_0.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_0.png
rename to Resources/Textures/Structures/Furniture/Carpets/black_carpet.rsi/carpet_0.png
diff --git a/Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_1.png b/Resources/Textures/Structures/Furniture/Carpets/black_carpet.rsi/carpet_1.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_1.png
rename to Resources/Textures/Structures/Furniture/Carpets/black_carpet.rsi/carpet_1.png
diff --git a/Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_2.png b/Resources/Textures/Structures/Furniture/Carpets/black_carpet.rsi/carpet_2.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_2.png
rename to Resources/Textures/Structures/Furniture/Carpets/black_carpet.rsi/carpet_2.png
diff --git a/Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_3.png b/Resources/Textures/Structures/Furniture/Carpets/black_carpet.rsi/carpet_3.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_3.png
rename to Resources/Textures/Structures/Furniture/Carpets/black_carpet.rsi/carpet_3.png
diff --git a/Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_4.png b/Resources/Textures/Structures/Furniture/Carpets/black_carpet.rsi/carpet_4.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_4.png
rename to Resources/Textures/Structures/Furniture/Carpets/black_carpet.rsi/carpet_4.png
diff --git a/Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_5.png b/Resources/Textures/Structures/Furniture/Carpets/black_carpet.rsi/carpet_5.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_5.png
rename to Resources/Textures/Structures/Furniture/Carpets/black_carpet.rsi/carpet_5.png
diff --git a/Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_6.png b/Resources/Textures/Structures/Furniture/Carpets/black_carpet.rsi/carpet_6.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_6.png
rename to Resources/Textures/Structures/Furniture/Carpets/black_carpet.rsi/carpet_6.png
diff --git a/Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_7.png b/Resources/Textures/Structures/Furniture/Carpets/black_carpet.rsi/carpet_7.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_7.png
rename to Resources/Textures/Structures/Furniture/Carpets/black_carpet.rsi/carpet_7.png
diff --git a/Resources/Textures/Constructible/Carpets/black_carpet.rsi/full.png b/Resources/Textures/Structures/Furniture/Carpets/black_carpet.rsi/full.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/black_carpet.rsi/full.png
rename to Resources/Textures/Structures/Furniture/Carpets/black_carpet.rsi/full.png
diff --git a/Resources/Textures/Constructible/Carpets/black_carpet.rsi/meta.json b/Resources/Textures/Structures/Furniture/Carpets/black_carpet.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/black_carpet.rsi/meta.json
rename to Resources/Textures/Structures/Furniture/Carpets/black_carpet.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_0.png b/Resources/Textures/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_0.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_0.png
rename to Resources/Textures/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_0.png
diff --git a/Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_1.png b/Resources/Textures/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_1.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_1.png
rename to Resources/Textures/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_1.png
diff --git a/Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_2.png b/Resources/Textures/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_2.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_2.png
rename to Resources/Textures/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_2.png
diff --git a/Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_3.png b/Resources/Textures/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_3.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_3.png
rename to Resources/Textures/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_3.png
diff --git a/Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_4.png b/Resources/Textures/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_4.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_4.png
rename to Resources/Textures/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_4.png
diff --git a/Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_5.png b/Resources/Textures/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_5.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_5.png
rename to Resources/Textures/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_5.png
diff --git a/Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_6.png b/Resources/Textures/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_6.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_6.png
rename to Resources/Textures/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_6.png
diff --git a/Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_7.png b/Resources/Textures/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_7.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_7.png
rename to Resources/Textures/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_7.png
diff --git a/Resources/Textures/Constructible/Carpets/blue_carpet.rsi/full.png b/Resources/Textures/Structures/Furniture/Carpets/blue_carpet.rsi/full.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/blue_carpet.rsi/full.png
rename to Resources/Textures/Structures/Furniture/Carpets/blue_carpet.rsi/full.png
diff --git a/Resources/Textures/Constructible/Carpets/blue_carpet.rsi/meta.json b/Resources/Textures/Structures/Furniture/Carpets/blue_carpet.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/blue_carpet.rsi/meta.json
rename to Resources/Textures/Structures/Furniture/Carpets/blue_carpet.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_0.png b/Resources/Textures/Structures/Furniture/Carpets/gay_carpet.rsi/carpet_0.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_0.png
rename to Resources/Textures/Structures/Furniture/Carpets/gay_carpet.rsi/carpet_0.png
diff --git a/Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_1.png b/Resources/Textures/Structures/Furniture/Carpets/gay_carpet.rsi/carpet_1.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_1.png
rename to Resources/Textures/Structures/Furniture/Carpets/gay_carpet.rsi/carpet_1.png
diff --git a/Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_2.png b/Resources/Textures/Structures/Furniture/Carpets/gay_carpet.rsi/carpet_2.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_2.png
rename to Resources/Textures/Structures/Furniture/Carpets/gay_carpet.rsi/carpet_2.png
diff --git a/Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_3.png b/Resources/Textures/Structures/Furniture/Carpets/gay_carpet.rsi/carpet_3.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_3.png
rename to Resources/Textures/Structures/Furniture/Carpets/gay_carpet.rsi/carpet_3.png
diff --git a/Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_4.png b/Resources/Textures/Structures/Furniture/Carpets/gay_carpet.rsi/carpet_4.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_4.png
rename to Resources/Textures/Structures/Furniture/Carpets/gay_carpet.rsi/carpet_4.png
diff --git a/Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_5.png b/Resources/Textures/Structures/Furniture/Carpets/gay_carpet.rsi/carpet_5.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_5.png
rename to Resources/Textures/Structures/Furniture/Carpets/gay_carpet.rsi/carpet_5.png
diff --git a/Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_6.png b/Resources/Textures/Structures/Furniture/Carpets/gay_carpet.rsi/carpet_6.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_6.png
rename to Resources/Textures/Structures/Furniture/Carpets/gay_carpet.rsi/carpet_6.png
diff --git a/Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_7.png b/Resources/Textures/Structures/Furniture/Carpets/gay_carpet.rsi/carpet_7.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_7.png
rename to Resources/Textures/Structures/Furniture/Carpets/gay_carpet.rsi/carpet_7.png
diff --git a/Resources/Textures/Constructible/Carpets/gay_carpet.rsi/full.png b/Resources/Textures/Structures/Furniture/Carpets/gay_carpet.rsi/full.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/gay_carpet.rsi/full.png
rename to Resources/Textures/Structures/Furniture/Carpets/gay_carpet.rsi/full.png
diff --git a/Resources/Textures/Constructible/Carpets/gay_carpet.rsi/meta.json b/Resources/Textures/Structures/Furniture/Carpets/gay_carpet.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/gay_carpet.rsi/meta.json
rename to Resources/Textures/Structures/Furniture/Carpets/gay_carpet.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_0.png b/Resources/Textures/Structures/Furniture/Carpets/green_carpet.rsi/carpet_0.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_0.png
rename to Resources/Textures/Structures/Furniture/Carpets/green_carpet.rsi/carpet_0.png
diff --git a/Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_1.png b/Resources/Textures/Structures/Furniture/Carpets/green_carpet.rsi/carpet_1.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_1.png
rename to Resources/Textures/Structures/Furniture/Carpets/green_carpet.rsi/carpet_1.png
diff --git a/Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_2.png b/Resources/Textures/Structures/Furniture/Carpets/green_carpet.rsi/carpet_2.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_2.png
rename to Resources/Textures/Structures/Furniture/Carpets/green_carpet.rsi/carpet_2.png
diff --git a/Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_3.png b/Resources/Textures/Structures/Furniture/Carpets/green_carpet.rsi/carpet_3.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_3.png
rename to Resources/Textures/Structures/Furniture/Carpets/green_carpet.rsi/carpet_3.png
diff --git a/Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_4.png b/Resources/Textures/Structures/Furniture/Carpets/green_carpet.rsi/carpet_4.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_4.png
rename to Resources/Textures/Structures/Furniture/Carpets/green_carpet.rsi/carpet_4.png
diff --git a/Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_5.png b/Resources/Textures/Structures/Furniture/Carpets/green_carpet.rsi/carpet_5.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_5.png
rename to Resources/Textures/Structures/Furniture/Carpets/green_carpet.rsi/carpet_5.png
diff --git a/Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_6.png b/Resources/Textures/Structures/Furniture/Carpets/green_carpet.rsi/carpet_6.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_6.png
rename to Resources/Textures/Structures/Furniture/Carpets/green_carpet.rsi/carpet_6.png
diff --git a/Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_7.png b/Resources/Textures/Structures/Furniture/Carpets/green_carpet.rsi/carpet_7.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_7.png
rename to Resources/Textures/Structures/Furniture/Carpets/green_carpet.rsi/carpet_7.png
diff --git a/Resources/Textures/Constructible/Carpets/green_carpet.rsi/full.png b/Resources/Textures/Structures/Furniture/Carpets/green_carpet.rsi/full.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/green_carpet.rsi/full.png
rename to Resources/Textures/Structures/Furniture/Carpets/green_carpet.rsi/full.png
diff --git a/Resources/Textures/Constructible/Carpets/green_carpet.rsi/meta.json b/Resources/Textures/Structures/Furniture/Carpets/green_carpet.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/green_carpet.rsi/meta.json
rename to Resources/Textures/Structures/Furniture/Carpets/green_carpet.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_0.png b/Resources/Textures/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_0.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_0.png
rename to Resources/Textures/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_0.png
diff --git a/Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_1.png b/Resources/Textures/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_1.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_1.png
rename to Resources/Textures/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_1.png
diff --git a/Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_2.png b/Resources/Textures/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_2.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_2.png
rename to Resources/Textures/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_2.png
diff --git a/Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_3.png b/Resources/Textures/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_3.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_3.png
rename to Resources/Textures/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_3.png
diff --git a/Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_4.png b/Resources/Textures/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_4.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_4.png
rename to Resources/Textures/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_4.png
diff --git a/Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_5.png b/Resources/Textures/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_5.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_5.png
rename to Resources/Textures/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_5.png
diff --git a/Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_6.png b/Resources/Textures/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_6.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_6.png
rename to Resources/Textures/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_6.png
diff --git a/Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_7.png b/Resources/Textures/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_7.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_7.png
rename to Resources/Textures/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_7.png
diff --git a/Resources/Textures/Constructible/Carpets/orange_carpet.rsi/full.png b/Resources/Textures/Structures/Furniture/Carpets/orange_carpet.rsi/full.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/orange_carpet.rsi/full.png
rename to Resources/Textures/Structures/Furniture/Carpets/orange_carpet.rsi/full.png
diff --git a/Resources/Textures/Constructible/Carpets/orange_carpet.rsi/meta.json b/Resources/Textures/Structures/Furniture/Carpets/orange_carpet.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/orange_carpet.rsi/meta.json
rename to Resources/Textures/Structures/Furniture/Carpets/orange_carpet.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_0.png b/Resources/Textures/Structures/Furniture/Carpets/purple_carpet.rsi/carpet_0.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_0.png
rename to Resources/Textures/Structures/Furniture/Carpets/purple_carpet.rsi/carpet_0.png
diff --git a/Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_1.png b/Resources/Textures/Structures/Furniture/Carpets/purple_carpet.rsi/carpet_1.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_1.png
rename to Resources/Textures/Structures/Furniture/Carpets/purple_carpet.rsi/carpet_1.png
diff --git a/Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_2.png b/Resources/Textures/Structures/Furniture/Carpets/purple_carpet.rsi/carpet_2.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_2.png
rename to Resources/Textures/Structures/Furniture/Carpets/purple_carpet.rsi/carpet_2.png
diff --git a/Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_3.png b/Resources/Textures/Structures/Furniture/Carpets/purple_carpet.rsi/carpet_3.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_3.png
rename to Resources/Textures/Structures/Furniture/Carpets/purple_carpet.rsi/carpet_3.png
diff --git a/Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_4.png b/Resources/Textures/Structures/Furniture/Carpets/purple_carpet.rsi/carpet_4.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_4.png
rename to Resources/Textures/Structures/Furniture/Carpets/purple_carpet.rsi/carpet_4.png
diff --git a/Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_5.png b/Resources/Textures/Structures/Furniture/Carpets/purple_carpet.rsi/carpet_5.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_5.png
rename to Resources/Textures/Structures/Furniture/Carpets/purple_carpet.rsi/carpet_5.png
diff --git a/Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_6.png b/Resources/Textures/Structures/Furniture/Carpets/purple_carpet.rsi/carpet_6.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_6.png
rename to Resources/Textures/Structures/Furniture/Carpets/purple_carpet.rsi/carpet_6.png
diff --git a/Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_7.png b/Resources/Textures/Structures/Furniture/Carpets/purple_carpet.rsi/carpet_7.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_7.png
rename to Resources/Textures/Structures/Furniture/Carpets/purple_carpet.rsi/carpet_7.png
diff --git a/Resources/Textures/Constructible/Carpets/purple_carpet.rsi/full.png b/Resources/Textures/Structures/Furniture/Carpets/purple_carpet.rsi/full.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/purple_carpet.rsi/full.png
rename to Resources/Textures/Structures/Furniture/Carpets/purple_carpet.rsi/full.png
diff --git a/Resources/Textures/Constructible/Carpets/purple_carpet.rsi/meta.json b/Resources/Textures/Structures/Furniture/Carpets/purple_carpet.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/purple_carpet.rsi/meta.json
rename to Resources/Textures/Structures/Furniture/Carpets/purple_carpet.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_0.png b/Resources/Textures/Structures/Furniture/Carpets/red_carpet.rsi/carpet_0.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_0.png
rename to Resources/Textures/Structures/Furniture/Carpets/red_carpet.rsi/carpet_0.png
diff --git a/Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_1.png b/Resources/Textures/Structures/Furniture/Carpets/red_carpet.rsi/carpet_1.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_1.png
rename to Resources/Textures/Structures/Furniture/Carpets/red_carpet.rsi/carpet_1.png
diff --git a/Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_2.png b/Resources/Textures/Structures/Furniture/Carpets/red_carpet.rsi/carpet_2.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_2.png
rename to Resources/Textures/Structures/Furniture/Carpets/red_carpet.rsi/carpet_2.png
diff --git a/Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_3.png b/Resources/Textures/Structures/Furniture/Carpets/red_carpet.rsi/carpet_3.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_3.png
rename to Resources/Textures/Structures/Furniture/Carpets/red_carpet.rsi/carpet_3.png
diff --git a/Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_4.png b/Resources/Textures/Structures/Furniture/Carpets/red_carpet.rsi/carpet_4.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_4.png
rename to Resources/Textures/Structures/Furniture/Carpets/red_carpet.rsi/carpet_4.png
diff --git a/Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_5.png b/Resources/Textures/Structures/Furniture/Carpets/red_carpet.rsi/carpet_5.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_5.png
rename to Resources/Textures/Structures/Furniture/Carpets/red_carpet.rsi/carpet_5.png
diff --git a/Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_6.png b/Resources/Textures/Structures/Furniture/Carpets/red_carpet.rsi/carpet_6.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_6.png
rename to Resources/Textures/Structures/Furniture/Carpets/red_carpet.rsi/carpet_6.png
diff --git a/Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_7.png b/Resources/Textures/Structures/Furniture/Carpets/red_carpet.rsi/carpet_7.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_7.png
rename to Resources/Textures/Structures/Furniture/Carpets/red_carpet.rsi/carpet_7.png
diff --git a/Resources/Textures/Constructible/Carpets/red_carpet.rsi/full.png b/Resources/Textures/Structures/Furniture/Carpets/red_carpet.rsi/full.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/red_carpet.rsi/full.png
rename to Resources/Textures/Structures/Furniture/Carpets/red_carpet.rsi/full.png
diff --git a/Resources/Textures/Constructible/Carpets/red_carpet.rsi/meta.json b/Resources/Textures/Structures/Furniture/Carpets/red_carpet.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/red_carpet.rsi/meta.json
rename to Resources/Textures/Structures/Furniture/Carpets/red_carpet.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_0.png b/Resources/Textures/Structures/Furniture/Carpets/skyblue_carpet.rsi/carpet_0.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_0.png
rename to Resources/Textures/Structures/Furniture/Carpets/skyblue_carpet.rsi/carpet_0.png
diff --git a/Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_1.png b/Resources/Textures/Structures/Furniture/Carpets/skyblue_carpet.rsi/carpet_1.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_1.png
rename to Resources/Textures/Structures/Furniture/Carpets/skyblue_carpet.rsi/carpet_1.png
diff --git a/Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_2.png b/Resources/Textures/Structures/Furniture/Carpets/skyblue_carpet.rsi/carpet_2.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_2.png
rename to Resources/Textures/Structures/Furniture/Carpets/skyblue_carpet.rsi/carpet_2.png
diff --git a/Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_3.png b/Resources/Textures/Structures/Furniture/Carpets/skyblue_carpet.rsi/carpet_3.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_3.png
rename to Resources/Textures/Structures/Furniture/Carpets/skyblue_carpet.rsi/carpet_3.png
diff --git a/Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_4.png b/Resources/Textures/Structures/Furniture/Carpets/skyblue_carpet.rsi/carpet_4.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_4.png
rename to Resources/Textures/Structures/Furniture/Carpets/skyblue_carpet.rsi/carpet_4.png
diff --git a/Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_5.png b/Resources/Textures/Structures/Furniture/Carpets/skyblue_carpet.rsi/carpet_5.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_5.png
rename to Resources/Textures/Structures/Furniture/Carpets/skyblue_carpet.rsi/carpet_5.png
diff --git a/Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_6.png b/Resources/Textures/Structures/Furniture/Carpets/skyblue_carpet.rsi/carpet_6.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_6.png
rename to Resources/Textures/Structures/Furniture/Carpets/skyblue_carpet.rsi/carpet_6.png
diff --git a/Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_7.png b/Resources/Textures/Structures/Furniture/Carpets/skyblue_carpet.rsi/carpet_7.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_7.png
rename to Resources/Textures/Structures/Furniture/Carpets/skyblue_carpet.rsi/carpet_7.png
diff --git a/Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/full.png b/Resources/Textures/Structures/Furniture/Carpets/skyblue_carpet.rsi/full.png
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/full.png
rename to Resources/Textures/Structures/Furniture/Carpets/skyblue_carpet.rsi/full.png
diff --git a/Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/meta.json b/Resources/Textures/Structures/Furniture/Carpets/skyblue_carpet.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/meta.json
rename to Resources/Textures/Structures/Furniture/Carpets/skyblue_carpet.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Tables/bar.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/bar.rsi/full.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/bar.rsi/full.png
rename to Resources/Textures/Structures/Furniture/Tables/bar.rsi/full.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/bar.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/bar.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/bar.rsi/meta.json
rename to Resources/Textures/Structures/Furniture/Tables/bar.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_0.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_0.png
rename to Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_0.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_1.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_1.png
rename to Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_1.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_2.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_2.png
rename to Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_2.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_3.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_3.png
rename to Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_3.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_4.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_4.png
rename to Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_4.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_5.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_5.png
rename to Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_5.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_6.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_6.png
rename to Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_6.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_7.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_7.png
rename to Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_7.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/carpet.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/full.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/carpet.rsi/full.png
rename to Resources/Textures/Structures/Furniture/Tables/carpet.rsi/full.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/carpet.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/carpet.rsi/meta.json
rename to Resources/Textures/Structures/Furniture/Tables/carpet.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_0.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_0.png
rename to Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_0.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_1.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_1.png
rename to Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_1.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_2.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_2.png
rename to Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_2.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_3.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_3.png
rename to Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_3.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_4.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_4.png
rename to Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_4.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_5.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_5.png
rename to Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_5.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_6.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_6.png
rename to Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_6.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_7.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_7.png
rename to Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_7.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/debug.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/debug.rsi/full.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/debug.rsi/full.png
rename to Resources/Textures/Structures/Furniture/Tables/debug.rsi/full.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/debug.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/debug.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/debug.rsi/meta.json
rename to Resources/Textures/Structures/Furniture/Tables/debug.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/debug.rsi/state_0.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_0.png
rename to Resources/Textures/Structures/Furniture/Tables/debug.rsi/state_0.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/debug.rsi/state_1.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_1.png
rename to Resources/Textures/Structures/Furniture/Tables/debug.rsi/state_1.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/debug.rsi/state_2.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_2.png
rename to Resources/Textures/Structures/Furniture/Tables/debug.rsi/state_2.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/debug.rsi/state_3.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_3.png
rename to Resources/Textures/Structures/Furniture/Tables/debug.rsi/state_3.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/debug.rsi/state_4.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_4.png
rename to Resources/Textures/Structures/Furniture/Tables/debug.rsi/state_4.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/debug.rsi/state_5.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_5.png
rename to Resources/Textures/Structures/Furniture/Tables/debug.rsi/state_5.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/debug.rsi/state_6.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_6.png
rename to Resources/Textures/Structures/Furniture/Tables/debug.rsi/state_6.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/debug.rsi/state_7.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_7.png
rename to Resources/Textures/Structures/Furniture/Tables/debug.rsi/state_7.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/frame.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/frame.rsi/full.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/frame.rsi/full.png
rename to Resources/Textures/Structures/Furniture/Tables/frame.rsi/full.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/frame.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/frame.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/frame.rsi/meta.json
rename to Resources/Textures/Structures/Furniture/Tables/frame.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_0.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_0.png
rename to Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_0.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_1.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_1.png
rename to Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_1.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_2.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_2.png
rename to Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_2.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_3.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_3.png
rename to Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_3.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_4.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_4.png
rename to Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_4.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_5.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_5.png
rename to Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_5.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_6.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_6.png
rename to Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_6.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_7.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_7.png
rename to Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_7.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/generic.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/full.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/generic.rsi/full.png
rename to Resources/Textures/Structures/Furniture/Tables/generic.rsi/full.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/generic.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/generic.rsi/meta.json
rename to Resources/Textures/Structures/Furniture/Tables/generic.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Tables/generic.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_0.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/generic.rsi/state_0.png
rename to Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_0.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/generic.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_1.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/generic.rsi/state_1.png
rename to Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_1.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/generic.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_2.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/generic.rsi/state_2.png
rename to Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_2.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/generic.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_3.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/generic.rsi/state_3.png
rename to Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_3.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/generic.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_4.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/generic.rsi/state_4.png
rename to Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_4.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/generic.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_5.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/generic.rsi/state_5.png
rename to Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_5.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/generic.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_6.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/generic.rsi/state_6.png
rename to Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_6.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/generic.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_7.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/generic.rsi/state_7.png
rename to Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_7.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/glass.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/full.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/glass.rsi/full.png
rename to Resources/Textures/Structures/Furniture/Tables/glass.rsi/full.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/glass.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/glass.rsi/meta.json
rename to Resources/Textures/Structures/Furniture/Tables/glass.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_0.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_0.png
rename to Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_0.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_1.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_1.png
rename to Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_1.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_2.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_2.png
rename to Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_2.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_3.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_3.png
rename to Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_3.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_4.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_4.png
rename to Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_4.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_5.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_5.png
rename to Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_5.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_6.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_6.png
rename to Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_6.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_7.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_7.png
rename to Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_7.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/metal.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/metal.rsi/full.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/metal.rsi/full.png
rename to Resources/Textures/Structures/Furniture/Tables/metal.rsi/full.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/metal.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/metal.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/metal.rsi/meta.json
rename to Resources/Textures/Structures/Furniture/Tables/metal.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_0.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_0.png
rename to Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_0.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_1.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_1.png
rename to Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_1.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_2.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_2.png
rename to Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_2.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_3.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_3.png
rename to Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_3.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_4.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_4.png
rename to Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_4.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_5.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_5.png
rename to Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_5.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_6.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_6.png
rename to Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_6.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_7.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_7.png
rename to Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_7.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/full.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/full.png
rename to Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/full.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/meta.json
rename to Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_0.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_0.png
rename to Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_0.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_1.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_1.png
rename to Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_1.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_2.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_2.png
rename to Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_2.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_3.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_3.png
rename to Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_3.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_4.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_4.png
rename to Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_4.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_5.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_5.png
rename to Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_5.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_6.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_6.png
rename to Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_6.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_7.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_7.png
rename to Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_7.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/full.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/full.png
rename to Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/full.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/meta.json
rename to Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_0.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_0.png
rename to Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_0.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_1.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_1.png
rename to Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_1.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_2.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_2.png
rename to Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_2.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_3.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_3.png
rename to Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_3.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_4.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_4.png
rename to Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_4.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_5.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_5.png
rename to Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_5.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_6.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_6.png
rename to Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_6.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_7.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_7.png
rename to Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_7.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/stone.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/stone.rsi/full.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/stone.rsi/full.png
rename to Resources/Textures/Structures/Furniture/Tables/stone.rsi/full.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/stone.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/stone.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/stone.rsi/meta.json
rename to Resources/Textures/Structures/Furniture/Tables/stone.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/stone.rsi/state_0.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_0.png
rename to Resources/Textures/Structures/Furniture/Tables/stone.rsi/state_0.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/stone.rsi/state_1.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_1.png
rename to Resources/Textures/Structures/Furniture/Tables/stone.rsi/state_1.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/stone.rsi/state_2.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_2.png
rename to Resources/Textures/Structures/Furniture/Tables/stone.rsi/state_2.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/stone.rsi/state_3.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_3.png
rename to Resources/Textures/Structures/Furniture/Tables/stone.rsi/state_3.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/stone.rsi/state_4.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_4.png
rename to Resources/Textures/Structures/Furniture/Tables/stone.rsi/state_4.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/stone.rsi/state_5.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_5.png
rename to Resources/Textures/Structures/Furniture/Tables/stone.rsi/state_5.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/stone.rsi/state_6.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_6.png
rename to Resources/Textures/Structures/Furniture/Tables/stone.rsi/state_6.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/stone.rsi/state_7.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_7.png
rename to Resources/Textures/Structures/Furniture/Tables/stone.rsi/state_7.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/wood.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/full.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/wood.rsi/full.png
rename to Resources/Textures/Structures/Furniture/Tables/wood.rsi/full.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/wood.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/wood.rsi/meta.json
rename to Resources/Textures/Structures/Furniture/Tables/wood.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Tables/wood.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_0.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/wood.rsi/state_0.png
rename to Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_0.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/wood.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_1.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/wood.rsi/state_1.png
rename to Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_1.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/wood.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_2.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/wood.rsi/state_2.png
rename to Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_2.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/wood.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_3.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/wood.rsi/state_3.png
rename to Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_3.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/wood.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_4.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/wood.rsi/state_4.png
rename to Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_4.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/wood.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_5.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/wood.rsi/state_5.png
rename to Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_5.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/wood.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_6.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/wood.rsi/state_6.png
rename to Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_6.png
diff --git a/Resources/Textures/Constructible/Structures/Tables/wood.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_7.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Tables/wood.rsi/state_7.png
rename to Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_7.png
diff --git a/Resources/Textures/Constructible/Misc/bookshelf.rsi/base.png b/Resources/Textures/Structures/Furniture/bookshelf.rsi/base.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/bookshelf.rsi/base.png
rename to Resources/Textures/Structures/Furniture/bookshelf.rsi/base.png
diff --git a/Resources/Textures/Constructible/Misc/bookshelf.rsi/book-0.png b/Resources/Textures/Structures/Furniture/bookshelf.rsi/book-0.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/bookshelf.rsi/book-0.png
rename to Resources/Textures/Structures/Furniture/bookshelf.rsi/book-0.png
diff --git a/Resources/Textures/Constructible/Misc/bookshelf.rsi/book-1.png b/Resources/Textures/Structures/Furniture/bookshelf.rsi/book-1.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/bookshelf.rsi/book-1.png
rename to Resources/Textures/Structures/Furniture/bookshelf.rsi/book-1.png
diff --git a/Resources/Textures/Constructible/Misc/bookshelf.rsi/book-2.png b/Resources/Textures/Structures/Furniture/bookshelf.rsi/book-2.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/bookshelf.rsi/book-2.png
rename to Resources/Textures/Structures/Furniture/bookshelf.rsi/book-2.png
diff --git a/Resources/Textures/Constructible/Misc/bookshelf.rsi/book-3.png b/Resources/Textures/Structures/Furniture/bookshelf.rsi/book-3.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/bookshelf.rsi/book-3.png
rename to Resources/Textures/Structures/Furniture/bookshelf.rsi/book-3.png
diff --git a/Resources/Textures/Constructible/Misc/bookshelf.rsi/book-4.png b/Resources/Textures/Structures/Furniture/bookshelf.rsi/book-4.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/bookshelf.rsi/book-4.png
rename to Resources/Textures/Structures/Furniture/bookshelf.rsi/book-4.png
diff --git a/Resources/Textures/Constructible/Misc/bookshelf.rsi/book-5.png b/Resources/Textures/Structures/Furniture/bookshelf.rsi/book-5.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/bookshelf.rsi/book-5.png
rename to Resources/Textures/Structures/Furniture/bookshelf.rsi/book-5.png
diff --git a/Resources/Textures/Constructible/Misc/bookshelf.rsi/meta.json b/Resources/Textures/Structures/Furniture/bookshelf.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Misc/bookshelf.rsi/meta.json
rename to Resources/Textures/Structures/Furniture/bookshelf.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/armchair_preview.png b/Resources/Textures/Structures/Furniture/furniture.rsi/armchair_preview.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/furniture.rsi/armchair_preview.png
rename to Resources/Textures/Structures/Furniture/furniture.rsi/armchair_preview.png
diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/bar_chair.png b/Resources/Textures/Structures/Furniture/furniture.rsi/bar_chair.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/furniture.rsi/bar_chair.png
rename to Resources/Textures/Structures/Furniture/furniture.rsi/bar_chair.png
diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/bar_chair_over.png b/Resources/Textures/Structures/Furniture/furniture.rsi/bar_chair_over.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/furniture.rsi/bar_chair_over.png
rename to Resources/Textures/Structures/Furniture/furniture.rsi/bar_chair_over.png
diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/bar_stool.png b/Resources/Textures/Structures/Furniture/furniture.rsi/bar_stool.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/furniture.rsi/bar_stool.png
rename to Resources/Textures/Structures/Furniture/furniture.rsi/bar_stool.png
diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/bed.png b/Resources/Textures/Structures/Furniture/furniture.rsi/bed.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/furniture.rsi/bed.png
rename to Resources/Textures/Structures/Furniture/furniture.rsi/bed.png
diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/bed_padding.png b/Resources/Textures/Structures/Furniture/furniture.rsi/bed_padding.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/furniture.rsi/bed_padding.png
rename to Resources/Textures/Structures/Furniture/furniture.rsi/bed_padding.png
diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/chair.png b/Resources/Textures/Structures/Furniture/furniture.rsi/chair.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/furniture.rsi/chair.png
rename to Resources/Textures/Structures/Furniture/furniture.rsi/chair.png
diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/chair_armrest.png b/Resources/Textures/Structures/Furniture/furniture.rsi/chair_armrest.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/furniture.rsi/chair_armrest.png
rename to Resources/Textures/Structures/Furniture/furniture.rsi/chair_armrest.png
diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/chair_padding.png b/Resources/Textures/Structures/Furniture/furniture.rsi/chair_padding.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/furniture.rsi/chair_padding.png
rename to Resources/Textures/Structures/Furniture/furniture.rsi/chair_padding.png
diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/chair_padding_over.png b/Resources/Textures/Structures/Furniture/furniture.rsi/chair_padding_over.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/furniture.rsi/chair_padding_over.png
rename to Resources/Textures/Structures/Furniture/furniture.rsi/chair_padding_over.png
diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/chair_preview.png b/Resources/Textures/Structures/Furniture/furniture.rsi/chair_preview.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/furniture.rsi/chair_preview.png
rename to Resources/Textures/Structures/Furniture/furniture.rsi/chair_preview.png
diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/comfychair_preview.png b/Resources/Textures/Structures/Furniture/furniture.rsi/comfychair_preview.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/furniture.rsi/comfychair_preview.png
rename to Resources/Textures/Structures/Furniture/furniture.rsi/comfychair_preview.png
diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/meta.json b/Resources/Textures/Structures/Furniture/furniture.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Misc/furniture.rsi/meta.json
rename to Resources/Textures/Structures/Furniture/furniture.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/officechair_dark.png b/Resources/Textures/Structures/Furniture/furniture.rsi/officechair_dark.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/furniture.rsi/officechair_dark.png
rename to Resources/Textures/Structures/Furniture/furniture.rsi/officechair_dark.png
diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/officechair_white.png b/Resources/Textures/Structures/Furniture/furniture.rsi/officechair_white.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/furniture.rsi/officechair_white.png
rename to Resources/Textures/Structures/Furniture/furniture.rsi/officechair_white.png
diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/psychbed.png b/Resources/Textures/Structures/Furniture/furniture.rsi/psychbed.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/furniture.rsi/psychbed.png
rename to Resources/Textures/Structures/Furniture/furniture.rsi/psychbed.png
diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/psychbed_padding.png b/Resources/Textures/Structures/Furniture/furniture.rsi/psychbed_padding.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/furniture.rsi/psychbed_padding.png
rename to Resources/Textures/Structures/Furniture/furniture.rsi/psychbed_padding.png
diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/rack.png b/Resources/Textures/Structures/Furniture/furniture.rsi/rack.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/furniture.rsi/rack.png
rename to Resources/Textures/Structures/Furniture/furniture.rsi/rack.png
diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/shelf.png b/Resources/Textures/Structures/Furniture/furniture.rsi/shelf.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/furniture.rsi/shelf.png
rename to Resources/Textures/Structures/Furniture/furniture.rsi/shelf.png
diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/shuttle_chair.png b/Resources/Textures/Structures/Furniture/furniture.rsi/shuttle_chair.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/furniture.rsi/shuttle_chair.png
rename to Resources/Textures/Structures/Furniture/furniture.rsi/shuttle_chair.png
diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/stool_base.png b/Resources/Textures/Structures/Furniture/furniture.rsi/stool_base.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/furniture.rsi/stool_base.png
rename to Resources/Textures/Structures/Furniture/furniture.rsi/stool_base.png
diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/stool_padded_preview.png b/Resources/Textures/Structures/Furniture/furniture.rsi/stool_padded_preview.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/furniture.rsi/stool_padded_preview.png
rename to Resources/Textures/Structures/Furniture/furniture.rsi/stool_padded_preview.png
diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/stool_padding.png b/Resources/Textures/Structures/Furniture/furniture.rsi/stool_padding.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/furniture.rsi/stool_padding.png
rename to Resources/Textures/Structures/Furniture/furniture.rsi/stool_padding.png
diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/stool_preview.png b/Resources/Textures/Structures/Furniture/furniture.rsi/stool_preview.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/furniture.rsi/stool_preview.png
rename to Resources/Textures/Structures/Furniture/furniture.rsi/stool_preview.png
diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/w_overlay.png b/Resources/Textures/Structures/Furniture/furniture.rsi/w_overlay.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/furniture.rsi/w_overlay.png
rename to Resources/Textures/Structures/Furniture/furniture.rsi/w_overlay.png
diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/wheelchair.png b/Resources/Textures/Structures/Furniture/furniture.rsi/wheelchair.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/furniture.rsi/wheelchair.png
rename to Resources/Textures/Structures/Furniture/furniture.rsi/wheelchair.png
diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/wheelchair_folded.png b/Resources/Textures/Structures/Furniture/furniture.rsi/wheelchair_folded.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/furniture.rsi/wheelchair_folded.png
rename to Resources/Textures/Structures/Furniture/furniture.rsi/wheelchair_folded.png
diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/wooden_chair.png b/Resources/Textures/Structures/Furniture/furniture.rsi/wooden_chair.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/furniture.rsi/wooden_chair.png
rename to Resources/Textures/Structures/Furniture/furniture.rsi/wooden_chair.png
diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/wooden_chair_wings.png b/Resources/Textures/Structures/Furniture/furniture.rsi/wooden_chair_wings.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/furniture.rsi/wooden_chair_wings.png
rename to Resources/Textures/Structures/Furniture/furniture.rsi/wooden_chair_wings.png
diff --git a/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/church_organ.png b/Resources/Textures/Structures/Furniture/instruments.rsi/church-organ.png
similarity index 100%
rename from Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/church_organ.png
rename to Resources/Textures/Structures/Furniture/instruments.rsi/church-organ.png
diff --git a/Resources/Textures/Structures/Furniture/instruments.rsi/meta.json b/Resources/Textures/Structures/Furniture/instruments.rsi/meta.json
new file mode 100644
index 0000000000..58223fccbe
--- /dev/null
+++ b/Resources/Textures/Structures/Furniture/instruments.rsi/meta.json
@@ -0,0 +1,39 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "https://github.com/vgstation-coders/vgstation13 at 8d9c91e19cb52713c7f7f1804c2b6f7203f8d331",
+  "states": [
+    {
+      "name": "minimoog",
+      "directions": 4
+    },
+    {
+      "name": "church-organ",
+      "directions": 4
+    },
+    {
+      "name": "minimoog-broken",
+      "directions": 4
+    },
+    {
+      "name": "piano",
+      "directions": 4
+    },
+    {
+      "name": "piano-broken",
+      "directions": 4
+    },
+    {
+      "name": "xylophone",
+      "directions": 4
+    },
+    {
+      "name": "xylophone-broken",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/minimoog-broken.png b/Resources/Textures/Structures/Furniture/instruments.rsi/minimoog-broken.png
similarity index 100%
rename from Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/minimoog-broken.png
rename to Resources/Textures/Structures/Furniture/instruments.rsi/minimoog-broken.png
diff --git a/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/minimoog.png b/Resources/Textures/Structures/Furniture/instruments.rsi/minimoog.png
similarity index 100%
rename from Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/minimoog.png
rename to Resources/Textures/Structures/Furniture/instruments.rsi/minimoog.png
diff --git a/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/piano-broken.png b/Resources/Textures/Structures/Furniture/instruments.rsi/piano-broken.png
similarity index 100%
rename from Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/piano-broken.png
rename to Resources/Textures/Structures/Furniture/instruments.rsi/piano-broken.png
diff --git a/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/piano.png b/Resources/Textures/Structures/Furniture/instruments.rsi/piano.png
similarity index 100%
rename from Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/piano.png
rename to Resources/Textures/Structures/Furniture/instruments.rsi/piano.png
diff --git a/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/pianobroken.png b/Resources/Textures/Structures/Furniture/instruments.rsi/pianobroken.png
similarity index 100%
rename from Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/pianobroken.png
rename to Resources/Textures/Structures/Furniture/instruments.rsi/pianobroken.png
diff --git a/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/xylophone-broken.png b/Resources/Textures/Structures/Furniture/instruments.rsi/xylophone-broken.png
similarity index 100%
rename from Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/xylophone-broken.png
rename to Resources/Textures/Structures/Furniture/instruments.rsi/xylophone-broken.png
diff --git a/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/xylophone.png b/Resources/Textures/Structures/Furniture/instruments.rsi/xylophone.png
similarity index 100%
rename from Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/xylophone.png
rename to Resources/Textures/Structures/Furniture/instruments.rsi/xylophone.png
diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/applebush.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/applebush.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/applebush.png
rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/applebush.png
diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/meta.json b/Resources/Textures/Structures/Furniture/potted_plants.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/meta.json
rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-01.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-01.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-01.png
rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-01.png
diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-02.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-02.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-02.png
rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-02.png
diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-03.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-03.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-03.png
rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-03.png
diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-04.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-04.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-04.png
rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-04.png
diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-05.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-05.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-05.png
rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-05.png
diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-06.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-06.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-06.png
rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-06.png
diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-07.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-07.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-07.png
rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-07.png
diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-08.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-08.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-08.png
rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-08.png
diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-09.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-09.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-09.png
rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-09.png
diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-10.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-10.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-10.png
rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-10.png
diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-11.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-11.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-11.png
rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-11.png
diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-12.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-12.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-12.png
rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-12.png
diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-13.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-13.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-13.png
rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-13.png
diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-14.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-14.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-14.png
rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-14.png
diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-15.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-15.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-15.png
rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-15.png
diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-16.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-16.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-16.png
rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-16.png
diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-17.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-17.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-17.png
rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-17.png
diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-18.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-18.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-18.png
rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-18.png
diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-19.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-19.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-19.png
rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-19.png
diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-20.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-20.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-20.png
rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-20.png
diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-21.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-21.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-21.png
rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-21.png
diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-22.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-22.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-22.png
rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-22.png
diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-23.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-23.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-23.png
rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-23.png
diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-24.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-24.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-24.png
rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-24.png
diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-25.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-25.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-25.png
rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-25.png
diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-26.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-26.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-26.png
rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-26.png
diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-27.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-27.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-27.png
rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-27.png
diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-28.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-28.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-28.png
rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-28.png
diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-29.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-29.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-29.png
rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-29.png
diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/random.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/random.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/random.png
rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/random.png
diff --git a/Resources/Textures/Constructible/Watercloset/toilet.rsi/closed_toilet_seat_down.png b/Resources/Textures/Structures/Furniture/toilet.rsi/closed_toilet_seat_down.png
similarity index 100%
rename from Resources/Textures/Constructible/Watercloset/toilet.rsi/closed_toilet_seat_down.png
rename to Resources/Textures/Structures/Furniture/toilet.rsi/closed_toilet_seat_down.png
diff --git a/Resources/Textures/Constructible/Watercloset/toilet.rsi/closed_toilet_seat_up.png b/Resources/Textures/Structures/Furniture/toilet.rsi/closed_toilet_seat_up.png
similarity index 100%
rename from Resources/Textures/Constructible/Watercloset/toilet.rsi/closed_toilet_seat_up.png
rename to Resources/Textures/Structures/Furniture/toilet.rsi/closed_toilet_seat_up.png
diff --git a/Resources/Textures/Constructible/Watercloset/toilet.rsi/meta.json b/Resources/Textures/Structures/Furniture/toilet.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Watercloset/toilet.rsi/meta.json
rename to Resources/Textures/Structures/Furniture/toilet.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Watercloset/toilet.rsi/open_toilet_seat_down.png b/Resources/Textures/Structures/Furniture/toilet.rsi/open_toilet_seat_down.png
similarity index 100%
rename from Resources/Textures/Constructible/Watercloset/toilet.rsi/open_toilet_seat_down.png
rename to Resources/Textures/Structures/Furniture/toilet.rsi/open_toilet_seat_down.png
diff --git a/Resources/Textures/Constructible/Watercloset/toilet.rsi/open_toilet_seat_up.png b/Resources/Textures/Structures/Furniture/toilet.rsi/open_toilet_seat_up.png
similarity index 100%
rename from Resources/Textures/Constructible/Watercloset/toilet.rsi/open_toilet_seat_up.png
rename to Resources/Textures/Structures/Furniture/toilet.rsi/open_toilet_seat_up.png
diff --git a/Resources/Textures/Constructible/Hydroponics/containers.rsi/claypot-item.png b/Resources/Textures/Structures/Hydroponics/containers.rsi/claypot-item.png
similarity index 100%
rename from Resources/Textures/Constructible/Hydroponics/containers.rsi/claypot-item.png
rename to Resources/Textures/Structures/Hydroponics/containers.rsi/claypot-item.png
diff --git a/Resources/Textures/Constructible/Hydroponics/containers.rsi/claypot-large.png b/Resources/Textures/Structures/Hydroponics/containers.rsi/claypot-large.png
similarity index 100%
rename from Resources/Textures/Constructible/Hydroponics/containers.rsi/claypot-large.png
rename to Resources/Textures/Structures/Hydroponics/containers.rsi/claypot-large.png
diff --git a/Resources/Textures/Constructible/Hydroponics/containers.rsi/claypot.png b/Resources/Textures/Structures/Hydroponics/containers.rsi/claypot.png
similarity index 100%
rename from Resources/Textures/Constructible/Hydroponics/containers.rsi/claypot.png
rename to Resources/Textures/Structures/Hydroponics/containers.rsi/claypot.png
diff --git a/Resources/Textures/Constructible/Hydroponics/containers.rsi/hydrocover.png b/Resources/Textures/Structures/Hydroponics/containers.rsi/hydrocover.png
similarity index 100%
rename from Resources/Textures/Constructible/Hydroponics/containers.rsi/hydrocover.png
rename to Resources/Textures/Structures/Hydroponics/containers.rsi/hydrocover.png
diff --git a/Resources/Textures/Constructible/Hydroponics/containers.rsi/hydrotray.png b/Resources/Textures/Structures/Hydroponics/containers.rsi/hydrotray.png
similarity index 100%
rename from Resources/Textures/Constructible/Hydroponics/containers.rsi/hydrotray.png
rename to Resources/Textures/Structures/Hydroponics/containers.rsi/hydrotray.png
diff --git a/Resources/Textures/Constructible/Hydroponics/containers.rsi/hydrotray2.png b/Resources/Textures/Structures/Hydroponics/containers.rsi/hydrotray2.png
similarity index 100%
rename from Resources/Textures/Constructible/Hydroponics/containers.rsi/hydrotray2.png
rename to Resources/Textures/Structures/Hydroponics/containers.rsi/hydrotray2.png
diff --git a/Resources/Textures/Constructible/Hydroponics/containers.rsi/hydrotray3.png b/Resources/Textures/Structures/Hydroponics/containers.rsi/hydrotray3.png
similarity index 100%
rename from Resources/Textures/Constructible/Hydroponics/containers.rsi/hydrotray3.png
rename to Resources/Textures/Structures/Hydroponics/containers.rsi/hydrotray3.png
diff --git a/Resources/Textures/Constructible/Hydroponics/containers.rsi/meta.json b/Resources/Textures/Structures/Hydroponics/containers.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Hydroponics/containers.rsi/meta.json
rename to Resources/Textures/Structures/Hydroponics/containers.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Hydroponics/misc.rsi/meta.json b/Resources/Textures/Structures/Hydroponics/misc.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Hydroponics/misc.rsi/meta.json
rename to Resources/Textures/Structures/Hydroponics/misc.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Hydroponics/misc.rsi/moldcreep0.png b/Resources/Textures/Structures/Hydroponics/misc.rsi/moldcreep0.png
similarity index 100%
rename from Resources/Textures/Constructible/Hydroponics/misc.rsi/moldcreep0.png
rename to Resources/Textures/Structures/Hydroponics/misc.rsi/moldcreep0.png
diff --git a/Resources/Textures/Constructible/Hydroponics/misc.rsi/moldcreep1.png b/Resources/Textures/Structures/Hydroponics/misc.rsi/moldcreep1.png
similarity index 100%
rename from Resources/Textures/Constructible/Hydroponics/misc.rsi/moldcreep1.png
rename to Resources/Textures/Structures/Hydroponics/misc.rsi/moldcreep1.png
diff --git a/Resources/Textures/Constructible/Hydroponics/misc.rsi/moldcreep2.png b/Resources/Textures/Structures/Hydroponics/misc.rsi/moldcreep2.png
similarity index 100%
rename from Resources/Textures/Constructible/Hydroponics/misc.rsi/moldcreep2.png
rename to Resources/Textures/Structures/Hydroponics/misc.rsi/moldcreep2.png
diff --git a/Resources/Textures/Constructible/Hydroponics/misc.rsi/soil.png b/Resources/Textures/Structures/Hydroponics/misc.rsi/soil.png
similarity index 100%
rename from Resources/Textures/Constructible/Hydroponics/misc.rsi/soil.png
rename to Resources/Textures/Structures/Hydroponics/misc.rsi/soil.png
diff --git a/Resources/Textures/Constructible/Hydroponics/misc.rsi/spaceworms.png b/Resources/Textures/Structures/Hydroponics/misc.rsi/spaceworms.png
similarity index 100%
rename from Resources/Textures/Constructible/Hydroponics/misc.rsi/spaceworms.png
rename to Resources/Textures/Structures/Hydroponics/misc.rsi/spaceworms.png
diff --git a/Resources/Textures/Constructible/Hydroponics/misc.rsi/vine_flowers.png b/Resources/Textures/Structures/Hydroponics/misc.rsi/vine_flowers.png
similarity index 100%
rename from Resources/Textures/Constructible/Hydroponics/misc.rsi/vine_flowers.png
rename to Resources/Textures/Structures/Hydroponics/misc.rsi/vine_flowers.png
diff --git a/Resources/Textures/Constructible/Hydroponics/misc.rsi/vine_fruit.png b/Resources/Textures/Structures/Hydroponics/misc.rsi/vine_fruit.png
similarity index 100%
rename from Resources/Textures/Constructible/Hydroponics/misc.rsi/vine_fruit.png
rename to Resources/Textures/Structures/Hydroponics/misc.rsi/vine_fruit.png
diff --git a/Resources/Textures/Constructible/Hydroponics/overlays.rsi/alert3.png b/Resources/Textures/Structures/Hydroponics/overlays.rsi/alert3.png
similarity index 100%
rename from Resources/Textures/Constructible/Hydroponics/overlays.rsi/alert3.png
rename to Resources/Textures/Structures/Hydroponics/overlays.rsi/alert3.png
diff --git a/Resources/Textures/Constructible/Hydroponics/overlays.rsi/harvest3.png b/Resources/Textures/Structures/Hydroponics/overlays.rsi/harvest3.png
similarity index 100%
rename from Resources/Textures/Constructible/Hydroponics/overlays.rsi/harvest3.png
rename to Resources/Textures/Structures/Hydroponics/overlays.rsi/harvest3.png
diff --git a/Resources/Textures/Constructible/Hydroponics/overlays.rsi/lowhealth3.png b/Resources/Textures/Structures/Hydroponics/overlays.rsi/lowhealth3.png
similarity index 100%
rename from Resources/Textures/Constructible/Hydroponics/overlays.rsi/lowhealth3.png
rename to Resources/Textures/Structures/Hydroponics/overlays.rsi/lowhealth3.png
diff --git a/Resources/Textures/Constructible/Hydroponics/overlays.rsi/lownutri.png b/Resources/Textures/Structures/Hydroponics/overlays.rsi/lownutri.png
similarity index 100%
rename from Resources/Textures/Constructible/Hydroponics/overlays.rsi/lownutri.png
rename to Resources/Textures/Structures/Hydroponics/overlays.rsi/lownutri.png
diff --git a/Resources/Textures/Constructible/Hydroponics/overlays.rsi/lownutri3.png b/Resources/Textures/Structures/Hydroponics/overlays.rsi/lownutri3.png
similarity index 100%
rename from Resources/Textures/Constructible/Hydroponics/overlays.rsi/lownutri3.png
rename to Resources/Textures/Structures/Hydroponics/overlays.rsi/lownutri3.png
diff --git a/Resources/Textures/Constructible/Hydroponics/overlays.rsi/lowwater3.png b/Resources/Textures/Structures/Hydroponics/overlays.rsi/lowwater3.png
similarity index 100%
rename from Resources/Textures/Constructible/Hydroponics/overlays.rsi/lowwater3.png
rename to Resources/Textures/Structures/Hydroponics/overlays.rsi/lowwater3.png
diff --git a/Resources/Textures/Constructible/Hydroponics/overlays.rsi/meta.json b/Resources/Textures/Structures/Hydroponics/overlays.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Hydroponics/overlays.rsi/meta.json
rename to Resources/Textures/Structures/Hydroponics/overlays.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/ammo.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/ammo.rsi/broken.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/ammo.rsi/broken.png
rename to Resources/Textures/Structures/Machines/VendingMachines/ammo.rsi/broken.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/ammo.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/ammo.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/ammo.rsi/meta.json
rename to Resources/Textures/Structures/Machines/VendingMachines/ammo.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/ammo.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/ammo.rsi/normal-unshaded.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/ammo.rsi/normal-unshaded.png
rename to Resources/Textures/Structures/Machines/VendingMachines/ammo.rsi/normal-unshaded.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/ammo.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/ammo.rsi/off.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/ammo.rsi/off.png
rename to Resources/Textures/Structures/Machines/VendingMachines/ammo.rsi/off.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/ammo.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/ammo.rsi/panel.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/ammo.rsi/panel.png
rename to Resources/Textures/Structures/Machines/VendingMachines/ammo.rsi/panel.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/bardrobe.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/bardrobe.rsi/broken.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/bardrobe.rsi/broken.png
rename to Resources/Textures/Structures/Machines/VendingMachines/bardrobe.rsi/broken.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/bardrobe.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/bardrobe.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/bardrobe.rsi/meta.json
rename to Resources/Textures/Structures/Machines/VendingMachines/bardrobe.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/bardrobe.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/bardrobe.rsi/normal-unshaded.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/bardrobe.rsi/normal-unshaded.png
rename to Resources/Textures/Structures/Machines/VendingMachines/bardrobe.rsi/normal-unshaded.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/bardrobe.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/bardrobe.rsi/off.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/bardrobe.rsi/off.png
rename to Resources/Textures/Structures/Machines/VendingMachines/bardrobe.rsi/off.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/bardrobe.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/bardrobe.rsi/panel.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/bardrobe.rsi/panel.png
rename to Resources/Textures/Structures/Machines/VendingMachines/bardrobe.rsi/panel.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/boozeomat.rsi/broken.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/broken.png
rename to Resources/Textures/Structures/Machines/VendingMachines/boozeomat.rsi/broken.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/boozeomat.rsi/deny-unshaded.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/deny-unshaded.png
rename to Resources/Textures/Structures/Machines/VendingMachines/boozeomat.rsi/deny-unshaded.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/boozeomat.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/meta.json
rename to Resources/Textures/Structures/Machines/VendingMachines/boozeomat.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/boozeomat.rsi/normal-unshaded.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/normal-unshaded.png
rename to Resources/Textures/Structures/Machines/VendingMachines/boozeomat.rsi/normal-unshaded.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/boozeomat.rsi/off.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/off.png
rename to Resources/Textures/Structures/Machines/VendingMachines/boozeomat.rsi/off.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/boozeomat.rsi/panel.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/panel.png
rename to Resources/Textures/Structures/Machines/VendingMachines/boozeomat.rsi/panel.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/broken.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/broken.png
rename to Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/broken.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/deny-unshaded.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/deny-unshaded.png
rename to Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/deny-unshaded.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/eject-unshaded.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/eject-unshaded.png
rename to Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/eject-unshaded.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/meta.json
rename to Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/normal-unshaded.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/normal-unshaded.png
rename to Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/normal-unshaded.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/off.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/off.png
rename to Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/off.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/panel.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/panel.png
rename to Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/panel.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/broken.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/broken.png
rename to Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/broken.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/deny-unshaded.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/deny-unshaded.png
rename to Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/deny-unshaded.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/eject-unshaded.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/eject-unshaded.png
rename to Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/eject-unshaded.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/meta.json
rename to Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/normal-unshaded.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/normal-unshaded.png
rename to Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/normal-unshaded.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/off.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/off.png
rename to Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/off.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/panel.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/panel.png
rename to Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/panel.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/clothing.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/clothing.rsi/broken.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/clothing.rsi/broken.png
rename to Resources/Textures/Structures/Machines/VendingMachines/clothing.rsi/broken.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/clothing.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/clothing.rsi/deny-unshaded.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/clothing.rsi/deny-unshaded.png
rename to Resources/Textures/Structures/Machines/VendingMachines/clothing.rsi/deny-unshaded.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/clothing.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/clothing.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/clothing.rsi/meta.json
rename to Resources/Textures/Structures/Machines/VendingMachines/clothing.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/clothing.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/clothing.rsi/normal-unshaded.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/clothing.rsi/normal-unshaded.png
rename to Resources/Textures/Structures/Machines/VendingMachines/clothing.rsi/normal-unshaded.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/clothing.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/clothing.rsi/off.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/clothing.rsi/off.png
rename to Resources/Textures/Structures/Machines/VendingMachines/clothing.rsi/off.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/clothing.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/clothing.rsi/panel.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/clothing.rsi/panel.png
rename to Resources/Textures/Structures/Machines/VendingMachines/clothing.rsi/panel.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/broken.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/broken.png
rename to Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/broken.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/deny-unshaded.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/deny-unshaded.png
rename to Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/deny-unshaded.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/eject-unshaded.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/eject-unshaded.png
rename to Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/eject-unshaded.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/hellfire.png b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/hellfire.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/hellfire.png
rename to Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/hellfire.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/meta.json
rename to Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/normal-unshaded.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/normal-unshaded.png
rename to Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/normal-unshaded.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/off.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/off.png
rename to Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/off.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/panel.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/panel.png
rename to Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/panel.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/screen.png b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/screen.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/screen.png
rename to Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/screen.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/broken.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/broken.png
rename to Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/broken.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/deny-unshaded.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/deny-unshaded.png
rename to Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/deny-unshaded.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/eject-unshaded.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/eject-unshaded.png
rename to Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/eject-unshaded.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/meta.json
rename to Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/normal-unshaded.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/normal-unshaded.png
rename to Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/normal-unshaded.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/normal.png b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/normal.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/normal.png
rename to Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/normal.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/off.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/off.png
rename to Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/off.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/panel.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/panel.png
rename to Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/panel.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/dinnerware.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/broken.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/dinnerware.rsi/broken.png
rename to Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/broken.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/dinnerware.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/eject-unshaded.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/dinnerware.rsi/eject-unshaded.png
rename to Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/eject-unshaded.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/dinnerware.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/dinnerware.rsi/meta.json
rename to Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/dinnerware.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/normal-unshaded.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/dinnerware.rsi/normal-unshaded.png
rename to Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/normal-unshaded.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/dinnerware.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/off.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/dinnerware.rsi/off.png
rename to Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/off.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/discount.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/broken.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/discount.rsi/broken.png
rename to Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/broken.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/discount.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/discount.rsi/meta.json
rename to Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/discount.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/normal-unshaded.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/discount.rsi/normal-unshaded.png
rename to Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/normal-unshaded.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/discount.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/off.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/discount.rsi/off.png
rename to Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/off.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/broken.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/broken.png
rename to Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/broken.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/deny-unshaded.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/deny-unshaded.png
rename to Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/deny-unshaded.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/eject-unshaded.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/eject-unshaded.png
rename to Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/eject-unshaded.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/meta.json
rename to Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/normal-unshaded.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/normal-unshaded.png
rename to Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/normal-unshaded.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/off.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/off.png
rename to Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/off.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/panel.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/panel.png
rename to Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/panel.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/maintenance_panel.png b/Resources/Textures/Structures/Machines/VendingMachines/maintenance_panel.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/maintenance_panel.png
rename to Resources/Textures/Structures/Machines/VendingMachines/maintenance_panel.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/broken.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/broken.png
rename to Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/broken.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/deny-unshaded.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/deny-unshaded.png
rename to Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/deny-unshaded.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/eject-unshaded.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/eject-unshaded.png
rename to Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/eject-unshaded.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/meta.json
rename to Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/normal-unshaded.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/normal-unshaded.png
rename to Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/normal-unshaded.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/off.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/off.png
rename to Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/off.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/panel.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/panel.png
rename to Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/panel.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/broken.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/broken.png
rename to Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/broken.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/deny-unshaded.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/deny-unshaded.png
rename to Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/deny-unshaded.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/eject-unshaded.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/eject-unshaded.png
rename to Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/eject-unshaded.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/meta.json
rename to Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/normal-unshaded.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/normal-unshaded.png
rename to Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/normal-unshaded.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/off.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/off.png
rename to Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/off.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/broken.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/broken.png
rename to Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/broken.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/deny-unshaded.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/deny-unshaded.png
rename to Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/deny-unshaded.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/meta.json
rename to Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/normal-unshaded.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/normal-unshaded.png
rename to Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/normal-unshaded.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/off.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/off.png
rename to Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/off.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/panel.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/panel.png
rename to Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/panel.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/broken.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/broken.png
rename to Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/broken.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/eject-unshaded.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/eject-unshaded.png
rename to Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/eject-unshaded.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/meta.json
rename to Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/normal-unshaded.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/normal-unshaded.png
rename to Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/normal-unshaded.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/off.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/off.png
rename to Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/off.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/smartfridge.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/broken.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/smartfridge.rsi/broken.png
rename to Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/broken.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/smartfridge.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/smartfridge.rsi/meta.json
rename to Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/smartfridge.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/normal-unshaded.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/smartfridge.rsi/normal-unshaded.png
rename to Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/normal-unshaded.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/smartfridge.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/off.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/smartfridge.rsi/off.png
rename to Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/off.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/broken.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/broken.png
rename to Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/broken.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/deny-unshaded.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/deny-unshaded.png
rename to Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/deny-unshaded.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/eject-unshaded.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/eject-unshaded.png
rename to Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/eject-unshaded.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/meta.json
rename to Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/normal-unshaded.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/normal-unshaded.png
rename to Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/normal-unshaded.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/off.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/off.png
rename to Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/off.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/panel.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/panel.png
rename to Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/panel.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/broken.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/broken.png
rename to Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/broken.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/deny-unshaded.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/deny-unshaded.png
rename to Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/deny-unshaded.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/eject-unshaded.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/eject-unshaded.png
rename to Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/eject-unshaded.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/meta.json
rename to Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/normal-unshaded.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/normal-unshaded.png
rename to Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/normal-unshaded.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/off.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/off.png
rename to Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/off.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/panel.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/panel.png
rename to Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/panel.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/broken.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/broken.png
rename to Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/broken.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/deny-unshaded.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/deny-unshaded.png
rename to Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/deny-unshaded.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/eject-unshaded.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/eject-unshaded.png
rename to Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/eject-unshaded.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/meta.json
rename to Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/normal-unshaded.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/normal-unshaded.png
rename to Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/normal-unshaded.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/off.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/off.png
rename to Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/off.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/panel.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/panel.png
rename to Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/panel.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/screen.png b/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/screen.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/screen.png
rename to Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/screen.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/broken.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/broken.png
rename to Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/broken.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/deny-unshaded.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/deny-unshaded.png
rename to Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/deny-unshaded.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/eject-unshaded.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/eject-unshaded.png
rename to Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/eject-unshaded.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/eject.png b/Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/eject.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/eject.png
rename to Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/eject.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/meta.json
rename to Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/normal-unshaded.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/normal-unshaded.png
rename to Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/normal-unshaded.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/off.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/off.png
rename to Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/off.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/panel.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/panel.png
rename to Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/panel.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/broken.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/broken.png
rename to Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/broken.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/deny-unshaded.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/deny-unshaded.png
rename to Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/deny-unshaded.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/meta.json
rename to Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/normal-unshaded.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/normal-unshaded.png
rename to Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/normal-unshaded.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/off.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/off.png
rename to Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/off.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/broken.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/broken.png
rename to Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/broken.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/deny-unshaded.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/deny-unshaded.png
rename to Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/deny-unshaded.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/eject-unshaded.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/eject-unshaded.png
rename to Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/eject-unshaded.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/eject.png b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/eject.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/eject.png
rename to Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/eject.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/meta.json
rename to Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/normal-unshaded.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/normal-unshaded.png
rename to Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/normal-unshaded.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/off.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/off.png
rename to Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/off.png
diff --git a/Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/panel.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/panel.png
rename to Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/panel.png
diff --git a/Resources/Textures/Constructible/Power/autolathe.rsi/building.png b/Resources/Textures/Structures/Machines/autolathe.rsi/building.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/autolathe.rsi/building.png
rename to Resources/Textures/Structures/Machines/autolathe.rsi/building.png
diff --git a/Resources/Textures/Constructible/Power/autolathe.rsi/building_unlit.png b/Resources/Textures/Structures/Machines/autolathe.rsi/building_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/autolathe.rsi/building_unlit.png
rename to Resources/Textures/Structures/Machines/autolathe.rsi/building_unlit.png
diff --git a/Resources/Textures/Constructible/Power/autolathe.rsi/icon.png b/Resources/Textures/Structures/Machines/autolathe.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/autolathe.rsi/icon.png
rename to Resources/Textures/Structures/Machines/autolathe.rsi/icon.png
diff --git a/Resources/Textures/Constructible/Power/autolathe.rsi/inserting_glass.png b/Resources/Textures/Structures/Machines/autolathe.rsi/inserting_glass.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/autolathe.rsi/inserting_glass.png
rename to Resources/Textures/Structures/Machines/autolathe.rsi/inserting_glass.png
diff --git a/Resources/Textures/Constructible/Power/autolathe.rsi/inserting_gold.png b/Resources/Textures/Structures/Machines/autolathe.rsi/inserting_gold.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/autolathe.rsi/inserting_gold.png
rename to Resources/Textures/Structures/Machines/autolathe.rsi/inserting_gold.png
diff --git a/Resources/Textures/Constructible/Power/autolathe.rsi/inserting_metal.png b/Resources/Textures/Structures/Machines/autolathe.rsi/inserting_metal.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/autolathe.rsi/inserting_metal.png
rename to Resources/Textures/Structures/Machines/autolathe.rsi/inserting_metal.png
diff --git a/Resources/Textures/Constructible/Power/autolathe.rsi/inserting_phoron.png b/Resources/Textures/Structures/Machines/autolathe.rsi/inserting_phoron.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/autolathe.rsi/inserting_phoron.png
rename to Resources/Textures/Structures/Machines/autolathe.rsi/inserting_phoron.png
diff --git a/Resources/Textures/Constructible/Power/autolathe.rsi/inserting_plasma.png b/Resources/Textures/Structures/Machines/autolathe.rsi/inserting_plasma.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/autolathe.rsi/inserting_plasma.png
rename to Resources/Textures/Structures/Machines/autolathe.rsi/inserting_plasma.png
diff --git a/Resources/Textures/Constructible/Power/autolathe.rsi/inserting_plastic.png b/Resources/Textures/Structures/Machines/autolathe.rsi/inserting_plastic.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/autolathe.rsi/inserting_plastic.png
rename to Resources/Textures/Structures/Machines/autolathe.rsi/inserting_plastic.png
diff --git a/Resources/Textures/Constructible/Power/autolathe.rsi/inserting_unlit.png b/Resources/Textures/Structures/Machines/autolathe.rsi/inserting_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/autolathe.rsi/inserting_unlit.png
rename to Resources/Textures/Structures/Machines/autolathe.rsi/inserting_unlit.png
diff --git a/Resources/Textures/Constructible/Power/autolathe.rsi/meta.json b/Resources/Textures/Structures/Machines/autolathe.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/autolathe.rsi/meta.json
rename to Resources/Textures/Structures/Machines/autolathe.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/autolathe.rsi/panel.png b/Resources/Textures/Structures/Machines/autolathe.rsi/panel.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/autolathe.rsi/panel.png
rename to Resources/Textures/Structures/Machines/autolathe.rsi/panel.png
diff --git a/Resources/Textures/Constructible/Power/autolathe.rsi/unlit.png b/Resources/Textures/Structures/Machines/autolathe.rsi/unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/autolathe.rsi/unlit.png
rename to Resources/Textures/Structures/Machines/autolathe.rsi/unlit.png
diff --git a/Resources/Textures/Constructible/Specific/Medical/cloning.rsi/meta.json b/Resources/Textures/Structures/Machines/cloning.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Medical/cloning.rsi/meta.json
rename to Resources/Textures/Structures/Machines/cloning.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Specific/Medical/cloning.rsi/pod_0.png b/Resources/Textures/Structures/Machines/cloning.rsi/pod_0.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Medical/cloning.rsi/pod_0.png
rename to Resources/Textures/Structures/Machines/cloning.rsi/pod_0.png
diff --git a/Resources/Textures/Constructible/Specific/Medical/cloning.rsi/pod_1.png b/Resources/Textures/Structures/Machines/cloning.rsi/pod_1.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Medical/cloning.rsi/pod_1.png
rename to Resources/Textures/Structures/Machines/cloning.rsi/pod_1.png
diff --git a/Resources/Textures/Constructible/Specific/Medical/cloning.rsi/pod_e.png b/Resources/Textures/Structures/Machines/cloning.rsi/pod_e.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Medical/cloning.rsi/pod_e.png
rename to Resources/Textures/Structures/Machines/cloning.rsi/pod_e.png
diff --git a/Resources/Textures/Constructible/Specific/Medical/cloning.rsi/pod_g.png b/Resources/Textures/Structures/Machines/cloning.rsi/pod_g.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Medical/cloning.rsi/pod_g.png
rename to Resources/Textures/Structures/Machines/cloning.rsi/pod_g.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/ai-fixer-404.png b/Resources/Textures/Structures/Machines/computers.rsi/ai-fixer-404.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/ai-fixer-404.png
rename to Resources/Textures/Structures/Machines/computers.rsi/ai-fixer-404.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/ai-fixer-empty.png b/Resources/Textures/Structures/Machines/computers.rsi/ai-fixer-empty.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/ai-fixer-empty.png
rename to Resources/Textures/Structures/Machines/computers.rsi/ai-fixer-empty.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/ai-fixer-full.png b/Resources/Textures/Structures/Machines/computers.rsi/ai-fixer-full.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/ai-fixer-full.png
rename to Resources/Textures/Structures/Machines/computers.rsi/ai-fixer-full.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/ai-fixer-on.png b/Resources/Textures/Structures/Machines/computers.rsi/ai-fixer-on.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/ai-fixer-on.png
rename to Resources/Textures/Structures/Machines/computers.rsi/ai-fixer-on.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/ai-fixer.png b/Resources/Textures/Structures/Machines/computers.rsi/ai-fixer.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/ai-fixer.png
rename to Resources/Textures/Structures/Machines/computers.rsi/ai-fixer.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/aiupload.png b/Resources/Textures/Structures/Machines/computers.rsi/aiupload.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/aiupload.png
rename to Resources/Textures/Structures/Machines/computers.rsi/aiupload.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/aiupload_key.png b/Resources/Textures/Structures/Machines/computers.rsi/aiupload_key.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/aiupload_key.png
rename to Resources/Textures/Structures/Machines/computers.rsi/aiupload_key.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/alert-0.png b/Resources/Textures/Structures/Machines/computers.rsi/alert-0.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/alert-0.png
rename to Resources/Textures/Structures/Machines/computers.rsi/alert-0.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/alert-1.png b/Resources/Textures/Structures/Machines/computers.rsi/alert-1.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/alert-1.png
rename to Resources/Textures/Structures/Machines/computers.rsi/alert-1.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/alert-2.png b/Resources/Textures/Structures/Machines/computers.rsi/alert-2.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/alert-2.png
rename to Resources/Textures/Structures/Machines/computers.rsi/alert-2.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/arcade.png b/Resources/Textures/Structures/Machines/computers.rsi/arcade.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/arcade.png
rename to Resources/Textures/Structures/Machines/computers.rsi/arcade.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/arcade_broken.png b/Resources/Textures/Structures/Machines/computers.rsi/arcade_broken.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/arcade_broken.png
rename to Resources/Textures/Structures/Machines/computers.rsi/arcade_broken.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/area_atmos.png b/Resources/Textures/Structures/Machines/computers.rsi/area_atmos.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/area_atmos.png
rename to Resources/Textures/Structures/Machines/computers.rsi/area_atmos.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/atmos_key.png b/Resources/Textures/Structures/Machines/computers.rsi/atmos_key.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/atmos_key.png
rename to Resources/Textures/Structures/Machines/computers.rsi/atmos_key.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/atmos_key_off.png b/Resources/Textures/Structures/Machines/computers.rsi/atmos_key_off.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/atmos_key_off.png
rename to Resources/Textures/Structures/Machines/computers.rsi/atmos_key_off.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/broken.png b/Resources/Textures/Structures/Machines/computers.rsi/broken.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/broken.png
rename to Resources/Textures/Structures/Machines/computers.rsi/broken.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/cameras.png b/Resources/Textures/Structures/Machines/computers.rsi/cameras.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/cameras.png
rename to Resources/Textures/Structures/Machines/computers.rsi/cameras.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/comm.png b/Resources/Textures/Structures/Machines/computers.rsi/comm.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/comm.png
rename to Resources/Textures/Structures/Machines/computers.rsi/comm.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/comm_logs.png b/Resources/Textures/Structures/Machines/computers.rsi/comm_logs.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/comm_logs.png
rename to Resources/Textures/Structures/Machines/computers.rsi/comm_logs.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/comm_monitor.png b/Resources/Textures/Structures/Machines/computers.rsi/comm_monitor.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/comm_monitor.png
rename to Resources/Textures/Structures/Machines/computers.rsi/comm_monitor.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/command.png b/Resources/Textures/Structures/Machines/computers.rsi/command.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/command.png
rename to Resources/Textures/Structures/Machines/computers.rsi/command.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/computer-datatheory.png b/Resources/Textures/Structures/Machines/computers.rsi/computer-datatheory.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/computer-datatheory.png
rename to Resources/Textures/Structures/Machines/computers.rsi/computer-datatheory.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/computer.png b/Resources/Textures/Structures/Machines/computers.rsi/computer.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/computer.png
rename to Resources/Textures/Structures/Machines/computers.rsi/computer.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/computer_broken.png b/Resources/Textures/Structures/Machines/computers.rsi/computer_broken.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/computer_broken.png
rename to Resources/Textures/Structures/Machines/computers.rsi/computer_broken.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/crew.png b/Resources/Textures/Structures/Machines/computers.rsi/crew.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/crew.png
rename to Resources/Textures/Structures/Machines/computers.rsi/crew.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/dna.png b/Resources/Textures/Structures/Machines/computers.rsi/dna.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/dna.png
rename to Resources/Textures/Structures/Machines/computers.rsi/dna.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/dron_control_monitor.png b/Resources/Textures/Structures/Machines/computers.rsi/dron_control_monitor.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/dron_control_monitor.png
rename to Resources/Textures/Structures/Machines/computers.rsi/dron_control_monitor.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/engie_cams.png b/Resources/Textures/Structures/Machines/computers.rsi/engie_cams.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/engie_cams.png
rename to Resources/Textures/Structures/Machines/computers.rsi/engie_cams.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/engine.png b/Resources/Textures/Structures/Machines/computers.rsi/engine.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/engine.png
rename to Resources/Textures/Structures/Machines/computers.rsi/engine.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/entertainment.png b/Resources/Textures/Structures/Machines/computers.rsi/entertainment.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/entertainment.png
rename to Resources/Textures/Structures/Machines/computers.rsi/entertainment.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/eris_control.png b/Resources/Textures/Structures/Machines/computers.rsi/eris_control.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/eris_control.png
rename to Resources/Textures/Structures/Machines/computers.rsi/eris_control.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/error.png b/Resources/Textures/Structures/Machines/computers.rsi/error.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/error.png
rename to Resources/Textures/Structures/Machines/computers.rsi/error.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/explosive.png b/Resources/Textures/Structures/Machines/computers.rsi/explosive.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/explosive.png
rename to Resources/Textures/Structures/Machines/computers.rsi/explosive.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/forensic.png b/Resources/Textures/Structures/Machines/computers.rsi/forensic.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/forensic.png
rename to Resources/Textures/Structures/Machines/computers.rsi/forensic.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/generic.png b/Resources/Textures/Structures/Machines/computers.rsi/generic.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/generic.png
rename to Resources/Textures/Structures/Machines/computers.rsi/generic.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/generic_key.png b/Resources/Textures/Structures/Machines/computers.rsi/generic_key.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/generic_key.png
rename to Resources/Textures/Structures/Machines/computers.rsi/generic_key.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/generic_key_off.png b/Resources/Textures/Structures/Machines/computers.rsi/generic_key_off.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/generic_key_off.png
rename to Resources/Textures/Structures/Machines/computers.rsi/generic_key_off.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/holocontrol.png b/Resources/Textures/Structures/Machines/computers.rsi/holocontrol.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/holocontrol.png
rename to Resources/Textures/Structures/Machines/computers.rsi/holocontrol.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/id.png b/Resources/Textures/Structures/Machines/computers.rsi/id.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/id.png
rename to Resources/Textures/Structures/Machines/computers.rsi/id.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/id_key.png b/Resources/Textures/Structures/Machines/computers.rsi/id_key.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/id_key.png
rename to Resources/Textures/Structures/Machines/computers.rsi/id_key.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/id_key_off.png b/Resources/Textures/Structures/Machines/computers.rsi/id_key_off.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/id_key_off.png
rename to Resources/Textures/Structures/Machines/computers.rsi/id_key_off.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/invaders.png b/Resources/Textures/Structures/Machines/computers.rsi/invaders.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/invaders.png
rename to Resources/Textures/Structures/Machines/computers.rsi/invaders.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/mass_driver.png b/Resources/Textures/Structures/Machines/computers.rsi/mass_driver.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/mass_driver.png
rename to Resources/Textures/Structures/Machines/computers.rsi/mass_driver.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/mecha.png b/Resources/Textures/Structures/Machines/computers.rsi/mecha.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/mecha.png
rename to Resources/Textures/Structures/Machines/computers.rsi/mecha.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/med_key.png b/Resources/Textures/Structures/Machines/computers.rsi/med_key.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/med_key.png
rename to Resources/Textures/Structures/Machines/computers.rsi/med_key.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/med_key_off.png b/Resources/Textures/Structures/Machines/computers.rsi/med_key_off.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/med_key_off.png
rename to Resources/Textures/Structures/Machines/computers.rsi/med_key_off.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/medcomp.png b/Resources/Textures/Structures/Machines/computers.rsi/medcomp.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/medcomp.png
rename to Resources/Textures/Structures/Machines/computers.rsi/medcomp.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/meta.json b/Resources/Textures/Structures/Machines/computers.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/meta.json
rename to Resources/Textures/Structures/Machines/computers.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/mining.png b/Resources/Textures/Structures/Machines/computers.rsi/mining.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/mining.png
rename to Resources/Textures/Structures/Machines/computers.rsi/mining.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/mining_key.png b/Resources/Textures/Structures/Machines/computers.rsi/mining_key.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/mining_key.png
rename to Resources/Textures/Structures/Machines/computers.rsi/mining_key.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/mining_key_off.png b/Resources/Textures/Structures/Machines/computers.rsi/mining_key_off.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/mining_key_off.png
rename to Resources/Textures/Structures/Machines/computers.rsi/mining_key_off.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/power_key.png b/Resources/Textures/Structures/Machines/computers.rsi/power_key.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/power_key.png
rename to Resources/Textures/Structures/Machines/computers.rsi/power_key.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/power_key_off.png b/Resources/Textures/Structures/Machines/computers.rsi/power_key_off.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/power_key_off.png
rename to Resources/Textures/Structures/Machines/computers.rsi/power_key_off.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/power_monitor.png b/Resources/Textures/Structures/Machines/computers.rsi/power_monitor.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/power_monitor.png
rename to Resources/Textures/Structures/Machines/computers.rsi/power_monitor.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/power_monitor_warn.png b/Resources/Textures/Structures/Machines/computers.rsi/power_monitor_warn.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/power_monitor_warn.png
rename to Resources/Textures/Structures/Machines/computers.rsi/power_monitor_warn.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/rd_key.png b/Resources/Textures/Structures/Machines/computers.rsi/rd_key.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/rd_key.png
rename to Resources/Textures/Structures/Machines/computers.rsi/rd_key.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/rd_key_off.png b/Resources/Textures/Structures/Machines/computers.rsi/rd_key_off.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/rd_key_off.png
rename to Resources/Textures/Structures/Machines/computers.rsi/rd_key_off.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/rdcomp.png b/Resources/Textures/Structures/Machines/computers.rsi/rdcomp.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/rdcomp.png
rename to Resources/Textures/Structures/Machines/computers.rsi/rdcomp.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/recharge_comp.png b/Resources/Textures/Structures/Machines/computers.rsi/recharge_comp.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/recharge_comp.png
rename to Resources/Textures/Structures/Machines/computers.rsi/recharge_comp.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/recharge_comp_on.png b/Resources/Textures/Structures/Machines/computers.rsi/recharge_comp_on.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/recharge_comp_on.png
rename to Resources/Textures/Structures/Machines/computers.rsi/recharge_comp_on.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/request.png b/Resources/Textures/Structures/Machines/computers.rsi/request.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/request.png
rename to Resources/Textures/Structures/Machines/computers.rsi/request.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/robot.png b/Resources/Textures/Structures/Machines/computers.rsi/robot.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/robot.png
rename to Resources/Textures/Structures/Machines/computers.rsi/robot.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/security.png b/Resources/Textures/Structures/Machines/computers.rsi/security.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/security.png
rename to Resources/Textures/Structures/Machines/computers.rsi/security.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/security_key.png b/Resources/Textures/Structures/Machines/computers.rsi/security_key.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/security_key.png
rename to Resources/Textures/Structures/Machines/computers.rsi/security_key.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/security_key_off.png b/Resources/Textures/Structures/Machines/computers.rsi/security_key_off.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/security_key_off.png
rename to Resources/Textures/Structures/Machines/computers.rsi/security_key_off.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/shuttle.png b/Resources/Textures/Structures/Machines/computers.rsi/shuttle.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/shuttle.png
rename to Resources/Textures/Structures/Machines/computers.rsi/shuttle.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/solar_screen.png b/Resources/Textures/Structures/Machines/computers.rsi/solar_screen.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/solar_screen.png
rename to Resources/Textures/Structures/Machines/computers.rsi/solar_screen.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/supply.png b/Resources/Textures/Structures/Machines/computers.rsi/supply.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/supply.png
rename to Resources/Textures/Structures/Machines/computers.rsi/supply.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/syndie_key.png b/Resources/Textures/Structures/Machines/computers.rsi/syndie_key.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/syndie_key.png
rename to Resources/Textures/Structures/Machines/computers.rsi/syndie_key.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/syndie_key_off.png b/Resources/Textures/Structures/Machines/computers.rsi/syndie_key_off.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/syndie_key_off.png
rename to Resources/Textures/Structures/Machines/computers.rsi/syndie_key_off.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/syndishuttle.png b/Resources/Textures/Structures/Machines/computers.rsi/syndishuttle.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/syndishuttle.png
rename to Resources/Textures/Structures/Machines/computers.rsi/syndishuttle.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/tank.png b/Resources/Textures/Structures/Machines/computers.rsi/tank.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/tank.png
rename to Resources/Textures/Structures/Machines/computers.rsi/tank.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/tcboss.png b/Resources/Textures/Structures/Machines/computers.rsi/tcboss.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/tcboss.png
rename to Resources/Textures/Structures/Machines/computers.rsi/tcboss.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/tech_key.png b/Resources/Textures/Structures/Machines/computers.rsi/tech_key.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/tech_key.png
rename to Resources/Textures/Structures/Machines/computers.rsi/tech_key.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/tech_key_off.png b/Resources/Textures/Structures/Machines/computers.rsi/tech_key_off.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/tech_key_off.png
rename to Resources/Textures/Structures/Machines/computers.rsi/tech_key_off.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/teleport.png b/Resources/Textures/Structures/Machines/computers.rsi/teleport.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/teleport.png
rename to Resources/Textures/Structures/Machines/computers.rsi/teleport.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/teleport_key.png b/Resources/Textures/Structures/Machines/computers.rsi/teleport_key.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/teleport_key.png
rename to Resources/Textures/Structures/Machines/computers.rsi/teleport_key.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/teleport_key_off.png b/Resources/Textures/Structures/Machines/computers.rsi/teleport_key_off.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/teleport_key_off.png
rename to Resources/Textures/Structures/Machines/computers.rsi/teleport_key_off.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/telesci.png b/Resources/Textures/Structures/Machines/computers.rsi/telesci.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/telesci.png
rename to Resources/Textures/Structures/Machines/computers.rsi/telesci.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/telesci_key.png b/Resources/Textures/Structures/Machines/computers.rsi/telesci_key.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/telesci_key.png
rename to Resources/Textures/Structures/Machines/computers.rsi/telesci_key.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/telesci_key_off.png b/Resources/Textures/Structures/Machines/computers.rsi/telesci_key_off.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/telesci_key_off.png
rename to Resources/Textures/Structures/Machines/computers.rsi/telesci_key_off.png
diff --git a/Resources/Textures/Constructible/Power/computers.rsi/turbinecomp.png b/Resources/Textures/Structures/Machines/computers.rsi/turbinecomp.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/computers.rsi/turbinecomp.png
rename to Resources/Textures/Structures/Machines/computers.rsi/turbinecomp.png
diff --git a/Resources/Textures/Constructible/Power/genesplicer.rsi/genesplicer_empty.png b/Resources/Textures/Structures/Machines/genesplicer.rsi/genesplicer_empty.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/genesplicer.rsi/genesplicer_empty.png
rename to Resources/Textures/Structures/Machines/genesplicer.rsi/genesplicer_empty.png
diff --git a/Resources/Textures/Constructible/Power/genesplicer.rsi/genesplicer_loaded.png b/Resources/Textures/Structures/Machines/genesplicer.rsi/genesplicer_loaded.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/genesplicer.rsi/genesplicer_loaded.png
rename to Resources/Textures/Structures/Machines/genesplicer.rsi/genesplicer_loaded.png
diff --git a/Resources/Textures/Constructible/Power/genesplicer.rsi/genesplicer_screens.png b/Resources/Textures/Structures/Machines/genesplicer.rsi/genesplicer_screens.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/genesplicer.rsi/genesplicer_screens.png
rename to Resources/Textures/Structures/Machines/genesplicer.rsi/genesplicer_screens.png
diff --git a/Resources/Textures/Constructible/Power/genesplicer.rsi/meta.json b/Resources/Textures/Structures/Machines/genesplicer.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/genesplicer.rsi/meta.json
rename to Resources/Textures/Structures/Machines/genesplicer.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/gravity_generator.rsi/broken.png b/Resources/Textures/Structures/Machines/gravity_generator.rsi/broken.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/gravity_generator.rsi/broken.png
rename to Resources/Textures/Structures/Machines/gravity_generator.rsi/broken.png
diff --git a/Resources/Textures/Constructible/Power/gravity_generator.rsi/meta.json b/Resources/Textures/Structures/Machines/gravity_generator.rsi/meta.json
old mode 100755
new mode 100644
similarity index 100%
rename from Resources/Textures/Constructible/Power/gravity_generator.rsi/meta.json
rename to Resources/Textures/Structures/Machines/gravity_generator.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/gravity_generator.rsi/off.png b/Resources/Textures/Structures/Machines/gravity_generator.rsi/off.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/gravity_generator.rsi/off.png
rename to Resources/Textures/Structures/Machines/gravity_generator.rsi/off.png
diff --git a/Resources/Textures/Constructible/Power/gravity_generator.rsi/on.png b/Resources/Textures/Structures/Machines/gravity_generator.rsi/on.png
old mode 100755
new mode 100644
similarity index 100%
rename from Resources/Textures/Constructible/Power/gravity_generator.rsi/on.png
rename to Resources/Textures/Structures/Machines/gravity_generator.rsi/on.png
diff --git a/Resources/Textures/Constructible/Power/gravity_generator_core.rsi/activated.png b/Resources/Textures/Structures/Machines/gravity_generator_core.rsi/activated.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/gravity_generator_core.rsi/activated.png
rename to Resources/Textures/Structures/Machines/gravity_generator_core.rsi/activated.png
diff --git a/Resources/Textures/Constructible/Power/gravity_generator_core.rsi/activating.png b/Resources/Textures/Structures/Machines/gravity_generator_core.rsi/activating.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/gravity_generator_core.rsi/activating.png
rename to Resources/Textures/Structures/Machines/gravity_generator_core.rsi/activating.png
diff --git a/Resources/Textures/Constructible/Power/gravity_generator_core.rsi/idle.png b/Resources/Textures/Structures/Machines/gravity_generator_core.rsi/idle.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/gravity_generator_core.rsi/idle.png
rename to Resources/Textures/Structures/Machines/gravity_generator_core.rsi/idle.png
diff --git a/Resources/Textures/Constructible/Power/gravity_generator_core.rsi/meta.json b/Resources/Textures/Structures/Machines/gravity_generator_core.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/gravity_generator_core.rsi/meta.json
rename to Resources/Textures/Structures/Machines/gravity_generator_core.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/gravity_generator_core.rsi/startup.png b/Resources/Textures/Structures/Machines/gravity_generator_core.rsi/startup.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/gravity_generator_core.rsi/startup.png
rename to Resources/Textures/Structures/Machines/gravity_generator_core.rsi/startup.png
diff --git a/Resources/Textures/Constructible/Power/juicer.rsi/juicer0.png b/Resources/Textures/Structures/Machines/juicer.rsi/juicer0.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/juicer.rsi/juicer0.png
rename to Resources/Textures/Structures/Machines/juicer.rsi/juicer0.png
diff --git a/Resources/Textures/Constructible/Power/juicer.rsi/juicer1.png b/Resources/Textures/Structures/Machines/juicer.rsi/juicer1.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/juicer.rsi/juicer1.png
rename to Resources/Textures/Structures/Machines/juicer.rsi/juicer1.png
diff --git a/Resources/Textures/Constructible/Power/juicer.rsi/meta.json b/Resources/Textures/Structures/Machines/juicer.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/juicer.rsi/meta.json
rename to Resources/Textures/Structures/Machines/juicer.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/microwave.rsi/meta.json b/Resources/Textures/Structures/Machines/microwave.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/microwave.rsi/meta.json
rename to Resources/Textures/Structures/Machines/microwave.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/microwave.rsi/mw.png b/Resources/Textures/Structures/Machines/microwave.rsi/mw.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/microwave.rsi/mw.png
rename to Resources/Textures/Structures/Machines/microwave.rsi/mw.png
diff --git a/Resources/Textures/Constructible/Power/microwave.rsi/mw0.png b/Resources/Textures/Structures/Machines/microwave.rsi/mw0.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/microwave.rsi/mw0.png
rename to Resources/Textures/Structures/Machines/microwave.rsi/mw0.png
diff --git a/Resources/Textures/Constructible/Power/microwave.rsi/mw1.png b/Resources/Textures/Structures/Machines/microwave.rsi/mw1.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/microwave.rsi/mw1.png
rename to Resources/Textures/Structures/Machines/microwave.rsi/mw1.png
diff --git a/Resources/Textures/Constructible/Power/microwave.rsi/mw_running_unlit.png b/Resources/Textures/Structures/Machines/microwave.rsi/mw_running_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/microwave.rsi/mw_running_unlit.png
rename to Resources/Textures/Structures/Machines/microwave.rsi/mw_running_unlit.png
diff --git a/Resources/Textures/Constructible/Power/microwave.rsi/mw_unlit.png b/Resources/Textures/Structures/Machines/microwave.rsi/mw_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/microwave.rsi/mw_unlit.png
rename to Resources/Textures/Structures/Machines/microwave.rsi/mw_unlit.png
diff --git a/Resources/Textures/Constructible/Power/microwave.rsi/mwb.png b/Resources/Textures/Structures/Machines/microwave.rsi/mwb.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/microwave.rsi/mwb.png
rename to Resources/Textures/Structures/Machines/microwave.rsi/mwb.png
diff --git a/Resources/Textures/Constructible/Power/microwave.rsi/mwbloody.png b/Resources/Textures/Structures/Machines/microwave.rsi/mwbloody.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/microwave.rsi/mwbloody.png
rename to Resources/Textures/Structures/Machines/microwave.rsi/mwbloody.png
diff --git a/Resources/Textures/Constructible/Power/microwave.rsi/mwbloody0.png b/Resources/Textures/Structures/Machines/microwave.rsi/mwbloody0.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/microwave.rsi/mwbloody0.png
rename to Resources/Textures/Structures/Machines/microwave.rsi/mwbloody0.png
diff --git a/Resources/Textures/Constructible/Power/microwave.rsi/mwbloody1.png b/Resources/Textures/Structures/Machines/microwave.rsi/mwbloody1.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/microwave.rsi/mwbloody1.png
rename to Resources/Textures/Structures/Machines/microwave.rsi/mwbloody1.png
diff --git a/Resources/Textures/Constructible/Power/microwave.rsi/mwbloodyo.png b/Resources/Textures/Structures/Machines/microwave.rsi/mwbloodyo.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/microwave.rsi/mwbloodyo.png
rename to Resources/Textures/Structures/Machines/microwave.rsi/mwbloodyo.png
diff --git a/Resources/Textures/Constructible/Power/microwave.rsi/mwo.png b/Resources/Textures/Structures/Machines/microwave.rsi/mwo.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/microwave.rsi/mwo.png
rename to Resources/Textures/Structures/Machines/microwave.rsi/mwo.png
diff --git a/Resources/Textures/Constructible/Power/mixer.rsi/meta.json b/Resources/Textures/Structures/Machines/mixer.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/mixer.rsi/meta.json
rename to Resources/Textures/Structures/Machines/mixer.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/mixer.rsi/mixer_broken.png b/Resources/Textures/Structures/Machines/mixer.rsi/mixer_broken.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/mixer.rsi/mixer_broken.png
rename to Resources/Textures/Structures/Machines/mixer.rsi/mixer_broken.png
diff --git a/Resources/Textures/Constructible/Power/mixer.rsi/mixer_empty.png b/Resources/Textures/Structures/Machines/mixer.rsi/mixer_empty.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/mixer.rsi/mixer_empty.png
rename to Resources/Textures/Structures/Machines/mixer.rsi/mixer_empty.png
diff --git a/Resources/Textures/Constructible/Power/mixer.rsi/mixer_loaded.png b/Resources/Textures/Structures/Machines/mixer.rsi/mixer_loaded.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/mixer.rsi/mixer_loaded.png
rename to Resources/Textures/Structures/Machines/mixer.rsi/mixer_loaded.png
diff --git a/Resources/Textures/Constructible/Power/mixer.rsi/mixer_screen_broken.png b/Resources/Textures/Structures/Machines/mixer.rsi/mixer_screen_broken.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/mixer.rsi/mixer_screen_broken.png
rename to Resources/Textures/Structures/Machines/mixer.rsi/mixer_screen_broken.png
diff --git a/Resources/Textures/Constructible/Power/mixer.rsi/mixer_screens.png b/Resources/Textures/Structures/Machines/mixer.rsi/mixer_screens.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/mixer.rsi/mixer_screens.png
rename to Resources/Textures/Structures/Machines/mixer.rsi/mixer_screens.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/0.png b/Resources/Textures/Structures/Machines/parts.rsi/0.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/0.png
rename to Resources/Textures/Structures/Machines/parts.rsi/0.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/1.png b/Resources/Textures/Structures/Machines/parts.rsi/1.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/1.png
rename to Resources/Textures/Structures/Machines/parts.rsi/1.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/2.png b/Resources/Textures/Structures/Machines/parts.rsi/2.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/2.png
rename to Resources/Textures/Structures/Machines/parts.rsi/2.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/3.png b/Resources/Textures/Structures/Machines/parts.rsi/3.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/3.png
rename to Resources/Textures/Structures/Machines/parts.rsi/3.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/4.png b/Resources/Textures/Structures/Machines/parts.rsi/4.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/4.png
rename to Resources/Textures/Structures/Machines/parts.rsi/4.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/box_0.png b/Resources/Textures/Structures/Machines/parts.rsi/box_0.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/box_0.png
rename to Resources/Textures/Structures/Machines/parts.rsi/box_0.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/box_1.png b/Resources/Textures/Structures/Machines/parts.rsi/box_1.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/box_1.png
rename to Resources/Textures/Structures/Machines/parts.rsi/box_1.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/box_2.png b/Resources/Textures/Structures/Machines/parts.rsi/box_2.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/box_2.png
rename to Resources/Textures/Structures/Machines/parts.rsi/box_2.png
diff --git a/Resources/Textures/Structures/Machines/parts.rsi/meta.json b/Resources/Textures/Structures/Machines/parts.rsi/meta.json
new file mode 100644
index 0000000000..3071772281
--- /dev/null
+++ b/Resources/Textures/Structures/Machines/parts.rsi/meta.json
@@ -0,0 +1,52 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/0d9c9a8233dfc3fc55edc538955a761a6328bee0",
+  "states": [
+    {
+      "name": "0",
+      "directions": 4
+    },
+    {
+      "name": "1",
+      "directions": 4
+    },
+    {
+      "name": "2",
+      "directions": 4
+    },
+    {
+      "name": "3",
+      "directions": 4
+    },
+    {
+      "name": "4",
+      "directions": 4
+    },
+    {
+      "name": "box_0"
+    },
+    {
+      "name": "box_1"
+    },
+    {
+      "name": "box_2"
+    },
+    {
+      "name": "vbox_0"
+    },
+    {
+      "name": "vbox_1"
+    },
+    {
+      "name": "vbox_2"
+    },
+    {
+      "name": "vbox_3"
+    }
+  ]
+}
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/vbox_0.png b/Resources/Textures/Structures/Machines/parts.rsi/vbox_0.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/vbox_0.png
rename to Resources/Textures/Structures/Machines/parts.rsi/vbox_0.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/vbox_1.png b/Resources/Textures/Structures/Machines/parts.rsi/vbox_1.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/vbox_1.png
rename to Resources/Textures/Structures/Machines/parts.rsi/vbox_1.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/vbox_2.png b/Resources/Textures/Structures/Machines/parts.rsi/vbox_2.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/vbox_2.png
rename to Resources/Textures/Structures/Machines/parts.rsi/vbox_2.png
diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/vbox_3.png b/Resources/Textures/Structures/Machines/parts.rsi/vbox_3.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/vbox_3.png
rename to Resources/Textures/Structures/Machines/parts.rsi/vbox_3.png
diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/building.png b/Resources/Textures/Structures/Machines/protolathe.rsi/building.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/protolathe.rsi/building.png
rename to Resources/Textures/Structures/Machines/protolathe.rsi/building.png
diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/building_unlit.png b/Resources/Textures/Structures/Machines/protolathe.rsi/building_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/protolathe.rsi/building_unlit.png
rename to Resources/Textures/Structures/Machines/protolathe.rsi/building_unlit.png
diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/icon.png b/Resources/Textures/Structures/Machines/protolathe.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/protolathe.rsi/icon.png
rename to Resources/Textures/Structures/Machines/protolathe.rsi/icon.png
diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_adamantine.png b/Resources/Textures/Structures/Machines/protolathe.rsi/inserting_adamantine.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/protolathe.rsi/inserting_adamantine.png
rename to Resources/Textures/Structures/Machines/protolathe.rsi/inserting_adamantine.png
diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_bananium.png b/Resources/Textures/Structures/Machines/protolathe.rsi/inserting_bananium.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/protolathe.rsi/inserting_bananium.png
rename to Resources/Textures/Structures/Machines/protolathe.rsi/inserting_bananium.png
diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_diamond.png b/Resources/Textures/Structures/Machines/protolathe.rsi/inserting_diamond.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/protolathe.rsi/inserting_diamond.png
rename to Resources/Textures/Structures/Machines/protolathe.rsi/inserting_diamond.png
diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_glass.png b/Resources/Textures/Structures/Machines/protolathe.rsi/inserting_glass.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/protolathe.rsi/inserting_glass.png
rename to Resources/Textures/Structures/Machines/protolathe.rsi/inserting_glass.png
diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_gold.png b/Resources/Textures/Structures/Machines/protolathe.rsi/inserting_gold.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/protolathe.rsi/inserting_gold.png
rename to Resources/Textures/Structures/Machines/protolathe.rsi/inserting_gold.png
diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_metal.png b/Resources/Textures/Structures/Machines/protolathe.rsi/inserting_metal.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/protolathe.rsi/inserting_metal.png
rename to Resources/Textures/Structures/Machines/protolathe.rsi/inserting_metal.png
diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_phoron.png b/Resources/Textures/Structures/Machines/protolathe.rsi/inserting_phoron.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/protolathe.rsi/inserting_phoron.png
rename to Resources/Textures/Structures/Machines/protolathe.rsi/inserting_phoron.png
diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_plasma.png b/Resources/Textures/Structures/Machines/protolathe.rsi/inserting_plasma.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/protolathe.rsi/inserting_plasma.png
rename to Resources/Textures/Structures/Machines/protolathe.rsi/inserting_plasma.png
diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_plastic.png b/Resources/Textures/Structures/Machines/protolathe.rsi/inserting_plastic.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/protolathe.rsi/inserting_plastic.png
rename to Resources/Textures/Structures/Machines/protolathe.rsi/inserting_plastic.png
diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_silver.png b/Resources/Textures/Structures/Machines/protolathe.rsi/inserting_silver.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/protolathe.rsi/inserting_silver.png
rename to Resources/Textures/Structures/Machines/protolathe.rsi/inserting_silver.png
diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_unlit.png b/Resources/Textures/Structures/Machines/protolathe.rsi/inserting_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/protolathe.rsi/inserting_unlit.png
rename to Resources/Textures/Structures/Machines/protolathe.rsi/inserting_unlit.png
diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_uranium.png b/Resources/Textures/Structures/Machines/protolathe.rsi/inserting_uranium.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/protolathe.rsi/inserting_uranium.png
rename to Resources/Textures/Structures/Machines/protolathe.rsi/inserting_uranium.png
diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/meta.json b/Resources/Textures/Structures/Machines/protolathe.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/protolathe.rsi/meta.json
rename to Resources/Textures/Structures/Machines/protolathe.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/panel.png b/Resources/Textures/Structures/Machines/protolathe.rsi/panel.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/protolathe.rsi/panel.png
rename to Resources/Textures/Structures/Machines/protolathe.rsi/panel.png
diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/unlit.png b/Resources/Textures/Structures/Machines/protolathe.rsi/unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/protolathe.rsi/unlit.png
rename to Resources/Textures/Structures/Machines/protolathe.rsi/unlit.png
diff --git a/Resources/Textures/Constructible/Power/recycling.rsi/grinder-a0.png b/Resources/Textures/Structures/Machines/recycling.rsi/grinder-a0.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/recycling.rsi/grinder-a0.png
rename to Resources/Textures/Structures/Machines/recycling.rsi/grinder-a0.png
diff --git a/Resources/Textures/Constructible/Power/recycling.rsi/grinder-a1.png b/Resources/Textures/Structures/Machines/recycling.rsi/grinder-a1.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/recycling.rsi/grinder-a1.png
rename to Resources/Textures/Structures/Machines/recycling.rsi/grinder-a1.png
diff --git a/Resources/Textures/Constructible/Power/recycling.rsi/grinder-b0.png b/Resources/Textures/Structures/Machines/recycling.rsi/grinder-b0.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/recycling.rsi/grinder-b0.png
rename to Resources/Textures/Structures/Machines/recycling.rsi/grinder-b0.png
diff --git a/Resources/Textures/Constructible/Power/recycling.rsi/grinder-b1.png b/Resources/Textures/Structures/Machines/recycling.rsi/grinder-b1.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/recycling.rsi/grinder-b1.png
rename to Resources/Textures/Structures/Machines/recycling.rsi/grinder-b1.png
diff --git a/Resources/Textures/Constructible/Power/recycling.rsi/grinder-o0.png b/Resources/Textures/Structures/Machines/recycling.rsi/grinder-o0.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/recycling.rsi/grinder-o0.png
rename to Resources/Textures/Structures/Machines/recycling.rsi/grinder-o0.png
diff --git a/Resources/Textures/Constructible/Power/recycling.rsi/grinder-o0bld.png b/Resources/Textures/Structures/Machines/recycling.rsi/grinder-o0bld.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/recycling.rsi/grinder-o0bld.png
rename to Resources/Textures/Structures/Machines/recycling.rsi/grinder-o0bld.png
diff --git a/Resources/Textures/Constructible/Power/recycling.rsi/grinder-o1.png b/Resources/Textures/Structures/Machines/recycling.rsi/grinder-o1.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/recycling.rsi/grinder-o1.png
rename to Resources/Textures/Structures/Machines/recycling.rsi/grinder-o1.png
diff --git a/Resources/Textures/Constructible/Power/recycling.rsi/grinder-o1bld.png b/Resources/Textures/Structures/Machines/recycling.rsi/grinder-o1bld.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/recycling.rsi/grinder-o1bld.png
rename to Resources/Textures/Structures/Machines/recycling.rsi/grinder-o1bld.png
diff --git a/Resources/Textures/Constructible/Power/recycling.rsi/meta.json b/Resources/Textures/Structures/Machines/recycling.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/recycling.rsi/meta.json
rename to Resources/Textures/Structures/Machines/recycling.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/recycling.rsi/separator-.png b/Resources/Textures/Structures/Machines/recycling.rsi/separator-.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/recycling.rsi/separator-.png
rename to Resources/Textures/Structures/Machines/recycling.rsi/separator-.png
diff --git a/Resources/Textures/Constructible/Power/recycling.rsi/separator-0.png b/Resources/Textures/Structures/Machines/recycling.rsi/separator-0.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/recycling.rsi/separator-0.png
rename to Resources/Textures/Structures/Machines/recycling.rsi/separator-0.png
diff --git a/Resources/Textures/Constructible/Power/recycling.rsi/separator-A0.png b/Resources/Textures/Structures/Machines/recycling.rsi/separator-A0.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/recycling.rsi/separator-A0.png
rename to Resources/Textures/Structures/Machines/recycling.rsi/separator-A0.png
diff --git a/Resources/Textures/Constructible/Power/recycling.rsi/separator-A1.png b/Resources/Textures/Structures/Machines/recycling.rsi/separator-A1.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/recycling.rsi/separator-A1.png
rename to Resources/Textures/Structures/Machines/recycling.rsi/separator-A1.png
diff --git a/Resources/Textures/Constructible/Power/recycling.rsi/separator-AO0.png b/Resources/Textures/Structures/Machines/recycling.rsi/separator-AO0.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/recycling.rsi/separator-AO0.png
rename to Resources/Textures/Structures/Machines/recycling.rsi/separator-AO0.png
diff --git a/Resources/Textures/Constructible/Power/recycling.rsi/separator-AO1.png b/Resources/Textures/Structures/Machines/recycling.rsi/separator-AO1.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/recycling.rsi/separator-AO1.png
rename to Resources/Textures/Structures/Machines/recycling.rsi/separator-AO1.png
diff --git a/Resources/Textures/Constructible/Power/recycling.rsi/separator-B0.png b/Resources/Textures/Structures/Machines/recycling.rsi/separator-B0.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/recycling.rsi/separator-B0.png
rename to Resources/Textures/Structures/Machines/recycling.rsi/separator-B0.png
diff --git a/Resources/Textures/Constructible/Power/recycling.rsi/separator-BO0.png b/Resources/Textures/Structures/Machines/recycling.rsi/separator-BO0.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/recycling.rsi/separator-BO0.png
rename to Resources/Textures/Structures/Machines/recycling.rsi/separator-BO0.png
diff --git a/Resources/Textures/Constructible/Power/rndpointsource.rsi/meta.json b/Resources/Textures/Structures/Machines/rndpointsource.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/rndpointsource.rsi/meta.json
rename to Resources/Textures/Structures/Machines/rndpointsource.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/rndpointsource.rsi/rndpointsource-broken.png b/Resources/Textures/Structures/Machines/rndpointsource.rsi/rndpointsource-broken.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/rndpointsource.rsi/rndpointsource-broken.png
rename to Resources/Textures/Structures/Machines/rndpointsource.rsi/rndpointsource-broken.png
diff --git a/Resources/Textures/Constructible/Power/rndpointsource.rsi/rndpointsource-icon.png b/Resources/Textures/Structures/Machines/rndpointsource.rsi/rndpointsource-icon.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/rndpointsource.rsi/rndpointsource-icon.png
rename to Resources/Textures/Structures/Machines/rndpointsource.rsi/rndpointsource-icon.png
diff --git a/Resources/Textures/Constructible/Power/rndpointsource.rsi/rndpointsource-off.png b/Resources/Textures/Structures/Machines/rndpointsource.rsi/rndpointsource-off.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/rndpointsource.rsi/rndpointsource-off.png
rename to Resources/Textures/Structures/Machines/rndpointsource.rsi/rndpointsource-off.png
diff --git a/Resources/Textures/Constructible/Power/rndpointsource.rsi/rndpointsource.png b/Resources/Textures/Structures/Machines/rndpointsource.rsi/rndpointsource.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/rndpointsource.rsi/rndpointsource.png
rename to Resources/Textures/Structures/Machines/rndpointsource.rsi/rndpointsource.png
diff --git a/Resources/Textures/Constructible/Specific/Medical/scanner.rsi/closed.png b/Resources/Textures/Structures/Machines/scanner.rsi/closed.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Medical/scanner.rsi/closed.png
rename to Resources/Textures/Structures/Machines/scanner.rsi/closed.png
diff --git a/Resources/Textures/Constructible/Specific/Medical/scanner.rsi/closed_unpowered.png b/Resources/Textures/Structures/Machines/scanner.rsi/closed_unpowered.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Medical/scanner.rsi/closed_unpowered.png
rename to Resources/Textures/Structures/Machines/scanner.rsi/closed_unpowered.png
diff --git a/Resources/Textures/Constructible/Specific/Medical/scanner.rsi/idle_unlit.png b/Resources/Textures/Structures/Machines/scanner.rsi/idle_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Medical/scanner.rsi/idle_unlit.png
rename to Resources/Textures/Structures/Machines/scanner.rsi/idle_unlit.png
diff --git a/Resources/Textures/Constructible/Specific/Medical/scanner.rsi/maint_unlit.png b/Resources/Textures/Structures/Machines/scanner.rsi/maint_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Medical/scanner.rsi/maint_unlit.png
rename to Resources/Textures/Structures/Machines/scanner.rsi/maint_unlit.png
diff --git a/Resources/Textures/Constructible/Specific/Medical/scanner.rsi/meta.json b/Resources/Textures/Structures/Machines/scanner.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Medical/scanner.rsi/meta.json
rename to Resources/Textures/Structures/Machines/scanner.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Specific/Medical/scanner.rsi/occupied.png b/Resources/Textures/Structures/Machines/scanner.rsi/occupied.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Medical/scanner.rsi/occupied.png
rename to Resources/Textures/Structures/Machines/scanner.rsi/occupied.png
diff --git a/Resources/Textures/Constructible/Specific/Medical/scanner.rsi/occupied_unlit.png b/Resources/Textures/Structures/Machines/scanner.rsi/occupied_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Medical/scanner.rsi/occupied_unlit.png
rename to Resources/Textures/Structures/Machines/scanner.rsi/occupied_unlit.png
diff --git a/Resources/Textures/Constructible/Specific/Medical/scanner.rsi/off_unlit.png b/Resources/Textures/Structures/Machines/scanner.rsi/off_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Medical/scanner.rsi/off_unlit.png
rename to Resources/Textures/Structures/Machines/scanner.rsi/off_unlit.png
diff --git a/Resources/Textures/Constructible/Specific/Medical/scanner.rsi/open.png b/Resources/Textures/Structures/Machines/scanner.rsi/open.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Medical/scanner.rsi/open.png
rename to Resources/Textures/Structures/Machines/scanner.rsi/open.png
diff --git a/Resources/Textures/Constructible/Specific/Medical/scanner.rsi/open_unpowered.png b/Resources/Textures/Structures/Machines/scanner.rsi/open_unpowered.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Medical/scanner.rsi/open_unpowered.png
rename to Resources/Textures/Structures/Machines/scanner.rsi/open_unpowered.png
diff --git a/Resources/Textures/Constructible/Specific/Medical/scanner.rsi/red_unlit.png b/Resources/Textures/Structures/Machines/scanner.rsi/red_unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Medical/scanner.rsi/red_unlit.png
rename to Resources/Textures/Structures/Machines/scanner.rsi/red_unlit.png
diff --git a/Resources/Textures/Constructible/Hydroponics/machines.rsi/meta.json b/Resources/Textures/Structures/Machines/seed_extractor.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Hydroponics/machines.rsi/meta.json
rename to Resources/Textures/Structures/Machines/seed_extractor.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Hydroponics/machines.rsi/seedextractor-off.png b/Resources/Textures/Structures/Machines/seed_extractor.rsi/seedextractor-off.png
similarity index 100%
rename from Resources/Textures/Constructible/Hydroponics/machines.rsi/seedextractor-off.png
rename to Resources/Textures/Structures/Machines/seed_extractor.rsi/seedextractor-off.png
diff --git a/Resources/Textures/Constructible/Hydroponics/machines.rsi/seedextractor-unlit.png b/Resources/Textures/Structures/Machines/seed_extractor.rsi/seedextractor-unlit.png
similarity index 100%
rename from Resources/Textures/Constructible/Hydroponics/machines.rsi/seedextractor-unlit.png
rename to Resources/Textures/Structures/Machines/seed_extractor.rsi/seedextractor-unlit.png
diff --git a/Resources/Textures/Constructible/Hydroponics/machines.rsi/seedextractor.png b/Resources/Textures/Structures/Machines/seed_extractor.rsi/seedextractor.png
similarity index 100%
rename from Resources/Textures/Constructible/Hydroponics/machines.rsi/seedextractor.png
rename to Resources/Textures/Structures/Machines/seed_extractor.rsi/seedextractor.png
diff --git a/Resources/Textures/Constructible/Hydroponics/machines.rsi/spawner.png b/Resources/Textures/Structures/Machines/seed_extractor.rsi/spawner.png
similarity index 100%
rename from Resources/Textures/Constructible/Hydroponics/machines.rsi/spawner.png
rename to Resources/Textures/Structures/Machines/seed_extractor.rsi/spawner.png
diff --git a/Resources/Textures/Constructible/Hydroponics/machines.rsi/traitcopier.png b/Resources/Textures/Structures/Machines/seed_extractor.rsi/traitcopier.png
similarity index 100%
rename from Resources/Textures/Constructible/Hydroponics/machines.rsi/traitcopier.png
rename to Resources/Textures/Structures/Machines/seed_extractor.rsi/traitcopier.png
diff --git a/Resources/Textures/Constructible/Hydroponics/machines.rsi/traitgun.png b/Resources/Textures/Structures/Machines/seed_extractor.rsi/traitgun.png
similarity index 100%
rename from Resources/Textures/Constructible/Hydroponics/machines.rsi/traitgun.png
rename to Resources/Textures/Structures/Machines/seed_extractor.rsi/traitgun.png
diff --git a/Resources/Textures/Constructible/Hydroponics/machines.rsi/traitscanner.png b/Resources/Textures/Structures/Machines/seed_extractor.rsi/traitscanner.png
similarity index 100%
rename from Resources/Textures/Constructible/Hydroponics/machines.rsi/traitscanner.png
rename to Resources/Textures/Structures/Machines/seed_extractor.rsi/traitscanner.png
diff --git a/Resources/Textures/Constructible/Power/server.rsi/meta.json b/Resources/Textures/Structures/Machines/server.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/server.rsi/meta.json
rename to Resources/Textures/Structures/Machines/server.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/server.rsi/server-nopower.png b/Resources/Textures/Structures/Machines/server.rsi/server-nopower.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/server.rsi/server-nopower.png
rename to Resources/Textures/Structures/Machines/server.rsi/server-nopower.png
diff --git a/Resources/Textures/Constructible/Power/server.rsi/server-off.png b/Resources/Textures/Structures/Machines/server.rsi/server-off.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/server.rsi/server-off.png
rename to Resources/Textures/Structures/Machines/server.rsi/server-off.png
diff --git a/Resources/Textures/Constructible/Power/server.rsi/server-on.png b/Resources/Textures/Structures/Machines/server.rsi/server-on.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/server.rsi/server-on.png
rename to Resources/Textures/Structures/Machines/server.rsi/server-on.png
diff --git a/Resources/Textures/Constructible/Power/server.rsi/server.png b/Resources/Textures/Structures/Machines/server.rsi/server.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/server.rsi/server.png
rename to Resources/Textures/Structures/Machines/server.rsi/server.png
diff --git a/Resources/Textures/Constructible/Power/server.rsi/server_o.png b/Resources/Textures/Structures/Machines/server.rsi/server_o.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/server.rsi/server_o.png
rename to Resources/Textures/Structures/Machines/server.rsi/server_o.png
diff --git a/Resources/Textures/Objects/Misc/traitordm.rsi/meta.json b/Resources/Textures/Structures/Machines/traitordm.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Objects/Misc/traitordm.rsi/meta.json
rename to Resources/Textures/Structures/Machines/traitordm.rsi/meta.json
diff --git a/Resources/Textures/Objects/Misc/traitordm.rsi/redemption-unshaded.png b/Resources/Textures/Structures/Machines/traitordm.rsi/redemption-unshaded.png
similarity index 100%
rename from Resources/Textures/Objects/Misc/traitordm.rsi/redemption-unshaded.png
rename to Resources/Textures/Structures/Machines/traitordm.rsi/redemption-unshaded.png
diff --git a/Resources/Textures/Objects/Misc/traitordm.rsi/redemption.png b/Resources/Textures/Structures/Machines/traitordm.rsi/redemption.png
similarity index 100%
rename from Resources/Textures/Objects/Misc/traitordm.rsi/redemption.png
rename to Resources/Textures/Structures/Machines/traitordm.rsi/redemption.png
diff --git a/Resources/Textures/Constructible/Atmos/gascanisterport.rsi/gasCanisterPort.png b/Resources/Textures/Structures/Piping/Atmospherics/gascanisterport.rsi/gasCanisterPort.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/gascanisterport.rsi/gasCanisterPort.png
rename to Resources/Textures/Structures/Piping/Atmospherics/gascanisterport.rsi/gasCanisterPort.png
diff --git a/Resources/Textures/Constructible/Atmos/gascanisterport.rsi/meta.json b/Resources/Textures/Structures/Piping/Atmospherics/gascanisterport.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/gascanisterport.rsi/meta.json
rename to Resources/Textures/Structures/Piping/Atmospherics/gascanisterport.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Atmos/gasfilter.rsi/gasFilter.png b/Resources/Textures/Structures/Piping/Atmospherics/gasfilter.rsi/gasFilter.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/gasfilter.rsi/gasFilter.png
rename to Resources/Textures/Structures/Piping/Atmospherics/gasfilter.rsi/gasFilter.png
diff --git a/Resources/Textures/Constructible/Atmos/gasfilter.rsi/gasFilterOn.png b/Resources/Textures/Structures/Piping/Atmospherics/gasfilter.rsi/gasFilterOn.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/gasfilter.rsi/gasFilterOn.png
rename to Resources/Textures/Structures/Piping/Atmospherics/gasfilter.rsi/gasFilterOn.png
diff --git a/Resources/Textures/Constructible/Atmos/gasfilter.rsi/meta.json b/Resources/Textures/Structures/Piping/Atmospherics/gasfilter.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/gasfilter.rsi/meta.json
rename to Resources/Textures/Structures/Piping/Atmospherics/gasfilter.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Atmos/gasgenerator.rsi/gasGenerator.png b/Resources/Textures/Structures/Piping/Atmospherics/gasgenerator.rsi/gasGenerator.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/gasgenerator.rsi/gasGenerator.png
rename to Resources/Textures/Structures/Piping/Atmospherics/gasgenerator.rsi/gasGenerator.png
diff --git a/Resources/Textures/Constructible/Atmos/gasgenerator.rsi/meta.json b/Resources/Textures/Structures/Piping/Atmospherics/gasgenerator.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/gasgenerator.rsi/meta.json
rename to Resources/Textures/Structures/Piping/Atmospherics/gasgenerator.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Atmos/miners.rsi/broken.png b/Resources/Textures/Structures/Piping/Atmospherics/miners.rsi/broken.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/miners.rsi/broken.png
rename to Resources/Textures/Structures/Piping/Atmospherics/miners.rsi/broken.png
diff --git a/Resources/Textures/Constructible/Atmos/miners.rsi/meta.json b/Resources/Textures/Structures/Piping/Atmospherics/miners.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/miners.rsi/meta.json
rename to Resources/Textures/Structures/Piping/Atmospherics/miners.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Atmos/miners.rsi/miner.png b/Resources/Textures/Structures/Piping/Atmospherics/miners.rsi/miner.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/miners.rsi/miner.png
rename to Resources/Textures/Structures/Piping/Atmospherics/miners.rsi/miner.png
diff --git a/Resources/Textures/Constructible/Atmos/miners.rsi/on.png b/Resources/Textures/Structures/Piping/Atmospherics/miners.rsi/on.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/miners.rsi/on.png
rename to Resources/Textures/Structures/Piping/Atmospherics/miners.rsi/on.png
diff --git a/Resources/Textures/Constructible/Atmos/pipe.rsi/meta.json b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/pipe.rsi/meta.json
rename to Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Atmos/pipe.rsi/pipeBend.png b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeBend.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/pipe.rsi/pipeBend.png
rename to Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeBend.png
diff --git a/Resources/Textures/Constructible/Atmos/pipe.rsi/pipeConnectorEast.png b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeConnectorEast.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/pipe.rsi/pipeConnectorEast.png
rename to Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeConnectorEast.png
diff --git a/Resources/Textures/Constructible/Atmos/pipe.rsi/pipeConnectorNorth.png b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeConnectorNorth.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/pipe.rsi/pipeConnectorNorth.png
rename to Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeConnectorNorth.png
diff --git a/Resources/Textures/Constructible/Atmos/pipe.rsi/pipeConnectorSouth.png b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeConnectorSouth.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/pipe.rsi/pipeConnectorSouth.png
rename to Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeConnectorSouth.png
diff --git a/Resources/Textures/Constructible/Atmos/pipe.rsi/pipeConnectorWest.png b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeConnectorWest.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/pipe.rsi/pipeConnectorWest.png
rename to Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeConnectorWest.png
diff --git a/Resources/Textures/Constructible/Atmos/pipe.rsi/pipeFourway.png b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeFourway.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/pipe.rsi/pipeFourway.png
rename to Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeFourway.png
diff --git a/Resources/Textures/Constructible/Atmos/pipe.rsi/pipeHalf.png b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeHalf.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/pipe.rsi/pipeHalf.png
rename to Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeHalf.png
diff --git a/Resources/Textures/Constructible/Atmos/pipe.rsi/pipeStraight.png b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeStraight.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/pipe.rsi/pipeStraight.png
rename to Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeStraight.png
diff --git a/Resources/Textures/Constructible/Atmos/pipe.rsi/pipeTJunction.png b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeTJunction.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/pipe.rsi/pipeTJunction.png
rename to Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeTJunction.png
diff --git a/Resources/Textures/Constructible/Atmos/pump.rsi/meta.json b/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/pump.rsi/meta.json
rename to Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Atmos/pump.rsi/pumpDigitalValve.png b/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpDigitalValve.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/pump.rsi/pumpDigitalValve.png
rename to Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpDigitalValve.png
diff --git a/Resources/Textures/Constructible/Atmos/pump.rsi/pumpManualValve.png b/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpManualValve.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/pump.rsi/pumpManualValve.png
rename to Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpManualValve.png
diff --git a/Resources/Textures/Constructible/Atmos/pump.rsi/pumpPassiveGate.png b/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpPassiveGate.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/pump.rsi/pumpPassiveGate.png
rename to Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpPassiveGate.png
diff --git a/Resources/Textures/Constructible/Atmos/pump.rsi/pumpPassiveGateOn.png b/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpPassiveGateOn.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/pump.rsi/pumpPassiveGateOn.png
rename to Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpPassiveGateOn.png
diff --git a/Resources/Textures/Constructible/Atmos/pump.rsi/pumpPressure.png b/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpPressure.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/pump.rsi/pumpPressure.png
rename to Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpPressure.png
diff --git a/Resources/Textures/Constructible/Atmos/pump.rsi/pumpPressureOn.png b/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpPressureOn.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/pump.rsi/pumpPressureOn.png
rename to Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpPressureOn.png
diff --git a/Resources/Textures/Constructible/Atmos/pump.rsi/pumpVolume.png b/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpVolume.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/pump.rsi/pumpVolume.png
rename to Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpVolume.png
diff --git a/Resources/Textures/Constructible/Atmos/pump.rsi/pumpVolumeOn.png b/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpVolumeOn.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/pump.rsi/pumpVolumeOn.png
rename to Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpVolumeOn.png
diff --git a/Resources/Textures/Constructible/Atmos/scrubber.rsi/meta.json b/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/scrubber.rsi/meta.json
rename to Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Atmos/scrubber.rsi/scrub_off.png b/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_off.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/scrubber.rsi/scrub_off.png
rename to Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_off.png
diff --git a/Resources/Textures/Constructible/Atmos/scrubber.rsi/scrub_on.png b/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_on.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/scrubber.rsi/scrub_on.png
rename to Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_on.png
diff --git a/Resources/Textures/Constructible/Atmos/scrubber.rsi/scrub_purge.png b/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_purge.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/scrubber.rsi/scrub_purge.png
rename to Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_purge.png
diff --git a/Resources/Textures/Constructible/Atmos/scrubber.rsi/scrub_welded.png b/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_welded.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/scrubber.rsi/scrub_welded.png
rename to Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_welded.png
diff --git a/Resources/Textures/Constructible/Atmos/scrubber.rsi/scrub_wide.png b/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_wide.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/scrubber.rsi/scrub_wide.png
rename to Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_wide.png
diff --git a/Resources/Textures/Constructible/Atmos/thermomachine.rsi/freezer_off.png b/Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/freezer_off.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/thermomachine.rsi/freezer_off.png
rename to Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/freezer_off.png
diff --git a/Resources/Textures/Constructible/Atmos/thermomachine.rsi/freezer_on.png b/Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/freezer_on.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/thermomachine.rsi/freezer_on.png
rename to Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/freezer_on.png
diff --git a/Resources/Textures/Constructible/Atmos/thermomachine.rsi/freezer_open.png b/Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/freezer_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/thermomachine.rsi/freezer_open.png
rename to Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/freezer_open.png
diff --git a/Resources/Textures/Constructible/Atmos/thermomachine.rsi/heater_off.png b/Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/heater_off.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/thermomachine.rsi/heater_off.png
rename to Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/heater_off.png
diff --git a/Resources/Textures/Constructible/Atmos/thermomachine.rsi/heater_on.png b/Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/heater_on.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/thermomachine.rsi/heater_on.png
rename to Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/heater_on.png
diff --git a/Resources/Textures/Constructible/Atmos/thermomachine.rsi/heater_open.png b/Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/heater_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/thermomachine.rsi/heater_open.png
rename to Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/heater_open.png
diff --git a/Resources/Textures/Constructible/Atmos/thermomachine.rsi/meta.json b/Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/thermomachine.rsi/meta.json
rename to Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Atmos/thermomachine.rsi/pipe.png b/Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/pipe.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/thermomachine.rsi/pipe.png
rename to Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/pipe.png
diff --git a/Resources/Textures/Constructible/Atmos/vent.rsi/meta.json b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/vent.rsi/meta.json
rename to Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Atmos/vent.rsi/vent_in.png b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_in.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/vent.rsi/vent_in.png
rename to Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_in.png
diff --git a/Resources/Textures/Constructible/Atmos/vent.rsi/vent_off.png b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_off.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/vent.rsi/vent_off.png
rename to Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_off.png
diff --git a/Resources/Textures/Constructible/Atmos/vent.rsi/vent_out.png b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_out.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/vent.rsi/vent_out.png
rename to Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_out.png
diff --git a/Resources/Textures/Constructible/Atmos/vent.rsi/vent_welded.png b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_welded.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/vent.rsi/vent_welded.png
rename to Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_welded.png
diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/condisposal.png b/Resources/Textures/Structures/Piping/disposal.rsi/condisposal.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/disposal.rsi/condisposal.png
rename to Resources/Textures/Structures/Piping/disposal.rsi/condisposal.png
diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/conpipe-c.png b/Resources/Textures/Structures/Piping/disposal.rsi/conpipe-c.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/disposal.rsi/conpipe-c.png
rename to Resources/Textures/Structures/Piping/disposal.rsi/conpipe-c.png
diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/conpipe-j1.png b/Resources/Textures/Structures/Piping/disposal.rsi/conpipe-j1.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/disposal.rsi/conpipe-j1.png
rename to Resources/Textures/Structures/Piping/disposal.rsi/conpipe-j1.png
diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/conpipe-j1s.png b/Resources/Textures/Structures/Piping/disposal.rsi/conpipe-j1s.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/disposal.rsi/conpipe-j1s.png
rename to Resources/Textures/Structures/Piping/disposal.rsi/conpipe-j1s.png
diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/conpipe-j2.png b/Resources/Textures/Structures/Piping/disposal.rsi/conpipe-j2.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/disposal.rsi/conpipe-j2.png
rename to Resources/Textures/Structures/Piping/disposal.rsi/conpipe-j2.png
diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/conpipe-j2s.png b/Resources/Textures/Structures/Piping/disposal.rsi/conpipe-j2s.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/disposal.rsi/conpipe-j2s.png
rename to Resources/Textures/Structures/Piping/disposal.rsi/conpipe-j2s.png
diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/conpipe-s.png b/Resources/Textures/Structures/Piping/disposal.rsi/conpipe-s.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/disposal.rsi/conpipe-s.png
rename to Resources/Textures/Structures/Piping/disposal.rsi/conpipe-s.png
diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/conpipe-t.png b/Resources/Textures/Structures/Piping/disposal.rsi/conpipe-t.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/disposal.rsi/conpipe-t.png
rename to Resources/Textures/Structures/Piping/disposal.rsi/conpipe-t.png
diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/conpipe-tagger.png b/Resources/Textures/Structures/Piping/disposal.rsi/conpipe-tagger.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/disposal.rsi/conpipe-tagger.png
rename to Resources/Textures/Structures/Piping/disposal.rsi/conpipe-tagger.png
diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/conpipe-y.png b/Resources/Textures/Structures/Piping/disposal.rsi/conpipe-y.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/disposal.rsi/conpipe-y.png
rename to Resources/Textures/Structures/Piping/disposal.rsi/conpipe-y.png
diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/disposal-charging.png b/Resources/Textures/Structures/Piping/disposal.rsi/disposal-charging.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/disposal.rsi/disposal-charging.png
rename to Resources/Textures/Structures/Piping/disposal.rsi/disposal-charging.png
diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/disposal-flush.png b/Resources/Textures/Structures/Piping/disposal.rsi/disposal-flush.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/disposal.rsi/disposal-flush.png
rename to Resources/Textures/Structures/Piping/disposal.rsi/disposal-flush.png
diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/disposal.png b/Resources/Textures/Structures/Piping/disposal.rsi/disposal.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/disposal.rsi/disposal.png
rename to Resources/Textures/Structures/Piping/disposal.rsi/disposal.png
diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/dispover-charge.png b/Resources/Textures/Structures/Piping/disposal.rsi/dispover-charge.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/disposal.rsi/dispover-charge.png
rename to Resources/Textures/Structures/Piping/disposal.rsi/dispover-charge.png
diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/dispover-full.png b/Resources/Textures/Structures/Piping/disposal.rsi/dispover-full.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/disposal.rsi/dispover-full.png
rename to Resources/Textures/Structures/Piping/disposal.rsi/dispover-full.png
diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/dispover-handle.png b/Resources/Textures/Structures/Piping/disposal.rsi/dispover-handle.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/disposal.rsi/dispover-handle.png
rename to Resources/Textures/Structures/Piping/disposal.rsi/dispover-handle.png
diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/dispover-ready.png b/Resources/Textures/Structures/Piping/disposal.rsi/dispover-ready.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/disposal.rsi/dispover-ready.png
rename to Resources/Textures/Structures/Piping/disposal.rsi/dispover-ready.png
diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/intake-closing.png b/Resources/Textures/Structures/Piping/disposal.rsi/intake-closing.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/disposal.rsi/intake-closing.png
rename to Resources/Textures/Structures/Piping/disposal.rsi/intake-closing.png
diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/intake.png b/Resources/Textures/Structures/Piping/disposal.rsi/intake.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/disposal.rsi/intake.png
rename to Resources/Textures/Structures/Piping/disposal.rsi/intake.png
diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/meta.json b/Resources/Textures/Structures/Piping/disposal.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/disposal.rsi/meta.json
rename to Resources/Textures/Structures/Piping/disposal.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/outlet-open.png b/Resources/Textures/Structures/Piping/disposal.rsi/outlet-open.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/disposal.rsi/outlet-open.png
rename to Resources/Textures/Structures/Piping/disposal.rsi/outlet-open.png
diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/outlet.png b/Resources/Textures/Structures/Piping/disposal.rsi/outlet.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/disposal.rsi/outlet.png
rename to Resources/Textures/Structures/Piping/disposal.rsi/outlet.png
diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/pipe-b.png b/Resources/Textures/Structures/Piping/disposal.rsi/pipe-b.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/disposal.rsi/pipe-b.png
rename to Resources/Textures/Structures/Piping/disposal.rsi/pipe-b.png
diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/pipe-bf.png b/Resources/Textures/Structures/Piping/disposal.rsi/pipe-bf.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/disposal.rsi/pipe-bf.png
rename to Resources/Textures/Structures/Piping/disposal.rsi/pipe-bf.png
diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/pipe-c.png b/Resources/Textures/Structures/Piping/disposal.rsi/pipe-c.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/disposal.rsi/pipe-c.png
rename to Resources/Textures/Structures/Piping/disposal.rsi/pipe-c.png
diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/pipe-cf.png b/Resources/Textures/Structures/Piping/disposal.rsi/pipe-cf.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/disposal.rsi/pipe-cf.png
rename to Resources/Textures/Structures/Piping/disposal.rsi/pipe-cf.png
diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/pipe-d.png b/Resources/Textures/Structures/Piping/disposal.rsi/pipe-d.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/disposal.rsi/pipe-d.png
rename to Resources/Textures/Structures/Piping/disposal.rsi/pipe-d.png
diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/pipe-j1.png b/Resources/Textures/Structures/Piping/disposal.rsi/pipe-j1.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/disposal.rsi/pipe-j1.png
rename to Resources/Textures/Structures/Piping/disposal.rsi/pipe-j1.png
diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/pipe-j1f.png b/Resources/Textures/Structures/Piping/disposal.rsi/pipe-j1f.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/disposal.rsi/pipe-j1f.png
rename to Resources/Textures/Structures/Piping/disposal.rsi/pipe-j1f.png
diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/pipe-j1s.png b/Resources/Textures/Structures/Piping/disposal.rsi/pipe-j1s.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/disposal.rsi/pipe-j1s.png
rename to Resources/Textures/Structures/Piping/disposal.rsi/pipe-j1s.png
diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/pipe-j1sf.png b/Resources/Textures/Structures/Piping/disposal.rsi/pipe-j1sf.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/disposal.rsi/pipe-j1sf.png
rename to Resources/Textures/Structures/Piping/disposal.rsi/pipe-j1sf.png
diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/pipe-j2.png b/Resources/Textures/Structures/Piping/disposal.rsi/pipe-j2.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/disposal.rsi/pipe-j2.png
rename to Resources/Textures/Structures/Piping/disposal.rsi/pipe-j2.png
diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/pipe-j2f.png b/Resources/Textures/Structures/Piping/disposal.rsi/pipe-j2f.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/disposal.rsi/pipe-j2f.png
rename to Resources/Textures/Structures/Piping/disposal.rsi/pipe-j2f.png
diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/pipe-j2s.png b/Resources/Textures/Structures/Piping/disposal.rsi/pipe-j2s.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/disposal.rsi/pipe-j2s.png
rename to Resources/Textures/Structures/Piping/disposal.rsi/pipe-j2s.png
diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/pipe-j2sf.png b/Resources/Textures/Structures/Piping/disposal.rsi/pipe-j2sf.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/disposal.rsi/pipe-j2sf.png
rename to Resources/Textures/Structures/Piping/disposal.rsi/pipe-j2sf.png
diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/pipe-s.png b/Resources/Textures/Structures/Piping/disposal.rsi/pipe-s.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/disposal.rsi/pipe-s.png
rename to Resources/Textures/Structures/Piping/disposal.rsi/pipe-s.png
diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/pipe-sf.png b/Resources/Textures/Structures/Piping/disposal.rsi/pipe-sf.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/disposal.rsi/pipe-sf.png
rename to Resources/Textures/Structures/Piping/disposal.rsi/pipe-sf.png
diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/pipe-t.png b/Resources/Textures/Structures/Piping/disposal.rsi/pipe-t.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/disposal.rsi/pipe-t.png
rename to Resources/Textures/Structures/Piping/disposal.rsi/pipe-t.png
diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/pipe-tagger-partial.png b/Resources/Textures/Structures/Piping/disposal.rsi/pipe-tagger-partial.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/disposal.rsi/pipe-tagger-partial.png
rename to Resources/Textures/Structures/Piping/disposal.rsi/pipe-tagger-partial.png
diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/pipe-tagger.png b/Resources/Textures/Structures/Piping/disposal.rsi/pipe-tagger.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/disposal.rsi/pipe-tagger.png
rename to Resources/Textures/Structures/Piping/disposal.rsi/pipe-tagger.png
diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/pipe-tf.png b/Resources/Textures/Structures/Piping/disposal.rsi/pipe-tf.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/disposal.rsi/pipe-tf.png
rename to Resources/Textures/Structures/Piping/disposal.rsi/pipe-tf.png
diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/pipe-u.png b/Resources/Textures/Structures/Piping/disposal.rsi/pipe-u.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/disposal.rsi/pipe-u.png
rename to Resources/Textures/Structures/Piping/disposal.rsi/pipe-u.png
diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/pipe-y.png b/Resources/Textures/Structures/Piping/disposal.rsi/pipe-y.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/disposal.rsi/pipe-y.png
rename to Resources/Textures/Structures/Piping/disposal.rsi/pipe-y.png
diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/pipe-yf.png b/Resources/Textures/Structures/Piping/disposal.rsi/pipe-yf.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/disposal.rsi/pipe-yf.png
rename to Resources/Textures/Structures/Piping/disposal.rsi/pipe-yf.png
diff --git a/Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_0.png b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_0.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_0.png
rename to Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_0.png
diff --git a/Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_1.png b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_1.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_1.png
rename to Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_1.png
diff --git a/Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_10.png b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_10.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_10.png
rename to Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_10.png
diff --git a/Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_11.png b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_11.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_11.png
rename to Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_11.png
diff --git a/Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_12.png b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_12.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_12.png
rename to Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_12.png
diff --git a/Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_13.png b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_13.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_13.png
rename to Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_13.png
diff --git a/Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_14.png b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_14.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_14.png
rename to Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_14.png
diff --git a/Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_15.png b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_15.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_15.png
rename to Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_15.png
diff --git a/Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_2.png b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_2.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_2.png
rename to Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_2.png
diff --git a/Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_3.png b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_3.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_3.png
rename to Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_3.png
diff --git a/Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_4.png b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_4.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_4.png
rename to Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_4.png
diff --git a/Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_5.png b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_5.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_5.png
rename to Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_5.png
diff --git a/Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_6.png b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_6.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_6.png
rename to Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_6.png
diff --git a/Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_7.png b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_7.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_7.png
rename to Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_7.png
diff --git a/Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_8.png b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_8.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_8.png
rename to Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_8.png
diff --git a/Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_9.png b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_9.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_9.png
rename to Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_9.png
diff --git a/Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/meta.json b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/meta.json
rename to Resources/Textures/Structures/Power/Cables/hv_cable.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_0.png b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_0.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_0.png
rename to Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_0.png
diff --git a/Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_1.png b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_1.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_1.png
rename to Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_1.png
diff --git a/Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_10.png b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_10.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_10.png
rename to Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_10.png
diff --git a/Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_11.png b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_11.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_11.png
rename to Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_11.png
diff --git a/Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_12.png b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_12.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_12.png
rename to Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_12.png
diff --git a/Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_13.png b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_13.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_13.png
rename to Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_13.png
diff --git a/Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_14.png b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_14.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_14.png
rename to Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_14.png
diff --git a/Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_15.png b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_15.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_15.png
rename to Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_15.png
diff --git a/Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_2.png b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_2.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_2.png
rename to Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_2.png
diff --git a/Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_3.png b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_3.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_3.png
rename to Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_3.png
diff --git a/Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_4.png b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_4.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_4.png
rename to Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_4.png
diff --git a/Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_5.png b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_5.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_5.png
rename to Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_5.png
diff --git a/Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_6.png b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_6.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_6.png
rename to Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_6.png
diff --git a/Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_7.png b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_7.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_7.png
rename to Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_7.png
diff --git a/Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_8.png b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_8.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_8.png
rename to Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_8.png
diff --git a/Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_9.png b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_9.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_9.png
rename to Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_9.png
diff --git a/Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/meta.json b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/meta.json
rename to Resources/Textures/Structures/Power/Cables/lv_cable.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/meta.json b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/meta.json
rename to Resources/Textures/Structures/Power/Cables/mv_cable.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_0.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_0.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_0.png
rename to Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_0.png
diff --git a/Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_1.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_1.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_1.png
rename to Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_1.png
diff --git a/Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_10.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_10.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_10.png
rename to Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_10.png
diff --git a/Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_11.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_11.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_11.png
rename to Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_11.png
diff --git a/Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_12.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_12.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_12.png
rename to Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_12.png
diff --git a/Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_13.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_13.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_13.png
rename to Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_13.png
diff --git a/Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_14.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_14.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_14.png
rename to Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_14.png
diff --git a/Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_15.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_15.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_15.png
rename to Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_15.png
diff --git a/Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_2.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_2.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_2.png
rename to Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_2.png
diff --git a/Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_3.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_3.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_3.png
rename to Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_3.png
diff --git a/Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_4.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_4.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_4.png
rename to Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_4.png
diff --git a/Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_5.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_5.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_5.png
rename to Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_5.png
diff --git a/Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_6.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_6.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_6.png
rename to Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_6.png
diff --git a/Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_7.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_7.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_7.png
rename to Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_7.png
diff --git a/Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_8.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_8.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_8.png
rename to Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_8.png
diff --git a/Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_9.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_9.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_9.png
rename to Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_9.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/box.png b/Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/box.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/box.png
rename to Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/box.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/boxc.png b/Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/boxc.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/boxc.png
rename to Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/boxc.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/boxw.png b/Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/boxw.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/boxw.png
rename to Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/boxw.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/meta.json
rename to Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/unlitp.png b/Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/unlitp.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/unlitp.png
rename to Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/unlitp.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/unlitp0.png b/Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/unlitp0.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/unlitp0.png
rename to Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/unlitp0.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/unlitp1.png b/Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/unlitp1.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/unlitp1.png
rename to Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/unlitp1.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/unlitp2.png b/Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/unlitp2.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/unlitp2.png
rename to Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/unlitp2.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/unlitp3.png b/Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/unlitp3.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/unlitp3.png
rename to Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/unlitp3.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/emitter_center.rsi/center.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/center.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/emitter_center.rsi/center.png
rename to Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/center.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/emitter_center.rsi/centerc.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/centerc.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/emitter_center.rsi/centerc.png
rename to Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/centerc.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/emitter_center.rsi/centerw.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/centerw.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/emitter_center.rsi/centerw.png
rename to Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/centerw.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/emitter_center.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/emitter_center.rsi/meta.json
rename to Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/emitter_center.rsi/unlitp.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/unlitp.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/emitter_center.rsi/unlitp.png
rename to Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/unlitp.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/emitter_center.rsi/unlitp0.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/unlitp0.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/emitter_center.rsi/unlitp0.png
rename to Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/unlitp0.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/emitter_center.rsi/unlitp1.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/unlitp1.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/emitter_center.rsi/unlitp1.png
rename to Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/unlitp1.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/emitter_center.rsi/unlitp2.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/unlitp2.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/emitter_center.rsi/unlitp2.png
rename to Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/unlitp2.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/emitter_center.rsi/unlitp3.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/unlitp3.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/emitter_center.rsi/unlitp3.png
rename to Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/unlitp3.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/emitter_left.rsi/left.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/left.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/emitter_left.rsi/left.png
rename to Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/left.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/emitter_left.rsi/leftc.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/leftc.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/emitter_left.rsi/leftc.png
rename to Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/leftc.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/emitter_left.rsi/leftw.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/leftw.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/emitter_left.rsi/leftw.png
rename to Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/leftw.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/emitter_left.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/emitter_left.rsi/meta.json
rename to Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/emitter_left.rsi/unlitp.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/unlitp.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/emitter_left.rsi/unlitp.png
rename to Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/unlitp.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/emitter_left.rsi/unlitp0.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/unlitp0.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/emitter_left.rsi/unlitp0.png
rename to Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/unlitp0.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/emitter_left.rsi/unlitp1.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/unlitp1.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/emitter_left.rsi/unlitp1.png
rename to Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/unlitp1.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/emitter_left.rsi/unlitp2.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/unlitp2.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/emitter_left.rsi/unlitp2.png
rename to Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/unlitp2.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/emitter_left.rsi/unlitp3.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/unlitp3.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/emitter_left.rsi/unlitp3.png
rename to Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/unlitp3.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/emitter_right.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/emitter_right.rsi/meta.json
rename to Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/emitter_right.rsi/right.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/right.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/emitter_right.rsi/right.png
rename to Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/right.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/emitter_right.rsi/rightc.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/rightc.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/emitter_right.rsi/rightc.png
rename to Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/rightc.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/emitter_right.rsi/rightw.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/rightw.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/emitter_right.rsi/rightw.png
rename to Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/rightw.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/emitter_right.rsi/unlitp.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/unlitp.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/emitter_right.rsi/unlitp.png
rename to Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/unlitp.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/emitter_right.rsi/unlitp0.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/unlitp0.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/emitter_right.rsi/unlitp0.png
rename to Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/unlitp0.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/emitter_right.rsi/unlitp1.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/unlitp1.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/emitter_right.rsi/unlitp1.png
rename to Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/unlitp1.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/emitter_right.rsi/unlitp2.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/unlitp2.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/emitter_right.rsi/unlitp2.png
rename to Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/unlitp2.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/emitter_right.rsi/unlitp3.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/unlitp3.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/emitter_right.rsi/unlitp3.png
rename to Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/unlitp3.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/end_cap.rsi/cap.png b/Resources/Textures/Structures/Power/Generation/PA/end_cap.rsi/cap.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/end_cap.rsi/cap.png
rename to Resources/Textures/Structures/Power/Generation/PA/end_cap.rsi/cap.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/end_cap.rsi/capc.png b/Resources/Textures/Structures/Power/Generation/PA/end_cap.rsi/capc.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/end_cap.rsi/capc.png
rename to Resources/Textures/Structures/Power/Generation/PA/end_cap.rsi/capc.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/end_cap.rsi/capw.png b/Resources/Textures/Structures/Power/Generation/PA/end_cap.rsi/capw.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/end_cap.rsi/capw.png
rename to Resources/Textures/Structures/Power/Generation/PA/end_cap.rsi/capw.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/end_cap.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/PA/end_cap.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/end_cap.rsi/meta.json
rename to Resources/Textures/Structures/Power/Generation/PA/end_cap.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/fuel_chamber.rsi/chamber.png b/Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/chamber.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/fuel_chamber.rsi/chamber.png
rename to Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/chamber.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/fuel_chamber.rsi/chamberc.png b/Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/chamberc.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/fuel_chamber.rsi/chamberc.png
rename to Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/chamberc.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/fuel_chamber.rsi/chamberw.png b/Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/chamberw.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/fuel_chamber.rsi/chamberw.png
rename to Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/chamberw.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/fuel_chamber.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/fuel_chamber.rsi/meta.json
rename to Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/fuel_chamber.rsi/unlitp.png b/Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/unlitp.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/fuel_chamber.rsi/unlitp.png
rename to Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/unlitp.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/fuel_chamber.rsi/unlitp0.png b/Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/unlitp0.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/fuel_chamber.rsi/unlitp0.png
rename to Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/unlitp0.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/fuel_chamber.rsi/unlitp1.png b/Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/unlitp1.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/fuel_chamber.rsi/unlitp1.png
rename to Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/unlitp1.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/fuel_chamber.rsi/unlitp2.png b/Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/unlitp2.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/fuel_chamber.rsi/unlitp2.png
rename to Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/unlitp2.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/fuel_chamber.rsi/unlitp3.png b/Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/unlitp3.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/fuel_chamber.rsi/unlitp3.png
rename to Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/unlitp3.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/particle.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/PA/particle.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/particle.rsi/meta.json
rename to Resources/Textures/Structures/Power/Generation/PA/particle.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/particle.rsi/particle0.png b/Resources/Textures/Structures/Power/Generation/PA/particle.rsi/particle0.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/particle.rsi/particle0.png
rename to Resources/Textures/Structures/Power/Generation/PA/particle.rsi/particle0.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/particle.rsi/particle1.png b/Resources/Textures/Structures/Power/Generation/PA/particle.rsi/particle1.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/particle.rsi/particle1.png
rename to Resources/Textures/Structures/Power/Generation/PA/particle.rsi/particle1.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/particle.rsi/particle2.png b/Resources/Textures/Structures/Power/Generation/PA/particle.rsi/particle2.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/particle.rsi/particle2.png
rename to Resources/Textures/Structures/Power/Generation/PA/particle.rsi/particle2.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/particle.rsi/particle3.png b/Resources/Textures/Structures/Power/Generation/PA/particle.rsi/particle3.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/particle.rsi/particle3.png
rename to Resources/Textures/Structures/Power/Generation/PA/particle.rsi/particle3.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/power_box.rsi/box.png b/Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/box.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/power_box.rsi/box.png
rename to Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/box.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/power_box.rsi/boxc.png b/Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/boxc.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/power_box.rsi/boxc.png
rename to Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/boxc.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/power_box.rsi/boxw.png b/Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/boxw.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/power_box.rsi/boxw.png
rename to Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/boxw.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/power_box.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/power_box.rsi/meta.json
rename to Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/power_box.rsi/unlitp.png b/Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/unlitp.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/power_box.rsi/unlitp.png
rename to Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/unlitp.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/power_box.rsi/unlitp0.png b/Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/unlitp0.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/power_box.rsi/unlitp0.png
rename to Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/unlitp0.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/power_box.rsi/unlitp1.png b/Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/unlitp1.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/power_box.rsi/unlitp1.png
rename to Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/unlitp1.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/power_box.rsi/unlitp2.png b/Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/unlitp2.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/power_box.rsi/unlitp2.png
rename to Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/unlitp2.png
diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/power_box.rsi/unlitp3.png b/Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/unlitp3.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Engines/PA/power_box.rsi/unlitp3.png
rename to Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/unlitp3.png
diff --git a/Resources/Textures/Constructible/Power/Singularity/collector.rsi/ca_active.png b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_active.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Singularity/collector.rsi/ca_active.png
rename to Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_active.png
diff --git a/Resources/Textures/Constructible/Power/Singularity/collector.rsi/ca_deactive.png b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_deactive.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Singularity/collector.rsi/ca_deactive.png
rename to Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_deactive.png
diff --git a/Resources/Textures/Constructible/Power/Singularity/collector.rsi/ca_off.png b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_off.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Singularity/collector.rsi/ca_off.png
rename to Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_off.png
diff --git a/Resources/Textures/Constructible/Power/Singularity/collector.rsi/ca_on.png b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_on.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Singularity/collector.rsi/ca_on.png
rename to Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_on.png
diff --git a/Resources/Textures/Constructible/Power/Singularity/collector.rsi/cu.png b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/cu.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Singularity/collector.rsi/cu.png
rename to Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/cu.png
diff --git a/Resources/Textures/Constructible/Power/Singularity/collector.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/Singularity/collector.rsi/meta.json
rename to Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/Singularity/containment.rsi/a1.png b/Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/a1.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Singularity/containment.rsi/a1.png
rename to Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/a1.png
diff --git a/Resources/Textures/Constructible/Power/Singularity/containment.rsi/a2.png b/Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/a2.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Singularity/containment.rsi/a2.png
rename to Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/a2.png
diff --git a/Resources/Textures/Constructible/Power/Singularity/containment.rsi/a3.png b/Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/a3.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Singularity/containment.rsi/a3.png
rename to Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/a3.png
diff --git a/Resources/Textures/Constructible/Power/Singularity/containment.rsi/icon.png b/Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Singularity/containment.rsi/icon.png
rename to Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/icon.png
diff --git a/Resources/Textures/Constructible/Power/Singularity/containment.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/Singularity/containment.rsi/meta.json
rename to Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/Singularity/containment.rsi/on.png b/Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/on.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Singularity/containment.rsi/on.png
rename to Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/on.png
diff --git a/Resources/Textures/Constructible/Power/Singularity/containment.rsi/p1.png b/Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/p1.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Singularity/containment.rsi/p1.png
rename to Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/p1.png
diff --git a/Resources/Textures/Constructible/Power/Singularity/containment.rsi/p2.png b/Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/p2.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Singularity/containment.rsi/p2.png
rename to Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/p2.png
diff --git a/Resources/Textures/Constructible/Power/Singularity/containment.rsi/p3.png b/Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/p3.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Singularity/containment.rsi/p3.png
rename to Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/p3.png
diff --git a/Resources/Textures/Constructible/Power/Singularity/containment.rsi/p4.png b/Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/p4.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Singularity/containment.rsi/p4.png
rename to Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/p4.png
diff --git a/Resources/Textures/Constructible/Power/Singularity/containment.rsi/p5.png b/Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/p5.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Singularity/containment.rsi/p5.png
rename to Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/p5.png
diff --git a/Resources/Textures/Constructible/Power/Singularity/containment.rsi/p6.png b/Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/p6.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Singularity/containment.rsi/p6.png
rename to Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/p6.png
diff --git a/Resources/Textures/Constructible/Power/Singularity/containment_field.rsi/field.png b/Resources/Textures/Structures/Power/Generation/Singularity/containment_field.rsi/field.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Singularity/containment_field.rsi/field.png
rename to Resources/Textures/Structures/Power/Generation/Singularity/containment_field.rsi/field.png
diff --git a/Resources/Textures/Constructible/Power/Singularity/containment_field.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/Singularity/containment_field.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/Singularity/containment_field.rsi/meta.json
rename to Resources/Textures/Structures/Power/Generation/Singularity/containment_field.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/Singularity/emitter.rsi/beam.png b/Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/beam.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Singularity/emitter.rsi/beam.png
rename to Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/beam.png
diff --git a/Resources/Textures/Constructible/Power/Singularity/emitter.rsi/emitter0.png b/Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/emitter0.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Singularity/emitter.rsi/emitter0.png
rename to Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/emitter0.png
diff --git a/Resources/Textures/Constructible/Power/Singularity/emitter.rsi/emitter1.png b/Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/emitter1.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Singularity/emitter.rsi/emitter1.png
rename to Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/emitter1.png
diff --git a/Resources/Textures/Constructible/Power/Singularity/emitter.rsi/emitter2.png b/Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/emitter2.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Singularity/emitter.rsi/emitter2.png
rename to Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/emitter2.png
diff --git a/Resources/Textures/Constructible/Power/Singularity/emitter.rsi/lock.png b/Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/lock.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Singularity/emitter.rsi/lock.png
rename to Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/lock.png
diff --git a/Resources/Textures/Constructible/Power/Singularity/emitter.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/Singularity/emitter.rsi/meta.json
rename to Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/Singularity/emitter.rsi/projectile.png b/Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/projectile.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Singularity/emitter.rsi/projectile.png
rename to Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/projectile.png
diff --git a/Resources/Textures/Constructible/Power/Singularity/emitter.rsi/underpowered.png b/Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/underpowered.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Singularity/emitter.rsi/underpowered.png
rename to Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/underpowered.png
diff --git a/Resources/Textures/Constructible/Power/Singularity/generator.rsi/icon.png b/Resources/Textures/Structures/Power/Generation/Singularity/generator.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Singularity/generator.rsi/icon.png
rename to Resources/Textures/Structures/Power/Generation/Singularity/generator.rsi/icon.png
diff --git a/Resources/Textures/Constructible/Power/Singularity/generator.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/Singularity/generator.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/Singularity/generator.rsi/meta.json
rename to Resources/Textures/Structures/Power/Generation/Singularity/generator.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/Singularity/singularity_1.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/Singularity/singularity_1.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/Singularity/singularity_1.rsi/meta.json
rename to Resources/Textures/Structures/Power/Generation/Singularity/singularity_1.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/Singularity/singularity_1.rsi/singularity_1.png b/Resources/Textures/Structures/Power/Generation/Singularity/singularity_1.rsi/singularity_1.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Singularity/singularity_1.rsi/singularity_1.png
rename to Resources/Textures/Structures/Power/Generation/Singularity/singularity_1.rsi/singularity_1.png
diff --git a/Resources/Textures/Constructible/Power/Singularity/singularity_2.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/Singularity/singularity_2.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/Singularity/singularity_2.rsi/meta.json
rename to Resources/Textures/Structures/Power/Generation/Singularity/singularity_2.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/Singularity/singularity_2.rsi/singularity_2.png b/Resources/Textures/Structures/Power/Generation/Singularity/singularity_2.rsi/singularity_2.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Singularity/singularity_2.rsi/singularity_2.png
rename to Resources/Textures/Structures/Power/Generation/Singularity/singularity_2.rsi/singularity_2.png
diff --git a/Resources/Textures/Constructible/Power/Singularity/singularity_3.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/Singularity/singularity_3.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/Singularity/singularity_3.rsi/meta.json
rename to Resources/Textures/Structures/Power/Generation/Singularity/singularity_3.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/Singularity/singularity_3.rsi/singularity_3.png b/Resources/Textures/Structures/Power/Generation/Singularity/singularity_3.rsi/singularity_3.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Singularity/singularity_3.rsi/singularity_3.png
rename to Resources/Textures/Structures/Power/Generation/Singularity/singularity_3.rsi/singularity_3.png
diff --git a/Resources/Textures/Constructible/Power/Singularity/singularity_4.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/Singularity/singularity_4.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/Singularity/singularity_4.rsi/meta.json
rename to Resources/Textures/Structures/Power/Generation/Singularity/singularity_4.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/Singularity/singularity_4.rsi/singularity_4.png b/Resources/Textures/Structures/Power/Generation/Singularity/singularity_4.rsi/singularity_4.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Singularity/singularity_4.rsi/singularity_4.png
rename to Resources/Textures/Structures/Power/Generation/Singularity/singularity_4.rsi/singularity_4.png
diff --git a/Resources/Textures/Constructible/Power/Singularity/singularity_5.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/Singularity/singularity_5.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/Singularity/singularity_5.rsi/meta.json
rename to Resources/Textures/Structures/Power/Generation/Singularity/singularity_5.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/Singularity/singularity_5.rsi/singularity_5.png b/Resources/Textures/Structures/Power/Generation/Singularity/singularity_5.rsi/singularity_5.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Singularity/singularity_5.rsi/singularity_5.png
rename to Resources/Textures/Structures/Power/Generation/Singularity/singularity_5.rsi/singularity_5.png
diff --git a/Resources/Textures/Constructible/Power/Singularity/singularity_6.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/Singularity/singularity_6.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/Singularity/singularity_6.rsi/meta.json
rename to Resources/Textures/Structures/Power/Generation/Singularity/singularity_6.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/Singularity/singularity_6.rsi/singularity_6.png b/Resources/Textures/Structures/Power/Generation/Singularity/singularity_6.rsi/singularity_6.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/Singularity/singularity_6.rsi/singularity_6.png
rename to Resources/Textures/Structures/Power/Generation/Singularity/singularity_6.rsi/singularity_6.png
diff --git a/Resources/Textures/Constructible/Power/ame_controller.rsi/control.png b/Resources/Textures/Structures/Power/Generation/ame.rsi/control.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/ame_controller.rsi/control.png
rename to Resources/Textures/Structures/Power/Generation/ame.rsi/control.png
diff --git a/Resources/Textures/Constructible/Power/ame_controller.rsi/control_critical.png b/Resources/Textures/Structures/Power/Generation/ame.rsi/control_critical.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/ame_controller.rsi/control_critical.png
rename to Resources/Textures/Structures/Power/Generation/ame.rsi/control_critical.png
diff --git a/Resources/Textures/Constructible/Power/ame_controller.rsi/control_fuck.png b/Resources/Textures/Structures/Power/Generation/ame.rsi/control_fuck.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/ame_controller.rsi/control_fuck.png
rename to Resources/Textures/Structures/Power/Generation/ame.rsi/control_fuck.png
diff --git a/Resources/Textures/Constructible/Power/ame_controller.rsi/control_on.png b/Resources/Textures/Structures/Power/Generation/ame.rsi/control_on.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/ame_controller.rsi/control_on.png
rename to Resources/Textures/Structures/Power/Generation/ame.rsi/control_on.png
diff --git a/Resources/Textures/Constructible/Power/ame_shielding.rsi/core.png b/Resources/Textures/Structures/Power/Generation/ame.rsi/core.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/ame_shielding.rsi/core.png
rename to Resources/Textures/Structures/Power/Generation/ame.rsi/core.png
diff --git a/Resources/Textures/Constructible/Power/ame_shielding.rsi/core_strong.png b/Resources/Textures/Structures/Power/Generation/ame.rsi/core_strong.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/ame_shielding.rsi/core_strong.png
rename to Resources/Textures/Structures/Power/Generation/ame.rsi/core_strong.png
diff --git a/Resources/Textures/Constructible/Power/ame_shielding.rsi/core_weak.png b/Resources/Textures/Structures/Power/Generation/ame.rsi/core_weak.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/ame_shielding.rsi/core_weak.png
rename to Resources/Textures/Structures/Power/Generation/ame.rsi/core_weak.png
diff --git a/Resources/Textures/Structures/Power/Generation/ame.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/ame.rsi/meta.json
new file mode 100644
index 0000000000..fd88680d91
--- /dev/null
+++ b/Resources/Textures/Structures/Power/Generation/ame.rsi/meta.json
@@ -0,0 +1,188 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/b440af09b52ba6bc5248e7934d148e991c928b07",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "shield_0"
+    },
+    {
+      "name": "shield_1"
+    },
+    {
+      "name": "shield_10"
+    },
+    {
+      "name": "shield_11"
+    },
+    {
+      "name": "shield_12"
+    },
+    {
+      "name": "shield_13"
+    },
+    {
+      "name": "shield_14"
+    },
+    {
+      "name": "shield_15"
+    },
+    {
+      "name": "shield_2"
+    },
+    {
+      "name": "shield_3"
+    },
+    {
+      "name": "shield_4"
+    },
+    {
+      "name": "shield_5"
+    },
+    {
+      "name": "shield_6"
+    },
+    {
+      "name": "shield_7"
+    },
+    {
+      "name": "shield_8"
+    },
+    {
+      "name": "core"
+    },
+    {
+      "name": "shield_9"
+    },
+    {
+      "name": "core_weak",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "core_strong",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "control"
+    },
+    {
+      "name": "control_critical",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "control_fuck",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "control_on",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    }
+  ]
+}
diff --git a/Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_0.png b/Resources/Textures/Structures/Power/Generation/ame.rsi/shield_0.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_0.png
rename to Resources/Textures/Structures/Power/Generation/ame.rsi/shield_0.png
diff --git a/Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_1.png b/Resources/Textures/Structures/Power/Generation/ame.rsi/shield_1.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_1.png
rename to Resources/Textures/Structures/Power/Generation/ame.rsi/shield_1.png
diff --git a/Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_10.png b/Resources/Textures/Structures/Power/Generation/ame.rsi/shield_10.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_10.png
rename to Resources/Textures/Structures/Power/Generation/ame.rsi/shield_10.png
diff --git a/Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_11.png b/Resources/Textures/Structures/Power/Generation/ame.rsi/shield_11.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_11.png
rename to Resources/Textures/Structures/Power/Generation/ame.rsi/shield_11.png
diff --git a/Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_12.png b/Resources/Textures/Structures/Power/Generation/ame.rsi/shield_12.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_12.png
rename to Resources/Textures/Structures/Power/Generation/ame.rsi/shield_12.png
diff --git a/Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_13.png b/Resources/Textures/Structures/Power/Generation/ame.rsi/shield_13.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_13.png
rename to Resources/Textures/Structures/Power/Generation/ame.rsi/shield_13.png
diff --git a/Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_14.png b/Resources/Textures/Structures/Power/Generation/ame.rsi/shield_14.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_14.png
rename to Resources/Textures/Structures/Power/Generation/ame.rsi/shield_14.png
diff --git a/Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_15.png b/Resources/Textures/Structures/Power/Generation/ame.rsi/shield_15.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_15.png
rename to Resources/Textures/Structures/Power/Generation/ame.rsi/shield_15.png
diff --git a/Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_2.png b/Resources/Textures/Structures/Power/Generation/ame.rsi/shield_2.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_2.png
rename to Resources/Textures/Structures/Power/Generation/ame.rsi/shield_2.png
diff --git a/Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_3.png b/Resources/Textures/Structures/Power/Generation/ame.rsi/shield_3.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_3.png
rename to Resources/Textures/Structures/Power/Generation/ame.rsi/shield_3.png
diff --git a/Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_4.png b/Resources/Textures/Structures/Power/Generation/ame.rsi/shield_4.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_4.png
rename to Resources/Textures/Structures/Power/Generation/ame.rsi/shield_4.png
diff --git a/Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_5.png b/Resources/Textures/Structures/Power/Generation/ame.rsi/shield_5.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_5.png
rename to Resources/Textures/Structures/Power/Generation/ame.rsi/shield_5.png
diff --git a/Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_6.png b/Resources/Textures/Structures/Power/Generation/ame.rsi/shield_6.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_6.png
rename to Resources/Textures/Structures/Power/Generation/ame.rsi/shield_6.png
diff --git a/Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_7.png b/Resources/Textures/Structures/Power/Generation/ame.rsi/shield_7.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_7.png
rename to Resources/Textures/Structures/Power/Generation/ame.rsi/shield_7.png
diff --git a/Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_8.png b/Resources/Textures/Structures/Power/Generation/ame.rsi/shield_8.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_8.png
rename to Resources/Textures/Structures/Power/Generation/ame.rsi/shield_8.png
diff --git a/Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_9.png b/Resources/Textures/Structures/Power/Generation/ame.rsi/shield_9.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_9.png
rename to Resources/Textures/Structures/Power/Generation/ame.rsi/shield_9.png
diff --git a/Resources/Textures/Constructible/Power/solar_panel.rsi/broken.png b/Resources/Textures/Structures/Power/Generation/solar_panel.rsi/broken.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/solar_panel.rsi/broken.png
rename to Resources/Textures/Structures/Power/Generation/solar_panel.rsi/broken.png
diff --git a/Resources/Textures/Constructible/Power/solar_panel.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/solar_panel.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/solar_panel.rsi/meta.json
rename to Resources/Textures/Structures/Power/Generation/solar_panel.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/solar_panel.rsi/normal.png b/Resources/Textures/Structures/Power/Generation/solar_panel.rsi/normal.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/solar_panel.rsi/normal.png
rename to Resources/Textures/Structures/Power/Generation/solar_panel.rsi/normal.png
diff --git a/Resources/Textures/Constructible/Power/solar_panel.rsi/solar_assembly.png b/Resources/Textures/Structures/Power/Generation/solar_panel.rsi/solar_assembly.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/solar_panel.rsi/solar_assembly.png
rename to Resources/Textures/Structures/Power/Generation/solar_panel.rsi/solar_assembly.png
diff --git a/Resources/Textures/Constructible/Power/solar_panel.rsi/solar_tracker.png b/Resources/Textures/Structures/Power/Generation/solar_panel.rsi/solar_tracker.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/solar_panel.rsi/solar_tracker.png
rename to Resources/Textures/Structures/Power/Generation/solar_panel.rsi/solar_tracker.png
diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apc-b.png b/Resources/Textures/Structures/Power/apc.rsi/apc-b.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/apc.rsi/apc-b.png
rename to Resources/Textures/Structures/Power/apc.rsi/apc-b.png
diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apc-spark.png b/Resources/Textures/Structures/Power/apc.rsi/apc-spark.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/apc.rsi/apc-spark.png
rename to Resources/Textures/Structures/Power/apc.rsi/apc-spark.png
diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apc0.png b/Resources/Textures/Structures/Power/apc.rsi/apc0.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/apc.rsi/apc0.png
rename to Resources/Textures/Structures/Power/apc.rsi/apc0.png
diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apc1-b-nocover.png b/Resources/Textures/Structures/Power/apc.rsi/apc1-b-nocover.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/apc.rsi/apc1-b-nocover.png
rename to Resources/Textures/Structures/Power/apc.rsi/apc1-b-nocover.png
diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apc1-nocover.png b/Resources/Textures/Structures/Power/apc.rsi/apc1-nocover.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/apc.rsi/apc1-nocover.png
rename to Resources/Textures/Structures/Power/apc.rsi/apc1-nocover.png
diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apc1.png b/Resources/Textures/Structures/Power/apc.rsi/apc1.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/apc.rsi/apc1.png
rename to Resources/Textures/Structures/Power/apc.rsi/apc1.png
diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apc2-b-nocover.png b/Resources/Textures/Structures/Power/apc.rsi/apc2-b-nocover.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/apc.rsi/apc2-b-nocover.png
rename to Resources/Textures/Structures/Power/apc.rsi/apc2-b-nocover.png
diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apc2-nocover.png b/Resources/Textures/Structures/Power/apc.rsi/apc2-nocover.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/apc.rsi/apc2-nocover.png
rename to Resources/Textures/Structures/Power/apc.rsi/apc2-nocover.png
diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apc2.png b/Resources/Textures/Structures/Power/apc.rsi/apc2.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/apc.rsi/apc2.png
rename to Resources/Textures/Structures/Power/apc.rsi/apc2.png
diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apcemag.png b/Resources/Textures/Structures/Power/apc.rsi/apcemag.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/apc.rsi/apcemag.png
rename to Resources/Textures/Structures/Power/apc.rsi/apcemag.png
diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apcewires.png b/Resources/Textures/Structures/Power/apc.rsi/apcewires.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/apc.rsi/apcewires.png
rename to Resources/Textures/Structures/Power/apc.rsi/apcewires.png
diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apcmaint.png b/Resources/Textures/Structures/Power/apc.rsi/apcmaint.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/apc.rsi/apcmaint.png
rename to Resources/Textures/Structures/Power/apc.rsi/apcmaint.png
diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apco0-0.png b/Resources/Textures/Structures/Power/apc.rsi/apco0-0.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/apc.rsi/apco0-0.png
rename to Resources/Textures/Structures/Power/apc.rsi/apco0-0.png
diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apco0-1.png b/Resources/Textures/Structures/Power/apc.rsi/apco0-1.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/apc.rsi/apco0-1.png
rename to Resources/Textures/Structures/Power/apc.rsi/apco0-1.png
diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apco0-2.png b/Resources/Textures/Structures/Power/apc.rsi/apco0-2.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/apc.rsi/apco0-2.png
rename to Resources/Textures/Structures/Power/apc.rsi/apco0-2.png
diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apco0-3.png b/Resources/Textures/Structures/Power/apc.rsi/apco0-3.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/apc.rsi/apco0-3.png
rename to Resources/Textures/Structures/Power/apc.rsi/apco0-3.png
diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apco1-0.png b/Resources/Textures/Structures/Power/apc.rsi/apco1-0.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/apc.rsi/apco1-0.png
rename to Resources/Textures/Structures/Power/apc.rsi/apco1-0.png
diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apco1-1.png b/Resources/Textures/Structures/Power/apc.rsi/apco1-1.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/apc.rsi/apco1-1.png
rename to Resources/Textures/Structures/Power/apc.rsi/apco1-1.png
diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apco1-2.png b/Resources/Textures/Structures/Power/apc.rsi/apco1-2.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/apc.rsi/apco1-2.png
rename to Resources/Textures/Structures/Power/apc.rsi/apco1-2.png
diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apco1-3.png b/Resources/Textures/Structures/Power/apc.rsi/apco1-3.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/apc.rsi/apco1-3.png
rename to Resources/Textures/Structures/Power/apc.rsi/apco1-3.png
diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apco2-0.png b/Resources/Textures/Structures/Power/apc.rsi/apco2-0.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/apc.rsi/apco2-0.png
rename to Resources/Textures/Structures/Power/apc.rsi/apco2-0.png
diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apco2-1.png b/Resources/Textures/Structures/Power/apc.rsi/apco2-1.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/apc.rsi/apco2-1.png
rename to Resources/Textures/Structures/Power/apc.rsi/apco2-1.png
diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apco2-2.png b/Resources/Textures/Structures/Power/apc.rsi/apco2-2.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/apc.rsi/apco2-2.png
rename to Resources/Textures/Structures/Power/apc.rsi/apco2-2.png
diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apco2-3.png b/Resources/Textures/Structures/Power/apc.rsi/apco2-3.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/apc.rsi/apco2-3.png
rename to Resources/Textures/Structures/Power/apc.rsi/apco2-3.png
diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apco3-0.png b/Resources/Textures/Structures/Power/apc.rsi/apco3-0.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/apc.rsi/apco3-0.png
rename to Resources/Textures/Structures/Power/apc.rsi/apco3-0.png
diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apco3-1.png b/Resources/Textures/Structures/Power/apc.rsi/apco3-1.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/apc.rsi/apco3-1.png
rename to Resources/Textures/Structures/Power/apc.rsi/apco3-1.png
diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apco3-2.png b/Resources/Textures/Structures/Power/apc.rsi/apco3-2.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/apc.rsi/apco3-2.png
rename to Resources/Textures/Structures/Power/apc.rsi/apco3-2.png
diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apcox-0.png b/Resources/Textures/Structures/Power/apc.rsi/apcox-0.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/apc.rsi/apcox-0.png
rename to Resources/Textures/Structures/Power/apc.rsi/apcox-0.png
diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apcox-1.png b/Resources/Textures/Structures/Power/apc.rsi/apcox-1.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/apc.rsi/apcox-1.png
rename to Resources/Textures/Structures/Power/apc.rsi/apcox-1.png
diff --git a/Resources/Textures/Constructible/Power/apc.rsi/meta.json b/Resources/Textures/Structures/Power/apc.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/apc.rsi/meta.json
rename to Resources/Textures/Structures/Power/apc.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/wire_terminal.rsi/meta.json b/Resources/Textures/Structures/Power/cable_terminal.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/wire_terminal.rsi/meta.json
rename to Resources/Textures/Structures/Power/cable_terminal.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/wire_terminal.rsi/term.png b/Resources/Textures/Structures/Power/cable_terminal.rsi/term.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/wire_terminal.rsi/term.png
rename to Resources/Textures/Structures/Power/cable_terminal.rsi/term.png
diff --git a/Resources/Textures/Constructible/Power/cell_recharger.rsi/empty.png b/Resources/Textures/Structures/Power/cell_recharger.rsi/empty.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/cell_recharger.rsi/empty.png
rename to Resources/Textures/Structures/Power/cell_recharger.rsi/empty.png
diff --git a/Resources/Textures/Constructible/Power/cell_recharger.rsi/full.png b/Resources/Textures/Structures/Power/cell_recharger.rsi/full.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/cell_recharger.rsi/full.png
rename to Resources/Textures/Structures/Power/cell_recharger.rsi/full.png
diff --git a/Resources/Textures/Constructible/Power/cell_recharger.rsi/light-charged.png b/Resources/Textures/Structures/Power/cell_recharger.rsi/light-charged.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/cell_recharger.rsi/light-charged.png
rename to Resources/Textures/Structures/Power/cell_recharger.rsi/light-charged.png
diff --git a/Resources/Textures/Constructible/Power/cell_recharger.rsi/light-charging.png b/Resources/Textures/Structures/Power/cell_recharger.rsi/light-charging.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/cell_recharger.rsi/light-charging.png
rename to Resources/Textures/Structures/Power/cell_recharger.rsi/light-charging.png
diff --git a/Resources/Textures/Constructible/Power/cell_recharger.rsi/light-empty.png b/Resources/Textures/Structures/Power/cell_recharger.rsi/light-empty.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/cell_recharger.rsi/light-empty.png
rename to Resources/Textures/Structures/Power/cell_recharger.rsi/light-empty.png
diff --git a/Resources/Textures/Constructible/Power/cell_recharger.rsi/light-off.png b/Resources/Textures/Structures/Power/cell_recharger.rsi/light-off.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/cell_recharger.rsi/light-off.png
rename to Resources/Textures/Structures/Power/cell_recharger.rsi/light-off.png
diff --git a/Resources/Textures/Constructible/Power/cell_recharger.rsi/meta.json b/Resources/Textures/Structures/Power/cell_recharger.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/cell_recharger.rsi/meta.json
rename to Resources/Textures/Structures/Power/cell_recharger.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/cell_recharger.rsi/open.png b/Resources/Textures/Structures/Power/cell_recharger.rsi/open.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/cell_recharger.rsi/open.png
rename to Resources/Textures/Structures/Power/cell_recharger.rsi/open.png
diff --git a/Resources/Textures/Constructible/Power/power.rsi/eightdirwire.png b/Resources/Textures/Structures/Power/power.rsi/eightdirwire.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/power.rsi/eightdirwire.png
rename to Resources/Textures/Structures/Power/power.rsi/eightdirwire.png
diff --git a/Resources/Textures/Constructible/Power/power.rsi/generator.png b/Resources/Textures/Structures/Power/power.rsi/generator.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/power.rsi/generator.png
rename to Resources/Textures/Structures/Power/power.rsi/generator.png
diff --git a/Resources/Textures/Constructible/Power/power.rsi/meta.json b/Resources/Textures/Structures/Power/power.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/power.rsi/meta.json
rename to Resources/Textures/Structures/Power/power.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/power.rsi/provider.png b/Resources/Textures/Structures/Power/power.rsi/provider.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/power.rsi/provider.png
rename to Resources/Textures/Structures/Power/power.rsi/provider.png
diff --git a/Resources/Textures/Constructible/Power/power.rsi/storage.png b/Resources/Textures/Structures/Power/power.rsi/storage.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/power.rsi/storage.png
rename to Resources/Textures/Structures/Power/power.rsi/storage.png
diff --git a/Resources/Textures/Constructible/Power/power.rsi/wiredmachine.png b/Resources/Textures/Structures/Power/power.rsi/wiredmachine.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/power.rsi/wiredmachine.png
rename to Resources/Textures/Structures/Power/power.rsi/wiredmachine.png
diff --git a/Resources/Textures/Constructible/Power/power.rsi/wirelessmachine.png b/Resources/Textures/Structures/Power/power.rsi/wirelessmachine.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/power.rsi/wirelessmachine.png
rename to Resources/Textures/Structures/Power/power.rsi/wirelessmachine.png
diff --git a/Resources/Textures/Constructible/Power/recharger.rsi/empty.png b/Resources/Textures/Structures/Power/recharger.rsi/empty.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/recharger.rsi/empty.png
rename to Resources/Textures/Structures/Power/recharger.rsi/empty.png
diff --git a/Resources/Textures/Constructible/Power/recharger.rsi/full.png b/Resources/Textures/Structures/Power/recharger.rsi/full.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/recharger.rsi/full.png
rename to Resources/Textures/Structures/Power/recharger.rsi/full.png
diff --git a/Resources/Textures/Constructible/Power/recharger.rsi/light-charged.png b/Resources/Textures/Structures/Power/recharger.rsi/light-charged.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/recharger.rsi/light-charged.png
rename to Resources/Textures/Structures/Power/recharger.rsi/light-charged.png
diff --git a/Resources/Textures/Constructible/Power/recharger.rsi/light-charging.png b/Resources/Textures/Structures/Power/recharger.rsi/light-charging.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/recharger.rsi/light-charging.png
rename to Resources/Textures/Structures/Power/recharger.rsi/light-charging.png
diff --git a/Resources/Textures/Constructible/Power/recharger.rsi/light-empty.png b/Resources/Textures/Structures/Power/recharger.rsi/light-empty.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/recharger.rsi/light-empty.png
rename to Resources/Textures/Structures/Power/recharger.rsi/light-empty.png
diff --git a/Resources/Textures/Constructible/Power/recharger.rsi/light-off.png b/Resources/Textures/Structures/Power/recharger.rsi/light-off.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/recharger.rsi/light-off.png
rename to Resources/Textures/Structures/Power/recharger.rsi/light-off.png
diff --git a/Resources/Textures/Constructible/Power/recharger.rsi/meta.json b/Resources/Textures/Structures/Power/recharger.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/recharger.rsi/meta.json
rename to Resources/Textures/Structures/Power/recharger.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/smes.rsi/meta.json b/Resources/Textures/Structures/Power/smes.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/smes.rsi/meta.json
rename to Resources/Textures/Structures/Power/smes.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/smes.rsi/smes-crit.png b/Resources/Textures/Structures/Power/smes.rsi/smes-crit.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/smes.rsi/smes-crit.png
rename to Resources/Textures/Structures/Power/smes.rsi/smes-crit.png
diff --git a/Resources/Textures/Constructible/Power/smes.rsi/smes-display.png b/Resources/Textures/Structures/Power/smes.rsi/smes-display.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/smes.rsi/smes-display.png
rename to Resources/Textures/Structures/Power/smes.rsi/smes-display.png
diff --git a/Resources/Textures/Constructible/Power/smes.rsi/smes-oc0.png b/Resources/Textures/Structures/Power/smes.rsi/smes-oc0.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/smes.rsi/smes-oc0.png
rename to Resources/Textures/Structures/Power/smes.rsi/smes-oc0.png
diff --git a/Resources/Textures/Constructible/Power/smes.rsi/smes-oc1.png b/Resources/Textures/Structures/Power/smes.rsi/smes-oc1.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/smes.rsi/smes-oc1.png
rename to Resources/Textures/Structures/Power/smes.rsi/smes-oc1.png
diff --git a/Resources/Textures/Constructible/Power/smes.rsi/smes-oc2.png b/Resources/Textures/Structures/Power/smes.rsi/smes-oc2.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/smes.rsi/smes-oc2.png
rename to Resources/Textures/Structures/Power/smes.rsi/smes-oc2.png
diff --git a/Resources/Textures/Constructible/Power/smes.rsi/smes-og1.png b/Resources/Textures/Structures/Power/smes.rsi/smes-og1.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/smes.rsi/smes-og1.png
rename to Resources/Textures/Structures/Power/smes.rsi/smes-og1.png
diff --git a/Resources/Textures/Constructible/Power/smes.rsi/smes-og2.png b/Resources/Textures/Structures/Power/smes.rsi/smes-og2.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/smes.rsi/smes-og2.png
rename to Resources/Textures/Structures/Power/smes.rsi/smes-og2.png
diff --git a/Resources/Textures/Constructible/Power/smes.rsi/smes-og3.png b/Resources/Textures/Structures/Power/smes.rsi/smes-og3.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/smes.rsi/smes-og3.png
rename to Resources/Textures/Structures/Power/smes.rsi/smes-og3.png
diff --git a/Resources/Textures/Constructible/Power/smes.rsi/smes-og4.png b/Resources/Textures/Structures/Power/smes.rsi/smes-og4.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/smes.rsi/smes-og4.png
rename to Resources/Textures/Structures/Power/smes.rsi/smes-og4.png
diff --git a/Resources/Textures/Constructible/Power/smes.rsi/smes-og5.png b/Resources/Textures/Structures/Power/smes.rsi/smes-og5.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/smes.rsi/smes-og5.png
rename to Resources/Textures/Structures/Power/smes.rsi/smes-og5.png
diff --git a/Resources/Textures/Constructible/Power/smes.rsi/smes-op0.png b/Resources/Textures/Structures/Power/smes.rsi/smes-op0.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/smes.rsi/smes-op0.png
rename to Resources/Textures/Structures/Power/smes.rsi/smes-op0.png
diff --git a/Resources/Textures/Constructible/Power/smes.rsi/smes-op1.png b/Resources/Textures/Structures/Power/smes.rsi/smes-op1.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/smes.rsi/smes-op1.png
rename to Resources/Textures/Structures/Power/smes.rsi/smes-op1.png
diff --git a/Resources/Textures/Constructible/Power/smes.rsi/smes-op2.png b/Resources/Textures/Structures/Power/smes.rsi/smes-op2.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/smes.rsi/smes-op2.png
rename to Resources/Textures/Structures/Power/smes.rsi/smes-op2.png
diff --git a/Resources/Textures/Constructible/Power/smes.rsi/smes.png b/Resources/Textures/Structures/Power/smes.rsi/smes.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/smes.rsi/smes.png
rename to Resources/Textures/Structures/Power/smes.rsi/smes.png
diff --git a/Resources/Textures/Constructible/Power/substation.rsi/charging.png b/Resources/Textures/Structures/Power/substation.rsi/charging.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/substation.rsi/charging.png
rename to Resources/Textures/Structures/Power/substation.rsi/charging.png
diff --git a/Resources/Textures/Constructible/Power/substation.rsi/dead.png b/Resources/Textures/Structures/Power/substation.rsi/dead.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/substation.rsi/dead.png
rename to Resources/Textures/Structures/Power/substation.rsi/dead.png
diff --git a/Resources/Textures/Constructible/Power/substation.rsi/full.png b/Resources/Textures/Structures/Power/substation.rsi/full.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/substation.rsi/full.png
rename to Resources/Textures/Structures/Power/substation.rsi/full.png
diff --git a/Resources/Textures/Constructible/Power/substation.rsi/meta.json b/Resources/Textures/Structures/Power/substation.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/substation.rsi/meta.json
rename to Resources/Textures/Structures/Power/substation.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/substation.rsi/screen.png b/Resources/Textures/Structures/Power/substation.rsi/screen.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/substation.rsi/screen.png
rename to Resources/Textures/Structures/Power/substation.rsi/screen.png
diff --git a/Resources/Textures/Constructible/Power/substation.rsi/substation.png b/Resources/Textures/Structures/Power/substation.rsi/substation.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/substation.rsi/substation.png
rename to Resources/Textures/Structures/Power/substation.rsi/substation.png
diff --git a/Resources/Textures/Constructible/Power/wall_recharger.rsi/empty.png b/Resources/Textures/Structures/Power/wall_recharger.rsi/empty.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/wall_recharger.rsi/empty.png
rename to Resources/Textures/Structures/Power/wall_recharger.rsi/empty.png
diff --git a/Resources/Textures/Constructible/Power/wall_recharger.rsi/full.png b/Resources/Textures/Structures/Power/wall_recharger.rsi/full.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/wall_recharger.rsi/full.png
rename to Resources/Textures/Structures/Power/wall_recharger.rsi/full.png
diff --git a/Resources/Textures/Constructible/Power/wall_recharger.rsi/light-charged.png b/Resources/Textures/Structures/Power/wall_recharger.rsi/light-charged.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/wall_recharger.rsi/light-charged.png
rename to Resources/Textures/Structures/Power/wall_recharger.rsi/light-charged.png
diff --git a/Resources/Textures/Constructible/Power/wall_recharger.rsi/light-charging.png b/Resources/Textures/Structures/Power/wall_recharger.rsi/light-charging.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/wall_recharger.rsi/light-charging.png
rename to Resources/Textures/Structures/Power/wall_recharger.rsi/light-charging.png
diff --git a/Resources/Textures/Constructible/Power/wall_recharger.rsi/light-empty.png b/Resources/Textures/Structures/Power/wall_recharger.rsi/light-empty.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/wall_recharger.rsi/light-empty.png
rename to Resources/Textures/Structures/Power/wall_recharger.rsi/light-empty.png
diff --git a/Resources/Textures/Constructible/Power/wall_recharger.rsi/light-off.png b/Resources/Textures/Structures/Power/wall_recharger.rsi/light-off.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/wall_recharger.rsi/light-off.png
rename to Resources/Textures/Structures/Power/wall_recharger.rsi/light-off.png
diff --git a/Resources/Textures/Constructible/Power/wall_recharger.rsi/meta.json b/Resources/Textures/Structures/Power/wall_recharger.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/wall_recharger.rsi/meta.json
rename to Resources/Textures/Structures/Power/wall_recharger.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Storage/Crates/electricalcrate.rsi/electricalcrate.png b/Resources/Textures/Structures/Storage/Crates/electricalcrate.rsi/electricalcrate.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/electricalcrate.rsi/electricalcrate.png
rename to Resources/Textures/Structures/Storage/Crates/electricalcrate.rsi/electricalcrate.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/electricalcrate.rsi/electricalcrate_door.png b/Resources/Textures/Structures/Storage/Crates/electricalcrate.rsi/electricalcrate_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/electricalcrate.rsi/electricalcrate_door.png
rename to Resources/Textures/Structures/Storage/Crates/electricalcrate.rsi/electricalcrate_door.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/electricalcrate.rsi/electricalcrate_icon.png b/Resources/Textures/Structures/Storage/Crates/electricalcrate.rsi/electricalcrate_icon.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/electricalcrate.rsi/electricalcrate_icon.png
rename to Resources/Textures/Structures/Storage/Crates/electricalcrate.rsi/electricalcrate_icon.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/electricalcrate.rsi/electricalcrate_open.png b/Resources/Textures/Structures/Storage/Crates/electricalcrate.rsi/electricalcrate_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/electricalcrate.rsi/electricalcrate_open.png
rename to Resources/Textures/Structures/Storage/Crates/electricalcrate.rsi/electricalcrate_open.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/electricalcrate.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/electricalcrate.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/electricalcrate.rsi/meta.json
rename to Resources/Textures/Structures/Storage/Crates/electricalcrate.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Storage/Crates/electricalcrate.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/electricalcrate.rsi/sparking.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/electricalcrate.rsi/sparking.png
rename to Resources/Textures/Structures/Storage/Crates/electricalcrate.rsi/sparking.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/electricalcrate.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/electricalcrate.rsi/welded.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/electricalcrate.rsi/welded.png
rename to Resources/Textures/Structures/Storage/Crates/electricalcrate.rsi/welded.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/engicrate.rsi/engicrate.png b/Resources/Textures/Structures/Storage/Crates/engicrate.rsi/engicrate.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/engicrate.rsi/engicrate.png
rename to Resources/Textures/Structures/Storage/Crates/engicrate.rsi/engicrate.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/engicrate.rsi/engicrate_door.png b/Resources/Textures/Structures/Storage/Crates/engicrate.rsi/engicrate_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/engicrate.rsi/engicrate_door.png
rename to Resources/Textures/Structures/Storage/Crates/engicrate.rsi/engicrate_door.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/engicrate.rsi/engicrate_icon.png b/Resources/Textures/Structures/Storage/Crates/engicrate.rsi/engicrate_icon.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/engicrate.rsi/engicrate_icon.png
rename to Resources/Textures/Structures/Storage/Crates/engicrate.rsi/engicrate_icon.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/engicrate.rsi/engicrate_open.png b/Resources/Textures/Structures/Storage/Crates/engicrate.rsi/engicrate_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/engicrate.rsi/engicrate_open.png
rename to Resources/Textures/Structures/Storage/Crates/engicrate.rsi/engicrate_open.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/engicrate.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/engicrate.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/engicrate.rsi/meta.json
rename to Resources/Textures/Structures/Storage/Crates/engicrate.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Storage/Crates/engicrate.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/engicrate.rsi/sparking.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/engicrate.rsi/sparking.png
rename to Resources/Textures/Structures/Storage/Crates/engicrate.rsi/sparking.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/engicrate.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/engicrate.rsi/welded.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/engicrate.rsi/welded.png
rename to Resources/Textures/Structures/Storage/Crates/engicrate.rsi/welded.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/engicrate_secure.rsi/engicratesecure.png b/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/engicratesecure.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/engicrate_secure.rsi/engicratesecure.png
rename to Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/engicratesecure.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/engicrate_secure.rsi/engicratesecure_door.png b/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/engicratesecure_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/engicrate_secure.rsi/engicratesecure_door.png
rename to Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/engicratesecure_door.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/engicrate_secure.rsi/engicratesecure_icon.png b/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/engicratesecure_icon.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/engicrate_secure.rsi/engicratesecure_icon.png
rename to Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/engicratesecure_icon.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/engicrate_secure.rsi/engicratesecure_open.png b/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/engicratesecure_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/engicrate_secure.rsi/engicratesecure_open.png
rename to Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/engicratesecure_open.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/engicrate_secure.rsi/locked.png b/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/locked.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/engicrate_secure.rsi/locked.png
rename to Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/locked.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/engicrate_secure.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/engicrate_secure.rsi/meta.json
rename to Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Storage/Crates/engicrate_secure.rsi/off.png b/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/off.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/engicrate_secure.rsi/off.png
rename to Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/off.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/engicrate_secure.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/sparking.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/engicrate_secure.rsi/sparking.png
rename to Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/sparking.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/engicrate_secure.rsi/unlocked.png b/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/unlocked.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/engicrate_secure.rsi/unlocked.png
rename to Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/unlocked.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/engicrate_secure.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/welded.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/engicrate_secure.rsi/welded.png
rename to Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/welded.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/freezer.rsi/freezer.png b/Resources/Textures/Structures/Storage/Crates/freezer.rsi/freezer.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/freezer.rsi/freezer.png
rename to Resources/Textures/Structures/Storage/Crates/freezer.rsi/freezer.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/freezer.rsi/freezer_door.png b/Resources/Textures/Structures/Storage/Crates/freezer.rsi/freezer_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/freezer.rsi/freezer_door.png
rename to Resources/Textures/Structures/Storage/Crates/freezer.rsi/freezer_door.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/freezer.rsi/freezer_icon.png b/Resources/Textures/Structures/Storage/Crates/freezer.rsi/freezer_icon.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/freezer.rsi/freezer_icon.png
rename to Resources/Textures/Structures/Storage/Crates/freezer.rsi/freezer_icon.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/freezer.rsi/freezer_open.png b/Resources/Textures/Structures/Storage/Crates/freezer.rsi/freezer_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/freezer.rsi/freezer_open.png
rename to Resources/Textures/Structures/Storage/Crates/freezer.rsi/freezer_open.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/freezer.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/freezer.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/freezer.rsi/meta.json
rename to Resources/Textures/Structures/Storage/Crates/freezer.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Storage/Crates/freezer.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/freezer.rsi/sparking.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/freezer.rsi/sparking.png
rename to Resources/Textures/Structures/Storage/Crates/freezer.rsi/sparking.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/freezer.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/freezer.rsi/welded.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/freezer.rsi/welded.png
rename to Resources/Textures/Structures/Storage/Crates/freezer.rsi/welded.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/generic.rsi/crate.png b/Resources/Textures/Structures/Storage/Crates/generic.rsi/crate.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/generic.rsi/crate.png
rename to Resources/Textures/Structures/Storage/Crates/generic.rsi/crate.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/generic.rsi/crate_door.png b/Resources/Textures/Structures/Storage/Crates/generic.rsi/crate_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/generic.rsi/crate_door.png
rename to Resources/Textures/Structures/Storage/Crates/generic.rsi/crate_door.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/generic.rsi/crate_icon.png b/Resources/Textures/Structures/Storage/Crates/generic.rsi/crate_icon.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/generic.rsi/crate_icon.png
rename to Resources/Textures/Structures/Storage/Crates/generic.rsi/crate_icon.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/generic.rsi/crate_open.png b/Resources/Textures/Structures/Storage/Crates/generic.rsi/crate_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/generic.rsi/crate_open.png
rename to Resources/Textures/Structures/Storage/Crates/generic.rsi/crate_open.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/generic.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/generic.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/generic.rsi/meta.json
rename to Resources/Textures/Structures/Storage/Crates/generic.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Storage/Crates/generic.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/generic.rsi/sparking.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/generic.rsi/sparking.png
rename to Resources/Textures/Structures/Storage/Crates/generic.rsi/sparking.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/generic.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/generic.rsi/welded.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/generic.rsi/welded.png
rename to Resources/Textures/Structures/Storage/Crates/generic.rsi/welded.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/hydro.rsi/hydrocrate.png b/Resources/Textures/Structures/Storage/Crates/hydro.rsi/hydrocrate.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/hydro.rsi/hydrocrate.png
rename to Resources/Textures/Structures/Storage/Crates/hydro.rsi/hydrocrate.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/hydro.rsi/hydrocrate_door.png b/Resources/Textures/Structures/Storage/Crates/hydro.rsi/hydrocrate_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/hydro.rsi/hydrocrate_door.png
rename to Resources/Textures/Structures/Storage/Crates/hydro.rsi/hydrocrate_door.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/hydro.rsi/hydrocrate_icon.png b/Resources/Textures/Structures/Storage/Crates/hydro.rsi/hydrocrate_icon.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/hydro.rsi/hydrocrate_icon.png
rename to Resources/Textures/Structures/Storage/Crates/hydro.rsi/hydrocrate_icon.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/hydro.rsi/hydrocrate_open.png b/Resources/Textures/Structures/Storage/Crates/hydro.rsi/hydrocrate_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/hydro.rsi/hydrocrate_open.png
rename to Resources/Textures/Structures/Storage/Crates/hydro.rsi/hydrocrate_open.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/hydro.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/hydro.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/hydro.rsi/meta.json
rename to Resources/Textures/Structures/Storage/Crates/hydro.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Storage/Crates/hydro.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/hydro.rsi/sparking.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/hydro.rsi/sparking.png
rename to Resources/Textures/Structures/Storage/Crates/hydro.rsi/sparking.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/hydro.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/hydro.rsi/welded.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/hydro.rsi/welded.png
rename to Resources/Textures/Structures/Storage/Crates/hydro.rsi/welded.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/hydro_secure.rsi/hydrocratesecure.png b/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/hydrocratesecure.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/hydro_secure.rsi/hydrocratesecure.png
rename to Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/hydrocratesecure.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/hydro_secure.rsi/hydrocratesecure_door.png b/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/hydrocratesecure_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/hydro_secure.rsi/hydrocratesecure_door.png
rename to Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/hydrocratesecure_door.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/hydro_secure.rsi/hydrocratesecure_icon.png b/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/hydrocratesecure_icon.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/hydro_secure.rsi/hydrocratesecure_icon.png
rename to Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/hydrocratesecure_icon.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/hydro_secure.rsi/hydrocratesecure_open.png b/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/hydrocratesecure_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/hydro_secure.rsi/hydrocratesecure_open.png
rename to Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/hydrocratesecure_open.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/hydro_secure.rsi/locked.png b/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/locked.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/hydro_secure.rsi/locked.png
rename to Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/locked.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/hydro_secure.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/hydro_secure.rsi/meta.json
rename to Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Storage/Crates/hydro_secure.rsi/off.png b/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/off.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/hydro_secure.rsi/off.png
rename to Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/off.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/hydro_secure.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/sparking.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/hydro_secure.rsi/sparking.png
rename to Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/sparking.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/hydro_secure.rsi/unlocked.png b/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/unlocked.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/hydro_secure.rsi/unlocked.png
rename to Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/unlocked.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/hydro_secure.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/welded.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/hydro_secure.rsi/welded.png
rename to Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/welded.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/livestock.rsi/livestockcrate.png b/Resources/Textures/Structures/Storage/Crates/livestock.rsi/livestockcrate.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/livestock.rsi/livestockcrate.png
rename to Resources/Textures/Structures/Storage/Crates/livestock.rsi/livestockcrate.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/livestock.rsi/livestockcrate_door.png b/Resources/Textures/Structures/Storage/Crates/livestock.rsi/livestockcrate_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/livestock.rsi/livestockcrate_door.png
rename to Resources/Textures/Structures/Storage/Crates/livestock.rsi/livestockcrate_door.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/livestock.rsi/livestockcrate_open.png b/Resources/Textures/Structures/Storage/Crates/livestock.rsi/livestockcrate_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/livestock.rsi/livestockcrate_open.png
rename to Resources/Textures/Structures/Storage/Crates/livestock.rsi/livestockcrate_open.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/livestock.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/livestock.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/livestock.rsi/meta.json
rename to Resources/Textures/Structures/Storage/Crates/livestock.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Storage/Crates/medical.rsi/medicalcrate.png b/Resources/Textures/Structures/Storage/Crates/medical.rsi/medicalcrate.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/medical.rsi/medicalcrate.png
rename to Resources/Textures/Structures/Storage/Crates/medical.rsi/medicalcrate.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/medical.rsi/medicalcrate_door.png b/Resources/Textures/Structures/Storage/Crates/medical.rsi/medicalcrate_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/medical.rsi/medicalcrate_door.png
rename to Resources/Textures/Structures/Storage/Crates/medical.rsi/medicalcrate_door.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/medical.rsi/medicalcrate_icon.png b/Resources/Textures/Structures/Storage/Crates/medical.rsi/medicalcrate_icon.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/medical.rsi/medicalcrate_icon.png
rename to Resources/Textures/Structures/Storage/Crates/medical.rsi/medicalcrate_icon.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/medical.rsi/medicalcrate_open.png b/Resources/Textures/Structures/Storage/Crates/medical.rsi/medicalcrate_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/medical.rsi/medicalcrate_open.png
rename to Resources/Textures/Structures/Storage/Crates/medical.rsi/medicalcrate_open.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/medical.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/medical.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/medical.rsi/meta.json
rename to Resources/Textures/Structures/Storage/Crates/medical.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Storage/Crates/medical.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/medical.rsi/sparking.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/medical.rsi/sparking.png
rename to Resources/Textures/Structures/Storage/Crates/medical.rsi/sparking.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/medical.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/medical.rsi/welded.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/medical.rsi/welded.png
rename to Resources/Textures/Structures/Storage/Crates/medical.rsi/welded.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/medicalcrate_secure.rsi/locked.png b/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/locked.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/medicalcrate_secure.rsi/locked.png
rename to Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/locked.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/medicalcrate_secure.rsi/medicalcratesecure.png b/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/medicalcratesecure.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/medicalcrate_secure.rsi/medicalcratesecure.png
rename to Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/medicalcratesecure.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/medicalcrate_secure.rsi/medicalcratesecure_door.png b/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/medicalcratesecure_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/medicalcrate_secure.rsi/medicalcratesecure_door.png
rename to Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/medicalcratesecure_door.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/medicalcrate_secure.rsi/medicalcratesecure_icon.png b/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/medicalcratesecure_icon.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/medicalcrate_secure.rsi/medicalcratesecure_icon.png
rename to Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/medicalcratesecure_icon.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/medicalcrate_secure.rsi/medicalcratesecure_open.png b/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/medicalcratesecure_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/medicalcrate_secure.rsi/medicalcratesecure_open.png
rename to Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/medicalcratesecure_open.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/medicalcrate_secure.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/medicalcrate_secure.rsi/meta.json
rename to Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Storage/Crates/medicalcrate_secure.rsi/off.png b/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/off.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/medicalcrate_secure.rsi/off.png
rename to Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/off.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/medicalcrate_secure.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/sparking.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/medicalcrate_secure.rsi/sparking.png
rename to Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/sparking.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/medicalcrate_secure.rsi/unlocked.png b/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/unlocked.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/medicalcrate_secure.rsi/unlocked.png
rename to Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/unlocked.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/medicalcrate_secure.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/welded.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/medicalcrate_secure.rsi/welded.png
rename to Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/welded.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/o2.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/o2.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/o2.rsi/meta.json
rename to Resources/Textures/Structures/Storage/Crates/o2.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Storage/Crates/o2.rsi/o2crate.png b/Resources/Textures/Structures/Storage/Crates/o2.rsi/o2crate.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/o2.rsi/o2crate.png
rename to Resources/Textures/Structures/Storage/Crates/o2.rsi/o2crate.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/o2.rsi/o2crate_door.png b/Resources/Textures/Structures/Storage/Crates/o2.rsi/o2crate_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/o2.rsi/o2crate_door.png
rename to Resources/Textures/Structures/Storage/Crates/o2.rsi/o2crate_door.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/o2.rsi/o2crate_icon.png b/Resources/Textures/Structures/Storage/Crates/o2.rsi/o2crate_icon.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/o2.rsi/o2crate_icon.png
rename to Resources/Textures/Structures/Storage/Crates/o2.rsi/o2crate_icon.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/o2.rsi/o2crate_open.png b/Resources/Textures/Structures/Storage/Crates/o2.rsi/o2crate_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/o2.rsi/o2crate_open.png
rename to Resources/Textures/Structures/Storage/Crates/o2.rsi/o2crate_open.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/o2.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/o2.rsi/sparking.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/o2.rsi/sparking.png
rename to Resources/Textures/Structures/Storage/Crates/o2.rsi/sparking.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/o2.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/o2.rsi/welded.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/o2.rsi/welded.png
rename to Resources/Textures/Structures/Storage/Crates/o2.rsi/welded.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/plasma.rsi/locked.png b/Resources/Textures/Structures/Storage/Crates/plasma.rsi/locked.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/plasma.rsi/locked.png
rename to Resources/Textures/Structures/Storage/Crates/plasma.rsi/locked.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/plasma.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/plasma.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/plasma.rsi/meta.json
rename to Resources/Textures/Structures/Storage/Crates/plasma.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Storage/Crates/plasma.rsi/off.png b/Resources/Textures/Structures/Storage/Crates/plasma.rsi/off.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/plasma.rsi/off.png
rename to Resources/Textures/Structures/Storage/Crates/plasma.rsi/off.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/plasma.rsi/plasmacrate.png b/Resources/Textures/Structures/Storage/Crates/plasma.rsi/plasmacrate.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/plasma.rsi/plasmacrate.png
rename to Resources/Textures/Structures/Storage/Crates/plasma.rsi/plasmacrate.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/plasma.rsi/plasmacrate_door.png b/Resources/Textures/Structures/Storage/Crates/plasma.rsi/plasmacrate_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/plasma.rsi/plasmacrate_door.png
rename to Resources/Textures/Structures/Storage/Crates/plasma.rsi/plasmacrate_door.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/plasma.rsi/plasmacrate_icon.png b/Resources/Textures/Structures/Storage/Crates/plasma.rsi/plasmacrate_icon.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/plasma.rsi/plasmacrate_icon.png
rename to Resources/Textures/Structures/Storage/Crates/plasma.rsi/plasmacrate_icon.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/plasma.rsi/plasmacrate_open.png b/Resources/Textures/Structures/Storage/Crates/plasma.rsi/plasmacrate_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/plasma.rsi/plasmacrate_open.png
rename to Resources/Textures/Structures/Storage/Crates/plasma.rsi/plasmacrate_open.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/plasma.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/plasma.rsi/sparking.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/plasma.rsi/sparking.png
rename to Resources/Textures/Structures/Storage/Crates/plasma.rsi/sparking.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/plasma.rsi/unlocked.png b/Resources/Textures/Structures/Storage/Crates/plasma.rsi/unlocked.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/plasma.rsi/unlocked.png
rename to Resources/Textures/Structures/Storage/Crates/plasma.rsi/unlocked.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/plasma.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/plasma.rsi/welded.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/plasma.rsi/welded.png
rename to Resources/Textures/Structures/Storage/Crates/plasma.rsi/welded.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/plastic.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/plastic.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/plastic.rsi/meta.json
rename to Resources/Textures/Structures/Storage/Crates/plastic.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Storage/Crates/plastic.rsi/plasticcrate.png b/Resources/Textures/Structures/Storage/Crates/plastic.rsi/plasticcrate.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/plastic.rsi/plasticcrate.png
rename to Resources/Textures/Structures/Storage/Crates/plastic.rsi/plasticcrate.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/plastic.rsi/plasticcrate_door.png b/Resources/Textures/Structures/Storage/Crates/plastic.rsi/plasticcrate_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/plastic.rsi/plasticcrate_door.png
rename to Resources/Textures/Structures/Storage/Crates/plastic.rsi/plasticcrate_door.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/plastic.rsi/plasticcrate_icon.png b/Resources/Textures/Structures/Storage/Crates/plastic.rsi/plasticcrate_icon.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/plastic.rsi/plasticcrate_icon.png
rename to Resources/Textures/Structures/Storage/Crates/plastic.rsi/plasticcrate_icon.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/plastic.rsi/plasticcrate_open.png b/Resources/Textures/Structures/Storage/Crates/plastic.rsi/plasticcrate_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/plastic.rsi/plasticcrate_open.png
rename to Resources/Textures/Structures/Storage/Crates/plastic.rsi/plasticcrate_open.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/plastic.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/plastic.rsi/sparking.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/plastic.rsi/sparking.png
rename to Resources/Textures/Structures/Storage/Crates/plastic.rsi/sparking.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/plastic.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/plastic.rsi/welded.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/plastic.rsi/welded.png
rename to Resources/Textures/Structures/Storage/Crates/plastic.rsi/welded.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/privatecrate_secure.rsi/locked.png b/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/locked.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/privatecrate_secure.rsi/locked.png
rename to Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/locked.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/privatecrate_secure.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/privatecrate_secure.rsi/meta.json
rename to Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Storage/Crates/privatecrate_secure.rsi/off.png b/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/off.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/privatecrate_secure.rsi/off.png
rename to Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/off.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/privatecrate_secure.rsi/privatecrate.png b/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/privatecrate.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/privatecrate_secure.rsi/privatecrate.png
rename to Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/privatecrate.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/privatecrate_secure.rsi/privatecrate_door.png b/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/privatecrate_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/privatecrate_secure.rsi/privatecrate_door.png
rename to Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/privatecrate_door.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/privatecrate_secure.rsi/privatecrate_icon.png b/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/privatecrate_icon.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/privatecrate_secure.rsi/privatecrate_icon.png
rename to Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/privatecrate_icon.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/privatecrate_secure.rsi/privatecrate_open.png b/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/privatecrate_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/privatecrate_secure.rsi/privatecrate_open.png
rename to Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/privatecrate_open.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/privatecrate_secure.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/sparking.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/privatecrate_secure.rsi/sparking.png
rename to Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/sparking.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/privatecrate_secure.rsi/unlocked.png b/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/unlocked.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/privatecrate_secure.rsi/unlocked.png
rename to Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/unlocked.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/privatecrate_secure.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/welded.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/privatecrate_secure.rsi/welded.png
rename to Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/welded.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/radiation.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/radiation.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/radiation.rsi/meta.json
rename to Resources/Textures/Structures/Storage/Crates/radiation.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Storage/Crates/radiation.rsi/radiationcrate.png b/Resources/Textures/Structures/Storage/Crates/radiation.rsi/radiationcrate.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/radiation.rsi/radiationcrate.png
rename to Resources/Textures/Structures/Storage/Crates/radiation.rsi/radiationcrate.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/radiation.rsi/radiationcrate_door.png b/Resources/Textures/Structures/Storage/Crates/radiation.rsi/radiationcrate_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/radiation.rsi/radiationcrate_door.png
rename to Resources/Textures/Structures/Storage/Crates/radiation.rsi/radiationcrate_door.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/radiation.rsi/radiationcrate_icon.png b/Resources/Textures/Structures/Storage/Crates/radiation.rsi/radiationcrate_icon.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/radiation.rsi/radiationcrate_icon.png
rename to Resources/Textures/Structures/Storage/Crates/radiation.rsi/radiationcrate_icon.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/radiation.rsi/radiationcrate_open.png b/Resources/Textures/Structures/Storage/Crates/radiation.rsi/radiationcrate_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/radiation.rsi/radiationcrate_open.png
rename to Resources/Textures/Structures/Storage/Crates/radiation.rsi/radiationcrate_open.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/radiation.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/radiation.rsi/sparking.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/radiation.rsi/sparking.png
rename to Resources/Textures/Structures/Storage/Crates/radiation.rsi/sparking.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/radiation.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/radiation.rsi/welded.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/radiation.rsi/welded.png
rename to Resources/Textures/Structures/Storage/Crates/radiation.rsi/welded.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/scicrate.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/scicrate.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/scicrate.rsi/meta.json
rename to Resources/Textures/Structures/Storage/Crates/scicrate.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Storage/Crates/scicrate.rsi/scicrate.png b/Resources/Textures/Structures/Storage/Crates/scicrate.rsi/scicrate.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/scicrate.rsi/scicrate.png
rename to Resources/Textures/Structures/Storage/Crates/scicrate.rsi/scicrate.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/scicrate.rsi/scicrate_door.png b/Resources/Textures/Structures/Storage/Crates/scicrate.rsi/scicrate_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/scicrate.rsi/scicrate_door.png
rename to Resources/Textures/Structures/Storage/Crates/scicrate.rsi/scicrate_door.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/scicrate.rsi/scicrate_icon.png b/Resources/Textures/Structures/Storage/Crates/scicrate.rsi/scicrate_icon.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/scicrate.rsi/scicrate_icon.png
rename to Resources/Textures/Structures/Storage/Crates/scicrate.rsi/scicrate_icon.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/scicrate.rsi/scicrate_open.png b/Resources/Textures/Structures/Storage/Crates/scicrate.rsi/scicrate_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/scicrate.rsi/scicrate_open.png
rename to Resources/Textures/Structures/Storage/Crates/scicrate.rsi/scicrate_open.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/scicrate.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/scicrate.rsi/sparking.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/scicrate.rsi/sparking.png
rename to Resources/Textures/Structures/Storage/Crates/scicrate.rsi/sparking.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/scicrate.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/scicrate.rsi/welded.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/scicrate.rsi/welded.png
rename to Resources/Textures/Structures/Storage/Crates/scicrate.rsi/welded.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/scicrate_secure.rsi/locked.png b/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/locked.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/scicrate_secure.rsi/locked.png
rename to Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/locked.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/scicrate_secure.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/scicrate_secure.rsi/meta.json
rename to Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Storage/Crates/scicrate_secure.rsi/off.png b/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/off.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/scicrate_secure.rsi/off.png
rename to Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/off.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/scicrate_secure.rsi/scicratesecure.png b/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/scicratesecure.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/scicrate_secure.rsi/scicratesecure.png
rename to Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/scicratesecure.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/scicrate_secure.rsi/scicratesecure_door.png b/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/scicratesecure_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/scicrate_secure.rsi/scicratesecure_door.png
rename to Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/scicratesecure_door.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/scicrate_secure.rsi/scicratesecure_icon.png b/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/scicratesecure_icon.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/scicrate_secure.rsi/scicratesecure_icon.png
rename to Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/scicratesecure_icon.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/scicrate_secure.rsi/scicratesecure_open.png b/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/scicratesecure_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/scicrate_secure.rsi/scicratesecure_open.png
rename to Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/scicratesecure_open.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/scicrate_secure.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/sparking.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/scicrate_secure.rsi/sparking.png
rename to Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/sparking.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/scicrate_secure.rsi/unlocked.png b/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/unlocked.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/scicrate_secure.rsi/unlocked.png
rename to Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/unlocked.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/scicrate_secure.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/welded.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/scicrate_secure.rsi/welded.png
rename to Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/welded.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/sec_gear.rsi/locked.png b/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/locked.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/sec_gear.rsi/locked.png
rename to Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/locked.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/sec_gear.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/sec_gear.rsi/meta.json
rename to Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Storage/Crates/sec_gear.rsi/off.png b/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/off.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/sec_gear.rsi/off.png
rename to Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/off.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/sec_gear.rsi/secgearcrate.png b/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/secgearcrate.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/sec_gear.rsi/secgearcrate.png
rename to Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/secgearcrate.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/sec_gear.rsi/secgearcrate_door.png b/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/secgearcrate_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/sec_gear.rsi/secgearcrate_door.png
rename to Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/secgearcrate_door.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/sec_gear.rsi/secgearcrate_icon.png b/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/secgearcrate_icon.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/sec_gear.rsi/secgearcrate_icon.png
rename to Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/secgearcrate_icon.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/sec_gear.rsi/secgearcrate_open.png b/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/secgearcrate_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/sec_gear.rsi/secgearcrate_open.png
rename to Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/secgearcrate_open.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/sec_gear.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/sparking.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/sec_gear.rsi/sparking.png
rename to Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/sparking.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/sec_gear.rsi/unlocked.png b/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/unlocked.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/sec_gear.rsi/unlocked.png
rename to Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/unlocked.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/sec_gear.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/welded.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/sec_gear.rsi/welded.png
rename to Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/welded.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/secure.rsi/locked.png b/Resources/Textures/Structures/Storage/Crates/secure.rsi/locked.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/secure.rsi/locked.png
rename to Resources/Textures/Structures/Storage/Crates/secure.rsi/locked.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/secure.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/secure.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/secure.rsi/meta.json
rename to Resources/Textures/Structures/Storage/Crates/secure.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Storage/Crates/secure.rsi/off.png b/Resources/Textures/Structures/Storage/Crates/secure.rsi/off.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/secure.rsi/off.png
rename to Resources/Textures/Structures/Storage/Crates/secure.rsi/off.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/secure.rsi/securecrate.png b/Resources/Textures/Structures/Storage/Crates/secure.rsi/securecrate.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/secure.rsi/securecrate.png
rename to Resources/Textures/Structures/Storage/Crates/secure.rsi/securecrate.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/secure.rsi/securecrate_door.png b/Resources/Textures/Structures/Storage/Crates/secure.rsi/securecrate_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/secure.rsi/securecrate_door.png
rename to Resources/Textures/Structures/Storage/Crates/secure.rsi/securecrate_door.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/secure.rsi/securecrate_icon.png b/Resources/Textures/Structures/Storage/Crates/secure.rsi/securecrate_icon.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/secure.rsi/securecrate_icon.png
rename to Resources/Textures/Structures/Storage/Crates/secure.rsi/securecrate_icon.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/secure.rsi/securecrate_open.png b/Resources/Textures/Structures/Storage/Crates/secure.rsi/securecrate_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/secure.rsi/securecrate_open.png
rename to Resources/Textures/Structures/Storage/Crates/secure.rsi/securecrate_open.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/secure.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/secure.rsi/sparking.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/secure.rsi/sparking.png
rename to Resources/Textures/Structures/Storage/Crates/secure.rsi/sparking.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/secure.rsi/unlocked.png b/Resources/Textures/Structures/Storage/Crates/secure.rsi/unlocked.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/secure.rsi/unlocked.png
rename to Resources/Textures/Structures/Storage/Crates/secure.rsi/unlocked.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/secure.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/secure.rsi/welded.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/secure.rsi/welded.png
rename to Resources/Textures/Structures/Storage/Crates/secure.rsi/welded.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/surgerycrate.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/surgerycrate.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/surgerycrate.rsi/meta.json
rename to Resources/Textures/Structures/Storage/Crates/surgerycrate.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Storage/Crates/surgerycrate.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/surgerycrate.rsi/sparking.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/surgerycrate.rsi/sparking.png
rename to Resources/Textures/Structures/Storage/Crates/surgerycrate.rsi/sparking.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/surgerycrate.rsi/surgerycrate.png b/Resources/Textures/Structures/Storage/Crates/surgerycrate.rsi/surgerycrate.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/surgerycrate.rsi/surgerycrate.png
rename to Resources/Textures/Structures/Storage/Crates/surgerycrate.rsi/surgerycrate.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/surgerycrate.rsi/surgerycrate_door.png b/Resources/Textures/Structures/Storage/Crates/surgerycrate.rsi/surgerycrate_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/surgerycrate.rsi/surgerycrate_door.png
rename to Resources/Textures/Structures/Storage/Crates/surgerycrate.rsi/surgerycrate_door.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/surgerycrate.rsi/surgerycrate_icon.png b/Resources/Textures/Structures/Storage/Crates/surgerycrate.rsi/surgerycrate_icon.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/surgerycrate.rsi/surgerycrate_icon.png
rename to Resources/Textures/Structures/Storage/Crates/surgerycrate.rsi/surgerycrate_icon.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/surgerycrate.rsi/surgerycrate_open.png b/Resources/Textures/Structures/Storage/Crates/surgerycrate.rsi/surgerycrate_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/surgerycrate.rsi/surgerycrate_open.png
rename to Resources/Textures/Structures/Storage/Crates/surgerycrate.rsi/surgerycrate_open.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/surgerycrate.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/surgerycrate.rsi/welded.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/surgerycrate.rsi/welded.png
rename to Resources/Textures/Structures/Storage/Crates/surgerycrate.rsi/welded.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/weapon.rsi/locked.png b/Resources/Textures/Structures/Storage/Crates/weapon.rsi/locked.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/weapon.rsi/locked.png
rename to Resources/Textures/Structures/Storage/Crates/weapon.rsi/locked.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/weapon.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/weapon.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/weapon.rsi/meta.json
rename to Resources/Textures/Structures/Storage/Crates/weapon.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Storage/Crates/weapon.rsi/off.png b/Resources/Textures/Structures/Storage/Crates/weapon.rsi/off.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/weapon.rsi/off.png
rename to Resources/Textures/Structures/Storage/Crates/weapon.rsi/off.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/weapon.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/weapon.rsi/sparking.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/weapon.rsi/sparking.png
rename to Resources/Textures/Structures/Storage/Crates/weapon.rsi/sparking.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/weapon.rsi/unlocked.png b/Resources/Textures/Structures/Storage/Crates/weapon.rsi/unlocked.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/weapon.rsi/unlocked.png
rename to Resources/Textures/Structures/Storage/Crates/weapon.rsi/unlocked.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/weapon.rsi/weaponcrate.png b/Resources/Textures/Structures/Storage/Crates/weapon.rsi/weaponcrate.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/weapon.rsi/weaponcrate.png
rename to Resources/Textures/Structures/Storage/Crates/weapon.rsi/weaponcrate.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/weapon.rsi/weaponcrate_door.png b/Resources/Textures/Structures/Storage/Crates/weapon.rsi/weaponcrate_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/weapon.rsi/weaponcrate_door.png
rename to Resources/Textures/Structures/Storage/Crates/weapon.rsi/weaponcrate_door.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/weapon.rsi/weaponcrate_icon.png b/Resources/Textures/Structures/Storage/Crates/weapon.rsi/weaponcrate_icon.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/weapon.rsi/weaponcrate_icon.png
rename to Resources/Textures/Structures/Storage/Crates/weapon.rsi/weaponcrate_icon.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/weapon.rsi/weaponcrate_open.png b/Resources/Textures/Structures/Storage/Crates/weapon.rsi/weaponcrate_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/weapon.rsi/weaponcrate_open.png
rename to Resources/Textures/Structures/Storage/Crates/weapon.rsi/weaponcrate_open.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/weapon.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/weapon.rsi/welded.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/weapon.rsi/welded.png
rename to Resources/Textures/Structures/Storage/Crates/weapon.rsi/welded.png
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/black-1.png b/Resources/Textures/Structures/Storage/canister.rsi/black-1.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/canister.rsi/black-1.png
rename to Resources/Textures/Structures/Storage/canister.rsi/black-1.png
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/black.png b/Resources/Textures/Structures/Storage/canister.rsi/black.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/canister.rsi/black.png
rename to Resources/Textures/Structures/Storage/canister.rsi/black.png
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/blue-1.png b/Resources/Textures/Structures/Storage/canister.rsi/blue-1.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/canister.rsi/blue-1.png
rename to Resources/Textures/Structures/Storage/canister.rsi/blue-1.png
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/blue.png b/Resources/Textures/Structures/Storage/canister.rsi/blue.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/canister.rsi/blue.png
rename to Resources/Textures/Structures/Storage/canister.rsi/blue.png
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/can-connector.png b/Resources/Textures/Structures/Storage/canister.rsi/can-connector.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/canister.rsi/can-connector.png
rename to Resources/Textures/Structures/Storage/canister.rsi/can-connector.png
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/can-o0.png b/Resources/Textures/Structures/Storage/canister.rsi/can-o0.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/canister.rsi/can-o0.png
rename to Resources/Textures/Structures/Storage/canister.rsi/can-o0.png
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/can-o1.png b/Resources/Textures/Structures/Storage/canister.rsi/can-o1.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/canister.rsi/can-o1.png
rename to Resources/Textures/Structures/Storage/canister.rsi/can-o1.png
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/can-o2.png b/Resources/Textures/Structures/Storage/canister.rsi/can-o2.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/canister.rsi/can-o2.png
rename to Resources/Textures/Structures/Storage/canister.rsi/can-o2.png
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/can-o3.png b/Resources/Textures/Structures/Storage/canister.rsi/can-o3.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/canister.rsi/can-o3.png
rename to Resources/Textures/Structures/Storage/canister.rsi/can-o3.png
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/can-oa1.png b/Resources/Textures/Structures/Storage/canister.rsi/can-oa1.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/canister.rsi/can-oa1.png
rename to Resources/Textures/Structures/Storage/canister.rsi/can-oa1.png
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/can-open.png b/Resources/Textures/Structures/Storage/canister.rsi/can-open.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/canister.rsi/can-open.png
rename to Resources/Textures/Structures/Storage/canister.rsi/can-open.png
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/darkblue-1.png b/Resources/Textures/Structures/Storage/canister.rsi/darkblue-1.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/canister.rsi/darkblue-1.png
rename to Resources/Textures/Structures/Storage/canister.rsi/darkblue-1.png
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/darkblue.png b/Resources/Textures/Structures/Storage/canister.rsi/darkblue.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/canister.rsi/darkblue.png
rename to Resources/Textures/Structures/Storage/canister.rsi/darkblue.png
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/freon-1.png b/Resources/Textures/Structures/Storage/canister.rsi/freon-1.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/canister.rsi/freon-1.png
rename to Resources/Textures/Structures/Storage/canister.rsi/freon-1.png
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/freon.png b/Resources/Textures/Structures/Storage/canister.rsi/freon.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/canister.rsi/freon.png
rename to Resources/Textures/Structures/Storage/canister.rsi/freon.png
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/green-1.png b/Resources/Textures/Structures/Storage/canister.rsi/green-1.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/canister.rsi/green-1.png
rename to Resources/Textures/Structures/Storage/canister.rsi/green-1.png
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/green.png b/Resources/Textures/Structures/Storage/canister.rsi/green.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/canister.rsi/green.png
rename to Resources/Textures/Structures/Storage/canister.rsi/green.png
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/grey-1.png b/Resources/Textures/Structures/Storage/canister.rsi/grey-1.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/canister.rsi/grey-1.png
rename to Resources/Textures/Structures/Storage/canister.rsi/grey-1.png
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/grey.png b/Resources/Textures/Structures/Storage/canister.rsi/grey.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/canister.rsi/grey.png
rename to Resources/Textures/Structures/Storage/canister.rsi/grey.png
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/meta.json b/Resources/Textures/Structures/Storage/canister.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/canister.rsi/meta.json
rename to Resources/Textures/Structures/Storage/canister.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/orange-1.png b/Resources/Textures/Structures/Storage/canister.rsi/orange-1.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/canister.rsi/orange-1.png
rename to Resources/Textures/Structures/Storage/canister.rsi/orange-1.png
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/orange.png b/Resources/Textures/Structures/Storage/canister.rsi/orange.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/canister.rsi/orange.png
rename to Resources/Textures/Structures/Storage/canister.rsi/orange.png
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/red-1.png b/Resources/Textures/Structures/Storage/canister.rsi/red-1.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/canister.rsi/red-1.png
rename to Resources/Textures/Structures/Storage/canister.rsi/red-1.png
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/red.png b/Resources/Textures/Structures/Storage/canister.rsi/red.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/canister.rsi/red.png
rename to Resources/Textures/Structures/Storage/canister.rsi/red.png
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/redws-1.png b/Resources/Textures/Structures/Storage/canister.rsi/redws-1.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/canister.rsi/redws-1.png
rename to Resources/Textures/Structures/Storage/canister.rsi/redws-1.png
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/redws.png b/Resources/Textures/Structures/Storage/canister.rsi/redws.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/canister.rsi/redws.png
rename to Resources/Textures/Structures/Storage/canister.rsi/redws.png
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/scrubber-connector.png b/Resources/Textures/Structures/Storage/canister.rsi/scrubber-connector.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/canister.rsi/scrubber-connector.png
rename to Resources/Textures/Structures/Storage/canister.rsi/scrubber-connector.png
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/scrubber-open.png b/Resources/Textures/Structures/Storage/canister.rsi/scrubber-open.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/canister.rsi/scrubber-open.png
rename to Resources/Textures/Structures/Storage/canister.rsi/scrubber-open.png
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/water_vapor-1.png b/Resources/Textures/Structures/Storage/canister.rsi/water_vapor-1.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/canister.rsi/water_vapor-1.png
rename to Resources/Textures/Structures/Storage/canister.rsi/water_vapor-1.png
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/water_vapor.png b/Resources/Textures/Structures/Storage/canister.rsi/water_vapor.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/canister.rsi/water_vapor.png
rename to Resources/Textures/Structures/Storage/canister.rsi/water_vapor.png
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/yellow-1.png b/Resources/Textures/Structures/Storage/canister.rsi/yellow-1.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/canister.rsi/yellow-1.png
rename to Resources/Textures/Structures/Storage/canister.rsi/yellow-1.png
diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/yellow.png b/Resources/Textures/Structures/Storage/canister.rsi/yellow.png
similarity index 100%
rename from Resources/Textures/Constructible/Atmos/canister.rsi/yellow.png
rename to Resources/Textures/Structures/Storage/canister.rsi/yellow.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/abductor.png b/Resources/Textures/Structures/Storage/closet.rsi/abductor.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/abductor.png
rename to Resources/Textures/Structures/Storage/closet.rsi/abductor.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/abductor_door.png b/Resources/Textures/Structures/Storage/closet.rsi/abductor_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/abductor_door.png
rename to Resources/Textures/Structures/Storage/closet.rsi/abductor_door.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/abductor_open.png b/Resources/Textures/Structures/Storage/closet.rsi/abductor_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/abductor_open.png
rename to Resources/Textures/Structures/Storage/closet.rsi/abductor_open.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/agentbox.png b/Resources/Textures/Structures/Storage/closet.rsi/agentbox.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/agentbox.png
rename to Resources/Textures/Structures/Storage/closet.rsi/agentbox.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/alien.png b/Resources/Textures/Structures/Storage/closet.rsi/alien.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/alien.png
rename to Resources/Textures/Structures/Storage/closet.rsi/alien.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/alien_door.png b/Resources/Textures/Structures/Storage/closet.rsi/alien_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/alien_door.png
rename to Resources/Textures/Structures/Storage/closet.rsi/alien_door.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/alien_open.png b/Resources/Textures/Structures/Storage/closet.rsi/alien_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/alien_open.png
rename to Resources/Textures/Structures/Storage/closet.rsi/alien_open.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/armory.png b/Resources/Textures/Structures/Storage/closet.rsi/armory.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/armory.png
rename to Resources/Textures/Structures/Storage/closet.rsi/armory.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/armory_door.png b/Resources/Textures/Structures/Storage/closet.rsi/armory_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/armory_door.png
rename to Resources/Textures/Structures/Storage/closet.rsi/armory_door.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/armory_open.png b/Resources/Textures/Structures/Storage/closet.rsi/armory_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/armory_open.png
rename to Resources/Textures/Structures/Storage/closet.rsi/armory_open.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/atmos.png b/Resources/Textures/Structures/Storage/closet.rsi/atmos.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/atmos.png
rename to Resources/Textures/Structures/Storage/closet.rsi/atmos.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/atmos_door.png b/Resources/Textures/Structures/Storage/closet.rsi/atmos_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/atmos_door.png
rename to Resources/Textures/Structures/Storage/closet.rsi/atmos_door.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/atmos_open.png b/Resources/Textures/Structures/Storage/closet.rsi/atmos_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/atmos_open.png
rename to Resources/Textures/Structures/Storage/closet.rsi/atmos_open.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/atmos_wardrobe_door.png b/Resources/Textures/Structures/Storage/closet.rsi/atmos_wardrobe_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/atmos_wardrobe_door.png
rename to Resources/Textures/Structures/Storage/closet.rsi/atmos_wardrobe_door.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/bio.png b/Resources/Textures/Structures/Storage/closet.rsi/bio.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/bio.png
rename to Resources/Textures/Structures/Storage/closet.rsi/bio.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/bio_door.png b/Resources/Textures/Structures/Storage/closet.rsi/bio_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/bio_door.png
rename to Resources/Textures/Structures/Storage/closet.rsi/bio_door.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/bio_jan.png b/Resources/Textures/Structures/Storage/closet.rsi/bio_jan.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/bio_jan.png
rename to Resources/Textures/Structures/Storage/closet.rsi/bio_jan.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/bio_jan_door.png b/Resources/Textures/Structures/Storage/closet.rsi/bio_jan_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/bio_jan_door.png
rename to Resources/Textures/Structures/Storage/closet.rsi/bio_jan_door.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/bio_jan_open.png b/Resources/Textures/Structures/Storage/closet.rsi/bio_jan_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/bio_jan_open.png
rename to Resources/Textures/Structures/Storage/closet.rsi/bio_jan_open.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/bio_open.png b/Resources/Textures/Structures/Storage/closet.rsi/bio_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/bio_open.png
rename to Resources/Textures/Structures/Storage/closet.rsi/bio_open.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/bio_sec.png b/Resources/Textures/Structures/Storage/closet.rsi/bio_sec.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/bio_sec.png
rename to Resources/Textures/Structures/Storage/closet.rsi/bio_sec.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/bio_sec_door.png b/Resources/Textures/Structures/Storage/closet.rsi/bio_sec_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/bio_sec_door.png
rename to Resources/Textures/Structures/Storage/closet.rsi/bio_sec_door.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/bio_sec_open.png b/Resources/Textures/Structures/Storage/closet.rsi/bio_sec_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/bio_sec_open.png
rename to Resources/Textures/Structures/Storage/closet.rsi/bio_sec_open.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/bio_viro.png b/Resources/Textures/Structures/Storage/closet.rsi/bio_viro.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/bio_viro.png
rename to Resources/Textures/Structures/Storage/closet.rsi/bio_viro.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/bio_viro_door.png b/Resources/Textures/Structures/Storage/closet.rsi/bio_viro_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/bio_viro_door.png
rename to Resources/Textures/Structures/Storage/closet.rsi/bio_viro_door.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/bio_viro_open.png b/Resources/Textures/Structures/Storage/closet.rsi/bio_viro_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/bio_viro_open.png
rename to Resources/Textures/Structures/Storage/closet.rsi/bio_viro_open.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/black_door.png b/Resources/Textures/Structures/Storage/closet.rsi/black_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/black_door.png
rename to Resources/Textures/Structures/Storage/closet.rsi/black_door.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/blue_door.png b/Resources/Textures/Structures/Storage/closet.rsi/blue_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/blue_door.png
rename to Resources/Textures/Structures/Storage/closet.rsi/blue_door.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/bomb.png b/Resources/Textures/Structures/Storage/closet.rsi/bomb.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/bomb.png
rename to Resources/Textures/Structures/Storage/closet.rsi/bomb.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/bomb_door.png b/Resources/Textures/Structures/Storage/closet.rsi/bomb_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/bomb_door.png
rename to Resources/Textures/Structures/Storage/closet.rsi/bomb_door.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/bomb_open.png b/Resources/Textures/Structures/Storage/closet.rsi/bomb_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/bomb_open.png
rename to Resources/Textures/Structures/Storage/closet.rsi/bomb_open.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/cabinet.png b/Resources/Textures/Structures/Storage/closet.rsi/cabinet.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/cabinet.png
rename to Resources/Textures/Structures/Storage/closet.rsi/cabinet.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/cabinet_door.png b/Resources/Textures/Structures/Storage/closet.rsi/cabinet_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/cabinet_door.png
rename to Resources/Textures/Structures/Storage/closet.rsi/cabinet_door.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/cabinet_open.png b/Resources/Textures/Structures/Storage/closet.rsi/cabinet_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/cabinet_open.png
rename to Resources/Textures/Structures/Storage/closet.rsi/cabinet_open.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/cap.png b/Resources/Textures/Structures/Storage/closet.rsi/cap.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/cap.png
rename to Resources/Textures/Structures/Storage/closet.rsi/cap.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/cap_door.png b/Resources/Textures/Structures/Storage/closet.rsi/cap_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/cap_door.png
rename to Resources/Textures/Structures/Storage/closet.rsi/cap_door.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/cap_open.png b/Resources/Textures/Structures/Storage/closet.rsi/cap_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/cap_open.png
rename to Resources/Textures/Structures/Storage/closet.rsi/cap_open.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/cardboard.png b/Resources/Textures/Structures/Storage/closet.rsi/cardboard.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/cardboard.png
rename to Resources/Textures/Structures/Storage/closet.rsi/cardboard.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/cardboard_open.png b/Resources/Textures/Structures/Storage/closet.rsi/cardboard_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/cardboard_open.png
rename to Resources/Textures/Structures/Storage/closet.rsi/cardboard_open.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/cardboard_special.png b/Resources/Textures/Structures/Storage/closet.rsi/cardboard_special.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/cardboard_special.png
rename to Resources/Textures/Structures/Storage/closet.rsi/cardboard_special.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/cargo.png b/Resources/Textures/Structures/Storage/closet.rsi/cargo.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/cargo.png
rename to Resources/Textures/Structures/Storage/closet.rsi/cargo.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/cargo_door.png b/Resources/Textures/Structures/Storage/closet.rsi/cargo_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/cargo_door.png
rename to Resources/Textures/Structures/Storage/closet.rsi/cargo_door.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/cargo_open.png b/Resources/Textures/Structures/Storage/closet.rsi/cargo_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/cargo_open.png
rename to Resources/Textures/Structures/Storage/closet.rsi/cargo_open.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/ce.png b/Resources/Textures/Structures/Storage/closet.rsi/ce.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/ce.png
rename to Resources/Textures/Structures/Storage/closet.rsi/ce.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/ce_door.png b/Resources/Textures/Structures/Storage/closet.rsi/ce_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/ce_door.png
rename to Resources/Textures/Structures/Storage/closet.rsi/ce_door.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/ce_open.png b/Resources/Textures/Structures/Storage/closet.rsi/ce_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/ce_open.png
rename to Resources/Textures/Structures/Storage/closet.rsi/ce_open.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/chemical_door.png b/Resources/Textures/Structures/Storage/closet.rsi/chemical_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/chemical_door.png
rename to Resources/Textures/Structures/Storage/closet.rsi/chemical_door.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/cmo.png b/Resources/Textures/Structures/Storage/closet.rsi/cmo.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/cmo.png
rename to Resources/Textures/Structures/Storage/closet.rsi/cmo.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/cmo_door.png b/Resources/Textures/Structures/Storage/closet.rsi/cmo_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/cmo_door.png
rename to Resources/Textures/Structures/Storage/closet.rsi/cmo_door.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/cmo_open.png b/Resources/Textures/Structures/Storage/closet.rsi/cmo_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/cmo_open.png
rename to Resources/Textures/Structures/Storage/closet.rsi/cmo_open.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/cursed.png b/Resources/Textures/Structures/Storage/closet.rsi/cursed.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/cursed.png
rename to Resources/Textures/Structures/Storage/closet.rsi/cursed.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/cursed_door.png b/Resources/Textures/Structures/Storage/closet.rsi/cursed_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/cursed_door.png
rename to Resources/Textures/Structures/Storage/closet.rsi/cursed_door.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/cursed_open.png b/Resources/Textures/Structures/Storage/closet.rsi/cursed_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/cursed_open.png
rename to Resources/Textures/Structures/Storage/closet.rsi/cursed_open.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/cursed_whole.png b/Resources/Textures/Structures/Storage/closet.rsi/cursed_whole.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/cursed_whole.png
rename to Resources/Textures/Structures/Storage/closet.rsi/cursed_whole.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/decursed.png b/Resources/Textures/Structures/Storage/closet.rsi/decursed.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/decursed.png
rename to Resources/Textures/Structures/Storage/closet.rsi/decursed.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/decursed_door.png b/Resources/Textures/Structures/Storage/closet.rsi/decursed_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/decursed_door.png
rename to Resources/Textures/Structures/Storage/closet.rsi/decursed_door.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/decursed_open.png b/Resources/Textures/Structures/Storage/closet.rsi/decursed_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/decursed_open.png
rename to Resources/Textures/Structures/Storage/closet.rsi/decursed_open.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/ecase.png b/Resources/Textures/Structures/Storage/closet.rsi/ecase.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/ecase.png
rename to Resources/Textures/Structures/Storage/closet.rsi/ecase.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/ecase_door.png b/Resources/Textures/Structures/Storage/closet.rsi/ecase_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/ecase_door.png
rename to Resources/Textures/Structures/Storage/closet.rsi/ecase_door.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/ecase_open.png b/Resources/Textures/Structures/Storage/closet.rsi/ecase_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/ecase_open.png
rename to Resources/Textures/Structures/Storage/closet.rsi/ecase_open.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/egun.png b/Resources/Textures/Structures/Storage/closet.rsi/egun.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/egun.png
rename to Resources/Textures/Structures/Storage/closet.rsi/egun.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/emergency.png b/Resources/Textures/Structures/Storage/closet.rsi/emergency.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/emergency.png
rename to Resources/Textures/Structures/Storage/closet.rsi/emergency.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/emergency_door.png b/Resources/Textures/Structures/Storage/closet.rsi/emergency_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/emergency_door.png
rename to Resources/Textures/Structures/Storage/closet.rsi/emergency_door.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/emergency_open.png b/Resources/Textures/Structures/Storage/closet.rsi/emergency_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/emergency_open.png
rename to Resources/Textures/Structures/Storage/closet.rsi/emergency_open.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/eng.png b/Resources/Textures/Structures/Storage/closet.rsi/eng.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/eng.png
rename to Resources/Textures/Structures/Storage/closet.rsi/eng.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/eng_elec_door.png b/Resources/Textures/Structures/Storage/closet.rsi/eng_elec_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/eng_elec_door.png
rename to Resources/Textures/Structures/Storage/closet.rsi/eng_elec_door.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/eng_open.png b/Resources/Textures/Structures/Storage/closet.rsi/eng_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/eng_open.png
rename to Resources/Textures/Structures/Storage/closet.rsi/eng_open.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/eng_rad_door.png b/Resources/Textures/Structures/Storage/closet.rsi/eng_rad_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/eng_rad_door.png
rename to Resources/Textures/Structures/Storage/closet.rsi/eng_rad_door.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/eng_secure.png b/Resources/Textures/Structures/Storage/closet.rsi/eng_secure.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/eng_secure.png
rename to Resources/Textures/Structures/Storage/closet.rsi/eng_secure.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/eng_secure_door.png b/Resources/Textures/Structures/Storage/closet.rsi/eng_secure_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/eng_secure_door.png
rename to Resources/Textures/Structures/Storage/closet.rsi/eng_secure_door.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/eng_secure_open.png b/Resources/Textures/Structures/Storage/closet.rsi/eng_secure_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/eng_secure_open.png
rename to Resources/Textures/Structures/Storage/closet.rsi/eng_secure_open.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/eng_tool_door.png b/Resources/Textures/Structures/Storage/closet.rsi/eng_tool_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/eng_tool_door.png
rename to Resources/Textures/Structures/Storage/closet.rsi/eng_tool_door.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/eng_weld_door.png b/Resources/Textures/Structures/Storage/closet.rsi/eng_weld_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/eng_weld_door.png
rename to Resources/Textures/Structures/Storage/closet.rsi/eng_weld_door.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/fire.png b/Resources/Textures/Structures/Storage/closet.rsi/fire.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/fire.png
rename to Resources/Textures/Structures/Storage/closet.rsi/fire.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/fire_door.png b/Resources/Textures/Structures/Storage/closet.rsi/fire_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/fire_door.png
rename to Resources/Textures/Structures/Storage/closet.rsi/fire_door.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/fire_open.png b/Resources/Textures/Structures/Storage/closet.rsi/fire_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/fire_open.png
rename to Resources/Textures/Structures/Storage/closet.rsi/fire_open.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/freezer.png b/Resources/Textures/Structures/Storage/closet.rsi/freezer.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/freezer.png
rename to Resources/Textures/Structures/Storage/closet.rsi/freezer.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/freezer_door.png b/Resources/Textures/Structures/Storage/closet.rsi/freezer_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/freezer_door.png
rename to Resources/Textures/Structures/Storage/closet.rsi/freezer_door.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/freezer_open.png b/Resources/Textures/Structures/Storage/closet.rsi/freezer_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/freezer_open.png
rename to Resources/Textures/Structures/Storage/closet.rsi/freezer_open.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/generic.png b/Resources/Textures/Structures/Storage/closet.rsi/generic.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/generic.png
rename to Resources/Textures/Structures/Storage/closet.rsi/generic.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/generic_door.png b/Resources/Textures/Structures/Storage/closet.rsi/generic_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/generic_door.png
rename to Resources/Textures/Structures/Storage/closet.rsi/generic_door.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/generic_open.png b/Resources/Textures/Structures/Storage/closet.rsi/generic_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/generic_open.png
rename to Resources/Textures/Structures/Storage/closet.rsi/generic_open.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/green_door.png b/Resources/Textures/Structures/Storage/closet.rsi/green_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/green_door.png
rename to Resources/Textures/Structures/Storage/closet.rsi/green_door.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/grey_door.png b/Resources/Textures/Structures/Storage/closet.rsi/grey_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/grey_door.png
rename to Resources/Textures/Structures/Storage/closet.rsi/grey_door.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/hop.png b/Resources/Textures/Structures/Storage/closet.rsi/hop.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/hop.png
rename to Resources/Textures/Structures/Storage/closet.rsi/hop.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/hop_door.png b/Resources/Textures/Structures/Storage/closet.rsi/hop_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/hop_door.png
rename to Resources/Textures/Structures/Storage/closet.rsi/hop_door.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/hop_open.png b/Resources/Textures/Structures/Storage/closet.rsi/hop_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/hop_open.png
rename to Resources/Textures/Structures/Storage/closet.rsi/hop_open.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/hos.png b/Resources/Textures/Structures/Storage/closet.rsi/hos.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/hos.png
rename to Resources/Textures/Structures/Storage/closet.rsi/hos.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/hos_door.png b/Resources/Textures/Structures/Storage/closet.rsi/hos_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/hos_door.png
rename to Resources/Textures/Structures/Storage/closet.rsi/hos_door.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/hos_open.png b/Resources/Textures/Structures/Storage/closet.rsi/hos_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/hos_open.png
rename to Resources/Textures/Structures/Storage/closet.rsi/hos_open.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/hydro.png b/Resources/Textures/Structures/Storage/closet.rsi/hydro.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/hydro.png
rename to Resources/Textures/Structures/Storage/closet.rsi/hydro.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/hydro_door.png b/Resources/Textures/Structures/Storage/closet.rsi/hydro_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/hydro_door.png
rename to Resources/Textures/Structures/Storage/closet.rsi/hydro_door.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/hydro_open.png b/Resources/Textures/Structures/Storage/closet.rsi/hydro_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/hydro_open.png
rename to Resources/Textures/Structures/Storage/closet.rsi/hydro_open.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/locked.png b/Resources/Textures/Structures/Storage/closet.rsi/locked.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/locked.png
rename to Resources/Textures/Structures/Storage/closet.rsi/locked.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/med.png b/Resources/Textures/Structures/Storage/closet.rsi/med.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/med.png
rename to Resources/Textures/Structures/Storage/closet.rsi/med.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/med_door.png b/Resources/Textures/Structures/Storage/closet.rsi/med_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/med_door.png
rename to Resources/Textures/Structures/Storage/closet.rsi/med_door.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/med_open.png b/Resources/Textures/Structures/Storage/closet.rsi/med_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/med_open.png
rename to Resources/Textures/Structures/Storage/closet.rsi/med_open.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/med_secure.png b/Resources/Textures/Structures/Storage/closet.rsi/med_secure.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/med_secure.png
rename to Resources/Textures/Structures/Storage/closet.rsi/med_secure.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/med_secure_door.png b/Resources/Textures/Structures/Storage/closet.rsi/med_secure_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/med_secure_door.png
rename to Resources/Textures/Structures/Storage/closet.rsi/med_secure_door.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/med_secure_open.png b/Resources/Textures/Structures/Storage/closet.rsi/med_secure_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/med_secure_open.png
rename to Resources/Textures/Structures/Storage/closet.rsi/med_secure_open.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/meta.json b/Resources/Textures/Structures/Storage/closet.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/meta.json
rename to Resources/Textures/Structures/Storage/closet.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/metalbox.png b/Resources/Textures/Structures/Storage/closet.rsi/metalbox.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/metalbox.png
rename to Resources/Textures/Structures/Storage/closet.rsi/metalbox.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/metalbox_open.png b/Resources/Textures/Structures/Storage/closet.rsi/metalbox_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/metalbox_open.png
rename to Resources/Textures/Structures/Storage/closet.rsi/metalbox_open.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/mining.png b/Resources/Textures/Structures/Storage/closet.rsi/mining.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/mining.png
rename to Resources/Textures/Structures/Storage/closet.rsi/mining.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/mining_door.png b/Resources/Textures/Structures/Storage/closet.rsi/mining_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/mining_door.png
rename to Resources/Textures/Structures/Storage/closet.rsi/mining_door.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/mining_open.png b/Resources/Textures/Structures/Storage/closet.rsi/mining_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/mining_open.png
rename to Resources/Textures/Structures/Storage/closet.rsi/mining_open.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/mixed_door.png b/Resources/Textures/Structures/Storage/closet.rsi/mixed_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/mixed_door.png
rename to Resources/Textures/Structures/Storage/closet.rsi/mixed_door.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/oldcloset.png b/Resources/Textures/Structures/Storage/closet.rsi/oldcloset.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/oldcloset.png
rename to Resources/Textures/Structures/Storage/closet.rsi/oldcloset.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/orange_door.png b/Resources/Textures/Structures/Storage/closet.rsi/orange_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/orange_door.png
rename to Resources/Textures/Structures/Storage/closet.rsi/orange_door.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/pink_door.png b/Resources/Textures/Structures/Storage/closet.rsi/pink_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/pink_door.png
rename to Resources/Textures/Structures/Storage/closet.rsi/pink_door.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/qm.png b/Resources/Textures/Structures/Storage/closet.rsi/qm.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/qm.png
rename to Resources/Textures/Structures/Storage/closet.rsi/qm.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/qm_door.png b/Resources/Textures/Structures/Storage/closet.rsi/qm_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/qm_door.png
rename to Resources/Textures/Structures/Storage/closet.rsi/qm_door.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/qm_open.png b/Resources/Textures/Structures/Storage/closet.rsi/qm_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/qm_open.png
rename to Resources/Textures/Structures/Storage/closet.rsi/qm_open.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/rd.png b/Resources/Textures/Structures/Storage/closet.rsi/rd.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/rd.png
rename to Resources/Textures/Structures/Storage/closet.rsi/rd.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/rd_door.png b/Resources/Textures/Structures/Storage/closet.rsi/rd_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/rd_door.png
rename to Resources/Textures/Structures/Storage/closet.rsi/rd_door.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/rd_open.png b/Resources/Textures/Structures/Storage/closet.rsi/rd_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/rd_open.png
rename to Resources/Textures/Structures/Storage/closet.rsi/rd_open.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/red_door.png b/Resources/Textures/Structures/Storage/closet.rsi/red_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/red_door.png
rename to Resources/Textures/Structures/Storage/closet.rsi/red_door.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/science.png b/Resources/Textures/Structures/Storage/closet.rsi/science.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/science.png
rename to Resources/Textures/Structures/Storage/closet.rsi/science.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/science_door.png b/Resources/Textures/Structures/Storage/closet.rsi/science_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/science_door.png
rename to Resources/Textures/Structures/Storage/closet.rsi/science_door.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/science_open.png b/Resources/Textures/Structures/Storage/closet.rsi/science_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/science_open.png
rename to Resources/Textures/Structures/Storage/closet.rsi/science_open.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/sec.png b/Resources/Textures/Structures/Storage/closet.rsi/sec.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/sec.png
rename to Resources/Textures/Structures/Storage/closet.rsi/sec.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/sec_door.png b/Resources/Textures/Structures/Storage/closet.rsi/sec_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/sec_door.png
rename to Resources/Textures/Structures/Storage/closet.rsi/sec_door.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/sec_open.png b/Resources/Textures/Structures/Storage/closet.rsi/sec_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/sec_open.png
rename to Resources/Textures/Structures/Storage/closet.rsi/sec_open.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/secure.png b/Resources/Textures/Structures/Storage/closet.rsi/secure.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/secure.png
rename to Resources/Textures/Structures/Storage/closet.rsi/secure.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/secure_door.png b/Resources/Textures/Structures/Storage/closet.rsi/secure_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/secure_door.png
rename to Resources/Textures/Structures/Storage/closet.rsi/secure_door.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/secure_open.png b/Resources/Textures/Structures/Storage/closet.rsi/secure_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/secure_open.png
rename to Resources/Textures/Structures/Storage/closet.rsi/secure_open.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/shotgun.png b/Resources/Textures/Structures/Storage/closet.rsi/shotgun.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/shotgun.png
rename to Resources/Textures/Structures/Storage/closet.rsi/shotgun.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/shotguncase.png b/Resources/Textures/Structures/Storage/closet.rsi/shotguncase.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/shotguncase.png
rename to Resources/Textures/Structures/Storage/closet.rsi/shotguncase.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/shotguncase_door.png b/Resources/Textures/Structures/Storage/closet.rsi/shotguncase_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/shotguncase_door.png
rename to Resources/Textures/Structures/Storage/closet.rsi/shotguncase_door.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/shotguncase_open.png b/Resources/Textures/Structures/Storage/closet.rsi/shotguncase_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/shotguncase_open.png
rename to Resources/Textures/Structures/Storage/closet.rsi/shotguncase_open.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/sparking.png b/Resources/Textures/Structures/Storage/closet.rsi/sparking.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/sparking.png
rename to Resources/Textures/Structures/Storage/closet.rsi/sparking.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/syndicate.png b/Resources/Textures/Structures/Storage/closet.rsi/syndicate.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/syndicate.png
rename to Resources/Textures/Structures/Storage/closet.rsi/syndicate.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/syndicate_door.png b/Resources/Textures/Structures/Storage/closet.rsi/syndicate_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/syndicate_door.png
rename to Resources/Textures/Structures/Storage/closet.rsi/syndicate_door.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/syndicate_open.png b/Resources/Textures/Structures/Storage/closet.rsi/syndicate_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/syndicate_open.png
rename to Resources/Textures/Structures/Storage/closet.rsi/syndicate_open.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/tac.png b/Resources/Textures/Structures/Storage/closet.rsi/tac.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/tac.png
rename to Resources/Textures/Structures/Storage/closet.rsi/tac.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/tac_door.png b/Resources/Textures/Structures/Storage/closet.rsi/tac_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/tac_door.png
rename to Resources/Textures/Structures/Storage/closet.rsi/tac_door.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/tac_open.png b/Resources/Textures/Structures/Storage/closet.rsi/tac_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/tac_open.png
rename to Resources/Textures/Structures/Storage/closet.rsi/tac_open.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/unlocked.png b/Resources/Textures/Structures/Storage/closet.rsi/unlocked.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/unlocked.png
rename to Resources/Textures/Structures/Storage/closet.rsi/unlocked.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/warden.png b/Resources/Textures/Structures/Storage/closet.rsi/warden.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/warden.png
rename to Resources/Textures/Structures/Storage/closet.rsi/warden.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/warden_door.png b/Resources/Textures/Structures/Storage/closet.rsi/warden_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/warden_door.png
rename to Resources/Textures/Structures/Storage/closet.rsi/warden_door.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/warden_open.png b/Resources/Textures/Structures/Storage/closet.rsi/warden_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/warden_open.png
rename to Resources/Textures/Structures/Storage/closet.rsi/warden_open.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/welded.png b/Resources/Textures/Structures/Storage/closet.rsi/welded.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/welded.png
rename to Resources/Textures/Structures/Storage/closet.rsi/welded.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/white_door.png b/Resources/Textures/Structures/Storage/closet.rsi/white_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/white_door.png
rename to Resources/Textures/Structures/Storage/closet.rsi/white_door.png
diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/yellow_door.png b/Resources/Textures/Structures/Storage/closet.rsi/yellow_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/closet.rsi/yellow_door.png
rename to Resources/Textures/Structures/Storage/closet.rsi/yellow_door.png
diff --git a/Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/crema_active_light.png b/Resources/Textures/Structures/Storage/morgue.rsi/crema_active_light.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/crema_active_light.png
rename to Resources/Textures/Structures/Storage/morgue.rsi/crema_active_light.png
diff --git a/Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/crema_closed.png b/Resources/Textures/Structures/Storage/morgue.rsi/crema_closed.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/crema_closed.png
rename to Resources/Textures/Structures/Storage/morgue.rsi/crema_closed.png
diff --git a/Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/crema_contents_light.png b/Resources/Textures/Structures/Storage/morgue.rsi/crema_contents_light.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/crema_contents_light.png
rename to Resources/Textures/Structures/Storage/morgue.rsi/crema_contents_light.png
diff --git a/Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/crema_open.png b/Resources/Textures/Structures/Storage/morgue.rsi/crema_open.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/crema_open.png
rename to Resources/Textures/Structures/Storage/morgue.rsi/crema_open.png
diff --git a/Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/crema_tray.png b/Resources/Textures/Structures/Storage/morgue.rsi/crema_tray.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/crema_tray.png
rename to Resources/Textures/Structures/Storage/morgue.rsi/crema_tray.png
diff --git a/Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/meta.json b/Resources/Textures/Structures/Storage/morgue.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/meta.json
rename to Resources/Textures/Structures/Storage/morgue.rsi/meta.json
diff --git a/Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/morgue_closed.png b/Resources/Textures/Structures/Storage/morgue.rsi/morgue_closed.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/morgue_closed.png
rename to Resources/Textures/Structures/Storage/morgue.rsi/morgue_closed.png
diff --git a/Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/morgue_nomob_light.png b/Resources/Textures/Structures/Storage/morgue.rsi/morgue_nomob_light.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/morgue_nomob_light.png
rename to Resources/Textures/Structures/Storage/morgue.rsi/morgue_nomob_light.png
diff --git a/Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/morgue_nosoul_light.png b/Resources/Textures/Structures/Storage/morgue.rsi/morgue_nosoul_light.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/morgue_nosoul_light.png
rename to Resources/Textures/Structures/Storage/morgue.rsi/morgue_nosoul_light.png
diff --git a/Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/morgue_open.png b/Resources/Textures/Structures/Storage/morgue.rsi/morgue_open.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/morgue_open.png
rename to Resources/Textures/Structures/Storage/morgue.rsi/morgue_open.png
diff --git a/Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/morgue_soul_light.png b/Resources/Textures/Structures/Storage/morgue.rsi/morgue_soul_light.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/morgue_soul_light.png
rename to Resources/Textures/Structures/Storage/morgue.rsi/morgue_soul_light.png
diff --git a/Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/morgue_tray.png b/Resources/Textures/Structures/Storage/morgue.rsi/morgue_tray.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/morgue_tray.png
rename to Resources/Textures/Structures/Storage/morgue.rsi/morgue_tray.png
diff --git a/Resources/Textures/Constructible/Misc/tanks.rsi/fueltank.png b/Resources/Textures/Structures/Storage/tanks.rsi/fueltank.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/tanks.rsi/fueltank.png
rename to Resources/Textures/Structures/Storage/tanks.rsi/fueltank.png
diff --git a/Resources/Textures/Constructible/Misc/tanks.rsi/meta.json b/Resources/Textures/Structures/Storage/tanks.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Misc/tanks.rsi/meta.json
rename to Resources/Textures/Structures/Storage/tanks.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Misc/tanks.rsi/watertank.png b/Resources/Textures/Structures/Storage/tanks.rsi/watertank.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/tanks.rsi/watertank.png
rename to Resources/Textures/Structures/Storage/tanks.rsi/watertank.png
diff --git a/Resources/Textures/Constructible/Lighting/emergency_light.rsi/emergency_light_off.png b/Resources/Textures/Structures/Wallmounts/Lighting/emergency_light.rsi/emergency_light_off.png
similarity index 100%
rename from Resources/Textures/Constructible/Lighting/emergency_light.rsi/emergency_light_off.png
rename to Resources/Textures/Structures/Wallmounts/Lighting/emergency_light.rsi/emergency_light_off.png
diff --git a/Resources/Textures/Constructible/Lighting/emergency_light.rsi/emergency_light_on.png b/Resources/Textures/Structures/Wallmounts/Lighting/emergency_light.rsi/emergency_light_on.png
similarity index 100%
rename from Resources/Textures/Constructible/Lighting/emergency_light.rsi/emergency_light_on.png
rename to Resources/Textures/Structures/Wallmounts/Lighting/emergency_light.rsi/emergency_light_on.png
diff --git a/Resources/Textures/Constructible/Lighting/emergency_light.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/Lighting/emergency_light.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Lighting/emergency_light.rsi/meta.json
rename to Resources/Textures/Structures/Wallmounts/Lighting/emergency_light.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Lighting/light_small.rsi/broken.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/broken.png
similarity index 100%
rename from Resources/Textures/Constructible/Lighting/light_small.rsi/broken.png
rename to Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/broken.png
diff --git a/Resources/Textures/Constructible/Lighting/light_small.rsi/burned.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/burned.png
similarity index 100%
rename from Resources/Textures/Constructible/Lighting/light_small.rsi/burned.png
rename to Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/burned.png
diff --git a/Resources/Textures/Constructible/Lighting/light_small.rsi/empty.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/empty.png
similarity index 100%
rename from Resources/Textures/Constructible/Lighting/light_small.rsi/empty.png
rename to Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/empty.png
diff --git a/Resources/Textures/Constructible/Lighting/light_small.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Lighting/light_small.rsi/meta.json
rename to Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Lighting/light_small.rsi/off.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/off.png
similarity index 100%
rename from Resources/Textures/Constructible/Lighting/light_small.rsi/off.png
rename to Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/off.png
diff --git a/Resources/Textures/Constructible/Lighting/light_small.rsi/on.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/on.png
similarity index 100%
rename from Resources/Textures/Constructible/Lighting/light_small.rsi/on.png
rename to Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/on.png
diff --git a/Resources/Textures/Constructible/Lighting/light_tube.rsi/broken.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png
similarity index 100%
rename from Resources/Textures/Constructible/Lighting/light_tube.rsi/broken.png
rename to Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png
diff --git a/Resources/Textures/Constructible/Lighting/light_tube.rsi/burned.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png
similarity index 100%
rename from Resources/Textures/Constructible/Lighting/light_tube.rsi/burned.png
rename to Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png
diff --git a/Resources/Textures/Constructible/Lighting/light_tube.rsi/empty.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png
similarity index 100%
rename from Resources/Textures/Constructible/Lighting/light_tube.rsi/empty.png
rename to Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png
diff --git a/Resources/Textures/Constructible/Lighting/light_tube.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Lighting/light_tube.rsi/meta.json
rename to Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Lighting/light_tube.rsi/off.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/off.png
similarity index 100%
rename from Resources/Textures/Constructible/Lighting/light_tube.rsi/off.png
rename to Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/off.png
diff --git a/Resources/Textures/Constructible/Lighting/light_tube.rsi/on.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/on.png
similarity index 100%
rename from Resources/Textures/Constructible/Lighting/light_tube.rsi/on.png
rename to Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/on.png
diff --git a/Resources/Textures/Constructible/Lighting/lighting.rsi/construct.png b/Resources/Textures/Structures/Wallmounts/Lighting/lighting.rsi/construct.png
similarity index 100%
rename from Resources/Textures/Constructible/Lighting/lighting.rsi/construct.png
rename to Resources/Textures/Structures/Wallmounts/Lighting/lighting.rsi/construct.png
diff --git a/Resources/Textures/Constructible/Lighting/lighting.rsi/empty.png b/Resources/Textures/Structures/Wallmounts/Lighting/lighting.rsi/empty.png
similarity index 100%
rename from Resources/Textures/Constructible/Lighting/lighting.rsi/empty.png
rename to Resources/Textures/Structures/Wallmounts/Lighting/lighting.rsi/empty.png
diff --git a/Resources/Textures/Constructible/Lighting/lighting.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/Lighting/lighting.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Lighting/lighting.rsi/meta.json
rename to Resources/Textures/Structures/Wallmounts/Lighting/lighting.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Lighting/lighting.rsi/off.png b/Resources/Textures/Structures/Wallmounts/Lighting/lighting.rsi/off.png
similarity index 100%
rename from Resources/Textures/Constructible/Lighting/lighting.rsi/off.png
rename to Resources/Textures/Structures/Wallmounts/Lighting/lighting.rsi/off.png
diff --git a/Resources/Textures/Constructible/Lighting/lighting.rsi/on.png b/Resources/Textures/Structures/Wallmounts/Lighting/lighting.rsi/on.png
similarity index 100%
rename from Resources/Textures/Constructible/Lighting/lighting.rsi/on.png
rename to Resources/Textures/Structures/Wallmounts/Lighting/lighting.rsi/on.png
diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/birdcage.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/birdcage.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/barsign.rsi/birdcage.png
rename to Resources/Textures/Structures/Wallmounts/barsign.rsi/birdcage.png
diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/combocafe.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/combocafe.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/barsign.rsi/combocafe.png
rename to Resources/Textures/Structures/Wallmounts/barsign.rsi/combocafe.png
diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/emergencyrumparty.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/emergencyrumparty.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/barsign.rsi/emergencyrumparty.png
rename to Resources/Textures/Structures/Wallmounts/barsign.rsi/emergencyrumparty.png
diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/empbarsign.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/empbarsign.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/barsign.rsi/empbarsign.png
rename to Resources/Textures/Structures/Wallmounts/barsign.rsi/empbarsign.png
diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/emprah.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/emprah.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/barsign.rsi/emprah.png
rename to Resources/Textures/Structures/Wallmounts/barsign.rsi/emprah.png
diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/empty.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/empty.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/barsign.rsi/empty.png
rename to Resources/Textures/Structures/Wallmounts/barsign.rsi/empty.png
diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/enginechange.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/enginechange.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/barsign.rsi/enginechange.png
rename to Resources/Textures/Structures/Wallmounts/barsign.rsi/enginechange.png
diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/goose.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/goose.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/barsign.rsi/goose.png
rename to Resources/Textures/Structures/Wallmounts/barsign.rsi/goose.png
diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/lv426.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/lv426.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/barsign.rsi/lv426.png
rename to Resources/Textures/Structures/Wallmounts/barsign.rsi/lv426.png
diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/maidcafe.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/maidcafe.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/barsign.rsi/maidcafe.png
rename to Resources/Textures/Structures/Wallmounts/barsign.rsi/maidcafe.png
diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/maltesefalcon.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/maltesefalcon.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/barsign.rsi/maltesefalcon.png
rename to Resources/Textures/Structures/Wallmounts/barsign.rsi/maltesefalcon.png
diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/barsign.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Misc/barsign.rsi/meta.json
rename to Resources/Textures/Structures/Wallmounts/barsign.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/officerbeersky.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/officerbeersky.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/barsign.rsi/officerbeersky.png
rename to Resources/Textures/Structures/Wallmounts/barsign.rsi/officerbeersky.png
diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/robustacafe.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/robustacafe.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/barsign.rsi/robustacafe.png
rename to Resources/Textures/Structures/Wallmounts/barsign.rsi/robustacafe.png
diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/the_lightbulb.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/the_lightbulb.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/barsign.rsi/the_lightbulb.png
rename to Resources/Textures/Structures/Wallmounts/barsign.rsi/the_lightbulb.png
diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/thealenath.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/thealenath.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/barsign.rsi/thealenath.png
rename to Resources/Textures/Structures/Wallmounts/barsign.rsi/thealenath.png
diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/thecoderbus.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/thecoderbus.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/barsign.rsi/thecoderbus.png
rename to Resources/Textures/Structures/Wallmounts/barsign.rsi/thecoderbus.png
diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/thedrunkcarp.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/thedrunkcarp.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/barsign.rsi/thedrunkcarp.png
rename to Resources/Textures/Structures/Wallmounts/barsign.rsi/thedrunkcarp.png
diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/theharmbaton.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/theharmbaton.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/barsign.rsi/theharmbaton.png
rename to Resources/Textures/Structures/Wallmounts/barsign.rsi/theharmbaton.png
diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/thenet.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/thenet.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/barsign.rsi/thenet.png
rename to Resources/Textures/Structures/Wallmounts/barsign.rsi/thenet.png
diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/theouterspess.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/theouterspess.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/barsign.rsi/theouterspess.png
rename to Resources/Textures/Structures/Wallmounts/barsign.rsi/theouterspess.png
diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/thesingulo.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/thesingulo.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/barsign.rsi/thesingulo.png
rename to Resources/Textures/Structures/Wallmounts/barsign.rsi/thesingulo.png
diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/thesun.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/thesun.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/barsign.rsi/thesun.png
rename to Resources/Textures/Structures/Wallmounts/barsign.rsi/thesun.png
diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/thewiggleroom.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/thewiggleroom.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/barsign.rsi/thewiggleroom.png
rename to Resources/Textures/Structures/Wallmounts/barsign.rsi/thewiggleroom.png
diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/thewretchedhive.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/thewretchedhive.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/barsign.rsi/thewretchedhive.png
rename to Resources/Textures/Structures/Wallmounts/barsign.rsi/thewretchedhive.png
diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/zocalo.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/zocalo.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/barsign.rsi/zocalo.png
rename to Resources/Textures/Structures/Wallmounts/barsign.rsi/zocalo.png
diff --git a/Resources/Textures/Constructible/Storage/Cabinets/extinguisher_cabinet.rsi/closed.png b/Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/closed.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Cabinets/extinguisher_cabinet.rsi/closed.png
rename to Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/closed.png
diff --git a/Resources/Textures/Constructible/Storage/Cabinets/extinguisher_cabinet.rsi/extinguisher-mini.png b/Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/extinguisher-mini.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Cabinets/extinguisher_cabinet.rsi/extinguisher-mini.png
rename to Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/extinguisher-mini.png
diff --git a/Resources/Textures/Constructible/Storage/Cabinets/extinguisher_cabinet.rsi/extinguisher.png b/Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/extinguisher.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Cabinets/extinguisher_cabinet.rsi/extinguisher.png
rename to Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/extinguisher.png
diff --git a/Resources/Textures/Constructible/Storage/Cabinets/extinguisher_cabinet.rsi/extinguisher_closed.png b/Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/extinguisher_closed.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Cabinets/extinguisher_cabinet.rsi/extinguisher_closed.png
rename to Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/extinguisher_closed.png
diff --git a/Resources/Textures/Constructible/Storage/Cabinets/extinguisher_cabinet.rsi/extinguisher_empty.png b/Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/extinguisher_empty.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Cabinets/extinguisher_cabinet.rsi/extinguisher_empty.png
rename to Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/extinguisher_empty.png
diff --git a/Resources/Textures/Constructible/Storage/Cabinets/extinguisher_cabinet.rsi/extinguisher_full.png b/Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/extinguisher_full.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Cabinets/extinguisher_cabinet.rsi/extinguisher_full.png
rename to Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/extinguisher_full.png
diff --git a/Resources/Textures/Constructible/Storage/Cabinets/extinguisher_cabinet.rsi/extinguisher_mini.png b/Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/extinguisher_mini.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Cabinets/extinguisher_cabinet.rsi/extinguisher_mini.png
rename to Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/extinguisher_mini.png
diff --git a/Resources/Textures/Constructible/Storage/Cabinets/extinguisher_cabinet.rsi/frame.png b/Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/frame.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Cabinets/extinguisher_cabinet.rsi/frame.png
rename to Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/frame.png
diff --git a/Resources/Textures/Constructible/Storage/Cabinets/extinguisher_cabinet.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Cabinets/extinguisher_cabinet.rsi/meta.json
rename to Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Storage/Cabinets/extinguisher_cabinet.rsi/open.png b/Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/open.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Cabinets/extinguisher_cabinet.rsi/open.png
rename to Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/open.png
diff --git a/Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/cabinet-empty-closed.png b/Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/cabinet-empty-closed.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/cabinet-empty-closed.png
rename to Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/cabinet-empty-closed.png
diff --git a/Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/cabinet-empty-open.png b/Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/cabinet-empty-open.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/cabinet-empty-open.png
rename to Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/cabinet-empty-open.png
diff --git a/Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/cabinet-filled-closed.png b/Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/cabinet-filled-closed.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/cabinet-filled-closed.png
rename to Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/cabinet-filled-closed.png
diff --git a/Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/cabinet-filled-open.png b/Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/cabinet-filled-open.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/cabinet-filled-open.png
rename to Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/cabinet-filled-open.png
diff --git a/Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/cabinet.png b/Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/cabinet.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/cabinet.png
rename to Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/cabinet.png
diff --git a/Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/fireaxe.png b/Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/fireaxe.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/fireaxe.png
rename to Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/fireaxe.png
diff --git a/Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/glass-1.png b/Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/glass-1.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/glass-1.png
rename to Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/glass-1.png
diff --git a/Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/glass-2.png b/Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/glass-2.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/glass-2.png
rename to Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/glass-2.png
diff --git a/Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/glass-3.png b/Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/glass-3.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/glass-3.png
rename to Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/glass-3.png
diff --git a/Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/glass-4.png b/Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/glass-4.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/glass-4.png
rename to Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/glass-4.png
diff --git a/Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/glass-up.png b/Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/glass-up.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/glass-up.png
rename to Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/glass-up.png
diff --git a/Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/glass.png b/Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/glass.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/glass.png
rename to Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/glass.png
diff --git a/Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/locked.png b/Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/locked.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/locked.png
rename to Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/locked.png
diff --git a/Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/meta.json
rename to Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/unlocked.png b/Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/unlocked.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/unlocked.png
rename to Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/unlocked.png
diff --git a/Resources/Textures/Constructible/Misc/mirror.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/mirror.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Misc/mirror.rsi/meta.json
rename to Resources/Textures/Structures/Wallmounts/mirror.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Misc/mirror.rsi/mirror.png b/Resources/Textures/Structures/Wallmounts/mirror.rsi/mirror.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/mirror.rsi/mirror.png
rename to Resources/Textures/Structures/Wallmounts/mirror.rsi/mirror.png
diff --git a/Resources/Textures/Constructible/Misc/mirror.rsi/mirror_broke.png b/Resources/Textures/Structures/Wallmounts/mirror.rsi/mirror_broke.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/mirror.rsi/mirror_broke.png
rename to Resources/Textures/Structures/Wallmounts/mirror.rsi/mirror_broke.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/ai.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/ai.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/ai.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/ai.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/anomaly.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/anomaly.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/armory.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/armory.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/armory.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/armory.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/ass.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/ass.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/ass.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/ass.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/atmos.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/atmos.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/atmos.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/atmos.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/atmos_air.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/atmos_air.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/atmos_air.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/atmos_air.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/atmos_co2.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/atmos_co2.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/atmos_co2.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/atmos_co2.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/atmos_n2.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/atmos_n2.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/atmos_n2.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/atmos_n2.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/atmos_n2o.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/atmos_n2o.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/atmos_n2o.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/atmos_n2o.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/atmos_o2.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/atmos_o2.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/atmos_o2.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/atmos_o2.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/atmos_plasma.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/atmos_plasma.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/atmos_plasma.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/atmos_plasma.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/atmos_waste.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/atmos_waste.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/atmos_waste.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/atmos_waste.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/atmosplaque.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/atmosplaque.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/atmosplaque.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/atmosplaque.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/bar.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/bar.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/bar.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/bar.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/biblio.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/biblio.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/biblio.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/biblio.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/bio.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/bio.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/bio.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/bio.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/biohazard.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/biohazard.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/biohazard.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/biohazard.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/bridge.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/bridge.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/bridge.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/bridge.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/canisters.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/canisters.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/canisters.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/canisters.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/cargo.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/cargo.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/cargo.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/cargo.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/cargo_dock.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/cargo_dock.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/cargo_dock.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/cargo_dock.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/chapel.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/chapel.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/chapel.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/chapel.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/chem.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/chem.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/chem.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/chem.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/chemistry1.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/chemistry1.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/chemistry1.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/chemistry1.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/chemistry2.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/chemistry2.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/chemistry2.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/chemistry2.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/cloning.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/cloning.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/cloning.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/cloning.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/commander.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/commander.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/commander.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/commander.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/conference_room.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/conference_room.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/conference_room.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/conference_room.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/corrosives.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/corrosives.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/corrosives.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/corrosives.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/cryogenics.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/cryogenics.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/cryogenics.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/cryogenics.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/danger.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/danger.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/danger.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/danger.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/deathsposal.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/deathsposal.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/deathsposal.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/deathsposal.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/direction_bridge.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_bridge.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/direction_bridge.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/direction_bridge.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/direction_eng.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_eng.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/direction_eng.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/direction_eng.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/direction_evac.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_evac.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/direction_evac.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/direction_evac.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/direction_med.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_med.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/direction_med.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/direction_med.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/direction_sci.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_sci.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/direction_sci.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/direction_sci.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/direction_sec.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_sec.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/direction_sec.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/direction_sec.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/direction_supply.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_supply.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/direction_supply.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/direction_supply.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/dock.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/dock.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/dock.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/dock.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/doors.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/doors.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/doors.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/doors.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/drones.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/drones.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/drones.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/drones.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/electrical.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/electrical.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/electrical.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/electrical.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/eng.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/eng.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/eng.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/eng.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/engine.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/engine.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/engine.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/engine.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/eva.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/eva.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/eva.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/eva.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/examroom.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/examroom.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/examroom.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/examroom.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/explosives.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/explosives.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/explosives.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/explosives.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/fire.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/fire.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/fire.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/fire.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/flammable.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/flammable.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/flammable.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/flammable.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/gravi.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/gravi.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/gravi.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/gravi.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/hydro1.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/hydro1.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/hydro1.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/hydro1.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/hydro2.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/hydro2.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/hydro2.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/hydro2.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/hydro3.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/hydro3.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/hydro3.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/hydro3.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/interrogation.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/interrogation.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/interrogation.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/interrogation.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/laser.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/laser.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/laser.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/laser.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/magnetics.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/magnetics.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/magnetics.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/magnetics.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/mail.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/mail.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/mail.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/mail.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/medbay.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/medbay.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/medbay.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/medbay.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/memetic.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/memetic.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/memetic.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/memetic.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/meta.json
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/miner_dock.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/miner_dock.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/miner_dock.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/miner_dock.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/monkey_painting.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/monkey_painting.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/monkey_painting.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/monkey_painting.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/morgue.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/morgue.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/morgue.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/morgue.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/nosmoking.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/nosmoking.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/nosmoking.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/nosmoking.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/nosmoking2.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/nosmoking2.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/nosmoking2.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/nosmoking2.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/optical.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/optical.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/optical.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/optical.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/oxidants.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/oxidants.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/oxidants.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/oxidants.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/pods.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/pods.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/pods.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/pods.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/prison.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/prison.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/prison.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/prison.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/radiation.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/radiation.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/radiation.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/radiation.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/rnd.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/rnd.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/rnd.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/rnd.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/robo.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/robo.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/robo.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/robo.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/sci.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/sci.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/sci.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/sci.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/science1.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/science1.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/science1.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/science1.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/science2.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/science2.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/science2.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/science2.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/secure.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/secure.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/secure.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/secure.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/securearea.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/securearea.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/securearea.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/securearea.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/shield.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/shield.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/shield.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/shield.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/shock.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/shock.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/shock.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/shock.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/something-old1.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/something-old1.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/something-old1.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/something-old1.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/something-old2.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/something-old2.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/something-old2.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/something-old2.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/space.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/space.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/space.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/space.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/surgery.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/surgery.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/surgery.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/surgery.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/telecoms.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/telecoms.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/telecoms.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/telecoms.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/toxin_res.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/toxin_res.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/toxin_res.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/toxin_res.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/toxins.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/toxins.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/toxins.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/toxins.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/virology.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/virology.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/virology.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/virology.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/xenobio.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/xenobio.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/xenobio2.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio2.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/xenobio2.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio2.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/xenolab.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/xenolab.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/xenolab.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/xenolab.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/zumosplaque.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/zumosplaque.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/zumosplaque.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/zumosplaque.png
diff --git a/Resources/Textures/Constructible/Power/switch.rsi/dead.png b/Resources/Textures/Structures/Wallmounts/switch.rsi/dead.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/switch.rsi/dead.png
rename to Resources/Textures/Structures/Wallmounts/switch.rsi/dead.png
diff --git a/Resources/Textures/Constructible/Power/switch.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/switch.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/switch.rsi/meta.json
rename to Resources/Textures/Structures/Wallmounts/switch.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/switch.rsi/off.png b/Resources/Textures/Structures/Wallmounts/switch.rsi/off.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/switch.rsi/off.png
rename to Resources/Textures/Structures/Wallmounts/switch.rsi/off.png
diff --git a/Resources/Textures/Constructible/Power/switch.rsi/on.png b/Resources/Textures/Structures/Wallmounts/switch.rsi/on.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/switch.rsi/on.png
rename to Resources/Textures/Structures/Wallmounts/switch.rsi/on.png
diff --git a/Resources/Textures/Constructible/Misc/sylphs.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/sylphs.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Misc/sylphs.rsi/meta.json
rename to Resources/Textures/Structures/Wallmounts/sylphs.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Misc/sylphs.rsi/sylph.png b/Resources/Textures/Structures/Wallmounts/sylphs.rsi/sylph.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/sylphs.rsi/sylph.png
rename to Resources/Textures/Structures/Wallmounts/sylphs.rsi/sylph.png
diff --git a/Resources/Textures/Constructible/Misc/sylphs.rsi/sylphicon.png b/Resources/Textures/Structures/Wallmounts/sylphs.rsi/sylphicon.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/sylphs.rsi/sylphicon.png
rename to Resources/Textures/Structures/Wallmounts/sylphs.rsi/sylphicon.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/asteroid_rock.rsi/0.png b/Resources/Textures/Structures/Walls/asteroid_rock.rsi/0.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/asteroid_rock.rsi/0.png
rename to Resources/Textures/Structures/Walls/asteroid_rock.rsi/0.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/asteroid_rock.rsi/1.png b/Resources/Textures/Structures/Walls/asteroid_rock.rsi/1.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/asteroid_rock.rsi/1.png
rename to Resources/Textures/Structures/Walls/asteroid_rock.rsi/1.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/asteroid_rock.rsi/2.png b/Resources/Textures/Structures/Walls/asteroid_rock.rsi/2.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/asteroid_rock.rsi/2.png
rename to Resources/Textures/Structures/Walls/asteroid_rock.rsi/2.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/asteroid_rock.rsi/3.png b/Resources/Textures/Structures/Walls/asteroid_rock.rsi/3.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/asteroid_rock.rsi/3.png
rename to Resources/Textures/Structures/Walls/asteroid_rock.rsi/3.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/asteroid_rock.rsi/4.png b/Resources/Textures/Structures/Walls/asteroid_rock.rsi/4.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/asteroid_rock.rsi/4.png
rename to Resources/Textures/Structures/Walls/asteroid_rock.rsi/4.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/asteroid_rock.rsi/meta.json b/Resources/Textures/Structures/Walls/asteroid_rock.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/asteroid_rock.rsi/meta.json
rename to Resources/Textures/Structures/Walls/asteroid_rock.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/barricades.rsi/barricadewooden.png b/Resources/Textures/Structures/Walls/barricades.rsi/barricadewooden.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/barricades.rsi/barricadewooden.png
rename to Resources/Textures/Structures/Walls/barricades.rsi/barricadewooden.png
diff --git a/Resources/Textures/Constructible/Structures/barricades.rsi/meta.json b/Resources/Textures/Structures/Walls/barricades.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/barricades.rsi/meta.json
rename to Resources/Textures/Structures/Walls/barricades.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Walls/brick.rsi/brick0.png b/Resources/Textures/Structures/Walls/brick.rsi/brick0.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/brick.rsi/brick0.png
rename to Resources/Textures/Structures/Walls/brick.rsi/brick0.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/brick.rsi/brick1.png b/Resources/Textures/Structures/Walls/brick.rsi/brick1.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/brick.rsi/brick1.png
rename to Resources/Textures/Structures/Walls/brick.rsi/brick1.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/brick.rsi/brick2.png b/Resources/Textures/Structures/Walls/brick.rsi/brick2.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/brick.rsi/brick2.png
rename to Resources/Textures/Structures/Walls/brick.rsi/brick2.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/brick.rsi/brick3.png b/Resources/Textures/Structures/Walls/brick.rsi/brick3.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/brick.rsi/brick3.png
rename to Resources/Textures/Structures/Walls/brick.rsi/brick3.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/brick.rsi/brick4.png b/Resources/Textures/Structures/Walls/brick.rsi/brick4.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/brick.rsi/brick4.png
rename to Resources/Textures/Structures/Walls/brick.rsi/brick4.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/brick.rsi/brick5.png b/Resources/Textures/Structures/Walls/brick.rsi/brick5.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/brick.rsi/brick5.png
rename to Resources/Textures/Structures/Walls/brick.rsi/brick5.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/brick.rsi/brick6.png b/Resources/Textures/Structures/Walls/brick.rsi/brick6.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/brick.rsi/brick6.png
rename to Resources/Textures/Structures/Walls/brick.rsi/brick6.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/brick.rsi/brick7.png b/Resources/Textures/Structures/Walls/brick.rsi/brick7.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/brick.rsi/brick7.png
rename to Resources/Textures/Structures/Walls/brick.rsi/brick7.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/brick.rsi/full.png b/Resources/Textures/Structures/Walls/brick.rsi/full.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/brick.rsi/full.png
rename to Resources/Textures/Structures/Walls/brick.rsi/full.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/brick.rsi/meta.json b/Resources/Textures/Structures/Walls/brick.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/brick.rsi/meta.json
rename to Resources/Textures/Structures/Walls/brick.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Walls/clock.rsi/clock0.png b/Resources/Textures/Structures/Walls/clock.rsi/clock0.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/clock.rsi/clock0.png
rename to Resources/Textures/Structures/Walls/clock.rsi/clock0.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/clock.rsi/clock1.png b/Resources/Textures/Structures/Walls/clock.rsi/clock1.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/clock.rsi/clock1.png
rename to Resources/Textures/Structures/Walls/clock.rsi/clock1.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/clock.rsi/clock2.png b/Resources/Textures/Structures/Walls/clock.rsi/clock2.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/clock.rsi/clock2.png
rename to Resources/Textures/Structures/Walls/clock.rsi/clock2.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/clock.rsi/clock3.png b/Resources/Textures/Structures/Walls/clock.rsi/clock3.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/clock.rsi/clock3.png
rename to Resources/Textures/Structures/Walls/clock.rsi/clock3.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/clock.rsi/clock4.png b/Resources/Textures/Structures/Walls/clock.rsi/clock4.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/clock.rsi/clock4.png
rename to Resources/Textures/Structures/Walls/clock.rsi/clock4.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/clock.rsi/clock5.png b/Resources/Textures/Structures/Walls/clock.rsi/clock5.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/clock.rsi/clock5.png
rename to Resources/Textures/Structures/Walls/clock.rsi/clock5.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/clock.rsi/clock6.png b/Resources/Textures/Structures/Walls/clock.rsi/clock6.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/clock.rsi/clock6.png
rename to Resources/Textures/Structures/Walls/clock.rsi/clock6.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/clock.rsi/clock7.png b/Resources/Textures/Structures/Walls/clock.rsi/clock7.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/clock.rsi/clock7.png
rename to Resources/Textures/Structures/Walls/clock.rsi/clock7.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/clock.rsi/full.png b/Resources/Textures/Structures/Walls/clock.rsi/full.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/clock.rsi/full.png
rename to Resources/Textures/Structures/Walls/clock.rsi/full.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/clock.rsi/meta.json b/Resources/Textures/Structures/Walls/clock.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/clock.rsi/meta.json
rename to Resources/Textures/Structures/Walls/clock.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Walls/clown.rsi/clown0.png b/Resources/Textures/Structures/Walls/clown.rsi/clown0.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/clown.rsi/clown0.png
rename to Resources/Textures/Structures/Walls/clown.rsi/clown0.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/clown.rsi/clown1.png b/Resources/Textures/Structures/Walls/clown.rsi/clown1.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/clown.rsi/clown1.png
rename to Resources/Textures/Structures/Walls/clown.rsi/clown1.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/clown.rsi/clown2.png b/Resources/Textures/Structures/Walls/clown.rsi/clown2.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/clown.rsi/clown2.png
rename to Resources/Textures/Structures/Walls/clown.rsi/clown2.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/clown.rsi/clown3.png b/Resources/Textures/Structures/Walls/clown.rsi/clown3.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/clown.rsi/clown3.png
rename to Resources/Textures/Structures/Walls/clown.rsi/clown3.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/clown.rsi/clown4.png b/Resources/Textures/Structures/Walls/clown.rsi/clown4.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/clown.rsi/clown4.png
rename to Resources/Textures/Structures/Walls/clown.rsi/clown4.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/clown.rsi/clown5.png b/Resources/Textures/Structures/Walls/clown.rsi/clown5.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/clown.rsi/clown5.png
rename to Resources/Textures/Structures/Walls/clown.rsi/clown5.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/clown.rsi/clown6.png b/Resources/Textures/Structures/Walls/clown.rsi/clown6.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/clown.rsi/clown6.png
rename to Resources/Textures/Structures/Walls/clown.rsi/clown6.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/clown.rsi/clown7.png b/Resources/Textures/Structures/Walls/clown.rsi/clown7.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/clown.rsi/clown7.png
rename to Resources/Textures/Structures/Walls/clown.rsi/clown7.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/clown.rsi/full.png b/Resources/Textures/Structures/Walls/clown.rsi/full.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/clown.rsi/full.png
rename to Resources/Textures/Structures/Walls/clown.rsi/full.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/clown.rsi/meta.json b/Resources/Textures/Structures/Walls/clown.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/clown.rsi/meta.json
rename to Resources/Textures/Structures/Walls/clown.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Walls/cult.rsi/cult0.png b/Resources/Textures/Structures/Walls/cult.rsi/cult0.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/cult.rsi/cult0.png
rename to Resources/Textures/Structures/Walls/cult.rsi/cult0.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/cult.rsi/cult1.png b/Resources/Textures/Structures/Walls/cult.rsi/cult1.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/cult.rsi/cult1.png
rename to Resources/Textures/Structures/Walls/cult.rsi/cult1.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/cult.rsi/cult2.png b/Resources/Textures/Structures/Walls/cult.rsi/cult2.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/cult.rsi/cult2.png
rename to Resources/Textures/Structures/Walls/cult.rsi/cult2.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/cult.rsi/cult3.png b/Resources/Textures/Structures/Walls/cult.rsi/cult3.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/cult.rsi/cult3.png
rename to Resources/Textures/Structures/Walls/cult.rsi/cult3.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/cult.rsi/cult4.png b/Resources/Textures/Structures/Walls/cult.rsi/cult4.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/cult.rsi/cult4.png
rename to Resources/Textures/Structures/Walls/cult.rsi/cult4.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/cult.rsi/cult5.png b/Resources/Textures/Structures/Walls/cult.rsi/cult5.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/cult.rsi/cult5.png
rename to Resources/Textures/Structures/Walls/cult.rsi/cult5.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/cult.rsi/cult6.png b/Resources/Textures/Structures/Walls/cult.rsi/cult6.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/cult.rsi/cult6.png
rename to Resources/Textures/Structures/Walls/cult.rsi/cult6.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/cult.rsi/cult7.png b/Resources/Textures/Structures/Walls/cult.rsi/cult7.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/cult.rsi/cult7.png
rename to Resources/Textures/Structures/Walls/cult.rsi/cult7.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/cult.rsi/full.png b/Resources/Textures/Structures/Walls/cult.rsi/full.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/cult.rsi/full.png
rename to Resources/Textures/Structures/Walls/cult.rsi/full.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/cult.rsi/meta.json b/Resources/Textures/Structures/Walls/cult.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/cult.rsi/meta.json
rename to Resources/Textures/Structures/Walls/cult.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Walls/debug.rsi/debug0.png b/Resources/Textures/Structures/Walls/debug.rsi/debug0.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/debug.rsi/debug0.png
rename to Resources/Textures/Structures/Walls/debug.rsi/debug0.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/debug.rsi/debug1.png b/Resources/Textures/Structures/Walls/debug.rsi/debug1.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/debug.rsi/debug1.png
rename to Resources/Textures/Structures/Walls/debug.rsi/debug1.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/debug.rsi/debug2.png b/Resources/Textures/Structures/Walls/debug.rsi/debug2.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/debug.rsi/debug2.png
rename to Resources/Textures/Structures/Walls/debug.rsi/debug2.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/debug.rsi/debug3.png b/Resources/Textures/Structures/Walls/debug.rsi/debug3.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/debug.rsi/debug3.png
rename to Resources/Textures/Structures/Walls/debug.rsi/debug3.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/debug.rsi/debug4.png b/Resources/Textures/Structures/Walls/debug.rsi/debug4.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/debug.rsi/debug4.png
rename to Resources/Textures/Structures/Walls/debug.rsi/debug4.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/debug.rsi/debug5.png b/Resources/Textures/Structures/Walls/debug.rsi/debug5.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/debug.rsi/debug5.png
rename to Resources/Textures/Structures/Walls/debug.rsi/debug5.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/debug.rsi/debug6.png b/Resources/Textures/Structures/Walls/debug.rsi/debug6.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/debug.rsi/debug6.png
rename to Resources/Textures/Structures/Walls/debug.rsi/debug6.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/debug.rsi/debug7.png b/Resources/Textures/Structures/Walls/debug.rsi/debug7.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/debug.rsi/debug7.png
rename to Resources/Textures/Structures/Walls/debug.rsi/debug7.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/debug.rsi/full.png b/Resources/Textures/Structures/Walls/debug.rsi/full.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/debug.rsi/full.png
rename to Resources/Textures/Structures/Walls/debug.rsi/full.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/debug.rsi/meta.json b/Resources/Textures/Structures/Walls/debug.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/debug.rsi/meta.json
rename to Resources/Textures/Structures/Walls/debug.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Walls/diamond.rsi/diamond0.png b/Resources/Textures/Structures/Walls/diamond.rsi/diamond0.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/diamond.rsi/diamond0.png
rename to Resources/Textures/Structures/Walls/diamond.rsi/diamond0.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/diamond.rsi/diamond1.png b/Resources/Textures/Structures/Walls/diamond.rsi/diamond1.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/diamond.rsi/diamond1.png
rename to Resources/Textures/Structures/Walls/diamond.rsi/diamond1.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/diamond.rsi/diamond2.png b/Resources/Textures/Structures/Walls/diamond.rsi/diamond2.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/diamond.rsi/diamond2.png
rename to Resources/Textures/Structures/Walls/diamond.rsi/diamond2.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/diamond.rsi/diamond3.png b/Resources/Textures/Structures/Walls/diamond.rsi/diamond3.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/diamond.rsi/diamond3.png
rename to Resources/Textures/Structures/Walls/diamond.rsi/diamond3.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/diamond.rsi/diamond4.png b/Resources/Textures/Structures/Walls/diamond.rsi/diamond4.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/diamond.rsi/diamond4.png
rename to Resources/Textures/Structures/Walls/diamond.rsi/diamond4.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/diamond.rsi/diamond5.png b/Resources/Textures/Structures/Walls/diamond.rsi/diamond5.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/diamond.rsi/diamond5.png
rename to Resources/Textures/Structures/Walls/diamond.rsi/diamond5.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/diamond.rsi/diamond6.png b/Resources/Textures/Structures/Walls/diamond.rsi/diamond6.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/diamond.rsi/diamond6.png
rename to Resources/Textures/Structures/Walls/diamond.rsi/diamond6.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/diamond.rsi/diamond7.png b/Resources/Textures/Structures/Walls/diamond.rsi/diamond7.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/diamond.rsi/diamond7.png
rename to Resources/Textures/Structures/Walls/diamond.rsi/diamond7.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/diamond.rsi/full.png b/Resources/Textures/Structures/Walls/diamond.rsi/full.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/diamond.rsi/full.png
rename to Resources/Textures/Structures/Walls/diamond.rsi/full.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/diamond.rsi/meta.json b/Resources/Textures/Structures/Walls/diamond.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/diamond.rsi/meta.json
rename to Resources/Textures/Structures/Walls/diamond.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Walls/gold.rsi/full.png b/Resources/Textures/Structures/Walls/gold.rsi/full.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/gold.rsi/full.png
rename to Resources/Textures/Structures/Walls/gold.rsi/full.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/gold.rsi/gold0.png b/Resources/Textures/Structures/Walls/gold.rsi/gold0.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/gold.rsi/gold0.png
rename to Resources/Textures/Structures/Walls/gold.rsi/gold0.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/gold.rsi/gold1.png b/Resources/Textures/Structures/Walls/gold.rsi/gold1.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/gold.rsi/gold1.png
rename to Resources/Textures/Structures/Walls/gold.rsi/gold1.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/gold.rsi/gold2.png b/Resources/Textures/Structures/Walls/gold.rsi/gold2.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/gold.rsi/gold2.png
rename to Resources/Textures/Structures/Walls/gold.rsi/gold2.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/gold.rsi/gold3.png b/Resources/Textures/Structures/Walls/gold.rsi/gold3.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/gold.rsi/gold3.png
rename to Resources/Textures/Structures/Walls/gold.rsi/gold3.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/gold.rsi/gold4.png b/Resources/Textures/Structures/Walls/gold.rsi/gold4.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/gold.rsi/gold4.png
rename to Resources/Textures/Structures/Walls/gold.rsi/gold4.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/gold.rsi/gold5.png b/Resources/Textures/Structures/Walls/gold.rsi/gold5.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/gold.rsi/gold5.png
rename to Resources/Textures/Structures/Walls/gold.rsi/gold5.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/gold.rsi/gold6.png b/Resources/Textures/Structures/Walls/gold.rsi/gold6.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/gold.rsi/gold6.png
rename to Resources/Textures/Structures/Walls/gold.rsi/gold6.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/gold.rsi/gold7.png b/Resources/Textures/Structures/Walls/gold.rsi/gold7.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/gold.rsi/gold7.png
rename to Resources/Textures/Structures/Walls/gold.rsi/gold7.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/gold.rsi/meta.json b/Resources/Textures/Structures/Walls/gold.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/gold.rsi/meta.json
rename to Resources/Textures/Structures/Walls/gold.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Walls/ice.rsi/full.png b/Resources/Textures/Structures/Walls/ice.rsi/full.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/ice.rsi/full.png
rename to Resources/Textures/Structures/Walls/ice.rsi/full.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/ice.rsi/ice0.png b/Resources/Textures/Structures/Walls/ice.rsi/ice0.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/ice.rsi/ice0.png
rename to Resources/Textures/Structures/Walls/ice.rsi/ice0.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/ice.rsi/ice1.png b/Resources/Textures/Structures/Walls/ice.rsi/ice1.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/ice.rsi/ice1.png
rename to Resources/Textures/Structures/Walls/ice.rsi/ice1.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/ice.rsi/ice2.png b/Resources/Textures/Structures/Walls/ice.rsi/ice2.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/ice.rsi/ice2.png
rename to Resources/Textures/Structures/Walls/ice.rsi/ice2.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/ice.rsi/ice3.png b/Resources/Textures/Structures/Walls/ice.rsi/ice3.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/ice.rsi/ice3.png
rename to Resources/Textures/Structures/Walls/ice.rsi/ice3.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/ice.rsi/ice4.png b/Resources/Textures/Structures/Walls/ice.rsi/ice4.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/ice.rsi/ice4.png
rename to Resources/Textures/Structures/Walls/ice.rsi/ice4.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/ice.rsi/ice5.png b/Resources/Textures/Structures/Walls/ice.rsi/ice5.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/ice.rsi/ice5.png
rename to Resources/Textures/Structures/Walls/ice.rsi/ice5.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/ice.rsi/ice6.png b/Resources/Textures/Structures/Walls/ice.rsi/ice6.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/ice.rsi/ice6.png
rename to Resources/Textures/Structures/Walls/ice.rsi/ice6.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/ice.rsi/ice7.png b/Resources/Textures/Structures/Walls/ice.rsi/ice7.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/ice.rsi/ice7.png
rename to Resources/Textures/Structures/Walls/ice.rsi/ice7.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/ice.rsi/meta.json b/Resources/Textures/Structures/Walls/ice.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/ice.rsi/meta.json
rename to Resources/Textures/Structures/Walls/ice.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/meta.json b/Resources/Textures/Structures/Walls/low_wall.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/meta.json
rename to Resources/Textures/Structures/Walls/low_wall.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal.png b/Resources/Textures/Structures/Walls/low_wall.rsi/metal.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal.png
rename to Resources/Textures/Structures/Walls/low_wall.rsi/metal.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_0.png b/Resources/Textures/Structures/Walls/low_wall.rsi/metal_0.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_0.png
rename to Resources/Textures/Structures/Walls/low_wall.rsi/metal_0.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_1.png b/Resources/Textures/Structures/Walls/low_wall.rsi/metal_1.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_1.png
rename to Resources/Textures/Structures/Walls/low_wall.rsi/metal_1.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_2.png b/Resources/Textures/Structures/Walls/low_wall.rsi/metal_2.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_2.png
rename to Resources/Textures/Structures/Walls/low_wall.rsi/metal_2.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_3.png b/Resources/Textures/Structures/Walls/low_wall.rsi/metal_3.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_3.png
rename to Resources/Textures/Structures/Walls/low_wall.rsi/metal_3.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_4.png b/Resources/Textures/Structures/Walls/low_wall.rsi/metal_4.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_4.png
rename to Resources/Textures/Structures/Walls/low_wall.rsi/metal_4.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_5.png b/Resources/Textures/Structures/Walls/low_wall.rsi/metal_5.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_5.png
rename to Resources/Textures/Structures/Walls/low_wall.rsi/metal_5.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_6.png b/Resources/Textures/Structures/Walls/low_wall.rsi/metal_6.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_6.png
rename to Resources/Textures/Structures/Walls/low_wall.rsi/metal_6.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_7.png b/Resources/Textures/Structures/Walls/low_wall.rsi/metal_7.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_7.png
rename to Resources/Textures/Structures/Walls/low_wall.rsi/metal_7.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_over_0.png b/Resources/Textures/Structures/Walls/low_wall.rsi/metal_over_0.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_over_0.png
rename to Resources/Textures/Structures/Walls/low_wall.rsi/metal_over_0.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_over_1.png b/Resources/Textures/Structures/Walls/low_wall.rsi/metal_over_1.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_over_1.png
rename to Resources/Textures/Structures/Walls/low_wall.rsi/metal_over_1.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_over_2.png b/Resources/Textures/Structures/Walls/low_wall.rsi/metal_over_2.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_over_2.png
rename to Resources/Textures/Structures/Walls/low_wall.rsi/metal_over_2.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_over_3.png b/Resources/Textures/Structures/Walls/low_wall.rsi/metal_over_3.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_over_3.png
rename to Resources/Textures/Structures/Walls/low_wall.rsi/metal_over_3.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_over_4.png b/Resources/Textures/Structures/Walls/low_wall.rsi/metal_over_4.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_over_4.png
rename to Resources/Textures/Structures/Walls/low_wall.rsi/metal_over_4.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_over_5.png b/Resources/Textures/Structures/Walls/low_wall.rsi/metal_over_5.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_over_5.png
rename to Resources/Textures/Structures/Walls/low_wall.rsi/metal_over_5.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_over_6.png b/Resources/Textures/Structures/Walls/low_wall.rsi/metal_over_6.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_over_6.png
rename to Resources/Textures/Structures/Walls/low_wall.rsi/metal_over_6.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_over_7.png b/Resources/Textures/Structures/Walls/low_wall.rsi/metal_over_7.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_over_7.png
rename to Resources/Textures/Structures/Walls/low_wall.rsi/metal_over_7.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/metal.rsi/full.png b/Resources/Textures/Structures/Walls/metal.rsi/full.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/metal.rsi/full.png
rename to Resources/Textures/Structures/Walls/metal.rsi/full.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/metal.rsi/meta.json b/Resources/Textures/Structures/Walls/metal.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/metal.rsi/meta.json
rename to Resources/Textures/Structures/Walls/metal.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Walls/metal.rsi/metal0.png b/Resources/Textures/Structures/Walls/metal.rsi/metal0.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/metal.rsi/metal0.png
rename to Resources/Textures/Structures/Walls/metal.rsi/metal0.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/metal.rsi/metal1.png b/Resources/Textures/Structures/Walls/metal.rsi/metal1.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/metal.rsi/metal1.png
rename to Resources/Textures/Structures/Walls/metal.rsi/metal1.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/metal.rsi/metal2.png b/Resources/Textures/Structures/Walls/metal.rsi/metal2.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/metal.rsi/metal2.png
rename to Resources/Textures/Structures/Walls/metal.rsi/metal2.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/metal.rsi/metal3.png b/Resources/Textures/Structures/Walls/metal.rsi/metal3.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/metal.rsi/metal3.png
rename to Resources/Textures/Structures/Walls/metal.rsi/metal3.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/metal.rsi/metal4.png b/Resources/Textures/Structures/Walls/metal.rsi/metal4.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/metal.rsi/metal4.png
rename to Resources/Textures/Structures/Walls/metal.rsi/metal4.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/metal.rsi/metal5.png b/Resources/Textures/Structures/Walls/metal.rsi/metal5.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/metal.rsi/metal5.png
rename to Resources/Textures/Structures/Walls/metal.rsi/metal5.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/metal.rsi/metal6.png b/Resources/Textures/Structures/Walls/metal.rsi/metal6.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/metal.rsi/metal6.png
rename to Resources/Textures/Structures/Walls/metal.rsi/metal6.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/metal.rsi/metal7.png b/Resources/Textures/Structures/Walls/metal.rsi/metal7.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/metal.rsi/metal7.png
rename to Resources/Textures/Structures/Walls/metal.rsi/metal7.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/plasma.rsi/full.png b/Resources/Textures/Structures/Walls/plasma.rsi/full.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/plasma.rsi/full.png
rename to Resources/Textures/Structures/Walls/plasma.rsi/full.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/plasma.rsi/meta.json b/Resources/Textures/Structures/Walls/plasma.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/plasma.rsi/meta.json
rename to Resources/Textures/Structures/Walls/plasma.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Walls/plasma.rsi/plasma0.png b/Resources/Textures/Structures/Walls/plasma.rsi/plasma0.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/plasma.rsi/plasma0.png
rename to Resources/Textures/Structures/Walls/plasma.rsi/plasma0.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/plasma.rsi/plasma1.png b/Resources/Textures/Structures/Walls/plasma.rsi/plasma1.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/plasma.rsi/plasma1.png
rename to Resources/Textures/Structures/Walls/plasma.rsi/plasma1.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/plasma.rsi/plasma2.png b/Resources/Textures/Structures/Walls/plasma.rsi/plasma2.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/plasma.rsi/plasma2.png
rename to Resources/Textures/Structures/Walls/plasma.rsi/plasma2.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/plasma.rsi/plasma3.png b/Resources/Textures/Structures/Walls/plasma.rsi/plasma3.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/plasma.rsi/plasma3.png
rename to Resources/Textures/Structures/Walls/plasma.rsi/plasma3.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/plasma.rsi/plasma4.png b/Resources/Textures/Structures/Walls/plasma.rsi/plasma4.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/plasma.rsi/plasma4.png
rename to Resources/Textures/Structures/Walls/plasma.rsi/plasma4.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/plasma.rsi/plasma5.png b/Resources/Textures/Structures/Walls/plasma.rsi/plasma5.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/plasma.rsi/plasma5.png
rename to Resources/Textures/Structures/Walls/plasma.rsi/plasma5.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/plasma.rsi/plasma6.png b/Resources/Textures/Structures/Walls/plasma.rsi/plasma6.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/plasma.rsi/plasma6.png
rename to Resources/Textures/Structures/Walls/plasma.rsi/plasma6.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/plasma.rsi/plasma7.png b/Resources/Textures/Structures/Walls/plasma.rsi/plasma7.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/plasma.rsi/plasma7.png
rename to Resources/Textures/Structures/Walls/plasma.rsi/plasma7.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/plastic.rsi/full.png b/Resources/Textures/Structures/Walls/plastic.rsi/full.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/plastic.rsi/full.png
rename to Resources/Textures/Structures/Walls/plastic.rsi/full.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/plastic.rsi/meta.json b/Resources/Textures/Structures/Walls/plastic.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/plastic.rsi/meta.json
rename to Resources/Textures/Structures/Walls/plastic.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Walls/plastic.rsi/plastic0.png b/Resources/Textures/Structures/Walls/plastic.rsi/plastic0.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/plastic.rsi/plastic0.png
rename to Resources/Textures/Structures/Walls/plastic.rsi/plastic0.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/plastic.rsi/plastic1.png b/Resources/Textures/Structures/Walls/plastic.rsi/plastic1.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/plastic.rsi/plastic1.png
rename to Resources/Textures/Structures/Walls/plastic.rsi/plastic1.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/plastic.rsi/plastic2.png b/Resources/Textures/Structures/Walls/plastic.rsi/plastic2.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/plastic.rsi/plastic2.png
rename to Resources/Textures/Structures/Walls/plastic.rsi/plastic2.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/plastic.rsi/plastic3.png b/Resources/Textures/Structures/Walls/plastic.rsi/plastic3.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/plastic.rsi/plastic3.png
rename to Resources/Textures/Structures/Walls/plastic.rsi/plastic3.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/plastic.rsi/plastic4.png b/Resources/Textures/Structures/Walls/plastic.rsi/plastic4.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/plastic.rsi/plastic4.png
rename to Resources/Textures/Structures/Walls/plastic.rsi/plastic4.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/plastic.rsi/plastic5.png b/Resources/Textures/Structures/Walls/plastic.rsi/plastic5.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/plastic.rsi/plastic5.png
rename to Resources/Textures/Structures/Walls/plastic.rsi/plastic5.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/plastic.rsi/plastic6.png b/Resources/Textures/Structures/Walls/plastic.rsi/plastic6.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/plastic.rsi/plastic6.png
rename to Resources/Textures/Structures/Walls/plastic.rsi/plastic6.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/plastic.rsi/plastic7.png b/Resources/Textures/Structures/Walls/plastic.rsi/plastic7.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/plastic.rsi/plastic7.png
rename to Resources/Textures/Structures/Walls/plastic.rsi/plastic7.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/riveted.rsi/full.png b/Resources/Textures/Structures/Walls/riveted.rsi/full.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/riveted.rsi/full.png
rename to Resources/Textures/Structures/Walls/riveted.rsi/full.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/riveted.rsi/meta.json b/Resources/Textures/Structures/Walls/riveted.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/riveted.rsi/meta.json
rename to Resources/Textures/Structures/Walls/riveted.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Walls/riveted.rsi/riveted0.png b/Resources/Textures/Structures/Walls/riveted.rsi/riveted0.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/riveted.rsi/riveted0.png
rename to Resources/Textures/Structures/Walls/riveted.rsi/riveted0.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/riveted.rsi/riveted1.png b/Resources/Textures/Structures/Walls/riveted.rsi/riveted1.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/riveted.rsi/riveted1.png
rename to Resources/Textures/Structures/Walls/riveted.rsi/riveted1.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/riveted.rsi/riveted2.png b/Resources/Textures/Structures/Walls/riveted.rsi/riveted2.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/riveted.rsi/riveted2.png
rename to Resources/Textures/Structures/Walls/riveted.rsi/riveted2.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/riveted.rsi/riveted3.png b/Resources/Textures/Structures/Walls/riveted.rsi/riveted3.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/riveted.rsi/riveted3.png
rename to Resources/Textures/Structures/Walls/riveted.rsi/riveted3.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/riveted.rsi/riveted4.png b/Resources/Textures/Structures/Walls/riveted.rsi/riveted4.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/riveted.rsi/riveted4.png
rename to Resources/Textures/Structures/Walls/riveted.rsi/riveted4.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/riveted.rsi/riveted5.png b/Resources/Textures/Structures/Walls/riveted.rsi/riveted5.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/riveted.rsi/riveted5.png
rename to Resources/Textures/Structures/Walls/riveted.rsi/riveted5.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/riveted.rsi/riveted6.png b/Resources/Textures/Structures/Walls/riveted.rsi/riveted6.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/riveted.rsi/riveted6.png
rename to Resources/Textures/Structures/Walls/riveted.rsi/riveted6.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/riveted.rsi/riveted7.png b/Resources/Textures/Structures/Walls/riveted.rsi/riveted7.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/riveted.rsi/riveted7.png
rename to Resources/Textures/Structures/Walls/riveted.rsi/riveted7.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/full.png b/Resources/Textures/Structures/Walls/sandstone.rsi/full.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/full.png
rename to Resources/Textures/Structures/Walls/sandstone.rsi/full.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/meta.json b/Resources/Textures/Structures/Walls/sandstone.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/meta.json
rename to Resources/Textures/Structures/Walls/sandstone.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/sandstone0.png b/Resources/Textures/Structures/Walls/sandstone.rsi/sandstone0.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/sandstone0.png
rename to Resources/Textures/Structures/Walls/sandstone.rsi/sandstone0.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/sandstone1.png b/Resources/Textures/Structures/Walls/sandstone.rsi/sandstone1.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/sandstone1.png
rename to Resources/Textures/Structures/Walls/sandstone.rsi/sandstone1.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/sandstone2.png b/Resources/Textures/Structures/Walls/sandstone.rsi/sandstone2.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/sandstone2.png
rename to Resources/Textures/Structures/Walls/sandstone.rsi/sandstone2.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/sandstone3.png b/Resources/Textures/Structures/Walls/sandstone.rsi/sandstone3.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/sandstone3.png
rename to Resources/Textures/Structures/Walls/sandstone.rsi/sandstone3.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/sandstone4.png b/Resources/Textures/Structures/Walls/sandstone.rsi/sandstone4.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/sandstone4.png
rename to Resources/Textures/Structures/Walls/sandstone.rsi/sandstone4.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/sandstone5.png b/Resources/Textures/Structures/Walls/sandstone.rsi/sandstone5.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/sandstone5.png
rename to Resources/Textures/Structures/Walls/sandstone.rsi/sandstone5.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/sandstone6.png b/Resources/Textures/Structures/Walls/sandstone.rsi/sandstone6.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/sandstone6.png
rename to Resources/Textures/Structures/Walls/sandstone.rsi/sandstone6.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/sandstone7.png b/Resources/Textures/Structures/Walls/sandstone.rsi/sandstone7.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/sandstone7.png
rename to Resources/Textures/Structures/Walls/sandstone.rsi/sandstone7.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/silver.rsi/full.png b/Resources/Textures/Structures/Walls/silver.rsi/full.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/silver.rsi/full.png
rename to Resources/Textures/Structures/Walls/silver.rsi/full.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/silver.rsi/meta.json b/Resources/Textures/Structures/Walls/silver.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/silver.rsi/meta.json
rename to Resources/Textures/Structures/Walls/silver.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Walls/silver.rsi/silver0.png b/Resources/Textures/Structures/Walls/silver.rsi/silver0.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/silver.rsi/silver0.png
rename to Resources/Textures/Structures/Walls/silver.rsi/silver0.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/silver.rsi/silver1.png b/Resources/Textures/Structures/Walls/silver.rsi/silver1.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/silver.rsi/silver1.png
rename to Resources/Textures/Structures/Walls/silver.rsi/silver1.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/silver.rsi/silver2.png b/Resources/Textures/Structures/Walls/silver.rsi/silver2.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/silver.rsi/silver2.png
rename to Resources/Textures/Structures/Walls/silver.rsi/silver2.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/silver.rsi/silver3.png b/Resources/Textures/Structures/Walls/silver.rsi/silver3.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/silver.rsi/silver3.png
rename to Resources/Textures/Structures/Walls/silver.rsi/silver3.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/silver.rsi/silver4.png b/Resources/Textures/Structures/Walls/silver.rsi/silver4.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/silver.rsi/silver4.png
rename to Resources/Textures/Structures/Walls/silver.rsi/silver4.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/silver.rsi/silver5.png b/Resources/Textures/Structures/Walls/silver.rsi/silver5.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/silver.rsi/silver5.png
rename to Resources/Textures/Structures/Walls/silver.rsi/silver5.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/silver.rsi/silver6.png b/Resources/Textures/Structures/Walls/silver.rsi/silver6.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/silver.rsi/silver6.png
rename to Resources/Textures/Structures/Walls/silver.rsi/silver6.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/silver.rsi/silver7.png b/Resources/Textures/Structures/Walls/silver.rsi/silver7.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/silver.rsi/silver7.png
rename to Resources/Textures/Structures/Walls/silver.rsi/silver7.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/full.png b/Resources/Textures/Structures/Walls/solid.rsi/full.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/full.png
rename to Resources/Textures/Structures/Walls/solid.rsi/full.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/meta.json b/Resources/Textures/Structures/Walls/solid.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/meta.json
rename to Resources/Textures/Structures/Walls/solid.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_construct-0.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-0.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_construct-0.png
rename to Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-0.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_construct-1.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-1.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_construct-1.png
rename to Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-1.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_construct-2.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-2.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_construct-2.png
rename to Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-2.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_construct-3.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-3.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_construct-3.png
rename to Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-3.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_construct-4.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-4.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_construct-4.png
rename to Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-4.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_construct-5.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-5.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_construct-5.png
rename to Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-5.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_cult.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_cult.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_cult.png
rename to Resources/Textures/Structures/Walls/solid.rsi/reinf_cult.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_metal.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_metal.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_metal.png
rename to Resources/Textures/Structures/Walls/solid.rsi/reinf_metal.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_over.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_over.png
rename to Resources/Textures/Structures/Walls/solid.rsi/reinf_over.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_over0.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_over0.png
rename to Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_over1.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over1.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_over1.png
rename to Resources/Textures/Structures/Walls/solid.rsi/reinf_over1.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_over2.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over2.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_over2.png
rename to Resources/Textures/Structures/Walls/solid.rsi/reinf_over2.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_over3.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over3.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_over3.png
rename to Resources/Textures/Structures/Walls/solid.rsi/reinf_over3.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_over4.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over4.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_over4.png
rename to Resources/Textures/Structures/Walls/solid.rsi/reinf_over4.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_over5.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over5.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_over5.png
rename to Resources/Textures/Structures/Walls/solid.rsi/reinf_over5.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_over6.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over6.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_over6.png
rename to Resources/Textures/Structures/Walls/solid.rsi/reinf_over6.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_over7.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over7.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_over7.png
rename to Resources/Textures/Structures/Walls/solid.rsi/reinf_over7.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinforced_wall_girder.png b/Resources/Textures/Structures/Walls/solid.rsi/reinforced_wall_girder.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinforced_wall_girder.png
rename to Resources/Textures/Structures/Walls/solid.rsi/reinforced_wall_girder.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/rgeneric.png b/Resources/Textures/Structures/Walls/solid.rsi/rgeneric.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/rgeneric.png
rename to Resources/Textures/Structures/Walls/solid.rsi/rgeneric.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/solid0.png b/Resources/Textures/Structures/Walls/solid.rsi/solid0.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/solid0.png
rename to Resources/Textures/Structures/Walls/solid.rsi/solid0.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/solid1.png b/Resources/Textures/Structures/Walls/solid.rsi/solid1.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/solid1.png
rename to Resources/Textures/Structures/Walls/solid.rsi/solid1.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/solid2.png b/Resources/Textures/Structures/Walls/solid.rsi/solid2.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/solid2.png
rename to Resources/Textures/Structures/Walls/solid.rsi/solid2.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/solid3.png b/Resources/Textures/Structures/Walls/solid.rsi/solid3.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/solid3.png
rename to Resources/Textures/Structures/Walls/solid.rsi/solid3.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/solid4.png b/Resources/Textures/Structures/Walls/solid.rsi/solid4.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/solid4.png
rename to Resources/Textures/Structures/Walls/solid.rsi/solid4.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/solid5.png b/Resources/Textures/Structures/Walls/solid.rsi/solid5.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/solid5.png
rename to Resources/Textures/Structures/Walls/solid.rsi/solid5.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/solid6.png b/Resources/Textures/Structures/Walls/solid.rsi/solid6.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/solid6.png
rename to Resources/Textures/Structures/Walls/solid.rsi/solid6.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/solid7.png b/Resources/Textures/Structures/Walls/solid.rsi/solid7.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/solid7.png
rename to Resources/Textures/Structures/Walls/solid.rsi/solid7.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/wall_girder.png b/Resources/Textures/Structures/Walls/solid.rsi/wall_girder.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/wall_girder.png
rename to Resources/Textures/Structures/Walls/solid.rsi/wall_girder.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/uranium.rsi/full.png b/Resources/Textures/Structures/Walls/uranium.rsi/full.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/uranium.rsi/full.png
rename to Resources/Textures/Structures/Walls/uranium.rsi/full.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/uranium.rsi/meta.json b/Resources/Textures/Structures/Walls/uranium.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/uranium.rsi/meta.json
rename to Resources/Textures/Structures/Walls/uranium.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Walls/uranium.rsi/uranium0.png b/Resources/Textures/Structures/Walls/uranium.rsi/uranium0.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/uranium.rsi/uranium0.png
rename to Resources/Textures/Structures/Walls/uranium.rsi/uranium0.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/uranium.rsi/uranium1.png b/Resources/Textures/Structures/Walls/uranium.rsi/uranium1.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/uranium.rsi/uranium1.png
rename to Resources/Textures/Structures/Walls/uranium.rsi/uranium1.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/uranium.rsi/uranium2.png b/Resources/Textures/Structures/Walls/uranium.rsi/uranium2.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/uranium.rsi/uranium2.png
rename to Resources/Textures/Structures/Walls/uranium.rsi/uranium2.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/uranium.rsi/uranium3.png b/Resources/Textures/Structures/Walls/uranium.rsi/uranium3.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/uranium.rsi/uranium3.png
rename to Resources/Textures/Structures/Walls/uranium.rsi/uranium3.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/uranium.rsi/uranium4.png b/Resources/Textures/Structures/Walls/uranium.rsi/uranium4.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/uranium.rsi/uranium4.png
rename to Resources/Textures/Structures/Walls/uranium.rsi/uranium4.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/uranium.rsi/uranium5.png b/Resources/Textures/Structures/Walls/uranium.rsi/uranium5.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/uranium.rsi/uranium5.png
rename to Resources/Textures/Structures/Walls/uranium.rsi/uranium5.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/uranium.rsi/uranium6.png b/Resources/Textures/Structures/Walls/uranium.rsi/uranium6.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/uranium.rsi/uranium6.png
rename to Resources/Textures/Structures/Walls/uranium.rsi/uranium6.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/uranium.rsi/uranium7.png b/Resources/Textures/Structures/Walls/uranium.rsi/uranium7.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/uranium.rsi/uranium7.png
rename to Resources/Textures/Structures/Walls/uranium.rsi/uranium7.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/wood.rsi/full.png b/Resources/Textures/Structures/Walls/wood.rsi/full.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/wood.rsi/full.png
rename to Resources/Textures/Structures/Walls/wood.rsi/full.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/wood.rsi/meta.json b/Resources/Textures/Structures/Walls/wood.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/wood.rsi/meta.json
rename to Resources/Textures/Structures/Walls/wood.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Walls/wood.rsi/wood0.png b/Resources/Textures/Structures/Walls/wood.rsi/wood0.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/wood.rsi/wood0.png
rename to Resources/Textures/Structures/Walls/wood.rsi/wood0.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/wood.rsi/wood1.png b/Resources/Textures/Structures/Walls/wood.rsi/wood1.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/wood.rsi/wood1.png
rename to Resources/Textures/Structures/Walls/wood.rsi/wood1.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/wood.rsi/wood2.png b/Resources/Textures/Structures/Walls/wood.rsi/wood2.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/wood.rsi/wood2.png
rename to Resources/Textures/Structures/Walls/wood.rsi/wood2.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/wood.rsi/wood3.png b/Resources/Textures/Structures/Walls/wood.rsi/wood3.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/wood.rsi/wood3.png
rename to Resources/Textures/Structures/Walls/wood.rsi/wood3.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/wood.rsi/wood4.png b/Resources/Textures/Structures/Walls/wood.rsi/wood4.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/wood.rsi/wood4.png
rename to Resources/Textures/Structures/Walls/wood.rsi/wood4.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/wood.rsi/wood5.png b/Resources/Textures/Structures/Walls/wood.rsi/wood5.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/wood.rsi/wood5.png
rename to Resources/Textures/Structures/Walls/wood.rsi/wood5.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/wood.rsi/wood6.png b/Resources/Textures/Structures/Walls/wood.rsi/wood6.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/wood.rsi/wood6.png
rename to Resources/Textures/Structures/Walls/wood.rsi/wood6.png
diff --git a/Resources/Textures/Constructible/Structures/Walls/wood.rsi/wood7.png b/Resources/Textures/Structures/Walls/wood.rsi/wood7.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Walls/wood.rsi/wood7.png
rename to Resources/Textures/Structures/Walls/wood.rsi/wood7.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/0_1.png b/Resources/Textures/Structures/Windows/cracks.rsi/0_1.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/0_1.png
rename to Resources/Textures/Structures/Windows/cracks.rsi/0_1.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/0_2.png b/Resources/Textures/Structures/Windows/cracks.rsi/0_2.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/0_2.png
rename to Resources/Textures/Structures/Windows/cracks.rsi/0_2.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/0_3.png b/Resources/Textures/Structures/Windows/cracks.rsi/0_3.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/0_3.png
rename to Resources/Textures/Structures/Windows/cracks.rsi/0_3.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/0_4.png b/Resources/Textures/Structures/Windows/cracks.rsi/0_4.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/0_4.png
rename to Resources/Textures/Structures/Windows/cracks.rsi/0_4.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/0_5.png b/Resources/Textures/Structures/Windows/cracks.rsi/0_5.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/0_5.png
rename to Resources/Textures/Structures/Windows/cracks.rsi/0_5.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/1_1.png b/Resources/Textures/Structures/Windows/cracks.rsi/1_1.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/1_1.png
rename to Resources/Textures/Structures/Windows/cracks.rsi/1_1.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/1_2.png b/Resources/Textures/Structures/Windows/cracks.rsi/1_2.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/1_2.png
rename to Resources/Textures/Structures/Windows/cracks.rsi/1_2.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/1_3.png b/Resources/Textures/Structures/Windows/cracks.rsi/1_3.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/1_3.png
rename to Resources/Textures/Structures/Windows/cracks.rsi/1_3.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/1_4.png b/Resources/Textures/Structures/Windows/cracks.rsi/1_4.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/1_4.png
rename to Resources/Textures/Structures/Windows/cracks.rsi/1_4.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/1_5.png b/Resources/Textures/Structures/Windows/cracks.rsi/1_5.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/1_5.png
rename to Resources/Textures/Structures/Windows/cracks.rsi/1_5.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/2_1.png b/Resources/Textures/Structures/Windows/cracks.rsi/2_1.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/2_1.png
rename to Resources/Textures/Structures/Windows/cracks.rsi/2_1.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/2_2.png b/Resources/Textures/Structures/Windows/cracks.rsi/2_2.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/2_2.png
rename to Resources/Textures/Structures/Windows/cracks.rsi/2_2.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/2_3.png b/Resources/Textures/Structures/Windows/cracks.rsi/2_3.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/2_3.png
rename to Resources/Textures/Structures/Windows/cracks.rsi/2_3.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/2_4.png b/Resources/Textures/Structures/Windows/cracks.rsi/2_4.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/2_4.png
rename to Resources/Textures/Structures/Windows/cracks.rsi/2_4.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/2_5.png b/Resources/Textures/Structures/Windows/cracks.rsi/2_5.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/2_5.png
rename to Resources/Textures/Structures/Windows/cracks.rsi/2_5.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/3_1.png b/Resources/Textures/Structures/Windows/cracks.rsi/3_1.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/3_1.png
rename to Resources/Textures/Structures/Windows/cracks.rsi/3_1.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/3_2.png b/Resources/Textures/Structures/Windows/cracks.rsi/3_2.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/3_2.png
rename to Resources/Textures/Structures/Windows/cracks.rsi/3_2.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/3_3.png b/Resources/Textures/Structures/Windows/cracks.rsi/3_3.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/3_3.png
rename to Resources/Textures/Structures/Windows/cracks.rsi/3_3.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/3_4.png b/Resources/Textures/Structures/Windows/cracks.rsi/3_4.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/3_4.png
rename to Resources/Textures/Structures/Windows/cracks.rsi/3_4.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/3_5.png b/Resources/Textures/Structures/Windows/cracks.rsi/3_5.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/3_5.png
rename to Resources/Textures/Structures/Windows/cracks.rsi/3_5.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/4_1.png b/Resources/Textures/Structures/Windows/cracks.rsi/4_1.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/4_1.png
rename to Resources/Textures/Structures/Windows/cracks.rsi/4_1.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/4_2.png b/Resources/Textures/Structures/Windows/cracks.rsi/4_2.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/4_2.png
rename to Resources/Textures/Structures/Windows/cracks.rsi/4_2.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/4_3.png b/Resources/Textures/Structures/Windows/cracks.rsi/4_3.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/4_3.png
rename to Resources/Textures/Structures/Windows/cracks.rsi/4_3.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/4_4.png b/Resources/Textures/Structures/Windows/cracks.rsi/4_4.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/4_4.png
rename to Resources/Textures/Structures/Windows/cracks.rsi/4_4.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/4_5.png b/Resources/Textures/Structures/Windows/cracks.rsi/4_5.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/4_5.png
rename to Resources/Textures/Structures/Windows/cracks.rsi/4_5.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/5_1.png b/Resources/Textures/Structures/Windows/cracks.rsi/5_1.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/5_1.png
rename to Resources/Textures/Structures/Windows/cracks.rsi/5_1.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/5_2.png b/Resources/Textures/Structures/Windows/cracks.rsi/5_2.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/5_2.png
rename to Resources/Textures/Structures/Windows/cracks.rsi/5_2.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/5_3.png b/Resources/Textures/Structures/Windows/cracks.rsi/5_3.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/5_3.png
rename to Resources/Textures/Structures/Windows/cracks.rsi/5_3.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/5_4.png b/Resources/Textures/Structures/Windows/cracks.rsi/5_4.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/5_4.png
rename to Resources/Textures/Structures/Windows/cracks.rsi/5_4.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/5_5.png b/Resources/Textures/Structures/Windows/cracks.rsi/5_5.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/5_5.png
rename to Resources/Textures/Structures/Windows/cracks.rsi/5_5.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/6_1.png b/Resources/Textures/Structures/Windows/cracks.rsi/6_1.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/6_1.png
rename to Resources/Textures/Structures/Windows/cracks.rsi/6_1.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/6_2.png b/Resources/Textures/Structures/Windows/cracks.rsi/6_2.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/6_2.png
rename to Resources/Textures/Structures/Windows/cracks.rsi/6_2.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/6_3.png b/Resources/Textures/Structures/Windows/cracks.rsi/6_3.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/6_3.png
rename to Resources/Textures/Structures/Windows/cracks.rsi/6_3.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/6_4.png b/Resources/Textures/Structures/Windows/cracks.rsi/6_4.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/6_4.png
rename to Resources/Textures/Structures/Windows/cracks.rsi/6_4.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/6_5.png b/Resources/Textures/Structures/Windows/cracks.rsi/6_5.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/6_5.png
rename to Resources/Textures/Structures/Windows/cracks.rsi/6_5.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/7_1.png b/Resources/Textures/Structures/Windows/cracks.rsi/7_1.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/7_1.png
rename to Resources/Textures/Structures/Windows/cracks.rsi/7_1.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/7_2.png b/Resources/Textures/Structures/Windows/cracks.rsi/7_2.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/7_2.png
rename to Resources/Textures/Structures/Windows/cracks.rsi/7_2.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/7_3.png b/Resources/Textures/Structures/Windows/cracks.rsi/7_3.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/7_3.png
rename to Resources/Textures/Structures/Windows/cracks.rsi/7_3.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/7_4.png b/Resources/Textures/Structures/Windows/cracks.rsi/7_4.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/7_4.png
rename to Resources/Textures/Structures/Windows/cracks.rsi/7_4.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/7_5.png b/Resources/Textures/Structures/Windows/cracks.rsi/7_5.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/7_5.png
rename to Resources/Textures/Structures/Windows/cracks.rsi/7_5.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/meta.json b/Resources/Textures/Structures/Windows/cracks.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/meta.json
rename to Resources/Textures/Structures/Windows/cracks.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/full.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/full.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/full.png
rename to Resources/Textures/Structures/Windows/plasma_window.rsi/full.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/meta.json b/Resources/Textures/Structures/Windows/plasma_window.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/meta.json
rename to Resources/Textures/Structures/Windows/plasma_window.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow0.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow0.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow0.png
rename to Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow0.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow1.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow1.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow1.png
rename to Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow1.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow2.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow2.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow2.png
rename to Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow2.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow3.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow3.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow3.png
rename to Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow3.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow4.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow4.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow4.png
rename to Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow4.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow5.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow5.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow5.png
rename to Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow5.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow6.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow6.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow6.png
rename to Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow6.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow7.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow7.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow7.png
rename to Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow7.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/full.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/full.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/full.png
rename to Resources/Textures/Structures/Windows/reinforced_window.rsi/full.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/meta.json b/Resources/Textures/Structures/Windows/reinforced_window.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/meta.json
rename to Resources/Textures/Structures/Windows/reinforced_window.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/rwindow0.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow0.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/rwindow0.png
rename to Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow0.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/rwindow1.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow1.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/rwindow1.png
rename to Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow1.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/rwindow2.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow2.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/rwindow2.png
rename to Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow2.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/rwindow3.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow3.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/rwindow3.png
rename to Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow3.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/rwindow4.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow4.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/rwindow4.png
rename to Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow4.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/rwindow5.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow5.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/rwindow5.png
rename to Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow5.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/rwindow6.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow6.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/rwindow6.png
rename to Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow6.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/rwindow7.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow7.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/rwindow7.png
rename to Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow7.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/window.rsi/full.png b/Resources/Textures/Structures/Windows/window.rsi/full.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/window.rsi/full.png
rename to Resources/Textures/Structures/Windows/window.rsi/full.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/window.rsi/meta.json b/Resources/Textures/Structures/Windows/window.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/window.rsi/meta.json
rename to Resources/Textures/Structures/Windows/window.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Windows/window.rsi/window0.png b/Resources/Textures/Structures/Windows/window.rsi/window0.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/window.rsi/window0.png
rename to Resources/Textures/Structures/Windows/window.rsi/window0.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/window.rsi/window1.png b/Resources/Textures/Structures/Windows/window.rsi/window1.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/window.rsi/window1.png
rename to Resources/Textures/Structures/Windows/window.rsi/window1.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/window.rsi/window2.png b/Resources/Textures/Structures/Windows/window.rsi/window2.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/window.rsi/window2.png
rename to Resources/Textures/Structures/Windows/window.rsi/window2.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/window.rsi/window3.png b/Resources/Textures/Structures/Windows/window.rsi/window3.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/window.rsi/window3.png
rename to Resources/Textures/Structures/Windows/window.rsi/window3.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/window.rsi/window4.png b/Resources/Textures/Structures/Windows/window.rsi/window4.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/window.rsi/window4.png
rename to Resources/Textures/Structures/Windows/window.rsi/window4.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/window.rsi/window5.png b/Resources/Textures/Structures/Windows/window.rsi/window5.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/window.rsi/window5.png
rename to Resources/Textures/Structures/Windows/window.rsi/window5.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/window.rsi/window6.png b/Resources/Textures/Structures/Windows/window.rsi/window6.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/window.rsi/window6.png
rename to Resources/Textures/Structures/Windows/window.rsi/window6.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/window.rsi/window7.png b/Resources/Textures/Structures/Windows/window.rsi/window7.png
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/window.rsi/window7.png
rename to Resources/Textures/Structures/Windows/window.rsi/window7.png
diff --git a/Resources/Textures/Constructible/Specific/Cargo/teleporter.rsi/beam.png b/Resources/Textures/Structures/cargo_telepad.rsi/beam.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Cargo/teleporter.rsi/beam.png
rename to Resources/Textures/Structures/cargo_telepad.rsi/beam.png
diff --git a/Resources/Textures/Constructible/Specific/Cargo/teleporter.rsi/idle.png b/Resources/Textures/Structures/cargo_telepad.rsi/idle.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Cargo/teleporter.rsi/idle.png
rename to Resources/Textures/Structures/cargo_telepad.rsi/idle.png
diff --git a/Resources/Textures/Constructible/Specific/Cargo/teleporter.rsi/meta.json b/Resources/Textures/Structures/cargo_telepad.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Cargo/teleporter.rsi/meta.json
rename to Resources/Textures/Structures/cargo_telepad.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Specific/Cargo/teleporter.rsi/offline.png b/Resources/Textures/Structures/cargo_telepad.rsi/offline.png
similarity index 100%
rename from Resources/Textures/Constructible/Specific/Cargo/teleporter.rsi/offline.png
rename to Resources/Textures/Structures/cargo_telepad.rsi/offline.png
diff --git a/Resources/Textures/Constructible/Tiles/catwalk.rsi/catwalk_0.png b/Resources/Textures/Structures/catwalk.rsi/catwalk_0.png
similarity index 100%
rename from Resources/Textures/Constructible/Tiles/catwalk.rsi/catwalk_0.png
rename to Resources/Textures/Structures/catwalk.rsi/catwalk_0.png
diff --git a/Resources/Textures/Constructible/Tiles/catwalk.rsi/catwalk_1.png b/Resources/Textures/Structures/catwalk.rsi/catwalk_1.png
similarity index 100%
rename from Resources/Textures/Constructible/Tiles/catwalk.rsi/catwalk_1.png
rename to Resources/Textures/Structures/catwalk.rsi/catwalk_1.png
diff --git a/Resources/Textures/Constructible/Tiles/catwalk.rsi/catwalk_2.png b/Resources/Textures/Structures/catwalk.rsi/catwalk_2.png
similarity index 100%
rename from Resources/Textures/Constructible/Tiles/catwalk.rsi/catwalk_2.png
rename to Resources/Textures/Structures/catwalk.rsi/catwalk_2.png
diff --git a/Resources/Textures/Constructible/Tiles/catwalk.rsi/catwalk_3.png b/Resources/Textures/Structures/catwalk.rsi/catwalk_3.png
similarity index 100%
rename from Resources/Textures/Constructible/Tiles/catwalk.rsi/catwalk_3.png
rename to Resources/Textures/Structures/catwalk.rsi/catwalk_3.png
diff --git a/Resources/Textures/Constructible/Tiles/catwalk.rsi/catwalk_4.png b/Resources/Textures/Structures/catwalk.rsi/catwalk_4.png
similarity index 100%
rename from Resources/Textures/Constructible/Tiles/catwalk.rsi/catwalk_4.png
rename to Resources/Textures/Structures/catwalk.rsi/catwalk_4.png
diff --git a/Resources/Textures/Constructible/Tiles/catwalk.rsi/catwalk_5.png b/Resources/Textures/Structures/catwalk.rsi/catwalk_5.png
similarity index 100%
rename from Resources/Textures/Constructible/Tiles/catwalk.rsi/catwalk_5.png
rename to Resources/Textures/Structures/catwalk.rsi/catwalk_5.png
diff --git a/Resources/Textures/Constructible/Tiles/catwalk.rsi/catwalk_6.png b/Resources/Textures/Structures/catwalk.rsi/catwalk_6.png
similarity index 100%
rename from Resources/Textures/Constructible/Tiles/catwalk.rsi/catwalk_6.png
rename to Resources/Textures/Structures/catwalk.rsi/catwalk_6.png
diff --git a/Resources/Textures/Constructible/Tiles/catwalk.rsi/catwalk_7.png b/Resources/Textures/Structures/catwalk.rsi/catwalk_7.png
similarity index 100%
rename from Resources/Textures/Constructible/Tiles/catwalk.rsi/catwalk_7.png
rename to Resources/Textures/Structures/catwalk.rsi/catwalk_7.png
diff --git a/Resources/Textures/Constructible/Tiles/catwalk.rsi/catwalk_preview.png b/Resources/Textures/Structures/catwalk.rsi/catwalk_preview.png
similarity index 100%
rename from Resources/Textures/Constructible/Tiles/catwalk.rsi/catwalk_preview.png
rename to Resources/Textures/Structures/catwalk.rsi/catwalk_preview.png
diff --git a/Resources/Textures/Constructible/Tiles/catwalk.rsi/meta.json b/Resources/Textures/Structures/catwalk.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Tiles/catwalk.rsi/meta.json
rename to Resources/Textures/Structures/catwalk.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/conveyor.rsi/conveyor_loose.png b/Resources/Textures/Structures/conveyor.rsi/conveyor_loose.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/conveyor.rsi/conveyor_loose.png
rename to Resources/Textures/Structures/conveyor.rsi/conveyor_loose.png
diff --git a/Resources/Textures/Constructible/Power/conveyor.rsi/conveyor_started_ccw.png b/Resources/Textures/Structures/conveyor.rsi/conveyor_started_ccw.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/conveyor.rsi/conveyor_started_ccw.png
rename to Resources/Textures/Structures/conveyor.rsi/conveyor_started_ccw.png
diff --git a/Resources/Textures/Constructible/Power/conveyor.rsi/conveyor_started_ccw_r.png b/Resources/Textures/Structures/conveyor.rsi/conveyor_started_ccw_r.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/conveyor.rsi/conveyor_started_ccw_r.png
rename to Resources/Textures/Structures/conveyor.rsi/conveyor_started_ccw_r.png
diff --git a/Resources/Textures/Constructible/Power/conveyor.rsi/conveyor_started_cw.png b/Resources/Textures/Structures/conveyor.rsi/conveyor_started_cw.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/conveyor.rsi/conveyor_started_cw.png
rename to Resources/Textures/Structures/conveyor.rsi/conveyor_started_cw.png
diff --git a/Resources/Textures/Constructible/Power/conveyor.rsi/conveyor_started_cw_r.png b/Resources/Textures/Structures/conveyor.rsi/conveyor_started_cw_r.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/conveyor.rsi/conveyor_started_cw_r.png
rename to Resources/Textures/Structures/conveyor.rsi/conveyor_started_cw_r.png
diff --git a/Resources/Textures/Constructible/Power/conveyor.rsi/conveyor_stopped_ccw.png b/Resources/Textures/Structures/conveyor.rsi/conveyor_stopped_ccw.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/conveyor.rsi/conveyor_stopped_ccw.png
rename to Resources/Textures/Structures/conveyor.rsi/conveyor_stopped_ccw.png
diff --git a/Resources/Textures/Constructible/Power/conveyor.rsi/conveyor_stopped_cw.png b/Resources/Textures/Structures/conveyor.rsi/conveyor_stopped_cw.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/conveyor.rsi/conveyor_stopped_cw.png
rename to Resources/Textures/Structures/conveyor.rsi/conveyor_stopped_cw.png
diff --git a/Resources/Textures/Constructible/Power/conveyor.rsi/greenlight.png b/Resources/Textures/Structures/conveyor.rsi/greenlight.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/conveyor.rsi/greenlight.png
rename to Resources/Textures/Structures/conveyor.rsi/greenlight.png
diff --git a/Resources/Textures/Constructible/Power/conveyor.rsi/meta.json b/Resources/Textures/Structures/conveyor.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Power/conveyor.rsi/meta.json
rename to Resources/Textures/Structures/conveyor.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Power/conveyor.rsi/redlight.png b/Resources/Textures/Structures/conveyor.rsi/redlight.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/conveyor.rsi/redlight.png
rename to Resources/Textures/Structures/conveyor.rsi/redlight.png
diff --git a/Resources/Textures/Constructible/Power/conveyor.rsi/switch-fwd.png b/Resources/Textures/Structures/conveyor.rsi/switch-fwd.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/conveyor.rsi/switch-fwd.png
rename to Resources/Textures/Structures/conveyor.rsi/switch-fwd.png
diff --git a/Resources/Textures/Constructible/Power/conveyor.rsi/switch-off.png b/Resources/Textures/Structures/conveyor.rsi/switch-off.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/conveyor.rsi/switch-off.png
rename to Resources/Textures/Structures/conveyor.rsi/switch-off.png
diff --git a/Resources/Textures/Constructible/Power/conveyor.rsi/switch-rev.png b/Resources/Textures/Structures/conveyor.rsi/switch-rev.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/conveyor.rsi/switch-rev.png
rename to Resources/Textures/Structures/conveyor.rsi/switch-rev.png
diff --git a/Resources/Textures/Constructible/Power/conveyor.rsi/switch.png b/Resources/Textures/Structures/conveyor.rsi/switch.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/conveyor.rsi/switch.png
rename to Resources/Textures/Structures/conveyor.rsi/switch.png
diff --git a/Resources/Textures/Constructible/Power/dispensers.rsi/booze_dispenser.png b/Resources/Textures/Structures/dispensers.rsi/booze_dispenser.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/dispensers.rsi/booze_dispenser.png
rename to Resources/Textures/Structures/dispensers.rsi/booze_dispenser.png
diff --git a/Resources/Textures/Constructible/Power/dispensers.rsi/dispenser.png b/Resources/Textures/Structures/dispensers.rsi/dispenser.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/dispensers.rsi/dispenser.png
rename to Resources/Textures/Structures/dispensers.rsi/dispenser.png
diff --git a/Resources/Textures/Constructible/Power/industrial_dispenser.rsi/industrial_dispenser.png b/Resources/Textures/Structures/dispensers.rsi/industrial_dispenser.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/industrial_dispenser.rsi/industrial_dispenser.png
rename to Resources/Textures/Structures/dispensers.rsi/industrial_dispenser.png
diff --git a/Resources/Textures/Constructible/Power/dispensers.rsi/meta.json b/Resources/Textures/Structures/dispensers.rsi/meta.json
similarity index 52%
rename from Resources/Textures/Constructible/Power/dispensers.rsi/meta.json
rename to Resources/Textures/Structures/dispensers.rsi/meta.json
index 763c13fbcb..bef6bf2fad 100644
--- a/Resources/Textures/Constructible/Power/dispensers.rsi/meta.json
+++ b/Resources/Textures/Structures/dispensers.rsi/meta.json
@@ -1,35 +1,23 @@
 {
   "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi",
   "size": {
     "x": 32,
     "y": 32
   },
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi",
   "states": [
     {
-      "name": "booze_dispenser",
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "name": "booze_dispenser"
     },
     {
-      "name": "soda_dispenser",
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "name": "industrial_dispenser"
     },
     {
-      "name": "dispenser",
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "name": "soda_dispenser"
+    },
+    {
+      "name": "dispenser"
     }
   ]
 }
diff --git a/Resources/Textures/Constructible/Power/dispensers.rsi/soda_dispenser.png b/Resources/Textures/Structures/dispensers.rsi/soda_dispenser.png
similarity index 100%
rename from Resources/Textures/Constructible/Power/dispensers.rsi/soda_dispenser.png
rename to Resources/Textures/Structures/dispensers.rsi/soda_dispenser.png
diff --git a/Resources/Textures/Constructible/Misc/kitchen.rsi/meta.json b/Resources/Textures/Structures/meat_spike.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Misc/kitchen.rsi/meta.json
rename to Resources/Textures/Structures/meat_spike.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Misc/kitchen.rsi/spike.png b/Resources/Textures/Structures/meat_spike.rsi/spike.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/kitchen.rsi/spike.png
rename to Resources/Textures/Structures/meat_spike.rsi/spike.png
diff --git a/Resources/Textures/Constructible/Misc/kitchen.rsi/spikebloody.png b/Resources/Textures/Structures/meat_spike.rsi/spikebloody.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/kitchen.rsi/spikebloody.png
rename to Resources/Textures/Structures/meat_spike.rsi/spikebloody.png
diff --git a/Resources/Textures/Constructible/Misc/kitchen.rsi/spikebloodygreen.png b/Resources/Textures/Structures/meat_spike.rsi/spikebloodygreen.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/kitchen.rsi/spikebloodygreen.png
rename to Resources/Textures/Structures/meat_spike.rsi/spikebloodygreen.png
diff --git a/Resources/Textures/Constructible/Tiles/Asteroid/asteroid_coarse_sand0.png b/Resources/Textures/Tiles/Asteroid/asteroid_coarse_sand0.png
similarity index 100%
rename from Resources/Textures/Constructible/Tiles/Asteroid/asteroid_coarse_sand0.png
rename to Resources/Textures/Tiles/Asteroid/asteroid_coarse_sand0.png
diff --git a/Resources/Textures/Constructible/Tiles/Asteroid/asteroid_coarse_sand1.png b/Resources/Textures/Tiles/Asteroid/asteroid_coarse_sand1.png
similarity index 100%
rename from Resources/Textures/Constructible/Tiles/Asteroid/asteroid_coarse_sand1.png
rename to Resources/Textures/Tiles/Asteroid/asteroid_coarse_sand1.png
diff --git a/Resources/Textures/Constructible/Tiles/Asteroid/asteroid_coarse_sand2.png b/Resources/Textures/Tiles/Asteroid/asteroid_coarse_sand2.png
similarity index 100%
rename from Resources/Textures/Constructible/Tiles/Asteroid/asteroid_coarse_sand2.png
rename to Resources/Textures/Tiles/Asteroid/asteroid_coarse_sand2.png
diff --git a/Resources/Textures/Constructible/Tiles/Asteroid/asteroid_coarse_sand_dug.png b/Resources/Textures/Tiles/Asteroid/asteroid_coarse_sand_dug.png
similarity index 100%
rename from Resources/Textures/Constructible/Tiles/Asteroid/asteroid_coarse_sand_dug.png
rename to Resources/Textures/Tiles/Asteroid/asteroid_coarse_sand_dug.png
diff --git a/Resources/Textures/Constructible/Tiles/Asteroid/asteroid_sand.png b/Resources/Textures/Tiles/Asteroid/asteroid_sand.png
similarity index 100%
rename from Resources/Textures/Constructible/Tiles/Asteroid/asteroid_sand.png
rename to Resources/Textures/Tiles/Asteroid/asteroid_sand.png
diff --git a/Resources/Textures/Constructible/Tiles/Asteroid/asteroid_tile.png b/Resources/Textures/Tiles/Asteroid/asteroid_tile.png
similarity index 100%
rename from Resources/Textures/Constructible/Tiles/Asteroid/asteroid_tile.png
rename to Resources/Textures/Tiles/Asteroid/asteroid_tile.png
diff --git a/Resources/Textures/Constructible/Tiles/blue.png b/Resources/Textures/Tiles/blue.png
similarity index 100%
rename from Resources/Textures/Constructible/Tiles/blue.png
rename to Resources/Textures/Tiles/blue.png
diff --git a/Resources/Textures/Constructible/Tiles/copyright.txt b/Resources/Textures/Tiles/copyright.txt
similarity index 100%
rename from Resources/Textures/Constructible/Tiles/copyright.txt
rename to Resources/Textures/Tiles/copyright.txt
diff --git a/Resources/Textures/Constructible/Tiles/dark.png b/Resources/Textures/Tiles/dark.png
similarity index 100%
rename from Resources/Textures/Constructible/Tiles/dark.png
rename to Resources/Textures/Tiles/dark.png
diff --git a/Resources/Textures/Constructible/Tiles/elevator_shaft.png b/Resources/Textures/Tiles/elevator_shaft.png
similarity index 100%
rename from Resources/Textures/Constructible/Tiles/elevator_shaft.png
rename to Resources/Textures/Tiles/elevator_shaft.png
diff --git a/Resources/Textures/Constructible/Tiles/freezer.png b/Resources/Textures/Tiles/freezer.png
similarity index 100%
rename from Resources/Textures/Constructible/Tiles/freezer.png
rename to Resources/Textures/Tiles/freezer.png
diff --git a/Resources/Textures/Constructible/Tiles/glass.png b/Resources/Textures/Tiles/glass.png
similarity index 100%
rename from Resources/Textures/Constructible/Tiles/glass.png
rename to Resources/Textures/Tiles/glass.png
diff --git a/Resources/Textures/Constructible/Tiles/gold.png b/Resources/Textures/Tiles/gold.png
similarity index 100%
rename from Resources/Textures/Constructible/Tiles/gold.png
rename to Resources/Textures/Tiles/gold.png
diff --git a/Resources/Textures/Constructible/Tiles/green_circuit.png b/Resources/Textures/Tiles/green_circuit.png
similarity index 100%
rename from Resources/Textures/Constructible/Tiles/green_circuit.png
rename to Resources/Textures/Tiles/green_circuit.png
diff --git a/Resources/Textures/Constructible/Tiles/hydro.png b/Resources/Textures/Tiles/hydro.png
similarity index 100%
rename from Resources/Textures/Constructible/Tiles/hydro.png
rename to Resources/Textures/Tiles/hydro.png
diff --git a/Resources/Textures/Constructible/Tiles/kitchen.png b/Resources/Textures/Tiles/kitchen.png
similarity index 100%
rename from Resources/Textures/Constructible/Tiles/kitchen.png
rename to Resources/Textures/Tiles/kitchen.png
diff --git a/Resources/Textures/Constructible/Tiles/lattice.png b/Resources/Textures/Tiles/lattice.png
similarity index 100%
rename from Resources/Textures/Constructible/Tiles/lattice.png
rename to Resources/Textures/Tiles/lattice.png
diff --git a/Resources/Textures/Constructible/Tiles/lino.png b/Resources/Textures/Tiles/lino.png
similarity index 100%
rename from Resources/Textures/Constructible/Tiles/lino.png
rename to Resources/Textures/Tiles/lino.png
diff --git a/Resources/Textures/Constructible/Tiles/mono.png b/Resources/Textures/Tiles/mono.png
similarity index 100%
rename from Resources/Textures/Constructible/Tiles/mono.png
rename to Resources/Textures/Tiles/mono.png
diff --git a/Resources/Textures/Constructible/Tiles/plating.png b/Resources/Textures/Tiles/plating.png
similarity index 100%
rename from Resources/Textures/Constructible/Tiles/plating.png
rename to Resources/Textures/Tiles/plating.png
diff --git a/Resources/Textures/Constructible/Tiles/reinforced.png b/Resources/Textures/Tiles/reinforced.png
similarity index 100%
rename from Resources/Textures/Constructible/Tiles/reinforced.png
rename to Resources/Textures/Tiles/reinforced.png
diff --git a/Resources/Textures/Constructible/Tiles/rglass.png b/Resources/Textures/Tiles/rglass.png
similarity index 100%
rename from Resources/Textures/Constructible/Tiles/rglass.png
rename to Resources/Textures/Tiles/rglass.png
diff --git a/Resources/Textures/Constructible/Tiles/rock_vault.png b/Resources/Textures/Tiles/rock_vault.png
similarity index 100%
rename from Resources/Textures/Constructible/Tiles/rock_vault.png
rename to Resources/Textures/Tiles/rock_vault.png
diff --git a/Resources/Textures/Constructible/Tiles/showroom.png b/Resources/Textures/Tiles/showroom.png
similarity index 100%
rename from Resources/Textures/Constructible/Tiles/showroom.png
rename to Resources/Textures/Tiles/showroom.png
diff --git a/Resources/Textures/Constructible/Tiles/snow.png b/Resources/Textures/Tiles/snow.png
similarity index 100%
rename from Resources/Textures/Constructible/Tiles/snow.png
rename to Resources/Textures/Tiles/snow.png
diff --git a/Resources/Textures/Constructible/Tiles/steel.png b/Resources/Textures/Tiles/steel.png
similarity index 100%
rename from Resources/Textures/Constructible/Tiles/steel.png
rename to Resources/Textures/Tiles/steel.png
diff --git a/Resources/Textures/Constructible/Tiles/steel_dirty.png b/Resources/Textures/Tiles/steel_dirty.png
similarity index 100%
rename from Resources/Textures/Constructible/Tiles/steel_dirty.png
rename to Resources/Textures/Tiles/steel_dirty.png
diff --git a/Resources/Textures/Constructible/Tiles/steel_warning1.png b/Resources/Textures/Tiles/steel_warning1.png
similarity index 100%
rename from Resources/Textures/Constructible/Tiles/steel_warning1.png
rename to Resources/Textures/Tiles/steel_warning1.png
diff --git a/Resources/Textures/Constructible/Tiles/steel_warning2.png b/Resources/Textures/Tiles/steel_warning2.png
similarity index 100%
rename from Resources/Textures/Constructible/Tiles/steel_warning2.png
rename to Resources/Textures/Tiles/steel_warning2.png
diff --git a/Resources/Textures/Constructible/Tiles/tech_maint.png b/Resources/Textures/Tiles/tech_maint.png
similarity index 100%
rename from Resources/Textures/Constructible/Tiles/tech_maint.png
rename to Resources/Textures/Tiles/tech_maint.png
diff --git a/Resources/Textures/Constructible/Tiles/underplating.png b/Resources/Textures/Tiles/underplating.png
similarity index 100%
rename from Resources/Textures/Constructible/Tiles/underplating.png
rename to Resources/Textures/Tiles/underplating.png
diff --git a/Resources/Textures/Constructible/Tiles/white.png b/Resources/Textures/Tiles/white.png
similarity index 100%
rename from Resources/Textures/Constructible/Tiles/white.png
rename to Resources/Textures/Tiles/white.png
diff --git a/Resources/Textures/Constructible/Tiles/white_warning1.png b/Resources/Textures/Tiles/white_warning1.png
similarity index 100%
rename from Resources/Textures/Constructible/Tiles/white_warning1.png
rename to Resources/Textures/Tiles/white_warning1.png
diff --git a/Resources/Textures/Constructible/Tiles/white_warning2.png b/Resources/Textures/Tiles/white_warning2.png
similarity index 100%
rename from Resources/Textures/Constructible/Tiles/white_warning2.png
rename to Resources/Textures/Tiles/white_warning2.png
diff --git a/Resources/Textures/Constructible/Tiles/wood.png b/Resources/Textures/Tiles/wood.png
similarity index 100%
rename from Resources/Textures/Constructible/Tiles/wood.png
rename to Resources/Textures/Tiles/wood.png
diff --git a/Resources/keybinds.yml b/Resources/keybinds.yml
index 7de1f3b1d0..6a91958376 100644
--- a/Resources/keybinds.yml
+++ b/Resources/keybinds.yml
@@ -63,16 +63,22 @@ binds:
   key: T
 - function: FocusLocalChatWindow
   type: State
-  key: LBracket
+  key: Period
 - function: FocusRadioWindow
   type: State
   key: SemiColon
 - function: FocusOOCWindow
   type: State
-  key: RBracket
+  key: LBracket
 - function: FocusAdminChatWindow
   type: State
-  key: BackSlash
+  key: RBracket
+- function: FocusDeadChatWindow
+  type: State
+  key: Backslash
+- function: FocusConsoleChatWindow
+  type: State
+  key: Slash
 - function: EditorLinePlace
   type: State
   key: MouseLeft
diff --git a/RobustToolbox b/RobustToolbox
index c06707d519..3a86c827ea 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit c06707d51911ebb1ed8005277d0f10e58bf49d6d
+Subproject commit 3a86c827ea02f46b213f473f6479fbfaed35095e
diff --git a/SpaceStation14.sln.DotSettings b/SpaceStation14.sln.DotSettings
index 4e62aebed4..5ff7f8d1e5 100644
--- a/SpaceStation14.sln.DotSettings
+++ b/SpaceStation14.sln.DotSettings
@@ -63,6 +63,7 @@
     <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UTF/@EntryIndexedValue">UTF</s:String>
     <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UV/@EntryIndexedValue">UV</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=VP/@EntryIndexedValue">VP</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=UI/@EntryIndexedValue">UI</s:String>
 	<s:Boolean x:Key="/Default/Environment/Filtering/ExcludeCoverageFilters/=Lidgren_002ENetwork_003B_002A_003B_002A_003B_002A/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EdotCover_002EIde_002ECore_002EFilterManagement_002EModel_002ESolutionFilterSettingsManagerMigrateSettings/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EFeature_002EServices_002EDaemon_002ESettings_002EMigration_002ESwaWarningsModeSettingsMigrate/@EntryIndexedValue">True</s:Boolean>
@@ -176,6 +177,7 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=adminbus/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=adminned/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Aghost/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Airblocked/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=akms/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Anchorable/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Antag/@EntryIndexedValue">True</s:Boolean>