diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index da9d4d693a..2b6d556117 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -55,3 +55,10 @@
 #Jezi
 /Content.*/Medical @Jezithyr
 /Content.*/Body @Jezithyr
+
+# Sloth
+/Content.*/Audio @metalgearsloth
+/Content.*/Movement @metalgearsloth
+/Content.*/NPC @metalgearsloth
+/Content.*/Shuttles @metalgearsloth
+/Content.*/Weapons @metalgearsloth
diff --git a/.github/workflows/labeler-untriaged.yml b/.github/workflows/labeler-untriaged.yml
index 630122aa08..775aab2654 100644
--- a/.github/workflows/labeler-untriaged.yml
+++ b/.github/workflows/labeler-untriaged.yml
@@ -9,5 +9,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions-ecosystem/action-add-labels@v1
+      if: join(github.event.issue.labels) == ''
       with:
         labels: "Status: Untriaged"
diff --git a/Content.Client/Administration/UI/AdminMenuWindow.xaml.cs b/Content.Client/Administration/UI/AdminMenuWindow.xaml.cs
index f3aa2572f2..d5c43e2a50 100644
--- a/Content.Client/Administration/UI/AdminMenuWindow.xaml.cs
+++ b/Content.Client/Administration/UI/AdminMenuWindow.xaml.cs
@@ -3,38 +3,57 @@ using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
 
-namespace Content.Client.Administration.UI
+namespace Content.Client.Administration.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class AdminMenuWindow : DefaultWindow
 {
-    [GenerateTypedNameReferences]
-    public sealed partial class AdminMenuWindow : DefaultWindow
+    public event Action? OnDisposed;
+
+    public AdminMenuWindow()
     {
-        public event Action? OnDisposed;
+        MinSize = new Vector2(650, 250);
+        Title = Loc.GetString("admin-menu-title");
+        RobustXamlLoader.Load(this);
+        MasterTabContainer.SetTabTitle((int) TabIndex.Admin, Loc.GetString("admin-menu-admin-tab"));
+        MasterTabContainer.SetTabTitle((int) TabIndex.Adminbus, Loc.GetString("admin-menu-adminbus-tab"));
+        MasterTabContainer.SetTabTitle((int) TabIndex.Atmos, Loc.GetString("admin-menu-atmos-tab"));
+        MasterTabContainer.SetTabTitle((int) TabIndex.Round, Loc.GetString("admin-menu-round-tab"));
+        MasterTabContainer.SetTabTitle((int) TabIndex.Server, Loc.GetString("admin-menu-server-tab"));
+        MasterTabContainer.SetTabTitle((int) TabIndex.PanicBunker, Loc.GetString("admin-menu-panic-bunker-tab"));
+        /*
+         * TODO: Remove baby jail code once a more mature gateway process is established. This code is only being issued as a stopgap to help with potential tiding in the immediate future.
+         */
+        MasterTabContainer.SetTabTitle((int) TabIndex.BabyJail, Loc.GetString("admin-menu-baby-jail-tab"));
+        MasterTabContainer.SetTabTitle((int) TabIndex.Players, Loc.GetString("admin-menu-players-tab"));
+        MasterTabContainer.SetTabTitle((int) TabIndex.Objects, Loc.GetString("admin-menu-objects-tab"));
+        MasterTabContainer.OnTabChanged += OnTabChanged;
+    }
 
-        public AdminMenuWindow()
-        {
-            MinSize = new Vector2(650, 250);
-            Title = Loc.GetString("admin-menu-title");
-            RobustXamlLoader.Load(this);
-            MasterTabContainer.SetTabTitle(0, Loc.GetString("admin-menu-admin-tab"));
-            MasterTabContainer.SetTabTitle(1, Loc.GetString("admin-menu-adminbus-tab"));
-            MasterTabContainer.SetTabTitle(2, Loc.GetString("admin-menu-atmos-tab"));
-            MasterTabContainer.SetTabTitle(3, Loc.GetString("admin-menu-round-tab"));
-            MasterTabContainer.SetTabTitle(4, Loc.GetString("admin-menu-server-tab"));
-            MasterTabContainer.SetTabTitle(5, Loc.GetString("admin-menu-panic-bunker-tab"));
-            /*
-             * TODO: Remove baby jail code once a more mature gateway process is established. This code is only being issued as a stopgap to help with potential tiding in the immediate future.
-             */
-            MasterTabContainer.SetTabTitle(6, Loc.GetString("admin-menu-baby-jail-tab"));
-            MasterTabContainer.SetTabTitle(7, Loc.GetString("admin-menu-players-tab"));
-            MasterTabContainer.SetTabTitle(8, Loc.GetString("admin-menu-objects-tab"));
-        }
+    private void OnTabChanged(int tabIndex)
+    {
+        var tabEnum = (TabIndex)tabIndex;
+        if (tabEnum == TabIndex.Objects)
+            ObjectsTabControl.RefreshObjectList();
+    }
 
-        protected override void Dispose(bool disposing)
-        {
-            OnDisposed?.Invoke();
-            base.Dispose(disposing);
-            OnDisposed = null;
-        }
+    protected override void Dispose(bool disposing)
+    {
+        OnDisposed?.Invoke();
+        base.Dispose(disposing);
+        OnDisposed = null;
+    }
+
+    private enum TabIndex
+    {
+        Admin = 0,
+        Adminbus,
+        Atmos,
+        Round,
+        Server,
+        PanicBunker,
+        BabyJail,
+        Players,
+        Objects,
     }
 }
-
diff --git a/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml b/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml
index 5d630425ab..ef679e778d 100644
--- a/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml
+++ b/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml
@@ -5,7 +5,7 @@
     <LineEdit Name="FilterLineEdit"
               MinSize="100 0"
               HorizontalExpand="True"
-              PlaceHolder="{Loc Filter}"/>
+              PlaceHolder="{Loc player-list-filter}"/>
     <PanelContainer Name="BackgroundPanel"
                     VerticalExpand="True"
                     HorizontalExpand="True">
diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/PlayerActionsWindow.xaml b/Content.Client/Administration/UI/Tabs/AdminTab/PlayerActionsWindow.xaml
index dcc1a05bb5..3df57de57b 100644
--- a/Content.Client/Administration/UI/Tabs/AdminTab/PlayerActionsWindow.xaml
+++ b/Content.Client/Administration/UI/Tabs/AdminTab/PlayerActionsWindow.xaml
@@ -4,7 +4,7 @@
     Title="{Loc admin-player-actions-window-title}" MinSize="425 272">
     <BoxContainer Orientation="Vertical">
         <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc Reason}" MinWidth="100" />
+            <Label Text="{Loc admin-player-actions-reason}" MinWidth="100" />
             <Control MinWidth="50" />
             <LineEdit Name="ReasonLine" MinWidth="100" HorizontalExpand="True" />
         </BoxContainer>
diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml b/Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml
index 8f27b17d2d..cceb21f14d 100644
--- a/Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml
+++ b/Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml
@@ -1,9 +1,9 @@
 <DefaultWindow
     xmlns="https://spacestation14.io"
     xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
-    Title="{Loc Teleport}" MinSize="425 230">
+    Title="{Loc admin-ui-teleport}" MinSize="425 230">
     <BoxContainer Orientation="Vertical">
         <cc:PlayerListControl Name="PlayerList" />
-        <Button Name="SubmitButton" Text="{Loc Teleport}" />
+        <Button Name="SubmitButton" Text="{Loc admin-ui-teleport}" />
     </BoxContainer>
 </DefaultWindow>
diff --git a/Content.Client/Administration/UI/Tabs/AdminbusTab/LoadBlueprintsWindow.xaml b/Content.Client/Administration/UI/Tabs/AdminbusTab/LoadBlueprintsWindow.xaml
index 6157a96f42..e06fc6e8ac 100644
--- a/Content.Client/Administration/UI/Tabs/AdminbusTab/LoadBlueprintsWindow.xaml
+++ b/Content.Client/Administration/UI/Tabs/AdminbusTab/LoadBlueprintsWindow.xaml
@@ -1,33 +1,33 @@
 <DefaultWindow
-    xmlns="https://spacestation14.io" Title="{Loc Load Blueprint}">
+    xmlns="https://spacestation14.io" Title="{Loc admin-ui-blueprint-load}">
     <BoxContainer Orientation="Vertical">
         <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc Map}" MinSize="100 0" />
+            <Label Text="{Loc admin-ui-blueprint-map}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <OptionButton Name="MapOptions" MinSize="100 0" HorizontalExpand="True" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc Path}" MinSize="100 0" />
+            <Label Text="{Loc admin-ui-blueprint-path}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <LineEdit Name="MapPath" MinSize="200 0" HorizontalExpand="True" Text="/Maps/" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc X}" MinSize="100 0" />
+            <Label Text="{Loc admin-ui-blueprint-x}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <SpinBox Name="XCoordinate" MinSize="100 0" HorizontalExpand="True" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc Y}" MinSize="100 0" />
+            <Label Text="{Loc admin-ui-blueprint-y}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <SpinBox Name="YCoordinate" MinSize="100 0" HorizontalExpand="True" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc Rotation}" MinSize="100 0" />
+            <Label Text="{Loc admin-ui-blueprint-rotation}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <SpinBox Name="RotationSpin" MinSize="100 0" HorizontalExpand="True" />
         </BoxContainer>
-        <Button Name="SubmitButton" Text="{Loc Load Blueprint}" />
-        <Button Name="TeleportButton" Text="{Loc Teleport to}" />
-        <Button Name="ResetButton" Text="{Loc Reset to default}"></Button>
+        <Button Name="SubmitButton" Text="{Loc admin-ui-blueprint-load}" />
+        <Button Name="TeleportButton" Text="{Loc admin-ui-blueprint-teleport}" />
+        <Button Name="ResetButton" Text="{Loc admin-ui-blueprint-reset}"></Button>
     </BoxContainer>
 </DefaultWindow>
diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml b/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml
index 4a1719cbf8..a7c4c35494 100644
--- a/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml
+++ b/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml
@@ -1,11 +1,11 @@
 <DefaultWindow
-    xmlns="https://spacestation14.io" Title="{Loc Add Atmos}">
+    xmlns="https://spacestation14.io" Title="{Loc admin-ui-atmos-add}">
     <BoxContainer Orientation="Vertical">
         <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc Grid}" MinSize="100 0" />
+            <Label Text="{Loc admin-ui-atmos-grid}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <OptionButton Name="GridOptions" MinSize="100 0" HorizontalExpand="True" />
         </BoxContainer>
-        <Button Name="SubmitButton" Text="{Loc Add Atmos}" />
+        <Button Name="SubmitButton" Text="{Loc admin-ui-atmos-add}" />
     </BoxContainer>
 </DefaultWindow>
diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml.cs
index 03fd52f446..72a594469d 100644
--- a/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml.cs
@@ -35,7 +35,7 @@ namespace Content.Client.Administration.UI.Tabs.AtmosTab
             while (query.MoveNext(out var uid, out var grid))
             {
                 _data.Add((uid, grid));
-                GridOptions.AddItem($"{uid} {(playerGrid == uid ? " (Current)" : "")}");
+                GridOptions.AddItem($"{uid} {(playerGrid == uid ? Loc.GetString($"admin-ui-atmos-grid-current") : "")}");
             }
 
             GridOptions.OnItemSelected += eventArgs => GridOptions.SelectId(eventArgs.Id);
diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml b/Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml
index df1c7aee65..6420396788 100644
--- a/Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml
+++ b/Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml
@@ -1,31 +1,31 @@
 <DefaultWindow
-    xmlns="https://spacestation14.io" Title="{Loc Add Gas}">
+    xmlns="https://spacestation14.io" Title="{Loc admin-ui-atmos-add-gas}">
     <BoxContainer Orientation="Vertical">
         <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc Grid}" MinSize="100 0" />
+            <Label Text="{Loc admin-ui-atmos-grid}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <OptionButton Name="GridOptions" MinSize="100 0" HorizontalExpand="True" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc TileX}" MinSize="100 0" />
+            <Label Text="{Loc admin-ui-atmos-tile-x}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <SpinBox Name="TileXSpin" MinSize="100 0" HorizontalExpand="True" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc TileY}" MinSize="100 0" />
+            <Label Text="{Loc admin-ui-atmos-tile-y}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <SpinBox Name="TileYSpin" MinSize="100 0" HorizontalExpand="True" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc Gas}" MinSize="100 0" />
+            <Label Text="{Loc admin-ui-atmos-gas}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <OptionButton Name="GasOptions" MinSize="100 0" HorizontalExpand="True" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc Amount}" MinSize="100 0" />
+            <Label Text="{Loc admin-ui-atmos-gas-amount}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <SpinBox Name="AmountSpin" MinSize="100 0" HorizontalExpand="True" />
         </BoxContainer>
-        <Button Name="SubmitButton" Text="{Loc Add Gas}" />
+        <Button Name="SubmitButton" Text="{Loc admin-ui-atmos-add-gas}" />
     </BoxContainer>
 </DefaultWindow>
diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml.cs
index c06d916133..c516acda2a 100644
--- a/Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml.cs
@@ -33,7 +33,7 @@ namespace Content.Client.Administration.UI.Tabs.AtmosTab
                 _gridData.Add(entManager.GetNetEntity(uid));
                 var player = playerManager.LocalEntity;
                 var playerGrid = entManager.GetComponentOrNull<TransformComponent>(player)?.GridUid;
-                GridOptions.AddItem($"{uid} {(playerGrid == uid ? " (Current)" : "")}");
+                GridOptions.AddItem($"{uid} {(playerGrid == uid ? Loc.GetString("admin-ui-atmos-grid-current") : "")}");
             }
 
             GridOptions.OnItemSelected += eventArgs => GridOptions.SelectId(eventArgs.Id);
diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/AtmosTab.xaml b/Content.Client/Administration/UI/Tabs/AtmosTab/AtmosTab.xaml
index 9916972ac1..8a80e74c1f 100644
--- a/Content.Client/Administration/UI/Tabs/AtmosTab/AtmosTab.xaml
+++ b/Content.Client/Administration/UI/Tabs/AtmosTab/AtmosTab.xaml
@@ -6,10 +6,10 @@
     Margin="4"
     MinSize="50 50">
     <GridContainer Columns="4">
-        <cc:UICommandButton Text="{Loc Add Atmos}" Command="addatmos" WindowType="{x:Type at:AddAtmosWindow}" />
-        <cc:UICommandButton Text="{Loc Add Gas}" Command="addgas" WindowType="{x:Type at:AddGasWindow}" />
-        <cc:UICommandButton Text="{Loc Fill Gas}" Command="fillgas" WindowType="{x:Type at:FillGasWindow}" />
-        <cc:UICommandButton Text="{Loc Set Temperature}" Command="settemp"
+        <cc:UICommandButton Text="{Loc admin-ui-atmos-add}" Command="addatmos" WindowType="{x:Type at:AddAtmosWindow}" />
+        <cc:UICommandButton Text="{Loc admin-ui-atmos-add-gas}" Command="addgas" WindowType="{x:Type at:AddGasWindow}" />
+        <cc:UICommandButton Text="{Loc admin-ui-atmos-fill-gas}" Command="fillgas" WindowType="{x:Type at:FillGasWindow}" />
+        <cc:UICommandButton Text="{Loc admin-ui-atmos-set-temperature}" Command="settemp"
                              WindowType="{x:Type at:SetTemperatureWindow}" />
     </GridContainer>
 </Control>
diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml b/Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml
index 242fcf2b82..f2dba57bff 100644
--- a/Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml
+++ b/Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml
@@ -1,21 +1,21 @@
 <DefaultWindow
-    xmlns="https://spacestation14.io" Title="{Loc Fill Gas}">
+    xmlns="https://spacestation14.io" Title="{Loc admin-ui-atmos-fill-gas}">
     <BoxContainer Orientation="Vertical">
         <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc Grid}" MinSize="100 0" />
+            <Label Text="{Loc admin-ui-atmos-grid}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <OptionButton Name="GridOptions" MinSize="100 0" HorizontalExpand="True" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc Gas}" MinSize="100 0" />
+            <Label Text="{Loc admin-ui-atmos-gas}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <OptionButton Name="GasOptions" MinSize="100 0" HorizontalExpand="True" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc Amount}" MinSize="100 0" />
+            <Label Text="{Loc admin-ui-atmos-gas-amount}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <SpinBox Name="AmountSpin" MinSize="100 0" HorizontalExpand="True" />
         </BoxContainer>
-        <Button Name="SubmitButton" Text="{Loc Fill Gas}" />
+        <Button Name="SubmitButton" Text="{Loc admin-ui-atmos-fill-gas}" />
     </BoxContainer>
 </DefaultWindow>
diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml.cs
index 3353d0873e..302ca8f21f 100644
--- a/Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml.cs
@@ -36,7 +36,7 @@ namespace Content.Client.Administration.UI.Tabs.AtmosTab
             {
                 var player = playerManager.LocalEntity;
                 var playerGrid = entManager.GetComponentOrNull<TransformComponent>(player)?.GridUid;
-                GridOptions.AddItem($"{uid} {(playerGrid == uid ? " (Current)" : "")}");
+                GridOptions.AddItem($"{uid} {(playerGrid == uid ? Loc.GetString($"admin-ui-atmos-grid-current") : "")}");
                 _gridData.Add(entManager.GetNetEntity(uid));
             }
 
diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/SetTemperatureWindow.xaml b/Content.Client/Administration/UI/Tabs/AtmosTab/SetTemperatureWindow.xaml
index dbc6577201..4102912d69 100644
--- a/Content.Client/Administration/UI/Tabs/AtmosTab/SetTemperatureWindow.xaml
+++ b/Content.Client/Administration/UI/Tabs/AtmosTab/SetTemperatureWindow.xaml
@@ -1,26 +1,26 @@
 <DefaultWindow
-    xmlns="https://spacestation14.io" Title="{Loc Set Temperature}">
+    xmlns="https://spacestation14.io" Title="{Loc admin-ui-atmos-set-temperature}">
     <BoxContainer Orientation="Vertical">
         <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc Grid}" MinSize="100 0" />
+            <Label Text="{Loc admin-ui-atmos-grid}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <OptionButton Name="GridOptions" MinSize="100 0" HorizontalExpand="True" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc TileX}" MinSize="100 0" />
+            <Label Text="{Loc admin-ui-atmos-tile-x}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <SpinBox Name="TileXSpin" MinSize="100 0" HorizontalExpand="True" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc TileY}" MinSize="100 0" />
+            <Label Text="{Loc admin-ui-atmos-tile-y}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <SpinBox Name="TileYSpin" MinSize="100 0" HorizontalExpand="True" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc Temperature}" MinSize="100 0" />
+            <Label Text="{Loc admin-ui-atmos-temperature}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <SpinBox Name="TemperatureSpin" MinSize="100 0" HorizontalExpand="True" />
         </BoxContainer>
-        <Button Name="SubmitButton" Text="{Loc Set Temperature}" />
+        <Button Name="SubmitButton" Text="{Loc admin-ui-atmos-set-temperature}" />
     </BoxContainer>
 </DefaultWindow>
diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/SetTemperatureWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AtmosTab/SetTemperatureWindow.xaml.cs
index 1183efb9b5..b3c4a83ed4 100644
--- a/Content.Client/Administration/UI/Tabs/AtmosTab/SetTemperatureWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/AtmosTab/SetTemperatureWindow.xaml.cs
@@ -32,7 +32,7 @@ namespace Content.Client.Administration.UI.Tabs.AtmosTab
             {
                 var player = playerManager.LocalEntity;
                 var playerGrid = entManager.GetComponentOrNull<TransformComponent>(player)?.GridUid;
-                GridOptions.AddItem($"{uid} {(playerGrid == uid ? " (Current)" : "")}");
+                GridOptions.AddItem($"{uid} {(playerGrid == uid ? Loc.GetString($"admin-ui-atmos-grid-current") : "")}");
                 _data.Add(entManager.GetNetEntity(uid));
             }
 
diff --git a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml
index ea89916ba8..f4298bbc00 100644
--- a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml
+++ b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml
@@ -4,18 +4,17 @@
          xmlns:co="clr-namespace:Content.Client.UserInterface.Controls">
     <BoxContainer Orientation="Vertical">
         <BoxContainer Orientation="Horizontal">
-            <Label HorizontalExpand="True" SizeFlagsStretchRatio="0.50"
-                   Text="{Loc Object type:}" />
-            <LineEdit Name="SearchLineEdit" PlaceHolder="{Loc Search...}" HorizontalExpand="True" SizeFlagsStretchRatio="1"/>
-            <OptionButton Name="ObjectTypeOptions" HorizontalExpand="True" SizeFlagsStretchRatio="0.25"/>
+            <Label Text="{Loc object-tab-object-type}" />
+            <OptionButton Name="ObjectTypeOptions" HorizontalAlignment="Left" />
+            <LineEdit Name="SearchLineEdit" PlaceHolder="{Loc object-tab-object-search}" HorizontalExpand="True"
+                      SizeFlagsStretchRatio="1" />
+            <Button Name="RefreshListButton" Text="{Loc object-tab-refresh-button}" ToggleMode="False" />
         </BoxContainer>
-        <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
-        </BoxContainer>
-        <cc:HSeparator/>
+        <cc:HSeparator />
         <BoxContainer Orientation="Vertical" HorizontalExpand="True" VerticalExpand="True">
-            <ot:ObjectsTabHeader Name="ListHeader"/>
-            <cc:HSeparator/>
-            <co:SearchListContainer Name="SearchList" Access="Public" VerticalExpand="True"/>
+            <ot:ObjectsTabHeader Name="ListHeader" />
+            <cc:HSeparator />
+            <co:SearchListContainer Name="SearchList" Access="Public" VerticalExpand="True" />
         </BoxContainer>
     </BoxContainer>
 </Control>
diff --git a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
index c8606ca80d..78eefa3462 100644
--- a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
@@ -3,6 +3,7 @@ using Content.Client.UserInterface.Controls;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Timing;
@@ -15,17 +16,14 @@ public sealed partial class ObjectsTab : Control
     [Dependency] private readonly IEntityManager _entityManager = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
 
-    private readonly List<ObjectsTabEntry> _objects = new();
-    private readonly List<ObjectsTabSelection> _selections = new();
-    private bool _ascending = false;  // Set to false for descending order by default
-    private ObjectsTabHeader.Header _headerClicked = ObjectsTabHeader.Header.ObjectName;
     private readonly Color _altColor = Color.FromHex("#292B38");
     private readonly Color _defaultColor = Color.FromHex("#2F2F3B");
 
-    public event Action<GUIBoundKeyEventArgs, ListData>? OnEntryKeyBindDown;
+    private bool _ascending;
+    private ObjectsTabHeader.Header _headerClicked = ObjectsTabHeader.Header.ObjectName;
 
-    private readonly TimeSpan _updateFrequency = TimeSpan.FromSeconds(2);
-    private TimeSpan _nextUpdate;
+    private readonly List<ObjectsTabSelection> _selections = [];
+    public event Action<GUIBoundKeyEventArgs, ListData>? OnEntryKeyBindDown;
 
     public ObjectsTab()
     {
@@ -38,40 +36,25 @@ public sealed partial class ObjectsTab : Control
             RefreshObjectList(_selections[ev.Id]);
         };
 
-        foreach (var type in Enum.GetValues(typeof(ObjectsTabSelection)))
+        foreach (var type in Enum.GetValues<ObjectsTabSelection>())
         {
-            _selections.Add((ObjectsTabSelection)type!);
-            ObjectTypeOptions.AddItem(Enum.GetName((ObjectsTabSelection)type)!);
+            _selections.Add(type);
+            ObjectTypeOptions.AddItem(GetLocalizedEnumValue(type));
         }
 
         ListHeader.OnHeaderClicked += HeaderClicked;
         SearchList.SearchBar = SearchLineEdit;
         SearchList.GenerateItem += GenerateButton;
         SearchList.DataFilterCondition += DataFilterCondition;
+        SearchList.ItemKeyBindDown += (args, data) => OnEntryKeyBindDown?.Invoke(args, data);
+        RefreshListButton.OnPressed += _ => RefreshObjectList();
 
-        RefreshObjectList();
-        // Set initial selection and refresh the list to apply the initial sort order
         var defaultSelection = ObjectsTabSelection.Grids;
-        ObjectTypeOptions.SelectId((int)defaultSelection); // Set the default selection
-        RefreshObjectList(defaultSelection); // Refresh the list with the default selection
-
-        // Initialize the next update time
-        _nextUpdate = TimeSpan.Zero;
+        ObjectTypeOptions.SelectId((int) defaultSelection);
+        RefreshObjectList(defaultSelection);
     }
 
-    protected override void FrameUpdate(FrameEventArgs args)
-    {
-        base.FrameUpdate(args);
-
-        if (_timing.CurTime < _nextUpdate)
-            return;
-
-        _nextUpdate = _timing.CurTime + _updateFrequency;
-
-        RefreshObjectList();
-    }
-
-    private void RefreshObjectList()
+    public void RefreshObjectList()
     {
         RefreshObjectList(_selections[ObjectTypeOptions.SelectedId]);
     }
@@ -101,6 +84,7 @@ public sealed partial class ObjectsTab : Control
                 {
                     entities.Add((metadata.EntityName, _entityManager.GetNetEntity(uid)));
                 }
+
                 break;
             }
             default:
@@ -111,14 +95,18 @@ public sealed partial class ObjectsTab : Control
         {
             var valueA = GetComparableValue(a, _headerClicked);
             var valueB = GetComparableValue(b, _headerClicked);
-            return _ascending ? Comparer<object>.Default.Compare(valueA, valueB) : Comparer<object>.Default.Compare(valueB, valueA);
+            return _ascending
+                ? Comparer<object>.Default.Compare(valueA, valueB)
+                : Comparer<object>.Default.Compare(valueB, valueA);
         });
 
         var listData = new List<ObjectsListData>();
-        for (int index = 0; index < entities.Count; index++)
+        for (var index = 0; index < entities.Count; index++)
         {
             var info = entities[index];
-            listData.Add(new ObjectsListData(info, $"{info.Name} {info.Entity}", index % 2 == 0 ? _altColor : _defaultColor));
+            listData.Add(new ObjectsListData(info,
+                $"{info.Name} {info.Entity}",
+                index % 2 == 0 ? _altColor : _defaultColor));
         }
 
         SearchList.PopulateList(listData);
@@ -129,10 +117,11 @@ public sealed partial class ObjectsTab : Control
         if (data is not ObjectsListData { Info: var info, BackgroundColor: var backgroundColor })
             return;
 
-        var entry = new ObjectsTabEntry(info.Name, info.Entity, new StyleBoxFlat { BackgroundColor = backgroundColor });
+        var entry = new ObjectsTabEntry(info.Name,
+            info.Entity,
+            new StyleBoxFlat { BackgroundColor = backgroundColor });
         button.ToolTip = $"{info.Name}, {info.Entity}";
 
-        button.OnKeyBindDown += args => OnEntryKeyBindDown?.Invoke(args, data);
         button.AddChild(entry);
     }
 
@@ -154,7 +143,7 @@ public sealed partial class ObjectsTab : Control
         {
             ObjectsTabHeader.Header.ObjectName => entity.Name,
             ObjectsTabHeader.Header.EntityID => entity.Entity.ToString(),
-            _ => entity.Name
+            _ => entity.Name,
         };
     }
 
@@ -174,6 +163,17 @@ public sealed partial class ObjectsTab : Control
         RefreshObjectList();
     }
 
+    private string GetLocalizedEnumValue(ObjectsTabSelection selection)
+    {
+        return selection switch
+        {
+            ObjectsTabSelection.Grids => Loc.GetString("object-tab-object-type-grids"),
+            ObjectsTabSelection.Maps => Loc.GetString("object-tab-object-type-maps"),
+            ObjectsTabSelection.Stations => Loc.GetString("object-tab-object-type-stations"),
+            _ => throw new ArgumentOutOfRangeException(nameof(selection), selection, null),
+        };
+    }
+
     private enum ObjectsTabSelection
     {
         Grids,
@@ -182,4 +182,5 @@ public sealed partial class ObjectsTab : Control
     }
 }
 
-public record ObjectsListData((string Name, NetEntity Entity) Info, string FilteringString, Color BackgroundColor) : ListData;
+public record ObjectsListData((string Name, NetEntity Entity) Info, string FilteringString, Color BackgroundColor)
+    : ListData;
diff --git a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml
index 25a96df1d3..e0723d4bdc 100644
--- a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml
+++ b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml
@@ -4,7 +4,7 @@
          xmlns:co="clr-namespace:Content.Client.UserInterface.Controls">
     <BoxContainer Orientation="Vertical">
         <BoxContainer Orientation="Horizontal">
-            <Label Name="PlayerCount" HorizontalExpand="True" Text="{Loc Player Count}" />
+            <Label Name="PlayerCount" HorizontalExpand="True" Text="{Loc player-tab-player-count}" />
             <LineEdit Name="SearchLineEdit" HorizontalExpand="True"
                       PlaceHolder="{Loc player-tab-filter-line-edit-placeholder}" />
             <Button Name="ShowDisconnectedButton" HorizontalExpand="True"
diff --git a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
index 826945e7cc..2187c40ce9 100644
--- a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
@@ -109,7 +109,7 @@ namespace Content.Client.Administration.UI.Tabs.PlayerTab
         private void RefreshPlayerList(IReadOnlyList<PlayerInfo> players)
         {
             _players = players;
-            PlayerCount.Text = $"Players: {_playerMan.PlayerCount}";
+            PlayerCount.Text = Loc.GetString("player-tab-player-count", ("count", _playerMan.PlayerCount));
 
             var filteredPlayers = players.Where(info => _showDisconnected || info.Connected).ToList();
 
diff --git a/Content.Client/Administration/UI/Tabs/RoundTab.xaml b/Content.Client/Administration/UI/Tabs/RoundTab.xaml
index 439441b133..2c8a400ecd 100644
--- a/Content.Client/Administration/UI/Tabs/RoundTab.xaml
+++ b/Content.Client/Administration/UI/Tabs/RoundTab.xaml
@@ -5,9 +5,9 @@
     MinSize="50 50">
     <GridContainer
         Columns="3">
-        <cc:CommandButton Command="startround" Text="{Loc Start Round}" />
-        <cc:CommandButton Command="endround" Text="{Loc End Round}" />
-        <cc:CommandButton Command="restartround" Text="{Loc Restart Round}" />
+        <cc:CommandButton Command="startround" Text="{Loc administration-ui-round-tab-start-round}" />
+        <cc:CommandButton Command="endround" Text="{Loc administration-ui-round-tab-end-round}" />
+        <cc:CommandButton Command="restartround" Text="{Loc administration-ui-round-tab-restart-round}" />
         <cc:CommandButton Command="restartroundnow" Text="{Loc administration-ui-round-tab-restart-round-now}" />
     </GridContainer>
 </Control>
diff --git a/Content.Client/CharacterAppearance/MagicMirrorBoundUserInterface.cs b/Content.Client/CharacterAppearance/MagicMirrorBoundUserInterface.cs
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/Content.Client/Chat/TypingIndicator/TypingIndicatorSystem.cs b/Content.Client/Chat/TypingIndicator/TypingIndicatorSystem.cs
index 844f793fc4..33dbc06ad8 100644
--- a/Content.Client/Chat/TypingIndicator/TypingIndicatorSystem.cs
+++ b/Content.Client/Chat/TypingIndicator/TypingIndicatorSystem.cs
@@ -65,14 +65,13 @@ public sealed class TypingIndicatorSystem : SharedTypingIndicatorSystem
     {
         if (_isClientTyping == isClientTyping)
             return;
-        _isClientTyping = isClientTyping;
 
-        // check if player controls any pawn
+        // check if player controls any entity.
         if (_playerManager.LocalEntity == null)
             return;
 
-        // send a networked event to server
-        RaiseNetworkEvent(new TypingChangedEvent(isClientTyping));
+        _isClientTyping = isClientTyping;
+        RaisePredictiveEvent(new TypingChangedEvent(isClientTyping));
     }
 
     private void OnShowTypingChanged(bool showTyping)
diff --git a/Content.Client/Clothing/UI/ChameleonMenu.xaml.cs b/Content.Client/Clothing/UI/ChameleonMenu.xaml.cs
index 131ee3b1e9..bd45be4510 100644
--- a/Content.Client/Clothing/UI/ChameleonMenu.xaml.cs
+++ b/Content.Client/Clothing/UI/ChameleonMenu.xaml.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using System.Numerics;
 using Content.Client.Clothing.Systems;
 using Content.Client.Stylesheets;
@@ -74,13 +74,9 @@ public sealed partial class ChameleonMenu : DefaultWindow
             };
             button.OnPressed += _ => OnIdSelected?.Invoke(id);
             Grid.AddChild(button);
-
-            var texture = _sprite.GetPrototypeIcon(proto);
-            button.AddChild(new TextureRect
-            {
-                Stretch = TextureRect.StretchMode.KeepAspectCentered,
-                Texture = texture.Default
-            });
+            var entityPrototypeView = new EntityPrototypeView();
+            button.AddChild(entityPrototypeView);
+            entityPrototypeView.SetPrototype(proto);
         }
     }
 
diff --git a/Content.Client/Construction/UI/ConstructionMenu.xaml b/Content.Client/Construction/UI/ConstructionMenu.xaml
index dd210d9729..6e4438cf6f 100644
--- a/Content.Client/Construction/UI/ConstructionMenu.xaml
+++ b/Content.Client/Construction/UI/ConstructionMenu.xaml
@@ -1,29 +1,33 @@
 <DefaultWindow xmlns="https://spacestation14.io">
     <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
-        <BoxContainer Orientation="Vertical" HorizontalExpand="True" SizeFlagsStretchRatio="0.4">
-            <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
+        <BoxContainer Orientation="Vertical" HorizontalExpand="True" SizeFlagsStretchRatio="0.4" Margin="0 0 5 0">
+            <BoxContainer Orientation="Horizontal" HorizontalExpand="True" Margin="0 0 0 5">
                 <LineEdit Name="SearchBar" PlaceHolder="Search" HorizontalExpand="True"/>
-                <OptionButton Name="Category" Access="Public" MinSize="130 0"/>
+                <OptionButton Name="OptionCategories" Access="Public" MinSize="130 0"/>
             </BoxContainer>
             <ItemList Name="Recipes" Access="Public" SelectMode="Single" VerticalExpand="True"/>
         </BoxContainer>
-        <Control MinSize="10 0"/>
         <BoxContainer Orientation="Vertical" HorizontalExpand="True" SizeFlagsStretchRatio="0.6">
+            <Button Name="FavoriteButton" Visible="false" HorizontalExpand="False"
+                HorizontalAlignment="Right" Margin="0 0 0 15"/>
             <Control>
-                <BoxContainer Orientation="Horizontal" Align="Center">
-                    <TextureRect Name="TargetTexture" HorizontalAlignment="Right" Stretch="Keep"/>
-                    <Control MinSize="10 0"/>
-                    <BoxContainer Orientation="Vertical">
-                        <RichTextLabel Name="TargetName"/>
-                        <RichTextLabel Name="TargetDesc"/>
+                <BoxContainer Orientation="Vertical" HorizontalExpand="True" Margin="0 0 0 5">
+                    <BoxContainer Orientation="Horizontal" Align="Center">
+                        <TextureRect Name="TargetTexture" HorizontalAlignment="Right" Stretch="Keep" Margin="0 0 10 0"/>
+                        <BoxContainer Orientation="Vertical">
+                            <RichTextLabel Name="TargetName"/>
+                            <RichTextLabel Name="TargetDesc"/>
+                        </BoxContainer>
                     </BoxContainer>
                 </BoxContainer>
             </Control>
-            <ItemList Name="RecipeStepList" Access="Public" VerticalExpand="True"/>
+            <ItemList Name="RecipeStepList" Access="Public" VerticalExpand="True" Margin="0 0 0 5"/>
             <BoxContainer Orientation="Vertical">
-                <Button Name="BuildButton" Disabled="True" ToggleMode="True" VerticalExpand="True" SizeFlagsStretchRatio="0.5"/>
+                <Button Name="BuildButton" Disabled="True" ToggleMode="True"
+                        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="EraseButton" ToggleMode="True"
+                        HorizontalExpand="True" SizeFlagsStretchRatio="0.7"/>
                     <Button Name="ClearButton" HorizontalExpand="True" SizeFlagsStretchRatio="0.3"/>
                 </BoxContainer>
             </BoxContainer>
diff --git a/Content.Client/Construction/UI/ConstructionMenu.xaml.cs b/Content.Client/Construction/UI/ConstructionMenu.xaml.cs
index 8fce1dbbda..f0cb814876 100644
--- a/Content.Client/Construction/UI/ConstructionMenu.xaml.cs
+++ b/Content.Client/Construction/UI/ConstructionMenu.xaml.cs
@@ -22,7 +22,7 @@ namespace Content.Client.Construction.UI
         // It isn't optimal to expose UI controls like this, but the UI control design is
         // questionable so it can't be helped.
         string[] Categories { get; set; }
-        OptionButton Category { get; }
+        OptionButton OptionCategories { get; }
 
         bool EraseButtonPressed { get; set; }
         bool BuildButtonPressed { get; set; }
@@ -32,12 +32,13 @@ namespace Content.Client.Construction.UI
 
         event EventHandler<(string search, string catagory)> PopulateRecipes;
         event EventHandler<ItemList.Item?> RecipeSelected;
+        event EventHandler RecipeFavorited;
         event EventHandler<bool> BuildButtonToggled;
         event EventHandler<bool> EraseButtonToggled;
         event EventHandler ClearAllGhosts;
 
         void ClearRecipeInfo();
-        void SetRecipeInfo(string name, string description, Texture iconTexture, bool isItem);
+        void SetRecipeInfo(string name, string description, Texture iconTexture, bool isItem, bool isFavorite);
         void ResetPlacement();
 
         #region Window Control
@@ -84,10 +85,12 @@ namespace Content.Client.Construction.UI
             Recipes.OnItemSelected += obj => RecipeSelected?.Invoke(this, obj.ItemList[obj.ItemIndex]);
             Recipes.OnItemDeselected += _ => RecipeSelected?.Invoke(this, null);
 
-            SearchBar.OnTextChanged += _ => PopulateRecipes?.Invoke(this, (SearchBar.Text, Categories[Category.SelectedId]));
-            Category.OnItemSelected += obj =>
+            SearchBar.OnTextChanged += _ =>
+                PopulateRecipes?.Invoke(this, (SearchBar.Text, Categories[OptionCategories.SelectedId]));
+            OptionCategories.OnItemSelected += obj =>
             {
-                Category.SelectId(obj.Id);
+                OptionCategories.SelectId(obj.Id);
+                SearchBar.SetText(string.Empty);
                 PopulateRecipes?.Invoke(this, (SearchBar.Text, Categories[obj.Id]));
             };
 
@@ -97,12 +100,14 @@ namespace Content.Client.Construction.UI
             ClearButton.OnPressed += _ => ClearAllGhosts?.Invoke(this, EventArgs.Empty);
             EraseButton.Text = Loc.GetString("construction-menu-eraser-mode");
             EraseButton.OnToggled += args => EraseButtonToggled?.Invoke(this, args.Pressed);
+
+            FavoriteButton.OnPressed += args => RecipeFavorited?.Invoke(this, EventArgs.Empty);
         }
 
         public event EventHandler? ClearAllGhosts;
-
         public event EventHandler<(string search, string catagory)>? PopulateRecipes;
         public event EventHandler<ItemList.Item?>? RecipeSelected;
+        public event EventHandler? RecipeFavorited;
         public event EventHandler<bool>? BuildButtonToggled;
         public event EventHandler<bool>? EraseButtonToggled;
 
@@ -112,13 +117,17 @@ namespace Content.Client.Construction.UI
             EraseButton.Pressed = false;
         }
 
-        public void SetRecipeInfo(string name, string description, Texture iconTexture, bool isItem)
+        public void SetRecipeInfo(
+            string name, string description, Texture iconTexture, bool isItem, bool isFavorite)
         {
             BuildButton.Disabled = false;
             BuildButton.Text = Loc.GetString(isItem ? "construction-menu-place-ghost" : "construction-menu-craft");
             TargetName.SetMessage(name);
             TargetDesc.SetMessage(description);
             TargetTexture.Texture = iconTexture;
+            FavoriteButton.Visible = true;
+            FavoriteButton.Text = Loc.GetString(
+                            isFavorite ? "construction-add-favorite-button" : "construction-remove-from-favorite-button");
         }
 
         public void ClearRecipeInfo()
@@ -127,6 +136,7 @@ namespace Content.Client.Construction.UI
             TargetName.SetMessage(string.Empty);
             TargetDesc.SetMessage(string.Empty);
             TargetTexture.Texture = null;
+            FavoriteButton.Visible = false;
             RecipeStepList.Clear();
         }
     }
diff --git a/Content.Client/Construction/UI/ConstructionMenuPresenter.cs b/Content.Client/Construction/UI/ConstructionMenuPresenter.cs
index 3e22186c16..42d63f97a9 100644
--- a/Content.Client/Construction/UI/ConstructionMenuPresenter.cs
+++ b/Content.Client/Construction/UI/ConstructionMenuPresenter.cs
@@ -36,7 +36,10 @@ namespace Content.Client.Construction.UI
 
         private ConstructionSystem? _constructionSystem;
         private ConstructionPrototype? _selected;
-
+        private List<ConstructionPrototype> _favoritedRecipes = [];
+        private string _selectedCategory = string.Empty;
+        private string _favoriteCatName = "construction-category-favorites";
+        private string _forAllCategoryName = "construction-category-all";
         private bool CraftingAvailable
         {
             get => _uiManager.GetActiveUIWidget<GameTopMenuBar>().CraftingButton.Visible;
@@ -65,7 +68,7 @@ namespace Content.Client.Construction.UI
                     else
                         _constructionView.OpenCentered();
 
-                    if(_selected != null)
+                    if (_selected != null)
                         PopulateInfo(_selected);
                 }
                 else
@@ -105,9 +108,10 @@ namespace Content.Client.Construction.UI
                 _constructionView.EraseButtonPressed = b;
             };
 
+            _constructionView.RecipeFavorited += (_, _) => OnViewFavoriteRecipe();
+
             PopulateCategories();
             OnViewPopulateRecipes(_constructionView, (string.Empty, string.Empty));
-
         }
 
         public void OnHudCraftingButtonToggled(ButtonToggledEventArgs args)
@@ -154,6 +158,13 @@ namespace Content.Client.Construction.UI
             recipesList.Clear();
             var recipes = new List<ConstructionPrototype>();
 
+            var isEmptyCategory = string.IsNullOrEmpty(category) || category == _forAllCategoryName;
+
+            if (isEmptyCategory)
+                _selectedCategory = string.Empty;
+            else
+                _selectedCategory = category;
+
             foreach (var recipe in _prototypeManager.EnumeratePrototypes<ConstructionPrototype>())
             {
                 if (recipe.Hide)
@@ -173,10 +184,19 @@ namespace Content.Client.Construction.UI
                         continue;
                 }
 
-                if (!string.IsNullOrEmpty(category) && category != "construction-category-all")
+                if (!isEmptyCategory)
                 {
-                    if (recipe.Category != category)
+                    if (category == _favoriteCatName)
+                    {
+                        if (!_favoritedRecipes.Contains(recipe))
+                        {
+                            continue;
+                        }
+                    }
+                    else if (recipe.Category != category)
+                    {
                         continue;
+                    }
                 }
 
                 recipes.Add(recipe);
@@ -192,13 +212,10 @@ namespace Content.Client.Construction.UI
             // There is apparently no way to set which
         }
 
-        private void PopulateCategories()
+        private void PopulateCategories(string? selectCategory = null)
         {
             var uniqueCategories = new HashSet<string>();
 
-            // hard-coded to show all recipes
-            uniqueCategories.Add("construction-category-all");
-
             foreach (var prototype in _prototypeManager.EnumeratePrototypes<ConstructionPrototype>())
             {
                 var category = prototype.Category;
@@ -207,25 +224,49 @@ namespace Content.Client.Construction.UI
                     uniqueCategories.Add(category);
             }
 
-            _constructionView.Category.Clear();
+            var isFavorites = _favoritedRecipes.Count > 0;
+            var categoriesArray = new string[isFavorites ? uniqueCategories.Count + 2 : uniqueCategories.Count + 1];
 
-            var array = uniqueCategories.OrderBy(Loc.GetString).ToArray();
-            Array.Sort(array);
+            // hard-coded to show all recipes
+            var idx = 0;
+            categoriesArray[idx++] = _forAllCategoryName;
 
-            for (var i = 0; i < array.Length; i++)
+            // hard-coded to show favorites if it need
+            if (isFavorites)
             {
-                var category = array[i];
-                _constructionView.Category.AddItem(Loc.GetString(category), i);
+                categoriesArray[idx++] = _favoriteCatName;
             }
 
-            _constructionView.Categories = array;
+            var sortedProtoCategories = uniqueCategories.OrderBy(Loc.GetString);
+
+            foreach (var cat in sortedProtoCategories)
+            {
+                categoriesArray[idx++] = cat;
+            }
+
+            _constructionView.OptionCategories.Clear();
+
+            for (var i = 0; i < categoriesArray.Length; i++)
+            {
+                _constructionView.OptionCategories.AddItem(Loc.GetString(categoriesArray[i]), i);
+
+                if (!string.IsNullOrEmpty(selectCategory) && selectCategory == categoriesArray[i])
+                    _constructionView.OptionCategories.SelectId(i);
+
+            }
+
+            _constructionView.Categories = categoriesArray;
         }
 
         private void PopulateInfo(ConstructionPrototype prototype)
         {
             var spriteSys = _systemManager.GetEntitySystem<SpriteSystem>();
             _constructionView.ClearRecipeInfo();
-            _constructionView.SetRecipeInfo(prototype.Name, prototype.Description, spriteSys.Frame0(prototype.Icon), prototype.Type != ConstructionType.Item);
+
+            _constructionView.SetRecipeInfo(
+                prototype.Name, prototype.Description, spriteSys.Frame0(prototype.Icon),
+                prototype.Type != ConstructionType.Item,
+                !_favoritedRecipes.Contains(prototype));
 
             var stepList = _constructionView.RecipeStepList;
             GenerateStepList(prototype, stepList);
@@ -243,7 +284,7 @@ namespace Content.Client.Construction.UI
                 var text = entry.Arguments != null
                     ? Loc.GetString(entry.Localization, entry.Arguments) : Loc.GetString(entry.Localization);
 
-                if (entry.EntryNumber is {} number)
+                if (entry.EntryNumber is { } number)
                 {
                     text = Loc.GetString("construction-presenter-step-wrapper",
                         ("step-number", number), ("text", text));
@@ -335,6 +376,26 @@ namespace Content.Client.Construction.UI
             if (args.System is ConstructionSystem) SystemBindingChanged(null);
         }
 
+        private void OnViewFavoriteRecipe()
+        {
+            if (_selected is not ConstructionPrototype recipe)
+                return;
+
+            if (!_favoritedRecipes.Remove(_selected))
+                _favoritedRecipes.Add(_selected);
+
+            if (_selectedCategory == _favoriteCatName)
+            {
+                if (_favoritedRecipes.Count > 0)
+                    OnViewPopulateRecipes(_constructionView, (string.Empty, _favoriteCatName));
+                else
+                    OnViewPopulateRecipes(_constructionView, (string.Empty, string.Empty));
+            }
+
+            PopulateInfo(_selected);
+            PopulateCategories(_selectedCategory);
+        }
+
         private void SystemBindingChanged(ConstructionSystem? newSystem)
         {
             if (newSystem is null)
diff --git a/Content.Client/DebugMon/DebugMonitorSystem.cs b/Content.Client/DebugMon/DebugMonitorManager.cs
similarity index 51%
rename from Content.Client/DebugMon/DebugMonitorSystem.cs
rename to Content.Client/DebugMon/DebugMonitorManager.cs
index fb5cd4f51a..7e1dca0d6f 100644
--- a/Content.Client/DebugMon/DebugMonitorSystem.cs
+++ b/Content.Client/DebugMon/DebugMonitorManager.cs
@@ -1,23 +1,28 @@
-using Content.Client.Administration.Managers;
+using Content.Client.Administration.Managers;
 using Content.Shared.CCVar;
+using Robust.Client;
 using Robust.Client.UserInterface;
 using Robust.Shared.Configuration;
 
-
 namespace Content.Client.DebugMon;
 
 /// <summary>
-/// This handles preventing certain debug monitors from appearing.
+/// This handles preventing certain debug monitors from being usable by non-admins.
 /// </summary>
-public sealed class DebugMonitorSystem : EntitySystem
+internal sealed class DebugMonitorManager
 {
     [Dependency] private readonly IConfigurationManager _cfg = default!;
     [Dependency] private readonly IClientAdminManager _admin = default!;
     [Dependency] private readonly IUserInterfaceManager _userInterface = default!;
+    [Dependency] private readonly IBaseClient _baseClient = default!;
 
-    public override void FrameUpdate(float frameTime)
+    public void FrameUpdate()
     {
-        if (!_admin.IsActive() && _cfg.GetCVar(CCVars.DebugCoordinatesAdminOnly))
+        if (_baseClient.RunLevel == ClientRunLevel.InGame
+            && !_admin.IsActive()
+            && _cfg.GetCVar(CCVars.DebugCoordinatesAdminOnly))
+        {
             _userInterface.DebugMonitors.SetMonitor(DebugMonitor.Coords, false);
+        }
     }
 }
diff --git a/Content.Client/DoAfter/DoAfterOverlay.cs b/Content.Client/DoAfter/DoAfterOverlay.cs
index dfbbf10891..a4565bb71a 100644
--- a/Content.Client/DoAfter/DoAfterOverlay.cs
+++ b/Content.Client/DoAfter/DoAfterOverlay.cs
@@ -8,6 +8,7 @@ using Robust.Client.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
+using Robust.Shared.Containers;
 
 namespace Content.Client.DoAfter;
 
@@ -19,6 +20,7 @@ public sealed class DoAfterOverlay : Overlay
     private readonly SharedTransformSystem _transform;
     private readonly MetaDataSystem _meta;
     private readonly ProgressColorSystem _progressColor;
+    private readonly SharedContainerSystem _container;
 
     private readonly Texture _barTexture;
     private readonly ShaderInstance _unshadedShader;
@@ -41,6 +43,7 @@ public sealed class DoAfterOverlay : Overlay
         _player = player;
         _transform = _entManager.EntitySysManager.GetEntitySystem<SharedTransformSystem>();
         _meta = _entManager.EntitySysManager.GetEntitySystem<MetaDataSystem>();
+        _container = _entManager.EntitySysManager.GetEntitySystem<SharedContainerSystem>();
         _progressColor = _entManager.System<ProgressColorSystem>();
         var sprite = new SpriteSpecifier.Rsi(new("/Textures/Interface/Misc/progress_bar.rsi"), "icon");
         _barTexture = _entManager.EntitySysManager.GetEntitySystem<SpriteSystem>().Frame0(sprite);
@@ -98,11 +101,13 @@ public sealed class DoAfterOverlay : Overlay
 
             var offset = 0f;
 
+            var isInContainer = _container.IsEntityOrParentInContainer(uid, meta, xform);
+
             foreach (var doAfter in comp.DoAfters.Values)
             {
                 // Hide some DoAfters from other players for stealthy actions (ie: thieving gloves)
                 var alpha = 1f;
-                if (doAfter.Args.Hidden)
+                if (doAfter.Args.Hidden || isInContainer)
                 {
                     if (uid != localEnt)
                         continue;
diff --git a/Content.Client/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs
index bc3b9b6dec..153d2dbe09 100644
--- a/Content.Client/Entry/EntryPoint.cs
+++ b/Content.Client/Entry/EntryPoint.cs
@@ -1,6 +1,7 @@
 using Content.Client.Administration.Managers;
 using Content.Client.Changelog;
 using Content.Client.Chat.Managers;
+using Content.Client.DebugMon;
 using Content.Client.Eui;
 using Content.Client.Fullscreen;
 using Content.Client.GhostKick;
@@ -34,6 +35,7 @@ using Robust.Shared.Configuration;
 using Robust.Shared.ContentPack;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Replays;
+using Robust.Shared.Timing;
 
 namespace Content.Client.Entry
 {
@@ -69,6 +71,7 @@ namespace Content.Client.Entry
         [Dependency] private readonly IReplayLoadManager _replayLoad = default!;
         [Dependency] private readonly ILogManager _logManager = default!;
         [Dependency] private readonly ContentReplayPlaybackManager _replayMan = default!;
+        [Dependency] private readonly DebugMonitorManager _debugMonitorManager = default!;
 
         public override void Init()
         {
@@ -206,5 +209,13 @@ namespace Content.Client.Entry
                 _stateManager.RequestStateChange<MainScreen>();
             }
         }
+
+        public override void Update(ModUpdateLevel level, FrameEventArgs frameEventArgs)
+        {
+            if (level == ModUpdateLevel.FramePreEngine)
+            {
+                _debugMonitorManager.FrameUpdate();
+            }
+        }
     }
 }
diff --git a/Content.Client/Examine/ExamineSystem.cs b/Content.Client/Examine/ExamineSystem.cs
index b476971a13..60d2b6a6ef 100644
--- a/Content.Client/Examine/ExamineSystem.cs
+++ b/Content.Client/Examine/ExamineSystem.cs
@@ -46,6 +46,8 @@ namespace Content.Client.Examine
 
         public override void Initialize()
         {
+            base.Initialize();
+
             UpdatesOutsidePrediction = true;
 
             SubscribeLocalEvent<GetVerbsEvent<ExamineVerb>>(AddExamineVerb);
diff --git a/Content.Client/IoC/ClientContentIoC.cs b/Content.Client/IoC/ClientContentIoC.cs
index d1c595ae9b..328cf41d0d 100644
--- a/Content.Client/IoC/ClientContentIoC.cs
+++ b/Content.Client/IoC/ClientContentIoC.cs
@@ -2,6 +2,7 @@ using Content.Client.Administration.Managers;
 using Content.Client.Changelog;
 using Content.Client.Chat.Managers;
 using Content.Client.Clickable;
+using Content.Client.DebugMon;
 using Content.Client.Eui;
 using Content.Client.GhostKick;
 using Content.Client.Launcher;
@@ -48,6 +49,7 @@ namespace Content.Client.IoC
             collection.Register<DocumentParsingManager>();
             collection.Register<ContentReplayPlaybackManager, ContentReplayPlaybackManager>();
             collection.Register<ISharedPlaytimeManager, JobRequirementsManager>();
+            collection.Register<DebugMonitorManager>();
         }
     }
 }
diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
index c1a7494a8f..f045e94761 100644
--- a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
@@ -480,10 +480,10 @@ namespace Content.Client.Lobby.UI
                 return;
             }
 
-            //Setup model
-            Dictionary<string, List<string>> model = new();
+            // Setup model
+            Dictionary<string, List<string>> traitGroups = new();
             List<string> defaultTraits = new();
-            model.Add("default", defaultTraits);
+            traitGroups.Add(TraitCategoryPrototype.Default, defaultTraits);
 
             foreach (var trait in traits)
             {
@@ -493,18 +493,19 @@ namespace Content.Client.Lobby.UI
                     continue;
                 }
 
-                if (!model.ContainsKey(trait.Category))
-                {
-                    model.Add(trait.Category, new());
-                }
-                model[trait.Category].Add(trait.ID);
+                if (!_prototypeManager.HasIndex(trait.Category))
+                    continue;
+
+                var group = traitGroups.GetOrNew(trait.Category);
+                group.Add(trait.ID);
             }
 
-            //Create UI view from model
-            foreach (var (categoryId, traitId) in model)
+            // Create UI view from model
+            foreach (var (categoryId, categoryTraits) in traitGroups)
             {
                 TraitCategoryPrototype? category = null;
-                if (categoryId != "default")
+
+                if (categoryId != TraitCategoryPrototype.Default)
                 {
                     category = _prototypeManager.Index<TraitCategoryPrototype>(categoryId);
                     // Label
@@ -519,7 +520,7 @@ namespace Content.Client.Lobby.UI
                 List<TraitPreferenceSelector?> selectors = new();
                 var selectionCount = 0;
 
-                foreach (var traitProto in traitId)
+                foreach (var traitProto in categoryTraits)
                 {
                     var trait = _prototypeManager.Index<TraitPrototype>(traitProto);
                     var selector = new TraitPreferenceSelector(trait);
@@ -530,7 +531,15 @@ namespace Content.Client.Lobby.UI
 
                     selector.PreferenceChanged += preference =>
                     {
-                        Profile = Profile?.WithTraitPreference(trait.ID, categoryId, preference);
+                        if (preference)
+                        {
+                            Profile = Profile?.WithTraitPreference(trait.ID, _prototypeManager);
+                        }
+                        else
+                        {
+                            Profile = Profile?.WithoutTraitPreference(trait.ID, _prototypeManager);
+                        }
+
                         SetDirty();
                         RefreshTraits(); // If too many traits are selected, they will be reset to the real value.
                     };
diff --git a/Content.Client/Options/UI/OptionDropDown.xaml b/Content.Client/Options/UI/OptionDropDown.xaml
new file mode 100644
index 0000000000..58dcdca6c8
--- /dev/null
+++ b/Content.Client/Options/UI/OptionDropDown.xaml
@@ -0,0 +1,6 @@
+<Control xmlns="https://spacestation14.io">
+    <BoxContainer Orientation="Horizontal">
+        <Label Name="NameLabel" MinWidth="400" />
+        <OptionButton Name="Button" Access="Public" />
+    </BoxContainer>
+</Control>
diff --git a/Content.Client/Options/UI/OptionDropDown.xaml.cs b/Content.Client/Options/UI/OptionDropDown.xaml.cs
new file mode 100644
index 0000000000..506e241a06
--- /dev/null
+++ b/Content.Client/Options/UI/OptionDropDown.xaml.cs
@@ -0,0 +1,21 @@
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
+
+namespace Content.Client.Options.UI;
+
+/// <summary>
+/// Standard UI control used for drop-downs in the options menu. Intended for use with <see cref="OptionsTabControlRow"/>.
+/// </summary>
+/// <seealso cref="OptionsTabControlRow.AddOptionDropDown{T}"/>
+[GenerateTypedNameReferences]
+public sealed partial class OptionDropDown : Control
+{
+    /// <summary>
+    /// The text describing what this drop-down controls.
+    /// </summary>
+    public string? Title
+    {
+        get => NameLabel.Text;
+        set => NameLabel.Text = value;
+    }
+}
diff --git a/Content.Client/Options/UI/OptionSlider.xaml b/Content.Client/Options/UI/OptionSlider.xaml
new file mode 100644
index 0000000000..fa2d78c67f
--- /dev/null
+++ b/Content.Client/Options/UI/OptionSlider.xaml
@@ -0,0 +1,7 @@
+<Control xmlns="https://spacestation14.io">
+    <BoxContainer Orientation="Horizontal">
+        <Label Name="NameLabel" MinWidth="400" />
+        <Slider Name="Slider" Access="Public" HorizontalExpand="True" />
+        <Label Name="ValueLabel" Access="Public" Margin="8 0 4 0" MinWidth="48" Align="Right" />
+    </BoxContainer>
+</Control>
diff --git a/Content.Client/Options/UI/OptionSlider.xaml.cs b/Content.Client/Options/UI/OptionSlider.xaml.cs
new file mode 100644
index 0000000000..6a377f7ee1
--- /dev/null
+++ b/Content.Client/Options/UI/OptionSlider.xaml.cs
@@ -0,0 +1,22 @@
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
+
+namespace Content.Client.Options.UI;
+
+/// <summary>
+/// Standard UI control used for sliders in the options menu. Intended for use with <see cref="OptionsTabControlRow"/>.
+/// </summary>
+/// <seealso cref="OptionsTabControlRow.AddOptionSlider"/>
+/// <seealso cref="OptionsTabControlRow.AddOptionPercentSlider"/>
+[GenerateTypedNameReferences]
+public sealed partial class OptionSlider : Control
+{
+    /// <summary>
+    /// The text describing what this slider controls.
+    /// </summary>
+    public string? Title
+    {
+        get => NameLabel.Text;
+        set => NameLabel.Text = value;
+    }
+}
diff --git a/Content.Client/Options/UI/OptionsMenu.xaml b/Content.Client/Options/UI/OptionsMenu.xaml
index 4f624c1bb6..90486a196a 100644
--- a/Content.Client/Options/UI/OptionsMenu.xaml
+++ b/Content.Client/Options/UI/OptionsMenu.xaml
@@ -7,5 +7,6 @@
         <tabs:GraphicsTab Name="GraphicsTab" />
         <tabs:KeyRebindTab Name="KeyRebindTab" />
         <tabs:AudioTab Name="AudioTab" />
+        <tabs:AccessibilityTab Name="AccessibilityTab" />
     </TabContainer>
 </DefaultWindow>
diff --git a/Content.Client/Options/UI/OptionsMenu.xaml.cs b/Content.Client/Options/UI/OptionsMenu.xaml.cs
index 35a3f751bb..61037f4e4a 100644
--- a/Content.Client/Options/UI/OptionsMenu.xaml.cs
+++ b/Content.Client/Options/UI/OptionsMenu.xaml.cs
@@ -1,9 +1,6 @@
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
-using Robust.Shared.IoC;
-using Content.Client.Options.UI.Tabs;
-
 
 namespace Content.Client.Options.UI
 {
@@ -19,13 +16,17 @@ namespace Content.Client.Options.UI
             Tabs.SetTabTitle(1, Loc.GetString("ui-options-tab-graphics"));
             Tabs.SetTabTitle(2, Loc.GetString("ui-options-tab-controls"));
             Tabs.SetTabTitle(3, Loc.GetString("ui-options-tab-audio"));
+            Tabs.SetTabTitle(4, Loc.GetString("ui-options-tab-accessibility"));
 
             UpdateTabs();
         }
 
         public void UpdateTabs()
         {
-            GraphicsTab.UpdateProperties();
+            GraphicsTab.Control.ReloadValues();
+            MiscTab.Control.ReloadValues();
+            AccessibilityTab.Control.ReloadValues();
+            AudioTab.Control.ReloadValues();
         }
     }
 }
diff --git a/Content.Client/Options/UI/OptionsTabControlRow.xaml b/Content.Client/Options/UI/OptionsTabControlRow.xaml
new file mode 100644
index 0000000000..fafdee4df7
--- /dev/null
+++ b/Content.Client/Options/UI/OptionsTabControlRow.xaml
@@ -0,0 +1,18 @@
+<Control xmlns="https://spacestation14.io"
+         xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls">
+    <controls:StripeBack HasBottomEdge="False">
+        <BoxContainer Orientation="Horizontal" Align="End" Margin="2">
+            <Button Name="DefaultButton"
+                    Text="{Loc 'ui-options-default'}"
+                    TextAlign="Center"
+                    Margin="8 0" />
+
+            <Button Name="ResetButton"
+                    Text="{Loc 'ui-options-reset-all'}"
+                    StyleClasses="Caution" />
+            <Button Name="ApplyButton"
+                    Text="{Loc 'ui-options-apply'}"
+                    StyleClasses="OpenLeft" />
+        </BoxContainer>
+    </controls:StripeBack>
+</Control>
diff --git a/Content.Client/Options/UI/OptionsTabControlRow.xaml.cs b/Content.Client/Options/UI/OptionsTabControlRow.xaml.cs
new file mode 100644
index 0000000000..31dd9897f4
--- /dev/null
+++ b/Content.Client/Options/UI/OptionsTabControlRow.xaml.cs
@@ -0,0 +1,684 @@
+using System.Linq;
+using Content.Client.Stylesheets;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Collections;
+using Robust.Shared.Configuration;
+
+namespace Content.Client.Options.UI;
+
+/// <summary>
+/// Control used on all tabs of the in-game options menu,
+/// contains the "save" and "reset" buttons and controls the entire logic.
+/// </summary>
+/// <remarks>
+/// <para>
+/// Basic operation is simple: options tabs put this control at the bottom of the tab,
+/// they bind UI controls to it with calls such as <see cref="AddOptionCheckBox"/>,
+/// then they call <see cref="Initialize"/>. The rest is all handled by the control.
+/// </para>
+/// <para>
+/// Individual options are implementations of <see cref="BaseOption"/>. See the type for details.
+/// Common implementations for building on top of CVars are already exist,
+/// but tabs can define their own if they need to.
+/// </para>
+/// <para>
+/// Generally, options are added via helper methods such as <see cref="AddOptionCheckBox"/>,
+/// however it is totally possible to directly instantiate the backing types
+/// and add them via <see cref="AddOption{T}"/>.
+/// </para>
+/// <para>
+/// The options system is general purpose enough that <see cref="OptionsTabControlRow"/> does not, itself,
+/// know what a CVar is. It does automatically save CVars to config when save is pressed, but otherwise CVar interaction
+/// is handled by <see cref="BaseOption"/> implementations.
+/// </para>
+/// <para>
+/// Behaviorally, the row has 3 control buttons: save, reset changed, and reset to default.
+/// "Save" writes the configuration changes and saves the configuration.
+/// "Reset changed" discards changes made in the menu and re-loads the saved settings.
+/// "Reset to default" resets the settings on the menu to be the default, out-of-the-box values.
+/// Note that "Reset to default" does not save immediately, the user must still press save manually.
+/// </para>
+/// <para>
+/// The disabled state of the 3 buttons is updated dynamically based on the values of the options.
+/// </para>
+/// </remarks>
+[GenerateTypedNameReferences]
+public sealed partial class OptionsTabControlRow : Control
+{
+    [Dependency] private readonly ILocalizationManager _loc = default!;
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
+
+    private ValueList<BaseOption> _options;
+
+    public OptionsTabControlRow()
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+
+        ResetButton.StyleClasses.Add(StyleBase.ButtonOpenRight);
+        ApplyButton.OnPressed += ApplyButtonPressed;
+        ResetButton.OnPressed += ResetButtonPressed;
+        DefaultButton.OnPressed += DefaultButtonPressed;
+    }
+
+    /// <summary>
+    /// Add a new option to be tracked by the control.
+    /// </summary>
+    /// <param name="option">The option object that manages this object's logic</param>
+    /// <typeparam name="T">
+    /// The type of option being passed in. Necessary to allow the return type to match the parameter type
+    /// for easy chaining.
+    /// </typeparam>
+    /// <returns>The same <paramref name="option"/> as passed in, for easy chaining.</returns>
+    public T AddOption<T>(T option) where T : BaseOption
+    {
+        _options.Add(option);
+        return option;
+    }
+
+    /// <summary>
+    /// Add a checkbox option backed by a simple boolean CVar.
+    /// </summary>
+    /// <param name="cVar">The CVar represented by the checkbox.</param>
+    /// <param name="checkBox">The UI control for the option.</param>
+    /// <param name="invert">
+    /// If true, the checkbox is inverted relative to the CVar: if the CVar is true, the checkbox will be unchecked.
+    /// </param>
+    /// <returns>The option instance backing the added option.</returns>
+    /// <seealso cref="OptionCheckboxCVar"/>
+    public OptionCheckboxCVar AddOptionCheckBox(CVarDef<bool> cVar, CheckBox checkBox, bool invert = false)
+    {
+        return AddOption(new OptionCheckboxCVar(this, _cfg, cVar, checkBox, invert));
+    }
+
+    /// <summary>
+    /// Add a slider option, displayed in percent, backed by a simple float CVar.
+    /// </summary>
+    /// <param name="cVar">The CVar represented by the slider.</param>
+    /// <param name="slider">The UI control for the option.</param>
+    /// <param name="min">The minimum value the slider should allow. The default value represents "0%"</param>
+    /// <param name="max">The maximum value the slider should allow. The default value represents "100%"</param>
+    /// <param name="scale">
+    /// Scale with which to multiply slider values when mapped to the backing CVar.
+    /// For example, if a scale of 2 is set, a slider at 75% writes a value of 1.5 to the CVar.
+    /// </param>
+    /// <returns>The option instance backing the added option.</returns>
+    /// <remarks>
+    /// <para>
+    /// Note that percentage values are represented as ratios in code, i.e. a value of 100% is "1".
+    /// </para>
+    /// </remarks>
+    public OptionSliderFloatCVar AddOptionPercentSlider(
+        CVarDef<float> cVar,
+        OptionSlider slider,
+        float min = 0,
+        float max = 1,
+        float scale = 1)
+    {
+        return AddOption(new OptionSliderFloatCVar(this, _cfg, cVar, slider, min, max, scale, FormatPercent));
+    }
+
+    /// <summary>
+    /// Add a slider option, backed by a simple integer CVar.
+    /// </summary>
+    /// <param name="cVar">The CVar represented by the slider.</param>
+    /// <param name="slider">The UI control for the option.</param>
+    /// <param name="min">The minimum value the slider should allow.</param>
+    /// <param name="max">The maximum value the slider should allow.</param>
+    /// <param name="format">
+    /// An optional delegate used to format the textual value display of the slider.
+    /// If not provided, the default behavior is to directly format the integer value as text.
+    /// </param>
+    /// <returns>The option instance backing the added option.</returns>
+    public OptionSliderIntCVar AddOptionSlider(
+        CVarDef<int> cVar,
+        OptionSlider slider,
+        int min,
+        int max,
+        Func<OptionSliderIntCVar, int, string>? format = null)
+    {
+        return AddOption(new OptionSliderIntCVar(this, _cfg, cVar, slider, min, max, format ?? FormatInt));
+    }
+
+    /// <summary>
+    /// Add a drop-down option, backed by a CVar.
+    /// </summary>
+    /// <param name="cVar">The CVar represented by the drop-down.</param>
+    /// <param name="dropDown">The UI control for the option.</param>
+    /// <param name="options">
+    /// The set of options that will be shown in the drop-down. Items are ordered as provided.
+    /// </param>
+    /// <typeparam name="T">The type of the CVar being controlled.</typeparam>
+    /// <returns>The option instance backing the added option.</returns>
+    public OptionDropDownCVar<T> AddOptionDropDown<T>(
+        CVarDef<T> cVar,
+        OptionDropDown dropDown,
+        IReadOnlyCollection<OptionDropDownCVar<T>.ValueOption> options)
+        where T : notnull
+    {
+        return AddOption(new OptionDropDownCVar<T>(this, _cfg, cVar, dropDown, options));
+    }
+
+    /// <summary>
+    /// Initializes the control row. This should be called after all options have been added.
+    /// </summary>
+    public void Initialize()
+    {
+        foreach (var option in _options)
+        {
+            option.LoadValue();
+        }
+
+        UpdateButtonState();
+    }
+
+    /// <summary>
+    /// Re-loads options in the settings from backing values.
+    /// Should be called when the options window is opened to make sure all values are up-to-date.
+    /// </summary>
+    public void ReloadValues()
+    {
+        Initialize();
+    }
+
+    /// <summary>
+    /// Called by <see cref="BaseOption"/> to signal that an option's value changed through user interaction.
+    /// </summary>
+    /// <remarks>
+    /// <see cref="BaseOption"/> implementations should not call this function directly,
+    /// instead they should call <see cref="BaseOption.ValueChanged"/>.
+    /// </remarks>
+    public void ValueChanged()
+    {
+        UpdateButtonState();
+    }
+
+    private void UpdateButtonState()
+    {
+        var anyModified = _options.Any(option => option.IsModified());
+        var anyModifiedFromDefault = _options.Any(option => option.IsModifiedFromDefault());
+
+        DefaultButton.Disabled = !anyModifiedFromDefault;
+        ApplyButton.Disabled = !anyModified;
+        ResetButton.Disabled = !anyModified;
+    }
+
+    private void ApplyButtonPressed(BaseButton.ButtonEventArgs obj)
+    {
+        foreach (var option in _options)
+        {
+            if (option.IsModified())
+                option.SaveValue();
+        }
+
+        _cfg.SaveToFile();
+        UpdateButtonState();
+    }
+
+    private void ResetButtonPressed(BaseButton.ButtonEventArgs obj)
+    {
+        foreach (var option in _options)
+        {
+            option.LoadValue();
+        }
+
+        UpdateButtonState();
+    }
+
+    private void DefaultButtonPressed(BaseButton.ButtonEventArgs obj)
+    {
+        foreach (var option in _options)
+        {
+            option.ResetToDefault();
+        }
+
+        UpdateButtonState();
+    }
+
+    private string FormatPercent(OptionSliderFloatCVar slider, float value)
+    {
+        return _loc.GetString("ui-options-value-percent", ("value", value));
+    }
+
+    private static string FormatInt(OptionSliderIntCVar slider, int value)
+    {
+        return value.ToString();
+    }
+}
+
+/// <summary>
+/// Base class of a single "option" for <see cref="OptionsTabControlRow"/>.
+/// </summary>
+/// <remarks>
+/// <para>
+/// Implementations of this class handle loading values from backing storage or defaults,
+/// handling UI controls, and saving. The main <see cref="OptionsTabControlRow"/> does not know what a CVar is.
+/// </para>
+/// <para>
+/// <see cref="BaseOptionCVar{TValue}"/> is a derived class that makes it easier to work with options
+/// backed by a single CVar.
+/// </para>
+/// </remarks>
+/// <param name="controller">The control row that owns this option.</param>
+/// <seealso cref="OptionsTabControlRow"/>
+public abstract class BaseOption(OptionsTabControlRow controller)
+{
+    /// <summary>
+    /// Should be called by derived implementations to indicate that their value changed, due to user interaction.
+    /// </summary>
+    protected virtual void ValueChanged()
+    {
+        controller.ValueChanged();
+    }
+
+    /// <summary>
+    /// Loads the value represented by this option from its backing store, into the UI state.
+    /// </summary>
+    public abstract void LoadValue();
+
+    /// <summary>
+    /// Saves the value in the UI state to the backing store.
+    /// </summary>
+    public abstract void SaveValue();
+
+    /// <summary>
+    /// Resets the UI state to that of the factory-default value. This should not write to the backing store.
+    /// </summary>
+    public abstract void ResetToDefault();
+
+    /// <summary>
+    /// Called to check if this option's UI value is different from the backing store value.
+    /// </summary>
+    /// <returns>If true, the UI value is different and was modified by the user.</returns>
+    public abstract bool IsModified();
+
+    /// <summary>
+    /// Called to check if this option's UI value is different from the backing store's default value.
+    /// </summary>
+    /// <returns>If true, the UI value is different.</returns>
+    public abstract bool IsModifiedFromDefault();
+}
+
+/// <summary>
+/// Derived class of <see cref="BaseOption"/> intended for making mappings to simple CVars easier.
+/// </summary>
+/// <typeparam name="TValue">The type of the CVar.</typeparam>
+/// <seealso cref="OptionsTabControlRow"/>
+public abstract class BaseOptionCVar<TValue> : BaseOption
+    where TValue : notnull
+{
+    /// <summary>
+    /// Raised immediately when the UI value of this option is changed by the user, even before saving.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// This can be used to update parts of the options UI based on the state of a checkbox.
+    /// </para>
+    /// </remarks>
+    public event Action<TValue>? ImmediateValueChanged;
+
+    private readonly IConfigurationManager _cfg;
+    private readonly CVarDef<TValue> _cVar;
+
+    /// <summary>
+    /// Sets and gets the actual CVar value to/from the frontend UI state or control.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// In the simplest case, this function should set a UI control's state to represent the CVar,
+    /// and inversely conver the UI control's state to the CVar value. For simple controls like a checkbox or slider,
+    /// this just means passing through their value property.
+    /// </para>
+    /// </remarks>
+    protected abstract TValue Value { get; set; }
+
+    protected BaseOptionCVar(
+        OptionsTabControlRow controller,
+        IConfigurationManager cfg,
+        CVarDef<TValue> cVar)
+        : base(controller)
+    {
+        _cfg = cfg;
+        _cVar = cVar;
+    }
+
+    public override void LoadValue()
+    {
+        Value = _cfg.GetCVar(_cVar);
+    }
+
+    public override void SaveValue()
+    {
+        _cfg.SetCVar(_cVar, Value);
+    }
+
+    public override void ResetToDefault()
+    {
+        Value = _cVar.DefaultValue;
+    }
+
+    public override bool IsModified()
+    {
+        return !IsValueEqual(Value, _cfg.GetCVar(_cVar));
+    }
+
+    public override bool IsModifiedFromDefault()
+    {
+        return !IsValueEqual(Value, _cVar.DefaultValue);
+    }
+
+    protected virtual bool IsValueEqual(TValue a, TValue b)
+    {
+        // Use different logic for floats so there's some error margin.
+        // This check is handled cleanly at compile-time by the JIT.
+        if (typeof(TValue) == typeof(float))
+            return MathHelper.CloseToPercent((float) (object) a, (float) (object) b);
+
+        return EqualityComparer<TValue>.Default.Equals(a, b);
+    }
+
+    protected override void ValueChanged()
+    {
+        base.ValueChanged();
+
+        ImmediateValueChanged?.Invoke(Value);
+    }
+}
+
+/// <summary>
+/// Implementation of a CVar option that simply corresponds with a <see cref="CheckBox"/>.
+/// </summary>
+/// <remarks>
+/// <para>
+/// Generally, you should just call <c>AddOption</c> methods on <see cref="OptionsTabControlRow"/>
+/// instead of instantiating this type directly.
+/// </para>
+/// </remarks>
+/// <seealso cref="OptionsTabControlRow"/>
+public sealed class OptionCheckboxCVar : BaseOptionCVar<bool>
+{
+    private readonly CheckBox _checkBox;
+    private readonly bool _invert;
+
+    protected override bool Value
+    {
+        get => _checkBox.Pressed ^ _invert;
+        set => _checkBox.Pressed = value ^ _invert;
+    }
+
+    /// <summary>
+    /// Creates a new instance of this type.
+    /// </summary>
+    /// <param name="controller">The control row that owns this option.</param>
+    /// <param name="cfg">The configuration manager to get and set values from.</param>
+    /// <param name="cVar">The CVar that is being controlled by this option.</param>
+    /// <param name="checkBox">The UI control for the option.</param>
+    /// <param name="invert">
+    /// If true, the checkbox is inverted relative to the CVar: if the CVar is true, the checkbox will be unchecked.
+    /// </param>
+    /// <remarks>
+    /// <para>
+    /// It is generally more convenient to call overloads on <see cref="OptionsTabControlRow"/>
+    /// such as <see cref="OptionsTabControlRow.AddOptionCheckBox"/> instead of instantiating this type directly.
+    /// </para>
+    /// </remarks>
+    public OptionCheckboxCVar(
+        OptionsTabControlRow controller,
+        IConfigurationManager cfg,
+        CVarDef<bool> cVar,
+        CheckBox checkBox,
+        bool invert)
+        : base(controller, cfg, cVar)
+    {
+        _checkBox = checkBox;
+        _invert = invert;
+        checkBox.OnToggled += _ =>
+        {
+            ValueChanged();
+        };
+    }
+}
+
+/// <summary>
+/// Implementation of a CVar option that simply corresponds with a floating-point <see cref="OptionSlider"/>.
+/// </summary>
+/// <seealso cref="OptionsTabControlRow"/>
+public sealed class OptionSliderFloatCVar : BaseOptionCVar<float>
+{
+    /// <summary>
+    /// Scale with which to multiply slider values when mapped to the backing CVar.
+    /// </summary>
+    /// <remarks>
+    /// For example, if a scale of 2 is set, a slider at 75% writes a value of 1.5 to the CVar.
+    /// </remarks>
+    public float Scale { get; }
+
+    private readonly OptionSlider _slider;
+    private readonly Func<OptionSliderFloatCVar, float, string> _format;
+
+    protected override float Value
+    {
+        get => _slider.Slider.Value * Scale;
+        set
+        {
+            _slider.Slider.Value = value / Scale;
+            UpdateLabelValue();
+        }
+    }
+
+    /// <summary>
+    /// Creates a new instance of this type.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// It is generally more convenient to call overloads on <see cref="OptionsTabControlRow"/>
+    /// such as <see cref="OptionsTabControlRow.AddOptionPercentSlider"/> instead of instantiating this type directly.
+    /// </para>
+    /// </remarks>
+    /// <param name="controller">The control row that owns this option.</param>
+    /// <param name="cfg">The configuration manager to get and set values from.</param>
+    /// <param name="cVar">The CVar that is being controlled by this option.</param>
+    /// <param name="slider">The UI control for the option.</param>
+    /// <param name="minValue">The minimum value the slider should allow.</param>
+    /// <param name="maxValue">The maximum value the slider should allow.</param>
+    /// <param name="scale">
+    /// Scale with which to multiply slider values when mapped to the backing CVar. See <see cref="Scale"/>.
+    /// </param>
+    /// <param name="format">Function that will be called to format the value display next to the slider.</param>
+    public OptionSliderFloatCVar(
+        OptionsTabControlRow controller,
+        IConfigurationManager cfg,
+        CVarDef<float> cVar,
+        OptionSlider slider,
+        float minValue,
+        float maxValue,
+        float scale,
+        Func<OptionSliderFloatCVar, float, string> format) : base(controller, cfg, cVar)
+    {
+        Scale = scale;
+        _slider = slider;
+        _format = format;
+
+        slider.Slider.MinValue = minValue;
+        slider.Slider.MaxValue = maxValue;
+
+        slider.Slider.OnValueChanged += _ =>
+        {
+            ValueChanged();
+            UpdateLabelValue();
+        };
+    }
+
+    private void UpdateLabelValue()
+    {
+        _slider.ValueLabel.Text = _format(this, _slider.Slider.Value);
+    }
+}
+
+/// <summary>
+/// Implementation of a CVar option that simply corresponds with an integer <see cref="OptionSlider"/>.
+/// </summary>
+/// <seealso cref="OptionsTabControlRow"/>
+public sealed class OptionSliderIntCVar : BaseOptionCVar<int>
+{
+    private readonly OptionSlider _slider;
+    private readonly Func<OptionSliderIntCVar, int, string> _format;
+
+    protected override int Value
+    {
+        get => (int) _slider.Slider.Value;
+        set
+        {
+            _slider.Slider.Value = value;
+            UpdateLabelValue();
+        }
+    }
+
+    /// <summary>
+    /// Creates a new instance of this type.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// It is generally more convenient to call overloads on <see cref="OptionsTabControlRow"/>
+    /// such as <see cref="OptionsTabControlRow.AddOptionPercentSlider"/> instead of instantiating this type directly.
+    /// </para>
+    /// </remarks>
+    /// <param name="controller">The control row that owns this option.</param>
+    /// <param name="cfg">The configuration manager to get and set values from.</param>
+    /// <param name="cVar">The CVar that is being controlled by this option.</param>
+    /// <param name="slider">The UI control for the option.</param>
+    /// <param name="minValue">The minimum value the slider should allow.</param>
+    /// <param name="maxValue">The maximum value the slider should allow.</param>
+    /// <param name="format">Function that will be called to format the value display next to the slider.</param>
+    public OptionSliderIntCVar(
+        OptionsTabControlRow controller,
+        IConfigurationManager cfg,
+        CVarDef<int> cVar,
+        OptionSlider slider,
+        int minValue,
+        int maxValue,
+        Func<OptionSliderIntCVar, int, string> format) : base(controller, cfg, cVar)
+    {
+        _slider = slider;
+        _format = format;
+
+        slider.Slider.MinValue = minValue;
+        slider.Slider.MaxValue = maxValue;
+        slider.Slider.Rounded = true;
+
+        slider.Slider.OnValueChanged += _ =>
+        {
+            ValueChanged();
+            UpdateLabelValue();
+        };
+    }
+
+    private void UpdateLabelValue()
+    {
+        _slider.ValueLabel.Text = _format(this, (int) _slider.Slider.Value);
+    }
+}
+
+/// <summary>
+/// Implementation of a CVar option via a drop-down.
+/// </summary>
+/// <seealso cref="OptionsTabControlRow"/>
+public sealed class OptionDropDownCVar<T> : BaseOptionCVar<T> where T : notnull
+{
+    private readonly OptionDropDown _dropDown;
+    private readonly ItemEntry[] _entries;
+
+    protected override T Value
+    {
+        get => (T) _dropDown.Button.SelectedMetadata!;
+        set => _dropDown.Button.SelectId(FindValueId(value));
+    }
+
+    /// <summary>
+    /// Creates a new instance of this type.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// It is generally more convenient to call overloads on <see cref="OptionsTabControlRow"/>
+    /// such as <see cref="OptionsTabControlRow.AddOptionDropDown{T}"/> instead of instantiating this type directly.
+    /// </para>
+    /// </remarks>
+    /// <param name="controller">The control row that owns this option.</param>
+    /// <param name="cfg">The configuration manager to get and set values from.</param>
+    /// <param name="cVar">The CVar that is being controlled by this option.</param>
+    /// <param name="dropDown">The UI control for the option.</param>
+    /// <param name="options">The list of options shown to the user.</param>
+    public OptionDropDownCVar(
+        OptionsTabControlRow controller,
+        IConfigurationManager cfg,
+        CVarDef<T> cVar,
+        OptionDropDown dropDown,
+        IReadOnlyCollection<ValueOption> options) : base(controller, cfg, cVar)
+    {
+        if (options.Count == 0)
+            throw new ArgumentException("Need at least one option!");
+
+        _dropDown = dropDown;
+        _entries = new ItemEntry[options.Count];
+
+        var button = dropDown.Button;
+        var i = 0;
+        foreach (var option in options)
+        {
+            _entries[i] = new ItemEntry
+            {
+                Key = option.Key,
+            };
+
+            button.AddItem(option.Label, i);
+            button.SetItemMetadata(button.GetIdx(i), option.Key);
+            i += 1;
+        }
+
+        dropDown.Button.OnItemSelected += args =>
+        {
+            dropDown.Button.SelectId(args.Id);
+            ValueChanged();
+        };
+    }
+
+    private int FindValueId(T value)
+    {
+        for (var i = 0; i < _entries.Length; i++)
+        {
+            if (IsValueEqual(_entries[i].Key, value))
+                return i;
+        }
+
+        // This will just default select the first entry or whatever.
+        return 0;
+    }
+
+    /// <summary>
+    /// A single option for a drop-down.
+    /// </summary>
+    /// <param name="key">The value that this option has. This is what will be written to the CVar if selected.</param>
+    /// <param name="label">The visual text shown to the user for the option.</param>
+    /// <seealso cref="OptionDropDownCVar{T}"/>
+    /// <seealso cref="OptionsTabControlRow.AddOptionDropDown{T}"/>
+    public sealed class ValueOption(T key, string label)
+    {
+        /// <summary>
+        /// The value that this option has. This is what will be written to the CVar if selected.
+        /// </summary>
+        public readonly T Key = key;
+
+        /// <summary>
+        /// The visual text shown to the user for the option.
+        /// </summary>
+        public readonly string Label = label;
+    }
+
+    private struct ItemEntry
+    {
+        public T Key;
+    }
+}
diff --git a/Content.Client/Options/UI/Tabs/AccessibilityTab.xaml b/Content.Client/Options/UI/Tabs/AccessibilityTab.xaml
new file mode 100644
index 0000000000..54d92b2b11
--- /dev/null
+++ b/Content.Client/Options/UI/Tabs/AccessibilityTab.xaml
@@ -0,0 +1,16 @@
+<Control xmlns="https://spacestation14.io"
+         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+         xmlns:ui="clr-namespace:Content.Client.Options.UI">
+    <BoxContainer Orientation="Vertical">
+        <ScrollContainer VerticalExpand="True" HScrollEnabled="False">
+            <BoxContainer Orientation="Vertical" Margin="8">
+                <CheckBox Name="ReducedMotionCheckBox" Text="{Loc 'ui-options-reduced-motion'}" />
+                <CheckBox Name="EnableColorNameCheckBox" Text="{Loc 'ui-options-enable-color-name'}" />
+                <CheckBox Name="ColorblindFriendlyCheckBox" Text="{Loc 'ui-options-colorblind-friendly'}" />
+                <ui:OptionSlider Name="ChatWindowOpacitySlider" Title="{Loc 'ui-options-chat-window-opacity'}" />
+                <ui:OptionSlider Name="ScreenShakeIntensitySlider" Title="{Loc 'ui-options-screen-shake-intensity'}" />
+            </BoxContainer>
+        </ScrollContainer>
+        <ui:OptionsTabControlRow Name="Control" Access="Public" />
+    </BoxContainer>
+</Control>
diff --git a/Content.Client/Options/UI/Tabs/AccessibilityTab.xaml.cs b/Content.Client/Options/UI/Tabs/AccessibilityTab.xaml.cs
new file mode 100644
index 0000000000..15182fbf12
--- /dev/null
+++ b/Content.Client/Options/UI/Tabs/AccessibilityTab.xaml.cs
@@ -0,0 +1,24 @@
+using Content.Shared.CCVar;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.Options.UI.Tabs;
+
+[GenerateTypedNameReferences]
+public sealed partial class AccessibilityTab : Control
+{
+    public AccessibilityTab()
+    {
+        RobustXamlLoader.Load(this);
+
+        Control.AddOptionCheckBox(CCVars.ChatEnableColorName, EnableColorNameCheckBox);
+        Control.AddOptionCheckBox(CCVars.AccessibilityColorblindFriendly, ColorblindFriendlyCheckBox);
+        Control.AddOptionCheckBox(CCVars.ReducedMotion, ReducedMotionCheckBox);
+        Control.AddOptionPercentSlider(CCVars.ChatWindowOpacity, ChatWindowOpacitySlider);
+        Control.AddOptionPercentSlider(CCVars.ScreenShakeIntensity, ScreenShakeIntensitySlider);
+
+        Control.Initialize();
+    }
+}
+
diff --git a/Content.Client/Options/UI/Tabs/AudioTab.xaml b/Content.Client/Options/UI/Tabs/AudioTab.xaml
index e54b0dc34e..c374af31c5 100644
--- a/Content.Client/Options/UI/Tabs/AudioTab.xaml
+++ b/Content.Client/Options/UI/Tabs/AudioTab.xaml
@@ -1,128 +1,26 @@
 <Control xmlns="https://spacestation14.io"
          xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-         xmlns:s="clr-namespace:Content.Client.Stylesheets"
-         xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls">
+         xmlns:ui="clr-namespace:Content.Client.Options.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'}" HorizontalExpand="True" />
-                    <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" />
-                <BoxContainer Orientation="Horizontal" Margin="5 0 0 0">
-                    <Label Text="{Loc 'ui-options-midi-volume'}" HorizontalExpand="True" />
-                    <Control MinSize="8 0" />
-                    <Slider Name="MidiVolumeSlider"
-                            MinValue="0"
-                            MaxValue="100"
-                            HorizontalExpand="True"
-                            MinSize="80 0"
-                            Rounded="True" />
-                    <Control MinSize="8 0" />
-                    <Label Name="MidiVolumeLabel" MinSize="48 0" Align="Right" />
-                    <Control MinSize="4 0"/>
-                </BoxContainer>
-                <BoxContainer Orientation="Horizontal" Margin="5 0 0 0">
-                    <Label Text="{Loc 'ui-options-ambient-music-volume'}" HorizontalExpand="True" />
-                    <Control MinSize="8 0" />
-                    <Slider Name="AmbientMusicVolumeSlider"
-                            MinValue="0"
-                            MaxValue="100"
-                            HorizontalExpand="True"
-                            MinSize="80 0"
-                            Rounded="True" />
-                    <Control MinSize="8 0" />
-                    <Label Name="AmbientMusicVolumeLabel" MinSize="48 0" Align="Right" />
-                    <Control MinSize="4 0"/>
-                </BoxContainer>
-                <BoxContainer Orientation="Horizontal" Margin="5 0 0 0">
-                    <Label Text="{Loc 'ui-options-ambience-volume'}" HorizontalExpand="True" />
-                    <Control MinSize="8 0" />
-                    <Slider Name="AmbienceVolumeSlider"
-                            MinValue="0"
-                            MaxValue="100"
-                            HorizontalExpand="True"
-                            MinSize="80 0"
-                            Rounded="True" />
-                    <Control MinSize="8 0" />
-                    <Label Name="AmbienceVolumeLabel" MinSize="48 0" Align="Right" />
-                    <Control MinSize="4 0"/>
-                </BoxContainer>
-                <BoxContainer Orientation="Horizontal" Margin="5 0 0 0">
-                    <Label Text="{Loc 'ui-options-lobby-volume'}" HorizontalExpand="True" />
-                    <Control MinSize="8 0" />
-                    <Slider Name="LobbyVolumeSlider"
-                            MinValue="0"
-                            MaxValue="100"
-                            HorizontalExpand="True"
-                            MinSize="80 0"
-                            Rounded="True" />
-                    <Control MinSize="8 0" />
-                    <Label Name="LobbyVolumeLabel" MinSize="48 0" Align="Right" />
-                    <Control MinSize="4 0"/>
-                </BoxContainer>
-                <BoxContainer Orientation="Horizontal" Margin="5 0 0 0">
-                    <Label Text="{Loc 'ui-options-interface-volume'}" HorizontalExpand="True" />
-                    <Control MinSize="8 0" />
-                    <Slider Name="InterfaceVolumeSlider"
-                            MinValue="0"
-                            MaxValue="100"
-                            HorizontalExpand="True"
-                            MinSize="80 0"
-                            Rounded="True" />
-                    <Control MinSize="8 0" />
-                    <Label Name="InterfaceVolumeLabel" MinSize="48 0" Align="Right" />
-                    <Control MinSize="4 0"/>
-                </BoxContainer>
-                <BoxContainer Orientation="Horizontal" Margin="5 0 0 0">
-                    <Label Text="{Loc 'ui-options-ambience-max-sounds'}" HorizontalExpand="True" />
-                    <Control MinSize="8 0" />
-                    <Slider Name="AmbienceSoundsSlider"
-                            MinValue="0"
-                            MaxValue="1"
-                            HorizontalExpand="True"
-                            MinSize="80 0"
-                            Rounded="True" />
-                    <Control MinSize="8 0" />
-                    <Label Name="AmbienceSoundsLabel" MinSize="48 0" Align="Right" />
-                    <Control MinSize="4 0"/>
-                </BoxContainer>
-                <Control MinSize="0 8" />
+                <ui:OptionSlider Name="SliderVolumeMaster" Title="{Loc 'ui-options-master-volume'}"
+                                 Margin="0 0 0 8" />
+                <ui:OptionSlider Name="SliderVolumeMidi" Title="{Loc 'ui-options-midi-volume'}" />
+                <ui:OptionSlider Name="SliderVolumeAmbientMusic" Title="{Loc 'ui-options-ambient-music-volume'}" />
+                <ui:OptionSlider Name="SliderVolumeAmbience" Title="{Loc 'ui-options-ambience-volume'}" />
+                <ui:OptionSlider Name="SliderVolumeLobby" Title="{Loc 'ui-options-lobby-volume'}" />
+                <ui:OptionSlider Name="SliderVolumeInterface" Title="{Loc 'ui-options-interface-volume'}" />
+                <ui:OptionSlider Name="SliderMaxAmbienceSounds" Title="{Loc 'ui-options-ambience-max-sounds'}"
+                                 Margin="0 0 0 8" />
                 <CheckBox Name="LobbyMusicCheckBox" Text="{Loc 'ui-options-lobby-music'}" />
                 <CheckBox Name="RestartSoundsCheckBox" Text="{Loc 'ui-options-restart-sounds'}" />
                 <CheckBox Name="EventMusicCheckBox" Text="{Loc 'ui-options-event-music'}" />
                 <CheckBox Name="AdminSoundsCheckBox" Text="{Loc 'ui-options-admin-sounds'}" />
             </BoxContainer>
         </BoxContainer>
-        <controls: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>
-        </controls:StripeBack>
+        <ui:OptionsTabControlRow Name="Control" Access="Public" />
     </BoxContainer>
 </Control>
diff --git a/Content.Client/Options/UI/Tabs/AudioTab.xaml.cs b/Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
index 470ca7d799..78186d446c 100644
--- a/Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
@@ -3,200 +3,72 @@ using Content.Shared.CCVar;
 using Robust.Client.Audio;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared;
 using Robust.Shared.Configuration;
-using Range = Robust.Client.UserInterface.Controls.Range;
 
-namespace Content.Client.Options.UI.Tabs
+namespace Content.Client.Options.UI.Tabs;
+
+[GenerateTypedNameReferences]
+public sealed partial class AudioTab : Control
 {
-    [GenerateTypedNameReferences]
-    public sealed partial class AudioTab : Control
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
+    [Dependency] private readonly IAudioManager _audio = default!;
+
+    public AudioTab()
     {
-        [Dependency] private readonly IConfigurationManager _cfg = default!;
-        private readonly IAudioManager _audio;
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
 
-        public AudioTab()
-        {
-            RobustXamlLoader.Load(this);
-            IoCManager.InjectDependencies(this);
+        var masterVolume = Control.AddOptionPercentSlider(
+            CVars.AudioMasterVolume,
+            SliderVolumeMaster,
+            scale: ContentAudioSystem.MasterVolumeMultiplier);
+        masterVolume.ImmediateValueChanged += OnMasterVolumeSliderChanged;
 
-            _audio = IoCManager.Resolve<IAudioManager>();
-            LobbyMusicCheckBox.Pressed = _cfg.GetCVar(CCVars.LobbyMusicEnabled);
-            RestartSoundsCheckBox.Pressed = _cfg.GetCVar(CCVars.RestartSoundsEnabled);
-            EventMusicCheckBox.Pressed = _cfg.GetCVar(CCVars.EventMusicEnabled);
-            AdminSoundsCheckBox.Pressed = _cfg.GetCVar(CCVars.AdminSoundsEnabled);
+        Control.AddOptionPercentSlider(
+            CVars.MidiVolume,
+            SliderVolumeMidi,
+            scale: ContentAudioSystem.MidiVolumeMultiplier);
 
-            ApplyButton.OnPressed += OnApplyButtonPressed;
-            ResetButton.OnPressed += OnResetButtonPressed;
-            MasterVolumeSlider.OnValueChanged += OnMasterVolumeSliderChanged;
-            MidiVolumeSlider.OnValueChanged += OnMidiVolumeSliderChanged;
-            AmbientMusicVolumeSlider.OnValueChanged += OnAmbientMusicVolumeSliderChanged;
-            AmbienceVolumeSlider.OnValueChanged += OnAmbienceVolumeSliderChanged;
-            AmbienceSoundsSlider.OnValueChanged += OnAmbienceSoundsSliderChanged;
-            LobbyVolumeSlider.OnValueChanged += OnLobbyVolumeSliderChanged;
-            InterfaceVolumeSlider.OnValueChanged += OnInterfaceVolumeSliderChanged;
-            LobbyMusicCheckBox.OnToggled += OnLobbyMusicCheckToggled;
-            RestartSoundsCheckBox.OnToggled += OnRestartSoundsCheckToggled;
-            EventMusicCheckBox.OnToggled += OnEventMusicCheckToggled;
-            AdminSoundsCheckBox.OnToggled += OnAdminSoundsCheckToggled;
+        Control.AddOptionPercentSlider(
+            CCVars.AmbientMusicVolume,
+            SliderVolumeAmbientMusic,
+            scale: ContentAudioSystem.AmbientMusicMultiplier);
 
-            AmbienceSoundsSlider.MinValue = _cfg.GetCVar(CCVars.MinMaxAmbientSourcesConfigured);
-            AmbienceSoundsSlider.MaxValue = _cfg.GetCVar(CCVars.MaxMaxAmbientSourcesConfigured);
+        Control.AddOptionPercentSlider(
+            CCVars.AmbienceVolume,
+            SliderVolumeAmbience,
+            scale: ContentAudioSystem.AmbienceMultiplier);
 
-            Reset();
-        }
+        Control.AddOptionPercentSlider(
+            CCVars.LobbyMusicVolume,
+            SliderVolumeLobby,
+            scale: ContentAudioSystem.LobbyMultiplier);
 
-        protected override void Dispose(bool disposing)
-        {
-            ApplyButton.OnPressed -= OnApplyButtonPressed;
-            ResetButton.OnPressed -= OnResetButtonPressed;
-            MasterVolumeSlider.OnValueChanged -= OnMasterVolumeSliderChanged;
-            MidiVolumeSlider.OnValueChanged -= OnMidiVolumeSliderChanged;
-            AmbientMusicVolumeSlider.OnValueChanged -= OnAmbientMusicVolumeSliderChanged;
-            AmbienceVolumeSlider.OnValueChanged -= OnAmbienceVolumeSliderChanged;
-            LobbyVolumeSlider.OnValueChanged -= OnLobbyVolumeSliderChanged;
-            InterfaceVolumeSlider.OnValueChanged -= OnInterfaceVolumeSliderChanged;
-            base.Dispose(disposing);
-        }
+        Control.AddOptionPercentSlider(
+            CCVars.InterfaceVolume,
+            SliderVolumeInterface,
+            scale: ContentAudioSystem.InterfaceMultiplier);
 
-        private void OnLobbyVolumeSliderChanged(Range obj)
-        {
-            UpdateChanges();
-        }
+        Control.AddOptionSlider(
+            CCVars.MaxAmbientSources,
+            SliderMaxAmbienceSounds,
+            _cfg.GetCVar(CCVars.MinMaxAmbientSourcesConfigured),
+            _cfg.GetCVar(CCVars.MaxMaxAmbientSourcesConfigured));
 
-        private void OnInterfaceVolumeSliderChanged(Range obj)
-        {
-            UpdateChanges();
-        }
+        Control.AddOptionCheckBox(CCVars.LobbyMusicEnabled, LobbyMusicCheckBox);
+        Control.AddOptionCheckBox(CCVars.RestartSoundsEnabled, RestartSoundsCheckBox);
+        Control.AddOptionCheckBox(CCVars.EventMusicEnabled, EventMusicCheckBox);
+        Control.AddOptionCheckBox(CCVars.AdminSoundsEnabled, AdminSoundsCheckBox);
 
-        private void OnAmbientMusicVolumeSliderChanged(Range obj)
-        {
-            UpdateChanges();
-        }
+        Control.Initialize();
+    }
 
-        private void OnAmbienceVolumeSliderChanged(Range obj)
-        {
-            UpdateChanges();
-        }
-
-        private void OnAmbienceSoundsSliderChanged(Range obj)
-        {
-            UpdateChanges();
-        }
-
-        private void OnMasterVolumeSliderChanged(Range range)
-        {
-            _audio.SetMasterGain(MasterVolumeSlider.Value / 100f * ContentAudioSystem.MasterVolumeMultiplier);
-            UpdateChanges();
-        }
-
-        private void OnMidiVolumeSliderChanged(Range range)
-        {
-            UpdateChanges();
-        }
-
-        private void OnLobbyMusicCheckToggled(BaseButton.ButtonEventArgs args)
-        {
-            UpdateChanges();
-        }
-        private void OnRestartSoundsCheckToggled(BaseButton.ButtonEventArgs args)
-        {
-            UpdateChanges();
-        }
-        private void OnEventMusicCheckToggled(BaseButton.ButtonEventArgs args)
-        {
-            UpdateChanges();
-        }
-
-        private void OnAdminSoundsCheckToggled(BaseButton.ButtonEventArgs args)
-        {
-            UpdateChanges();
-        }
-
-        private void OnApplyButtonPressed(BaseButton.ButtonEventArgs args)
-        {
-            _cfg.SetCVar(CVars.AudioMasterVolume, MasterVolumeSlider.Value / 100f * ContentAudioSystem.MasterVolumeMultiplier);
-            // Want the CVar updated values to have the multiplier applied
-            // For the UI we just display 0-100 still elsewhere
-            _cfg.SetCVar(CVars.MidiVolume, MidiVolumeSlider.Value / 100f * ContentAudioSystem.MidiVolumeMultiplier);
-            _cfg.SetCVar(CCVars.AmbienceVolume, AmbienceVolumeSlider.Value / 100f * ContentAudioSystem.AmbienceMultiplier);
-            _cfg.SetCVar(CCVars.AmbientMusicVolume, AmbientMusicVolumeSlider.Value / 100f * ContentAudioSystem.AmbientMusicMultiplier);
-            _cfg.SetCVar(CCVars.LobbyMusicVolume, LobbyVolumeSlider.Value / 100f * ContentAudioSystem.LobbyMultiplier);
-            _cfg.SetCVar(CCVars.InterfaceVolume, InterfaceVolumeSlider.Value / 100f * ContentAudioSystem.InterfaceMultiplier);
-
-            _cfg.SetCVar(CCVars.MaxAmbientSources, (int)AmbienceSoundsSlider.Value);
-
-            _cfg.SetCVar(CCVars.LobbyMusicEnabled, LobbyMusicCheckBox.Pressed);
-            _cfg.SetCVar(CCVars.RestartSoundsEnabled, RestartSoundsCheckBox.Pressed);
-            _cfg.SetCVar(CCVars.EventMusicEnabled, EventMusicCheckBox.Pressed);
-            _cfg.SetCVar(CCVars.AdminSoundsEnabled, AdminSoundsCheckBox.Pressed);
-            _cfg.SaveToFile();
-            UpdateChanges();
-        }
-
-        private void OnResetButtonPressed(BaseButton.ButtonEventArgs args)
-        {
-            Reset();
-        }
-
-        private void Reset()
-        {
-            MasterVolumeSlider.Value = _cfg.GetCVar(CVars.AudioMasterVolume) * 100f / ContentAudioSystem.MasterVolumeMultiplier;
-            MidiVolumeSlider.Value = _cfg.GetCVar(CVars.MidiVolume) * 100f / ContentAudioSystem.MidiVolumeMultiplier;
-            AmbienceVolumeSlider.Value = _cfg.GetCVar(CCVars.AmbienceVolume) * 100f / ContentAudioSystem.AmbienceMultiplier;
-            AmbientMusicVolumeSlider.Value = _cfg.GetCVar(CCVars.AmbientMusicVolume) * 100f / ContentAudioSystem.AmbientMusicMultiplier;
-            LobbyVolumeSlider.Value = _cfg.GetCVar(CCVars.LobbyMusicVolume) * 100f / ContentAudioSystem.LobbyMultiplier;
-            InterfaceVolumeSlider.Value = _cfg.GetCVar(CCVars.InterfaceVolume) * 100f / ContentAudioSystem.InterfaceMultiplier;
-
-            AmbienceSoundsSlider.Value = _cfg.GetCVar(CCVars.MaxAmbientSources);
-
-            LobbyMusicCheckBox.Pressed = _cfg.GetCVar(CCVars.LobbyMusicEnabled);
-            RestartSoundsCheckBox.Pressed = _cfg.GetCVar(CCVars.RestartSoundsEnabled);
-            EventMusicCheckBox.Pressed = _cfg.GetCVar(CCVars.EventMusicEnabled);
-            AdminSoundsCheckBox.Pressed = _cfg.GetCVar(CCVars.AdminSoundsEnabled);
-            UpdateChanges();
-        }
-
-        private void UpdateChanges()
-        {
-            // y'all need jesus.
-            var isMasterVolumeSame =
-                Math.Abs(MasterVolumeSlider.Value - _cfg.GetCVar(CVars.AudioMasterVolume) * 100f / ContentAudioSystem.MasterVolumeMultiplier) < 0.01f;
-            var isMidiVolumeSame =
-                Math.Abs(MidiVolumeSlider.Value - _cfg.GetCVar(CVars.MidiVolume) * 100f / ContentAudioSystem.MidiVolumeMultiplier) < 0.01f;
-            var isAmbientVolumeSame =
-                Math.Abs(AmbienceVolumeSlider.Value - _cfg.GetCVar(CCVars.AmbienceVolume) * 100f / ContentAudioSystem.AmbienceMultiplier) < 0.01f;
-            var isAmbientMusicVolumeSame =
-                Math.Abs(AmbientMusicVolumeSlider.Value - _cfg.GetCVar(CCVars.AmbientMusicVolume) * 100f / ContentAudioSystem.AmbientMusicMultiplier) < 0.01f;
-            var isLobbyVolumeSame =
-                Math.Abs(LobbyVolumeSlider.Value - _cfg.GetCVar(CCVars.LobbyMusicVolume) * 100f / ContentAudioSystem.LobbyMultiplier) < 0.01f;
-            var isInterfaceVolumeSame =
-                Math.Abs(InterfaceVolumeSlider.Value - _cfg.GetCVar(CCVars.InterfaceVolume) * 100f / ContentAudioSystem.InterfaceMultiplier) < 0.01f;
-
-            var isAmbientSoundsSame = (int)AmbienceSoundsSlider.Value == _cfg.GetCVar(CCVars.MaxAmbientSources);
-            var isLobbySame = LobbyMusicCheckBox.Pressed == _cfg.GetCVar(CCVars.LobbyMusicEnabled);
-            var isRestartSoundsSame = RestartSoundsCheckBox.Pressed == _cfg.GetCVar(CCVars.RestartSoundsEnabled);
-            var isEventSame = EventMusicCheckBox.Pressed == _cfg.GetCVar(CCVars.EventMusicEnabled);
-            var isAdminSoundsSame = AdminSoundsCheckBox.Pressed == _cfg.GetCVar(CCVars.AdminSoundsEnabled);
-            var isEverythingSame = isMasterVolumeSame && isMidiVolumeSame && isAmbientVolumeSame && isAmbientMusicVolumeSame && isAmbientSoundsSame && isLobbySame && isRestartSoundsSame && isEventSame
-                                   && isAdminSoundsSame && isLobbyVolumeSame && isInterfaceVolumeSame;
-            ApplyButton.Disabled = isEverythingSame;
-            ResetButton.Disabled = isEverythingSame;
-            MasterVolumeLabel.Text =
-                Loc.GetString("ui-options-volume-percent", ("volume", MasterVolumeSlider.Value / 100));
-            MidiVolumeLabel.Text =
-                Loc.GetString("ui-options-volume-percent", ("volume", MidiVolumeSlider.Value / 100));
-            AmbientMusicVolumeLabel.Text =
-                Loc.GetString("ui-options-volume-percent", ("volume", AmbientMusicVolumeSlider.Value / 100));
-            AmbienceVolumeLabel.Text =
-                Loc.GetString("ui-options-volume-percent", ("volume", AmbienceVolumeSlider.Value / 100));
-            LobbyVolumeLabel.Text =
-                Loc.GetString("ui-options-volume-percent", ("volume", LobbyVolumeSlider.Value / 100));
-            InterfaceVolumeLabel.Text =
-                Loc.GetString("ui-options-volume-percent", ("volume", InterfaceVolumeSlider.Value / 100));
-            AmbienceSoundsLabel.Text = ((int)AmbienceSoundsSlider.Value).ToString();
-        }
+    private void OnMasterVolumeSliderChanged(float value)
+    {
+        // TODO: I was thinking of giving OptionsTabControlRow a flag to "set CVar immediately", but I'm deferring that
+        // until there's a proper system for enforcing people don't close the window with pending changes.
+        _audio.SetMasterGain(value);
     }
 }
diff --git a/Content.Client/Options/UI/Tabs/GraphicsTab.xaml b/Content.Client/Options/UI/Tabs/GraphicsTab.xaml
index ec1b9aa002..f1b9743cad 100644
--- a/Content.Client/Options/UI/Tabs/GraphicsTab.xaml
+++ b/Content.Client/Options/UI/Tabs/GraphicsTab.xaml
@@ -1,53 +1,38 @@
 <tabs:GraphicsTab xmlns="https://spacestation14.io"
-          xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-          xmlns:tabs="clr-namespace:Content.Client.Options.UI.Tabs">
+          xmlns:tabs="clr-namespace:Content.Client.Options.UI.Tabs"
+          xmlns:ui="clr-namespace:Content.Client.Options.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">
+        <ScrollContainer VerticalExpand="True">
+            <BoxContainer Orientation="Vertical" Margin="8 8 8 8">
+                <!-- Display -->
+                <Label Text="{Loc 'ui-options-display-label'}" StyleClasses="LabelKeyText"/>
+                <CheckBox Name="VSyncCheckBox" Text="{Loc 'ui-options-vsync'}" />
+                <CheckBox Name="FullscreenCheckBox" Text="{Loc 'ui-options-fullscreen'}" />
+
+                <!-- Quality -->
+                <Label Text="{Loc 'ui-options-quality-label'}" StyleClasses="LabelKeyText"/>
+                <ui:OptionDropDown Name="DropDownLightingQuality" Title="{Loc 'ui-options-lighting-label'}" />
+                <CheckBox Name="ViewportLowResCheckBox" Text="{Loc 'ui-options-vp-low-res'}" />
+                <CheckBox Name="ParallaxLowQualityCheckBox" Text="{Loc 'ui-options-parallax-low-quality'}" />
+
+                <!-- Interface -->
+                <Label Text="{Loc 'ui-options-interface-label'}" StyleClasses="LabelKeyText"/>
+                <ui:OptionDropDown Name="DropDownUIScale" Title="{Loc 'ui-options-scale-label'}" />
                 <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>
+                <ui:OptionSlider Name="ViewportScaleSlider" Title="{Loc ui-options-vp-scale}" />
+                <ui:OptionSlider Name="ViewportWidthSlider" Title="{Loc ui-options-vp-width}" />
+                <CheckBox Name="IntegerScalingCheckBox"
+                          Text="{Loc 'ui-options-vp-integer-scaling'}"
+                          ToolTip="{Loc 'ui-options-vp-integer-scaling-tooltip'}" />
+                <CheckBox Name="ViewportVerticalFitCheckBox"
+                          Text="{Loc 'ui-options-vp-vertical-fit'}"
+                          ToolTip="{Loc 'ui-options-vp-vertical-fit-tooltip'}" />
+
+                <!-- Misc -->
+                <Label Text="{Loc 'ui-options-misc-label'}" StyleClasses="LabelKeyText"/>
+                <CheckBox Name="FpsCounterCheckBox" Text="{Loc 'ui-options-fps-counter'}" />
             </BoxContainer>
-            <BoxContainer Orientation="Horizontal">
-                <Label Name="ViewportWidthSliderDisplay" />
-                <Control MinSize="4 0" />
-                <Slider Name="ViewportWidthSlider"
-                        Rounded="True"
-                        MinWidth="200" />
-            </BoxContainer>
-            <CheckBox Name="IntegerScalingCheckBox"
-                      Text="{Loc 'ui-options-vp-integer-scaling'}"
-                      ToolTip="{Loc 'ui-options-vp-integer-scaling-tooltip'}" />
-            <CheckBox Name="ViewportVerticalFitCheckBox"
-                      Text="{Loc 'ui-options-vp-vertical-fit'}"
-                      ToolTip="{Loc 'ui-options-vp-vertical-fit-tooltip'}" />
-            <CheckBox Name="ViewportLowResCheckBox" Text="{Loc 'ui-options-vp-low-res'}" />
-            <CheckBox Name="ParallaxLowQualityCheckBox" Text="{Loc 'ui-options-parallax-low-quality'}" />
-            <CheckBox Name="FpsCounterCheckBox" Text="{Loc 'ui-options-fps-counter'}" />
-        </BoxContainer>
-        <controls:StripeBack HasBottomEdge="False" HasMargins="False">
-            <Button Name="ApplyButton"
-                    Text="{Loc 'ui-options-apply'}"
-                    TextAlign="Center"
-                    HorizontalAlignment="Right" />
-        </controls:StripeBack>
+        </ScrollContainer>
+        <ui:OptionsTabControlRow Name="Control" Access="Public" />
     </BoxContainer>
 </tabs:GraphicsTab>
diff --git a/Content.Client/Options/UI/Tabs/GraphicsTab.xaml.cs b/Content.Client/Options/UI/Tabs/GraphicsTab.xaml.cs
index a22adf3e63..f53a2edd95 100644
--- a/Content.Client/Options/UI/Tabs/GraphicsTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/GraphicsTab.xaml.cs
@@ -7,220 +7,141 @@ using Robust.Client.UserInterface.XAML;
 using Robust.Shared;
 using Robust.Shared.Configuration;
 
-namespace Content.Client.Options.UI.Tabs
+namespace Content.Client.Options.UI.Tabs;
+
+[GenerateTypedNameReferences]
+public sealed partial class GraphicsTab : Control
 {
-    [GenerateTypedNameReferences]
-    public sealed partial class GraphicsTab : Control
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
+
+    public GraphicsTab()
     {
-        private static readonly float[] UIScaleOptions =
+        IoCManager.InjectDependencies(this);
+        RobustXamlLoader.Load(this);
+
+        Control.AddOptionCheckBox(CVars.DisplayVSync, VSyncCheckBox);
+        Control.AddOption(new OptionFullscreen(Control, _cfg, FullscreenCheckBox));
+        Control.AddOption(new OptionLightingQuality(Control, _cfg, DropDownLightingQuality));
+
+        Control.AddOptionDropDown(
+            CVars.DisplayUIScale,
+            DropDownUIScale,
+            [
+                new OptionDropDownCVar<float>.ValueOption(
+                    0f,
+                    Loc.GetString("ui-options-scale-auto", ("scale", UserInterfaceManager.DefaultUIScale))),
+                new OptionDropDownCVar<float>.ValueOption(0.75f, Loc.GetString("ui-options-scale-75")),
+                new OptionDropDownCVar<float>.ValueOption(1.00f, Loc.GetString("ui-options-scale-100")),
+                new OptionDropDownCVar<float>.ValueOption(1.25f, Loc.GetString("ui-options-scale-125")),
+                new OptionDropDownCVar<float>.ValueOption(1.50f, Loc.GetString("ui-options-scale-150")),
+                new OptionDropDownCVar<float>.ValueOption(1.75f, Loc.GetString("ui-options-scale-175")),
+                new OptionDropDownCVar<float>.ValueOption(2.00f, Loc.GetString("ui-options-scale-200")),
+            ]);
+
+        var vpStretch = Control.AddOptionCheckBox(CCVars.ViewportStretch, ViewportStretchCheckBox);
+        var vpVertFit = Control.AddOptionCheckBox(CCVars.ViewportVerticalFit, ViewportVerticalFitCheckBox);
+        Control.AddOptionSlider(
+            CCVars.ViewportFixedScaleFactor,
+            ViewportScaleSlider,
+            1,
+            5,
+            (_, value) => Loc.GetString("ui-options-vp-scale-value", ("scale", value)));
+
+        vpStretch.ImmediateValueChanged += _ => UpdateViewportSettingsVisibility();
+        vpVertFit.ImmediateValueChanged += _ => UpdateViewportSettingsVisibility();
+
+        Control.AddOptionSlider(
+            CCVars.ViewportWidth,
+            ViewportWidthSlider,
+            (int)ViewportWidthSlider.Slider.MinValue,
+            (int)ViewportWidthSlider.Slider.MaxValue);
+
+        Control.AddOption(new OptionIntegerScaling(Control, _cfg, IntegerScalingCheckBox));
+        Control.AddOptionCheckBox(CCVars.ViewportScaleRender, ViewportLowResCheckBox, invert: true);
+        Control.AddOptionCheckBox(CCVars.ParallaxLowQuality, ParallaxLowQualityCheckBox);
+        Control.AddOptionCheckBox(CCVars.HudFpsCounterVisible, FpsCounterCheckBox);
+
+        Control.Initialize();
+
+        _cfg.OnValueChanged(CCVars.ViewportMinimumWidth, _ => UpdateViewportWidthRange());
+        _cfg.OnValueChanged(CCVars.ViewportMaximumWidth, _ => UpdateViewportWidthRange());
+
+        UpdateViewportWidthRange();
+        UpdateViewportSettingsVisibility();
+    }
+
+    private void UpdateViewportSettingsVisibility()
+    {
+        ViewportScaleSlider.Visible = !ViewportStretchCheckBox.Pressed;
+        IntegerScalingCheckBox.Visible = ViewportStretchCheckBox.Pressed;
+        ViewportVerticalFitCheckBox.Visible = ViewportStretchCheckBox.Pressed;
+        ViewportWidthSlider.Visible = !ViewportStretchCheckBox.Pressed || !ViewportVerticalFitCheckBox.Pressed;
+    }
+
+    private void UpdateViewportWidthRange()
+    {
+        var min = _cfg.GetCVar(CCVars.ViewportMinimumWidth);
+        var max = _cfg.GetCVar(CCVars.ViewportMaximumWidth);
+
+        ViewportWidthSlider.Slider.MinValue = min;
+        ViewportWidthSlider.Slider.MaxValue = max;
+    }
+
+    private sealed class OptionLightingQuality : BaseOption
+    {
+        private readonly IConfigurationManager _cfg;
+        private readonly OptionDropDown _dropDown;
+
+        private const int QualityVeryLow = 0;
+        private const int QualityLow = 1;
+        private const int QualityMedium = 2;
+        private const int QualityHigh = 3;
+
+        private const int QualityDefault = QualityMedium;
+
+        public OptionLightingQuality(OptionsTabControlRow controller, IConfigurationManager cfg, OptionDropDown dropDown) : base(controller)
         {
-            0f,
-            0.75f,
-            1f,
-            1.25f,
-            1.50f,
-            1.75f,
-            2f
-        };
-
-        [Dependency] private readonly IConfigurationManager _cfg = 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;
-
-            ViewportStretchCheckBox.OnToggled += _ =>
-            {
-                UpdateViewportScale();
-                UpdateApplyButton();
-            };
-
-            ViewportScaleSlider.OnValueChanged += _ =>
-            {
-                UpdateApplyButton();
-                UpdateViewportScale();
-            };
-
-            ViewportWidthSlider.OnValueChanged += _ =>
-            {
-                UpdateViewportWidthDisplay();
-                UpdateApplyButton();
-            };
-
-            ViewportVerticalFitCheckBox.OnToggled += _ =>
-            {
-                UpdateViewportScale();
-                UpdateApplyButton();
-            };
-
-            IntegerScalingCheckBox.OnToggled += OnCheckBoxToggled;
-            ViewportLowResCheckBox.OnToggled += OnCheckBoxToggled;
-            ParallaxLowQualityCheckBox.OnToggled += OnCheckBoxToggled;
-            FpsCounterCheckBox.OnToggled += OnCheckBoxToggled;
-            ApplyButton.OnPressed += OnApplyButtonPressed;
-            VSyncCheckBox.Pressed = _cfg.GetCVar(CVars.DisplayVSync);
-            FullscreenCheckBox.Pressed = ConfigIsFullscreen;
-            LightingPresetOption.SelectId(GetConfigLightingQuality());
-            UIScaleOption.SelectId(GetConfigUIScalePreset(ConfigUIScale));
-            ViewportScaleSlider.Value = _cfg.GetCVar(CCVars.ViewportFixedScaleFactor);
-            ViewportStretchCheckBox.Pressed = _cfg.GetCVar(CCVars.ViewportStretch);
-            IntegerScalingCheckBox.Pressed = _cfg.GetCVar(CCVars.ViewportSnapToleranceMargin) != 0;
-            ViewportVerticalFitCheckBox.Pressed = _cfg.GetCVar(CCVars.ViewportVerticalFit);
-            ViewportLowResCheckBox.Pressed = !_cfg.GetCVar(CCVars.ViewportScaleRender);
-            ParallaxLowQualityCheckBox.Pressed = _cfg.GetCVar(CCVars.ParallaxLowQuality);
-            FpsCounterCheckBox.Pressed = _cfg.GetCVar(CCVars.HudFpsCounterVisible);
-            ViewportWidthSlider.Value = _cfg.GetCVar(CCVars.ViewportWidth);
-
-            _cfg.OnValueChanged(CCVars.ViewportMinimumWidth, _ => UpdateViewportWidthRange());
-            _cfg.OnValueChanged(CCVars.ViewportMaximumWidth, _ => UpdateViewportWidthRange());
-
-            UpdateViewportWidthRange();
-            UpdateViewportWidthDisplay();
-            UpdateViewportScale();
-            UpdateApplyButton();
+            _cfg = cfg;
+            _dropDown = dropDown;
+            var button = dropDown.Button;
+            button.AddItem(Loc.GetString("ui-options-lighting-very-low"), QualityVeryLow);
+            button.AddItem(Loc.GetString("ui-options-lighting-low"), QualityLow);
+            button.AddItem(Loc.GetString("ui-options-lighting-medium"), QualityMedium);
+            button.AddItem(Loc.GetString("ui-options-lighting-high"), QualityHigh);
+            button.OnItemSelected += OnOptionSelected;
         }
 
-        private void OnUIScaleChanged(OptionButton.ItemSelectedEventArgs args)
+        private void OnOptionSelected(OptionButton.ItemSelectedEventArgs obj)
         {
-            UIScaleOption.SelectId(args.Id);
-            UpdateApplyButton();
+            _dropDown.Button.SelectId(obj.Id);
+            ValueChanged();
         }
 
-        private void OnApplyButtonPressed(BaseButton.ButtonEventArgs args)
+        public override void LoadValue()
         {
-            _cfg.SetCVar(CVars.DisplayVSync, VSyncCheckBox.Pressed);
-            SetConfigLightingQuality(LightingPresetOption.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.ViewportVerticalFit, ViewportVerticalFitCheckBox.Pressed);
-            _cfg.SetCVar(CCVars.ViewportScaleRender, !ViewportLowResCheckBox.Pressed);
-            _cfg.SetCVar(CCVars.ParallaxLowQuality, ParallaxLowQualityCheckBox.Pressed);
-            _cfg.SetCVar(CCVars.HudFpsCounterVisible, FpsCounterCheckBox.Pressed);
-            _cfg.SetCVar(CCVars.ViewportWidth, (int) ViewportWidthSlider.Value);
-
-            _cfg.SaveToFile();
-            UpdateApplyButton();
+            _dropDown.Button.SelectId(GetConfigLightingQuality());
         }
 
-        private void OnCheckBoxToggled(BaseButton.ButtonToggledEventArgs args)
+        public override void SaveValue()
         {
-            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 isUIScaleSame = MathHelper.CloseToPercent(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 isVPVerticalFitSame = ViewportVerticalFitCheckBox.Pressed == _cfg.GetCVar(CCVars.ViewportVerticalFit);
-            var isVPResSame = ViewportLowResCheckBox.Pressed == !_cfg.GetCVar(CCVars.ViewportScaleRender);
-            var isPLQSame = ParallaxLowQualityCheckBox.Pressed == _cfg.GetCVar(CCVars.ParallaxLowQuality);
-            var isFpsCounterVisibleSame = FpsCounterCheckBox.Pressed == _cfg.GetCVar(CCVars.HudFpsCounterVisible);
-            var isWidthSame = (int) ViewportWidthSlider.Value == _cfg.GetCVar(CCVars.ViewportWidth);
-
-            ApplyButton.Disabled = isVSyncSame &&
-                                   isFullscreenSame &&
-                                   isLightingQualitySame &&
-                                   isUIScaleSame &&
-                                   isVPStretchSame &&
-                                   isVPScaleSame &&
-                                   isIntegerScalingSame &&
-                                   isVPVerticalFitSame &&
-                                   isVPResSame &&
-                                   isPLQSame &&
-                                   isFpsCounterVisibleSame &&
-                                   isWidthSame;
-        }
-
-        private bool ConfigIsFullscreen =>
-            _cfg.GetCVar(CVars.DisplayWindowMode) == (int) WindowMode.Fullscreen;
-
-        public void UpdateProperties()
-        {
-            FullscreenCheckBox.Pressed = ConfigIsFullscreen;
-        }
-
-
-        private float ConfigUIScale => _cfg.GetCVar(CVars.DisplayUIScale);
-
-        private int GetConfigLightingQuality()
-        {
-            var val = _cfg.GetCVar(CVars.LightResolutionScale);
-            var soft = _cfg.GetCVar(CVars.LightSoftShadows);
-            if (val <= 0.125)
+            switch (_dropDown.Button.SelectedId)
             {
-                return 0;
-            }
-            else if ((val <= 0.5) && !soft)
-            {
-                return 1;
-            }
-            else if (val <= 0.5)
-            {
-                return 2;
-            }
-            else
-            {
-                return 3;
-            }
-        }
-
-        private void SetConfigLightingQuality(int value)
-        {
-            switch (value)
-            {
-                case 0:
+                case QualityVeryLow:
                     _cfg.SetCVar(CVars.LightResolutionScale, 0.125f);
                     _cfg.SetCVar(CVars.LightSoftShadows, false);
                     _cfg.SetCVar(CVars.LightBlur, false);
                     break;
-                case 1:
+                case QualityLow:
                     _cfg.SetCVar(CVars.LightResolutionScale, 0.5f);
                     _cfg.SetCVar(CVars.LightSoftShadows, false);
                     _cfg.SetCVar(CVars.LightBlur, true);
                     break;
-                case 2:
+                default: // = QualityMedium
                     _cfg.SetCVar(CVars.LightResolutionScale, 0.5f);
                     _cfg.SetCVar(CVars.LightSoftShadows, true);
                     _cfg.SetCVar(CVars.LightBlur, true);
                     break;
-                case 3:
+                case QualityHigh:
                     _cfg.SetCVar(CVars.LightResolutionScale, 1);
                     _cfg.SetCVar(CVars.LightSoftShadows, true);
                     _cfg.SetCVar(CVars.LightBlur, true);
@@ -228,40 +149,83 @@ namespace Content.Client.Options.UI.Tabs
             }
         }
 
-        private static int GetConfigUIScalePreset(float value)
+        public override void ResetToDefault()
         {
-            for (var i = 0; i < UIScaleOptions.Length; i++)
+            _dropDown.Button.SelectId(QualityDefault);
+        }
+
+        public override bool IsModified()
+        {
+            return _dropDown.Button.SelectedId != GetConfigLightingQuality();
+        }
+
+        public override bool IsModifiedFromDefault()
+        {
+            return _dropDown.Button.SelectedId != QualityDefault;
+        }
+
+        private int GetConfigLightingQuality()
+        {
+            var val = _cfg.GetCVar(CVars.LightResolutionScale);
+            var soft = _cfg.GetCVar(CVars.LightSoftShadows);
+            if (val <= 0.125)
+                return QualityVeryLow;
+
+            if ((val <= 0.5) && !soft)
+                return QualityLow;
+
+            if (val <= 0.5)
+                return QualityMedium;
+
+            return QualityHigh;
+        }
+    }
+
+    private sealed class OptionFullscreen : BaseOptionCVar<int>
+    {
+        private readonly CheckBox _checkBox;
+
+        protected override int Value
+        {
+            get => _checkBox.Pressed ? (int) WindowMode.Fullscreen : (int) WindowMode.Windowed;
+            set => _checkBox.Pressed = (value == (int) WindowMode.Fullscreen);
+        }
+
+        public OptionFullscreen(
+            OptionsTabControlRow controller,
+            IConfigurationManager cfg,
+            CheckBox checkBox)
+            : base(controller, cfg, CVars.DisplayWindowMode)
+        {
+            _checkBox = checkBox;
+            _checkBox.OnToggled += _ =>
             {
-                if (MathHelper.CloseToPercent(UIScaleOptions[i], value))
-                {
-                    return i;
-                }
-            }
+                ValueChanged();
+            };
+        }
+    }
 
-            return 0;
+    private sealed class OptionIntegerScaling : BaseOptionCVar<int>
+    {
+        private readonly CheckBox _checkBox;
+
+        protected override int Value
+        {
+            get => _checkBox.Pressed ? CCVars.ViewportSnapToleranceMargin.DefaultValue : 0;
+            set => _checkBox.Pressed = (value != 0);
         }
 
-        private void UpdateViewportScale()
+        public OptionIntegerScaling(
+            OptionsTabControlRow controller,
+            IConfigurationManager cfg,
+            CheckBox checkBox)
+            : base(controller, cfg, CCVars.ViewportSnapToleranceMargin)
         {
-            ViewportScaleBox.Visible = !ViewportStretchCheckBox.Pressed;
-            IntegerScalingCheckBox.Visible = ViewportStretchCheckBox.Pressed;
-            ViewportVerticalFitCheckBox.Visible = ViewportStretchCheckBox.Pressed;
-            ViewportWidthSlider.Visible = ViewportWidthSliderDisplay.Visible = !ViewportStretchCheckBox.Pressed || ViewportStretchCheckBox.Pressed && !ViewportVerticalFitCheckBox.Pressed;
-            ViewportScaleText.Text = Loc.GetString("ui-options-vp-scale", ("scale", ViewportScaleSlider.Value));
-        }
-
-        private void UpdateViewportWidthRange()
-        {
-            var min = _cfg.GetCVar(CCVars.ViewportMinimumWidth);
-            var max = _cfg.GetCVar(CCVars.ViewportMaximumWidth);
-
-            ViewportWidthSlider.MinValue = min;
-            ViewportWidthSlider.MaxValue = max;
-        }
-
-        private void UpdateViewportWidthDisplay()
-        {
-            ViewportWidthSliderDisplay.Text = Loc.GetString("ui-options-vp-width", ("width", (int) ViewportWidthSlider.Value));
+            _checkBox = checkBox;
+            _checkBox.OnToggled += _ =>
+            {
+                ValueChanged();
+            };
         }
     }
 }
diff --git a/Content.Client/Options/UI/Tabs/MiscTab.xaml b/Content.Client/Options/UI/Tabs/MiscTab.xaml
index 0c6ec38042..c1733e209d 100644
--- a/Content.Client/Options/UI/Tabs/MiscTab.xaml
+++ b/Content.Client/Options/UI/Tabs/MiscTab.xaml
@@ -1,76 +1,34 @@
 <tabs:MiscTab xmlns="https://spacestation14.io"
-                  xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-                  xmlns:tabs="clr-namespace:Content.Client.Options.UI.Tabs"
-                  xmlns:xNamespace="http://schemas.microsoft.com/winfx/2006/xaml"
-                  xmlns:s="clr-namespace:Content.Client.Stylesheets">
+              xmlns:tabs="clr-namespace:Content.Client.Options.UI.Tabs"
+              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+              xmlns:ui="clr-namespace:Content.Client.Options.UI">
     <BoxContainer Orientation="Vertical">
         <ScrollContainer VerticalExpand="True" HorizontalExpand="True">
             <BoxContainer Orientation="Vertical" Margin="8 8 8 8" VerticalExpand="True">
                 <Label Text="{Loc 'ui-options-general-ui-style'}"
-                       FontColorOverride="{xNamespace:Static s:StyleNano.NanoGold}"
                        StyleClasses="LabelKeyText"/>
-                <BoxContainer Orientation="Horizontal">
-                    <Label Text="{Loc 'ui-options-hud-theme'}" />
-                    <Control MinSize="4 0" />
-                    <OptionButton Name="HudThemeOption" />
-                </BoxContainer>
-                <BoxContainer Orientation="Horizontal">
-                    <Label Text="{Loc 'ui-options-hud-layout'}" />
-                    <Control MinSize="4 0" />
-                    <OptionButton Name="HudLayoutOption" />
-                </BoxContainer>
-                <Label Text="{Loc 'ui-options-general-accessibility'}"
-                       FontColorOverride="{xNamespace:Static s:StyleNano.NanoGold}"
-                       StyleClasses="LabelKeyText"/>
-                <CheckBox Name="ReducedMotionCheckBox" Text="{Loc 'ui-options-reduced-motion'}" />
-                <CheckBox Name="EnableColorNameCheckBox" Text="{Loc 'ui-options-enable-color-name'}" />
-                <CheckBox Name="ColorblindFriendlyCheckBox" Text="{Loc 'ui-options-colorblind-friendly'}" />
-                <BoxContainer Orientation="Horizontal">
-                    <Label Text="{Loc 'ui-options-chat-window-opacity'}" Margin="8 0" />
-                    <Slider Name="ChatWindowOpacitySlider"
-                            MinValue="0"
-                            MaxValue="1"
-                            MinWidth="200" />
-                    <Label Name="ChatWindowOpacityLabel" Margin="8 0" />
-                </BoxContainer>
-                <BoxContainer Orientation="Horizontal">
-                    <Label Text="{Loc 'ui-options-screen-shake-intensity'}" Margin="8 0" />
-                    <Slider Name="ScreenShakeIntensitySlider"
-                            MinValue="0"
-                            MaxValue="100"
-                            Rounded="True"
-                            MinWidth="200" />
-                    <Label Name="ScreenShakeIntensityLabel" Margin="8 0" />
-                </BoxContainer>
+                <ui:OptionDropDown Name="DropDownHudTheme" Title="{Loc 'ui-options-hud-theme'}" />
+                <ui:OptionDropDown Name="DropDownHudLayout" Title="{Loc 'ui-options-hud-layout'}" />
                 <Label Text="{Loc 'ui-options-general-discord'}"
-                       FontColorOverride="{xNamespace:Static s:StyleNano.NanoGold}"
                        StyleClasses="LabelKeyText"/>
                 <CheckBox Name="DiscordRich" Text="{Loc 'ui-options-discordrich'}" />
                 <Label Text="{Loc 'ui-options-general-speech'}"
-                       FontColorOverride="{xNamespace:Static s:StyleNano.NanoGold}"
                        StyleClasses="LabelKeyText"/>
                 <CheckBox Name="ShowOocPatronColor" Text="{Loc 'ui-options-show-ooc-patron-color'}" />
                 <CheckBox Name="ShowLoocAboveHeadCheckBox" Text="{Loc 'ui-options-show-looc-on-head'}" />
                 <CheckBox Name="FancySpeechBubblesCheckBox" Text="{Loc 'ui-options-fancy-speech'}" />
                 <CheckBox Name="FancyNameBackgroundsCheckBox" Text="{Loc 'ui-options-fancy-name-background'}" />
                 <Label Text="{Loc 'ui-options-general-cursor'}"
-                       FontColorOverride="{xNamespace:Static s:StyleNano.NanoGold}"
                        StyleClasses="LabelKeyText"/>
                 <CheckBox Name="ShowHeldItemCheckBox" Text="{Loc 'ui-options-show-held-item'}" />
                 <CheckBox Name="ShowCombatModeIndicatorsCheckBox" Text="{Loc 'ui-options-show-combat-mode-indicators'}" />
                 <Label Text="{Loc 'ui-options-general-storage'}"
-                       FontColorOverride="{xNamespace:Static s:StyleNano.NanoGold}"
                        StyleClasses="LabelKeyText"/>
                 <CheckBox Name="OpaqueStorageWindowCheckBox" Text="{Loc 'ui-options-opaque-storage-window'}" />
                 <CheckBox Name="StaticStorageUI" Text="{Loc 'ui-options-static-storage-ui'}" />
                 <!-- <CheckBox Name="ToggleWalk" Text="{Loc 'ui-options-hotkey-toggle-walk'}" /> -->
             </BoxContainer>
         </ScrollContainer>
-        <controls:StripeBack HasBottomEdge="False" HasMargins="False">
-            <Button Name="ApplyButton"
-                    Text="{Loc 'ui-options-apply'}"
-                    TextAlign="Center"
-                    HorizontalAlignment="Right" />
-        </controls:StripeBack>
+        <ui:OptionsTabControlRow Name="Control" Access="Public" />
     </BoxContainer>
 </tabs:MiscTab>
diff --git a/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs b/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs
index 13e3fd05f5..2aad4e1d0b 100644
--- a/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs
@@ -5,201 +5,54 @@ using Content.Shared.HUD;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Player;
 using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared;
-using Robust.Shared.Configuration;
-using Robust.Shared.Network;
-using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
-using Range = Robust.Client.UserInterface.Controls.Range;
 
-namespace Content.Client.Options.UI.Tabs
+namespace Content.Client.Options.UI.Tabs;
+
+[GenerateTypedNameReferences]
+public sealed partial class MiscTab : Control
 {
-    [GenerateTypedNameReferences]
-    public sealed partial class MiscTab : Control
+    [Dependency] private readonly IPlayerManager _playerManager = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+
+    public MiscTab()
     {
-        [Dependency] private readonly IPlayerManager _playerManager = default!;
-        [Dependency] private readonly IConfigurationManager _cfg = default!;
-        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
 
-        private readonly Dictionary<string, int> _hudThemeIdToIndex = new();
-
-        public MiscTab()
+        var themes = _prototypeManager.EnumeratePrototypes<HudThemePrototype>().ToList();
+        themes.Sort();
+        var themeEntries = new List<OptionDropDownCVar<string>.ValueOption>();
+        foreach (var gear in themes)
         {
-            RobustXamlLoader.Load(this);
-            IoCManager.InjectDependencies(this);
-
-            var themes = _prototypeManager.EnumeratePrototypes<HudThemePrototype>().ToList();
-            themes.Sort();
-            foreach (var gear in themes)
-            {
-                HudThemeOption.AddItem(Loc.GetString(gear.Name));
-                _hudThemeIdToIndex.Add(gear.ID, HudThemeOption.GetItemId(HudThemeOption.ItemCount - 1));
-            }
-
-            var hudLayout = _cfg.GetCVar(CCVars.UILayout);
-            var id = 0;
-            foreach (var layout in Enum.GetValues(typeof(ScreenType)))
-            {
-                var name = layout.ToString()!;
-                HudLayoutOption.AddItem(name, id);
-                if (name == hudLayout)
-                {
-                    HudLayoutOption.SelectId(id);
-                }
-                HudLayoutOption.SetItemMetadata(id, name);
-
-                id++;
-            }
-
-            HudLayoutOption.OnItemSelected += args =>
-            {
-                HudLayoutOption.SelectId(args.Id);
-                UpdateApplyButton();
-            };
-
-            // Channel can be null in replays so.
-            // ReSharper disable once ConditionalAccessQualifierIsNonNullableAccordingToAPIContract
-            ShowOocPatronColor.Visible = _playerManager.LocalSession?.Channel?.UserData.PatronTier is { };
-
-            HudThemeOption.OnItemSelected += OnHudThemeChanged;
-            DiscordRich.OnToggled += OnCheckBoxToggled;
-            ShowOocPatronColor.OnToggled += OnCheckBoxToggled;
-            ShowLoocAboveHeadCheckBox.OnToggled += OnCheckBoxToggled;
-            ShowHeldItemCheckBox.OnToggled += OnCheckBoxToggled;
-            ShowCombatModeIndicatorsCheckBox.OnToggled += OnCheckBoxToggled;
-            OpaqueStorageWindowCheckBox.OnToggled += OnCheckBoxToggled;
-            FancySpeechBubblesCheckBox.OnToggled += OnCheckBoxToggled;
-            FancyNameBackgroundsCheckBox.OnToggled += OnCheckBoxToggled;
-            EnableColorNameCheckBox.OnToggled += OnCheckBoxToggled;
-            ColorblindFriendlyCheckBox.OnToggled += OnCheckBoxToggled;
-            ReducedMotionCheckBox.OnToggled += OnCheckBoxToggled;
-            ChatWindowOpacitySlider.OnValueChanged += OnChatWindowOpacitySliderChanged;
-            ScreenShakeIntensitySlider.OnValueChanged += OnScreenShakeIntensitySliderChanged;
-            // ToggleWalk.OnToggled += OnCheckBoxToggled;
-            StaticStorageUI.OnToggled += OnCheckBoxToggled;
-
-            HudThemeOption.SelectId(_hudThemeIdToIndex.GetValueOrDefault(_cfg.GetCVar(CVars.InterfaceTheme), 0));
-            DiscordRich.Pressed = _cfg.GetCVar(CVars.DiscordEnabled);
-            ShowOocPatronColor.Pressed = _cfg.GetCVar(CCVars.ShowOocPatronColor);
-            ShowLoocAboveHeadCheckBox.Pressed = _cfg.GetCVar(CCVars.LoocAboveHeadShow);
-            ShowHeldItemCheckBox.Pressed = _cfg.GetCVar(CCVars.HudHeldItemShow);
-            ShowCombatModeIndicatorsCheckBox.Pressed = _cfg.GetCVar(CCVars.CombatModeIndicatorsPointShow);
-            OpaqueStorageWindowCheckBox.Pressed = _cfg.GetCVar(CCVars.OpaqueStorageWindow);
-            FancySpeechBubblesCheckBox.Pressed = _cfg.GetCVar(CCVars.ChatEnableFancyBubbles);
-            FancyNameBackgroundsCheckBox.Pressed = _cfg.GetCVar(CCVars.ChatFancyNameBackground);
-            EnableColorNameCheckBox.Pressed = _cfg.GetCVar(CCVars.ChatEnableColorName);
-            ColorblindFriendlyCheckBox.Pressed = _cfg.GetCVar(CCVars.AccessibilityColorblindFriendly);
-            ReducedMotionCheckBox.Pressed = _cfg.GetCVar(CCVars.ReducedMotion);
-            ChatWindowOpacitySlider.Value = _cfg.GetCVar(CCVars.ChatWindowOpacity);
-            ScreenShakeIntensitySlider.Value = _cfg.GetCVar(CCVars.ScreenShakeIntensity) * 100f;
-            // ToggleWalk.Pressed = _cfg.GetCVar(CCVars.ToggleWalk);
-            StaticStorageUI.Pressed = _cfg.GetCVar(CCVars.StaticStorageUI);
-
-
-            ApplyButton.OnPressed += OnApplyButtonPressed;
-            UpdateApplyButton();
+            themeEntries.Add(new OptionDropDownCVar<string>.ValueOption(gear.ID, Loc.GetString(gear.Name)));
         }
 
-        private void OnCheckBoxToggled(BaseButton.ButtonToggledEventArgs args)
+        var layoutEntries = new List<OptionDropDownCVar<string>.ValueOption>();
+        foreach (var layout in Enum.GetValues(typeof(ScreenType)))
         {
-            UpdateApplyButton();
+            layoutEntries.Add(new OptionDropDownCVar<string>.ValueOption(layout.ToString()!, layout.ToString()!));
         }
 
-        private void OnHudThemeChanged(OptionButton.ItemSelectedEventArgs args)
-        {
-            HudThemeOption.SelectId(args.Id);
-            UpdateApplyButton();
-        }
+        // Channel can be null in replays so.
+        // ReSharper disable once ConditionalAccessQualifierIsNonNullableAccordingToAPIContract
+        ShowOocPatronColor.Visible = _playerManager.LocalSession?.Channel?.UserData.PatronTier is { };
 
-        private void OnChatWindowOpacitySliderChanged(Range range)
-        {
-            ChatWindowOpacityLabel.Text = Loc.GetString("ui-options-chat-window-opacity-percent",
-                ("opacity", range.Value));
-            UpdateApplyButton();
-        }
+        Control.AddOptionDropDown(CVars.InterfaceTheme, DropDownHudTheme, themeEntries);
+        Control.AddOptionDropDown(CCVars.UILayout, DropDownHudLayout, layoutEntries);
 
-        private void OnScreenShakeIntensitySliderChanged(Range obj)
-        {
-            ScreenShakeIntensityLabel.Text = Loc.GetString("ui-options-screen-shake-percent", ("intensity", ScreenShakeIntensitySlider.Value / 100f));
-            UpdateApplyButton();
-        }
-
-        private void OnApplyButtonPressed(BaseButton.ButtonEventArgs args)
-        {
-            foreach (var theme in _prototypeManager.EnumeratePrototypes<HudThemePrototype>())
-            {
-                if (_hudThemeIdToIndex[theme.ID] != HudThemeOption.SelectedId)
-                    continue;
-                _cfg.SetCVar(CVars.InterfaceTheme, theme.ID);
-                break;
-            }
-
-            _cfg.SetCVar(CVars.DiscordEnabled, DiscordRich.Pressed);
-            _cfg.SetCVar(CCVars.HudHeldItemShow, ShowHeldItemCheckBox.Pressed);
-            _cfg.SetCVar(CCVars.CombatModeIndicatorsPointShow, ShowCombatModeIndicatorsCheckBox.Pressed);
-            _cfg.SetCVar(CCVars.OpaqueStorageWindow, OpaqueStorageWindowCheckBox.Pressed);
-            _cfg.SetCVar(CCVars.ShowOocPatronColor, ShowOocPatronColor.Pressed);
-            _cfg.SetCVar(CCVars.LoocAboveHeadShow, ShowLoocAboveHeadCheckBox.Pressed);
-            _cfg.SetCVar(CCVars.ChatEnableFancyBubbles, FancySpeechBubblesCheckBox.Pressed);
-            _cfg.SetCVar(CCVars.ChatFancyNameBackground, FancyNameBackgroundsCheckBox.Pressed);
-            _cfg.SetCVar(CCVars.ChatEnableColorName, EnableColorNameCheckBox.Pressed);
-            _cfg.SetCVar(CCVars.AccessibilityColorblindFriendly, ColorblindFriendlyCheckBox.Pressed);
-            _cfg.SetCVar(CCVars.ReducedMotion, ReducedMotionCheckBox.Pressed);
-            _cfg.SetCVar(CCVars.ChatWindowOpacity, ChatWindowOpacitySlider.Value);
-            _cfg.SetCVar(CCVars.ScreenShakeIntensity, ScreenShakeIntensitySlider.Value / 100f);
-            // _cfg.SetCVar(CCVars.ToggleWalk, ToggleWalk.Pressed);
-            _cfg.SetCVar(CCVars.StaticStorageUI, StaticStorageUI.Pressed);
-
-            if (HudLayoutOption.SelectedMetadata is string opt)
-            {
-                _cfg.SetCVar(CCVars.UILayout, opt);
-            }
-
-            _cfg.SaveToFile();
-            UpdateApplyButton();
-        }
-
-        private void UpdateApplyButton()
-        {
-            var isHudThemeSame = HudThemeOption.SelectedId == _hudThemeIdToIndex.GetValueOrDefault(_cfg.GetCVar(CVars.InterfaceTheme), 0);
-            var isLayoutSame = HudLayoutOption.SelectedMetadata is string opt && opt == _cfg.GetCVar(CCVars.UILayout);
-            var isDiscordSame = DiscordRich.Pressed == _cfg.GetCVar(CVars.DiscordEnabled);
-            var isShowHeldItemSame = ShowHeldItemCheckBox.Pressed == _cfg.GetCVar(CCVars.HudHeldItemShow);
-            var isCombatModeIndicatorsSame = ShowCombatModeIndicatorsCheckBox.Pressed == _cfg.GetCVar(CCVars.CombatModeIndicatorsPointShow);
-            var isOpaqueStorageWindow = OpaqueStorageWindowCheckBox.Pressed == _cfg.GetCVar(CCVars.OpaqueStorageWindow);
-            var isOocPatronColorShowSame = ShowOocPatronColor.Pressed == _cfg.GetCVar(CCVars.ShowOocPatronColor);
-            var isLoocShowSame = ShowLoocAboveHeadCheckBox.Pressed == _cfg.GetCVar(CCVars.LoocAboveHeadShow);
-            var isFancyChatSame = FancySpeechBubblesCheckBox.Pressed == _cfg.GetCVar(CCVars.ChatEnableFancyBubbles);
-            var isFancyBackgroundSame = FancyNameBackgroundsCheckBox.Pressed == _cfg.GetCVar(CCVars.ChatFancyNameBackground);
-            var isEnableColorNameSame = EnableColorNameCheckBox.Pressed == _cfg.GetCVar(CCVars.ChatEnableColorName);
-            var isColorblindFriendly = ColorblindFriendlyCheckBox.Pressed == _cfg.GetCVar(CCVars.AccessibilityColorblindFriendly);
-            var isReducedMotionSame = ReducedMotionCheckBox.Pressed == _cfg.GetCVar(CCVars.ReducedMotion);
-            var isChatWindowOpacitySame = Math.Abs(ChatWindowOpacitySlider.Value - _cfg.GetCVar(CCVars.ChatWindowOpacity)) < 0.01f;
-            var isScreenShakeIntensitySame = Math.Abs(ScreenShakeIntensitySlider.Value / 100f - _cfg.GetCVar(CCVars.ScreenShakeIntensity)) < 0.01f;
-            // var isToggleWalkSame = ToggleWalk.Pressed == _cfg.GetCVar(CCVars.ToggleWalk);
-            var isStaticStorageUISame = StaticStorageUI.Pressed == _cfg.GetCVar(CCVars.StaticStorageUI);
-
-            ApplyButton.Disabled = isHudThemeSame &&
-                                   isLayoutSame &&
-                                   isDiscordSame &&
-                                   isShowHeldItemSame &&
-                                   isCombatModeIndicatorsSame &&
-                                   isOpaqueStorageWindow &&
-                                   isOocPatronColorShowSame &&
-                                   isLoocShowSame &&
-                                   isFancyChatSame &&
-                                   isFancyBackgroundSame &&
-                                   isEnableColorNameSame &&
-                                   isColorblindFriendly &&
-                                   isReducedMotionSame &&
-                                   isChatWindowOpacitySame &&
-                                   isScreenShakeIntensitySame &&
-                                   // isToggleWalkSame &&
-                                   isStaticStorageUISame;
-        }
+        Control.AddOptionCheckBox(CVars.DiscordEnabled, DiscordRich);
+        Control.AddOptionCheckBox(CCVars.ShowOocPatronColor, ShowOocPatronColor);
+        Control.AddOptionCheckBox(CCVars.LoocAboveHeadShow, ShowLoocAboveHeadCheckBox);
+        Control.AddOptionCheckBox(CCVars.HudHeldItemShow, ShowHeldItemCheckBox);
+        Control.AddOptionCheckBox(CCVars.CombatModeIndicatorsPointShow, ShowCombatModeIndicatorsCheckBox);
+        Control.AddOptionCheckBox(CCVars.OpaqueStorageWindow, OpaqueStorageWindowCheckBox);
+        Control.AddOptionCheckBox(CCVars.ChatEnableFancyBubbles, FancySpeechBubblesCheckBox);
+        Control.AddOptionCheckBox(CCVars.ChatFancyNameBackground, FancyNameBackgroundsCheckBox);
+        Control.AddOptionCheckBox(CCVars.StaticStorageUI, StaticStorageUI);
 
+        Control.Initialize();
     }
-
 }
diff --git a/Content.Client/Storage/Systems/StorageSystem.cs b/Content.Client/Storage/Systems/StorageSystem.cs
index b80a855f98..a74a118cd0 100644
--- a/Content.Client/Storage/Systems/StorageSystem.cs
+++ b/Content.Client/Storage/Systems/StorageSystem.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using System.Numerics;
 using Content.Client.Animations;
 using Content.Shared.Hands;
@@ -69,7 +69,7 @@ public sealed class StorageSystem : SharedStorageSystem
 
     public void CloseStorageWindow(Entity<StorageComponent?> entity)
     {
-        if (!Resolve(entity, ref entity.Comp))
+        if (!Resolve(entity, ref entity.Comp, false))
             return;
 
         if (!_openStorages.Contains((entity, entity.Comp)))
diff --git a/Content.Client/UserInterface/Systems/Admin/AdminUIController.cs b/Content.Client/UserInterface/Systems/Admin/AdminUIController.cs
index e12ce0ab01..d36a91c373 100644
--- a/Content.Client/UserInterface/Systems/Admin/AdminUIController.cs
+++ b/Content.Client/UserInterface/Systems/Admin/AdminUIController.cs
@@ -230,7 +230,7 @@ public sealed class AdminUIController : UIController,
 
         if (function == EngineKeyFunctions.UIClick)
             _conHost.ExecuteCommand($"vv {uid}");
-        else if (function == EngineKeyFunctions.UseSecondary)
+        else if (function == EngineKeyFunctions.UIRightClick)
             _verb.OpenVerbMenu(uid, true);
         else
             return;
diff --git a/Content.Client/UserInterface/Systems/Alerts/Controls/AlertControl.cs b/Content.Client/UserInterface/Systems/Alerts/Controls/AlertControl.cs
index 6327757dec..19432cd799 100644
--- a/Content.Client/UserInterface/Systems/Alerts/Controls/AlertControl.cs
+++ b/Content.Client/UserInterface/Systems/Alerts/Controls/AlertControl.cs
@@ -52,20 +52,12 @@ namespace Content.Client.UserInterface.Systems.Alerts.Controls
             TooltipSupplier = SupplyTooltip;
             Alert = alert;
             _severity = severity;
-
-            _spriteViewEntity = _entityManager.Spawn(Alert.AlertViewEntity);
-            if (_entityManager.TryGetComponent<SpriteComponent>(_spriteViewEntity, out var sprite))
-            {
-                var icon = Alert.GetIcon(_severity);
-                if (sprite.LayerMapTryGet(AlertVisualLayers.Base, out var layer))
-                    sprite.LayerSetSprite(layer, icon);
-            }
-
             _icon = new SpriteView
             {
                 Scale = new Vector2(2, 2)
             };
-            _icon.SetEntity(_spriteViewEntity);
+
+            SetupIcon();
 
             Children.Add(_icon);
             _cooldownGraphic = new CooldownGraphic
@@ -113,6 +105,36 @@ namespace Content.Client.UserInterface.Systems.Alerts.Controls
             _cooldownGraphic.FromTime(Cooldown.Value.Start, Cooldown.Value.End);
         }
 
+        private void SetupIcon()
+        {
+            if (!_entityManager.Deleted(_spriteViewEntity))
+                _entityManager.QueueDeleteEntity(_spriteViewEntity);
+
+            _spriteViewEntity = _entityManager.Spawn(Alert.AlertViewEntity);
+            if (_entityManager.TryGetComponent<SpriteComponent>(_spriteViewEntity, out var sprite))
+            {
+                var icon = Alert.GetIcon(_severity);
+                if (sprite.LayerMapTryGet(AlertVisualLayers.Base, out var layer))
+                    sprite.LayerSetSprite(layer, icon);
+            }
+
+            _icon.SetEntity(_spriteViewEntity);
+        }
+
+        protected override void EnteredTree()
+        {
+            base.EnteredTree();
+            SetupIcon();
+        }
+
+        protected override void ExitedTree()
+        {
+            base.ExitedTree();
+
+            if (!_entityManager.Deleted(_spriteViewEntity))
+                _entityManager.QueueDeleteEntity(_spriteViewEntity);
+        }
+
         protected override void Dispose(bool disposing)
         {
             base.Dispose(disposing);
diff --git a/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs b/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs
index 8b53290f7f..2c71fa8c40 100644
--- a/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs
+++ b/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs
@@ -4,10 +4,11 @@ using Robust.Client.AutoGenerated;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface.Controls;
-using Content.Client.Stylesheets;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Prototypes;
 using FancyWindow = Content.Client.UserInterface.Controls.FancyWindow;
+using Content.Shared.IdentityManagement;
+using Robust.Shared.Timing;
 
 namespace Content.Client.VendingMachines.UI
 {
@@ -15,6 +16,10 @@ namespace Content.Client.VendingMachines.UI
     public sealed partial class VendingMachineMenu : FancyWindow
     {
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+        [Dependency] private readonly IEntityManager _entityManager = default!;
+        [Dependency] private readonly IGameTiming _timing = default!;
+
+        private readonly Dictionary<EntProtoId, EntityUid> _dummies = [];
 
         public event Action<ItemList.ItemListSelectedEventArgs>? OnItemSelected;
         public event Action<string>? OnSearchChanged;
@@ -36,6 +41,22 @@ namespace Content.Client.VendingMachines.UI
             };
         }
 
+        protected override void Dispose(bool disposing)
+        {
+            base.Dispose(disposing);
+
+            // Don't clean up dummies during disposal or we'll just have to spawn them again
+            if (!disposing)
+                return;
+
+            // Delete any dummy items we spawned
+            foreach (var entity in _dummies.Values)
+            {
+                _entityManager.QueueDeleteEntity(entity);
+            }
+            _dummies.Clear();
+        }
+
         /// <summary>
         /// Populates the list of available items on the vending machine interface
         /// and sets icons based on their prototypes
@@ -72,11 +93,16 @@ namespace Content.Client.VendingMachines.UI
                 vendingItem.Text = string.Empty;
                 vendingItem.Icon = null;
 
-                var itemName = entry.ID;
+                if (!_dummies.TryGetValue(entry.ID, out var dummy))
+                {
+                    dummy = _entityManager.Spawn(entry.ID);
+                    _dummies.Add(entry.ID, dummy);
+                }
+
+                var itemName = Identity.Name(dummy, _entityManager);
                 Texture? icon = null;
                 if (_prototypeManager.TryIndex<EntityPrototype>(entry.ID, out var prototype))
                 {
-                    itemName = prototype.Name;
                     icon = spriteSystem.GetPrototypeIcon(prototype).Default;
                 }
 
diff --git a/Content.IntegrationTests/Tests/Commands/ForceMapTest.cs b/Content.IntegrationTests/Tests/Commands/ForceMapTest.cs
new file mode 100644
index 0000000000..3fa7e64f1a
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Commands/ForceMapTest.cs
@@ -0,0 +1,88 @@
+using Content.Server.Maps;
+using Content.Shared.CCVar;
+using Robust.Shared.Configuration;
+using Robust.Shared.Console;
+
+namespace Content.IntegrationTests.Tests.Commands;
+
+[TestFixture]
+public sealed class ForceMapTest
+{
+    private const string DefaultMapName = "Empty";
+    private const string BadMapName = "asdf_asd-fa__sdfAsd_f"; // Hopefully no one ever names a map this...
+    private const string TestMapEligibleName = "ForceMapTestEligible";
+    private const string TestMapIneligibleName = "ForceMapTestIneligible";
+
+    [TestPrototypes]
+    private static readonly string TestMaps = @$"
+- type: gameMap
+  id: {TestMapIneligibleName}
+  mapName: {TestMapIneligibleName}
+  mapPath: /Maps/Test/empty.yml
+  minPlayers: 20
+  maxPlayers: 80
+  stations:
+    Empty:
+      stationProto: StandardNanotrasenStation
+      components:
+        - type: StationNameSetup
+          mapNameTemplate: ""Empty""
+
+- type: gameMap
+  id: {TestMapEligibleName}
+  mapName: {TestMapEligibleName}
+  mapPath: /Maps/Test/empty.yml
+  minPlayers: 0
+  stations:
+    Empty:
+      stationProto: StandardNanotrasenStation
+      components:
+        - type: StationNameSetup
+          mapNameTemplate: ""Empty""
+";
+
+    [Test]
+    public async Task TestForceMapCommand()
+    {
+        await using var pair = await PoolManager.GetServerClient();
+        var server = pair.Server;
+
+        var entMan = server.EntMan;
+        var configManager = server.ResolveDependency<IConfigurationManager>();
+        var consoleHost = server.ResolveDependency<IConsoleHost>();
+        var gameMapMan = server.ResolveDependency<IGameMapManager>();
+
+        await server.WaitAssertion(() =>
+        {
+            // Make sure we're set to the default map
+            Assert.That(gameMapMan.GetSelectedMap()?.ID, Is.EqualTo(DefaultMapName),
+                $"Test didn't start on expected map ({DefaultMapName})!");
+
+            // Try changing to a map that doesn't exist
+            consoleHost.ExecuteCommand($"forcemap {BadMapName}");
+            Assert.That(gameMapMan.GetSelectedMap()?.ID, Is.EqualTo(DefaultMapName),
+                $"Forcemap succeeded with a map that does not exist ({BadMapName})!");
+
+            // Try changing to a valid map
+            consoleHost.ExecuteCommand($"forcemap {TestMapEligibleName}");
+            Assert.That(gameMapMan.GetSelectedMap()?.ID, Is.EqualTo(TestMapEligibleName),
+                $"Forcemap failed with a valid map ({TestMapEligibleName})");
+
+            // Try changing to a map that exists but is ineligible
+            consoleHost.ExecuteCommand($"forcemap {TestMapIneligibleName}");
+            Assert.That(gameMapMan.GetSelectedMap()?.ID, Is.EqualTo(TestMapIneligibleName),
+                $"Forcemap failed with valid but ineligible map ({TestMapIneligibleName})!");
+
+            // Try clearing the force-selected map
+            consoleHost.ExecuteCommand("forcemap \"\"");
+            Assert.That(gameMapMan.GetSelectedMap(), Is.Null,
+                $"Running 'forcemap \"\"' did not clear the forced map!");
+
+        });
+
+        // Cleanup
+        configManager.SetCVar(CCVars.GameMap, DefaultMapName);
+
+        await pair.CleanReturnAsync();
+    }
+}
diff --git a/Content.IntegrationTests/Tests/Internals/AutoInternalsTests.cs b/Content.IntegrationTests/Tests/Internals/AutoInternalsTests.cs
new file mode 100644
index 0000000000..dbd612c710
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Internals/AutoInternalsTests.cs
@@ -0,0 +1,89 @@
+using Content.Server.Atmos.EntitySystems;
+using Content.Server.Body.Systems;
+using Content.Server.Station.Systems;
+using Content.Shared.Preferences;
+using Content.Shared.Roles.Jobs;
+
+namespace Content.IntegrationTests.Tests.Internals;
+
+[TestFixture]
+[TestOf(typeof(InternalsSystem))]
+public sealed class AutoInternalsTests
+{
+    [Test]
+    public async Task TestInternalsAutoActivateInSpaceForStationSpawn()
+    {
+        await using var pair = await PoolManager.GetServerClient();
+        var server = pair.Server;
+
+        var testMap = await pair.CreateTestMap();
+
+        var stationSpawning = server.System<StationSpawningSystem>();
+        var atmos = server.System<AtmosphereSystem>();
+        var internals = server.System<InternalsSystem>();
+
+        await server.WaitAssertion(() =>
+        {
+            var profile = new HumanoidCharacterProfile();
+            var dummy = stationSpawning.SpawnPlayerMob(testMap.GridCoords, new JobComponent()
+            {
+                Prototype = "TestInternalsDummy"
+            }, profile, station: null);
+
+            Assert.That(atmos.HasAtmosphere(testMap.Grid), Is.False, "Test map has atmosphere - test needs adjustment!");
+            Assert.That(internals.AreInternalsWorking(dummy), "Internals did not automatically connect!");
+
+            server.EntMan.DeleteEntity(dummy);
+        });
+
+        await pair.CleanReturnAsync();
+    }
+
+    [Test]
+    public async Task TestInternalsAutoActivateInSpaceForEntitySpawn()
+    {
+        await using var pair = await PoolManager.GetServerClient();
+        var server = pair.Server;
+
+        var testMap = await pair.CreateTestMap();
+
+        var atmos = server.System<AtmosphereSystem>();
+        var internals = server.System<InternalsSystem>();
+
+        await server.WaitAssertion(() =>
+        {
+            var dummy = server.EntMan.Spawn("TestInternalsDummyEntity", testMap.MapCoords);
+
+            Assert.That(atmos.HasAtmosphere(testMap.Grid), Is.False, "Test map has atmosphere - test needs adjustment!");
+            Assert.That(internals.AreInternalsWorking(dummy), "Internals did not automatically connect!");
+
+            server.EntMan.DeleteEntity(dummy);
+        });
+
+        await pair.CleanReturnAsync();
+    }
+
+    [TestPrototypes]
+    private const string Prototypes = @"
+- type: playTimeTracker
+  id: PlayTimeInternalsDummy
+
+- type: startingGear
+  id: InternalsDummyGear
+  equipment:
+    mask: ClothingMaskBreath
+    suitstorage: OxygenTankFilled
+
+- type: job
+  id: TestInternalsDummy
+  playTimeTracker: PlayTimeInternalsDummy
+  startingGear: InternalsDummyGear
+
+- type: entity
+  id: TestInternalsDummyEntity
+  parent: MobHuman
+  components:
+    - type: Loadout
+      prototypes: [InternalsDummyGear]
+";
+}
diff --git a/Content.MapRenderer/Painters/DecalPainter.cs b/Content.MapRenderer/Painters/DecalPainter.cs
index f863595f9a..6dfb26e1ef 100644
--- a/Content.MapRenderer/Painters/DecalPainter.cs
+++ b/Content.MapRenderer/Painters/DecalPainter.cs
@@ -86,7 +86,8 @@ public sealed class DecalPainter
 
         image.Mutate(o => o.Rotate((float) -decal.Angle.Degrees));
         var coloredImage = new Image<Rgba32>(image.Width, image.Height);
-        Color color = decal.Color?.ConvertImgSharp() ?? Color.White;
+        Color color = decal.Color?.WithAlpha(byte.MaxValue).ConvertImgSharp() ?? Color.White; // remove the encoded color alpha here
+        var alpha = decal.Color?.A ?? 1; // get the alpha separately so we can use it in DrawImage
         coloredImage.Mutate(o => o.BackgroundColor(color));
 
         image.Mutate(o => o
@@ -95,6 +96,6 @@ public sealed class DecalPainter
 
         // Very unsure why the - 1 is needed in the first place but all decals are off by exactly one pixel otherwise
         // Woohoo!
-        canvas.Mutate(o => o.DrawImage(image, new Point((int) data.X, (int) data.Y - 1), 1.0f));
+        canvas.Mutate(o => o.DrawImage(image, new Point((int) data.X, (int) data.Y - 1), alpha));
     }
 }
diff --git a/Content.MapRenderer/Painters/EntityPainter.cs b/Content.MapRenderer/Painters/EntityPainter.cs
index 808acf8fe4..2c70481b8a 100644
--- a/Content.MapRenderer/Painters/EntityPainter.cs
+++ b/Content.MapRenderer/Painters/EntityPainter.cs
@@ -123,19 +123,28 @@ public sealed class EntityPainter
 
             image.Mutate(o => o.Crop(rect));
 
+            var spriteRotation = 0f;
+            if (!entity.Sprite.NoRotation && !entity.Sprite.SnapCardinals && entity.Sprite.GetLayerDirectionCount(layer) == 1)
+            {
+                spriteRotation = (float) worldRotation.Degrees;
+            }
+
             var colorMix = entity.Sprite.Color * layer.Color;
             var imageColor = Color.FromRgba(colorMix.RByte, colorMix.GByte, colorMix.BByte, colorMix.AByte);
             var coloredImage = new Image<Rgba32>(image.Width, image.Height);
             coloredImage.Mutate(o => o.BackgroundColor(imageColor));
 
             var (imgX, imgY) = rsi?.Size ?? (EyeManager.PixelsPerMeter, EyeManager.PixelsPerMeter);
+            var offsetX = (int) (entity.Sprite.Offset.X * EyeManager.PixelsPerMeter);
+            var offsetY = (int) (entity.Sprite.Offset.Y * EyeManager.PixelsPerMeter);
             image.Mutate(o => o
                 .DrawImage(coloredImage, PixelColorBlendingMode.Multiply, PixelAlphaCompositionMode.SrcAtop, 1)
                 .Resize(imgX, imgY)
-                .Flip(FlipMode.Vertical));
+                .Flip(FlipMode.Vertical)
+                .Rotate(spriteRotation));
 
-            var pointX = (int) entity.X - imgX / 2 + EyeManager.PixelsPerMeter / 2;
-            var pointY = (int) entity.Y - imgY / 2 + EyeManager.PixelsPerMeter / 2;
+            var pointX = (int) entity.X + offsetX - imgX / 2;
+            var pointY = (int) entity.Y + offsetY - imgY / 2;
             canvas.Mutate(o => o.DrawImage(image, new Point(pointX, pointY), 1));
         }
     }
diff --git a/Content.MapRenderer/Painters/GridPainter.cs b/Content.MapRenderer/Painters/GridPainter.cs
index 416ec05199..d8d6e15378 100644
--- a/Content.MapRenderer/Painters/GridPainter.cs
+++ b/Content.MapRenderer/Painters/GridPainter.cs
@@ -138,8 +138,8 @@ namespace Content.MapRenderer.Painters
             var yOffset = (int) -grid.LocalAABB.Bottom;
             var tileSize = grid.TileSize;
 
-            var x = ((float) Math.Floor(position.X) + xOffset) * tileSize * TilePainter.TileImageSize;
-            var y = ((float) Math.Floor(position.Y) + yOffset) * tileSize * TilePainter.TileImageSize;
+            var x = (position.X + xOffset) * tileSize * TilePainter.TileImageSize;
+            var y = (position.Y + yOffset) * tileSize * TilePainter.TileImageSize;
 
             return (x, y);
         }
diff --git a/Content.Server.Database/Migrations/Postgres/20240623005121_BanTemplate.Designer.cs b/Content.Server.Database/Migrations/Postgres/20240623005121_BanTemplate.Designer.cs
new file mode 100644
index 0000000000..5d89f3dd29
--- /dev/null
+++ b/Content.Server.Database/Migrations/Postgres/20240623005121_BanTemplate.Designer.cs
@@ -0,0 +1,1960 @@
+// <auto-generated />
+using System;
+using System.Net;
+using System.Text.Json;
+using Content.Server.Database;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using NpgsqlTypes;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Postgres
+{
+    [DbContext(typeof(PostgresServerDbContext))]
+    [Migration("20240623005121_BanTemplate")]
+    partial class BanTemplate
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.0")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<int?>("AdminRankId")
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("text")
+                        .HasColumnName("title");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_admin");
+
+                    b.HasIndex("AdminRankId")
+                        .HasDatabaseName("IX_admin_admin_rank_id");
+
+                    b.ToTable("admin", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_flag_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<Guid>("AdminId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("admin_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("flag");
+
+                    b.Property<bool>("Negative")
+                        .HasColumnType("boolean")
+                        .HasColumnName("negative");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_flag");
+
+                    b.HasIndex("AdminId")
+                        .HasDatabaseName("IX_admin_flag_admin_id");
+
+                    b.HasIndex("Flag", "AdminId")
+                        .IsUnique();
+
+                    b.ToTable("admin_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_log_id");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date");
+
+                    b.Property<short>("Impact")
+                        .HasColumnType("smallint")
+                        .HasColumnName("impact");
+
+                    b.Property<JsonDocument>("Json")
+                        .IsRequired()
+                        .HasColumnType("jsonb")
+                        .HasColumnName("json");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("message");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer")
+                        .HasColumnName("type");
+
+                    b.HasKey("RoundId", "Id")
+                        .HasName("PK_admin_log");
+
+                    b.HasIndex("Date");
+
+                    b.HasIndex("Message")
+                        .HasAnnotation("Npgsql:TsVectorConfig", "english");
+
+                    NpgsqlIndexBuilderExtensions.HasMethod(b.HasIndex("Message"), "GIN");
+
+                    b.HasIndex("Type")
+                        .HasDatabaseName("IX_admin_log_type");
+
+                    b.ToTable("admin_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("LogId")
+                        .HasColumnType("integer")
+                        .HasColumnName("log_id");
+
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.HasKey("RoundId", "LogId", "PlayerUserId")
+                        .HasName("PK_admin_log_player");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_log_player_player_user_id");
+
+                    b.ToTable("admin_log_player", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_messages_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<bool>("Dismissed")
+                        .HasColumnType("boolean")
+                        .HasColumnName("dismissed");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("character varying(4096)")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Seen")
+                        .HasColumnType("boolean")
+                        .HasColumnName("seen");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_messages");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_messages_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_messages_round_id");
+
+                    b.ToTable("admin_messages", null, t =>
+                        {
+                            t.HasCheckConstraint("NotDismissedAndSeen", "NOT dismissed OR seen");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_notes_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("character varying(4096)")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Secret")
+                        .HasColumnType("boolean")
+                        .HasColumnName("secret");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("integer")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_notes");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_notes_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_notes_round_id");
+
+                    b.ToTable("admin_notes", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank");
+
+                    b.ToTable("admin_rank", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_flag_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("AdminRankId")
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("flag");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank_flag");
+
+                    b.HasIndex("AdminRankId");
+
+                    b.HasIndex("Flag", "AdminRankId")
+                        .IsUnique();
+
+                    b.ToTable("admin_rank_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_watchlists_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("character varying(4096)")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_watchlists");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_watchlists_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_watchlists_round_id");
+
+                    b.ToTable("admin_watchlists", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("antag_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("AntagName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("antag_name");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_antag");
+
+                    b.HasIndex("ProfileId", "AntagName")
+                        .IsUnique();
+
+                    b.ToTable("antag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AssignedUserId", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("assigned_user_id_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_assigned_user_id");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.HasIndex("UserName")
+                        .IsUnique();
+
+                    b.ToTable("assigned_user_id", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.BanTemplate", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_template_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<bool>("AutoDelete")
+                        .HasColumnType("boolean")
+                        .HasColumnName("auto_delete");
+
+                    b.Property<int>("ExemptFlags")
+                        .HasColumnType("integer")
+                        .HasColumnName("exempt_flags");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("boolean")
+                        .HasColumnName("hidden");
+
+                    b.Property<TimeSpan>("Length")
+                        .HasColumnType("interval")
+                        .HasColumnName("length");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("reason");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("integer")
+                        .HasColumnName("severity");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("title");
+
+                    b.HasKey("Id")
+                        .HasName("PK_ban_template");
+
+                    b.ToTable("ban_template", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("connection_log_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<IPAddress>("Address")
+                        .IsRequired()
+                        .HasColumnType("inet")
+                        .HasColumnName("address");
+
+                    b.Property<byte?>("Denied")
+                        .HasColumnType("smallint")
+                        .HasColumnName("denied");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("bytea")
+                        .HasColumnName("hwid");
+
+                    b.Property<int>("ServerId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasDefaultValue(0)
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("time");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_connection_log");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_connection_log_server_id");
+
+                    b.HasIndex("Time");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("connection_log", null, t =>
+                        {
+                            t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("job_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("JobName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("job_name");
+
+                    b.Property<int>("Priority")
+                        .HasColumnType("integer")
+                        .HasColumnName("priority");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_job");
+
+                    b.HasIndex("ProfileId");
+
+                    b.HasIndex("ProfileId", "JobName")
+                        .IsUnique();
+
+                    b.HasIndex(new[] { "ProfileId" }, "IX_job_one_high_priority")
+                        .IsUnique()
+                        .HasFilter("priority = 3");
+
+                    b.ToTable("job", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.PlayTime", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("play_time_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<Guid>("PlayerId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_id");
+
+                    b.Property<TimeSpan>("TimeSpent")
+                        .HasColumnType("interval")
+                        .HasColumnName("time_spent");
+
+                    b.Property<string>("Tracker")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("tracker");
+
+                    b.HasKey("Id")
+                        .HasName("PK_play_time");
+
+                    b.HasIndex("PlayerId", "Tracker")
+                        .IsUnique();
+
+                    b.ToTable("play_time", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("player_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("FirstSeenTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("first_seen_time");
+
+                    b.Property<DateTime?>("LastReadRules")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_read_rules");
+
+                    b.Property<IPAddress>("LastSeenAddress")
+                        .IsRequired()
+                        .HasColumnType("inet")
+                        .HasColumnName("last_seen_address");
+
+                    b.Property<byte[]>("LastSeenHWId")
+                        .HasColumnType("bytea")
+                        .HasColumnName("last_seen_hwid");
+
+                    b.Property<DateTime>("LastSeenTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_seen_time");
+
+                    b.Property<string>("LastSeenUserName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("last_seen_user_name");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_player");
+
+                    b.HasAlternateKey("UserId")
+                        .HasName("ak_player_user_id");
+
+                    b.HasIndex("LastSeenUserName");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("player", null, t =>
+                        {
+                            t.HasCheckConstraint("LastSeenAddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= last_seen_address");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("preference_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("AdminOOCColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("admin_ooc_color");
+
+                    b.Property<int>("SelectedCharacterSlot")
+                        .HasColumnType("integer")
+                        .HasColumnName("selected_character_slot");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_preference");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("preference", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("Age")
+                        .HasColumnType("integer")
+                        .HasColumnName("age");
+
+                    b.Property<string>("CharacterName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("char_name");
+
+                    b.Property<string>("EyeColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("eye_color");
+
+                    b.Property<string>("FacialHairColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("facial_hair_color");
+
+                    b.Property<string>("FacialHairName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("facial_hair_name");
+
+                    b.Property<string>("FlavorText")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("flavor_text");
+
+                    b.Property<string>("Gender")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("gender");
+
+                    b.Property<string>("HairColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("hair_color");
+
+                    b.Property<string>("HairName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("hair_name");
+
+                    b.Property<JsonDocument>("Markings")
+                        .HasColumnType("jsonb")
+                        .HasColumnName("markings");
+
+                    b.Property<int>("PreferenceId")
+                        .HasColumnType("integer")
+                        .HasColumnName("preference_id");
+
+                    b.Property<int>("PreferenceUnavailable")
+                        .HasColumnType("integer")
+                        .HasColumnName("pref_unavailable");
+
+                    b.Property<string>("Sex")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("sex");
+
+                    b.Property<string>("SkinColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("skin_color");
+
+                    b.Property<int>("Slot")
+                        .HasColumnType("integer")
+                        .HasColumnName("slot");
+
+                    b.Property<int>("SpawnPriority")
+                        .HasColumnType("integer")
+                        .HasColumnName("spawn_priority");
+
+                    b.Property<string>("Species")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("species");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile");
+
+                    b.HasIndex("PreferenceId")
+                        .HasDatabaseName("IX_profile_preference_id");
+
+                    b.HasIndex("Slot", "PreferenceId")
+                        .IsUnique();
+
+                    b.ToTable("profile", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadout", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_loadout_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("LoadoutName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("loadout_name");
+
+                    b.Property<int>("ProfileLoadoutGroupId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_loadout_group_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_loadout");
+
+                    b.HasIndex("ProfileLoadoutGroupId");
+
+                    b.ToTable("profile_loadout", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_loadout_group_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("GroupName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("group_name");
+
+                    b.Property<int>("ProfileRoleLoadoutId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_role_loadout_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_loadout_group");
+
+                    b.HasIndex("ProfileRoleLoadoutId");
+
+                    b.ToTable("profile_loadout_group", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_role_loadout_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.Property<string>("RoleName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("role_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_role_loadout");
+
+                    b.HasIndex("ProfileId");
+
+                    b.ToTable("profile_role_loadout", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.RoleWhitelist", b =>
+                {
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("text")
+                        .HasColumnName("role_id");
+
+                    b.HasKey("PlayerUserId", "RoleId")
+                        .HasName("PK_role_whitelists");
+
+                    b.ToTable("role_whitelists", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ServerId")
+                        .HasColumnType("integer")
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime?>("StartDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("start_date");
+
+                    b.HasKey("Id")
+                        .HasName("PK_round");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_round_server_id");
+
+                    b.HasIndex("StartDate");
+
+                    b.ToTable("round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server");
+
+                    b.ToTable("server", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_ban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<NpgsqlInet?>("Address")
+                        .HasColumnType("inet")
+                        .HasColumnName("address");
+
+                    b.Property<bool>("AutoDelete")
+                        .HasColumnType("boolean")
+                        .HasColumnName("auto_delete");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<int>("ExemptFlags")
+                        .HasColumnType("integer")
+                        .HasColumnName("exempt_flags");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("bytea")
+                        .HasColumnName("hwid");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("boolean")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("reason");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("integer")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_ban_round_id");
+
+                    b.ToTable("server_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address");
+
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanExemption", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<int>("Flags")
+                        .HasColumnType("integer")
+                        .HasColumnName("flags");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_server_ban_exemption");
+
+                    b.ToTable("server_ban_exemption", null, t =>
+                        {
+                            t.HasCheckConstraint("FlagsNotZero", "flags != 0");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_ban_hit_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_id");
+
+                    b.Property<int>("ConnectionId")
+                        .HasColumnType("integer")
+                        .HasColumnName("connection_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban_hit");
+
+                    b.HasIndex("BanId")
+                        .HasDatabaseName("IX_server_ban_hit_ban_id");
+
+                    b.HasIndex("ConnectionId")
+                        .HasDatabaseName("IX_server_ban_hit_connection_id");
+
+                    b.ToTable("server_ban_hit", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_role_ban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<NpgsqlInet?>("Address")
+                        .HasColumnType("inet")
+                        .HasColumnName("address");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("bytea")
+                        .HasColumnName("hwid");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("boolean")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("reason");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("role_id");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("integer")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_role_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_role_ban_round_id");
+
+                    b.ToTable("server_role_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address");
+
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("role_unban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_role_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("unban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("trait_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.Property<string>("TraitName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("trait_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_trait");
+
+                    b.HasIndex("ProfileId", "TraitName")
+                        .IsUnique();
+
+                    b.ToTable("trait", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.UploadedResourceLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("uploaded_resource_log_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<byte[]>("Data")
+                        .IsRequired()
+                        .HasColumnType("bytea")
+                        .HasColumnName("data");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("path");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_uploaded_resource_log");
+
+                    b.ToTable("uploaded_resource_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Whitelist", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_whitelist");
+
+                    b.ToTable("whitelist", (string)null);
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.Property<int>("PlayersId")
+                        .HasColumnType("integer")
+                        .HasColumnName("players_id");
+
+                    b.Property<int>("RoundsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("rounds_id");
+
+                    b.HasKey("PlayersId", "RoundsId")
+                        .HasName("PK_player_round");
+
+                    b.HasIndex("RoundsId")
+                        .HasDatabaseName("IX_player_round_rounds_id");
+
+                    b.ToTable("player_round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "AdminRank")
+                        .WithMany("Admins")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_admin_rank_admin_rank_id");
+
+                    b.Navigation("AdminRank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Admin", "Admin")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_flag_admin_admin_id");
+
+                    b.Navigation("Admin");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("RoundId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_round_round_id");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.AdminLog", "Log")
+                        .WithMany("Players")
+                        .HasForeignKey("RoundId", "LogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_admin_log_round_id_log_id");
+
+                    b.Navigation("Log");
+
+                    b.Navigation("Player");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminMessagesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminMessagesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminMessagesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminMessagesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_messages_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_messages_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminNotesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminNotesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminNotesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminNotesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_notes_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_notes_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "Rank")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_rank_flag_admin_rank_admin_rank_id");
+
+                    b.Navigation("Rank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminWatchlistsCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminWatchlistsDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminWatchlistsLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminWatchlistsReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_watchlists_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_watchlists_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Antags")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_antag_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("ConnectionLogs")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .IsRequired()
+                        .HasConstraintName("FK_connection_log_server_server_id");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Jobs")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_job_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.HasOne("Content.Server.Database.Preference", "Preference")
+                        .WithMany("Profiles")
+                        .HasForeignKey("PreferenceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_preference_preference_id");
+
+                    b.Navigation("Preference");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadout", b =>
+                {
+                    b.HasOne("Content.Server.Database.ProfileLoadoutGroup", "ProfileLoadoutGroup")
+                        .WithMany("Loadouts")
+                        .HasForeignKey("ProfileLoadoutGroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_loadout_profile_loadout_group_profile_loadout_group~");
+
+                    b.Navigation("ProfileLoadoutGroup");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.HasOne("Content.Server.Database.ProfileRoleLoadout", "ProfileRoleLoadout")
+                        .WithMany("Groups")
+                        .HasForeignKey("ProfileRoleLoadoutId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_loadout_group_profile_role_loadout_profile_role_loa~");
+
+                    b.Navigation("ProfileRoleLoadout");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Loadouts")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_role_loadout_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.RoleWhitelist", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("JobWhitelists")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_role_whitelists_player_player_user_id");
+
+                    b.Navigation("Player");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("Rounds")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_round_server_server_id");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_ban_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithMany("BanHits")
+                        .HasForeignKey("BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_server_ban_ban_id");
+
+                    b.HasOne("Content.Server.Database.ConnectionLog", "Connection")
+                        .WithMany("BanHits")
+                        .HasForeignKey("ConnectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_connection_log_connection_id");
+
+                    b.Navigation("Ban");
+
+                    b.Navigation("Connection");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerRoleBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerRoleBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_role_ban_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerRoleBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerRoleUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_role_unban_server_role_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_unban_server_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Traits")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_trait_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", null)
+                        .WithMany()
+                        .HasForeignKey("PlayersId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_player_players_id");
+
+                    b.HasOne("Content.Server.Database.Round", null)
+                        .WithMany()
+                        .HasForeignKey("RoundsId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_round_rounds_id");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Navigation("Players");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Navigation("Admins");
+
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Navigation("BanHits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Navigation("AdminLogs");
+
+                    b.Navigation("AdminMessagesCreated");
+
+                    b.Navigation("AdminMessagesDeleted");
+
+                    b.Navigation("AdminMessagesLastEdited");
+
+                    b.Navigation("AdminMessagesReceived");
+
+                    b.Navigation("AdminNotesCreated");
+
+                    b.Navigation("AdminNotesDeleted");
+
+                    b.Navigation("AdminNotesLastEdited");
+
+                    b.Navigation("AdminNotesReceived");
+
+                    b.Navigation("AdminServerBansCreated");
+
+                    b.Navigation("AdminServerBansLastEdited");
+
+                    b.Navigation("AdminServerRoleBansCreated");
+
+                    b.Navigation("AdminServerRoleBansLastEdited");
+
+                    b.Navigation("AdminWatchlistsCreated");
+
+                    b.Navigation("AdminWatchlistsDeleted");
+
+                    b.Navigation("AdminWatchlistsLastEdited");
+
+                    b.Navigation("AdminWatchlistsReceived");
+
+                    b.Navigation("JobWhitelists");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Navigation("Profiles");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Navigation("Antags");
+
+                    b.Navigation("Jobs");
+
+                    b.Navigation("Loadouts");
+
+                    b.Navigation("Traits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.Navigation("Loadouts");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.Navigation("Groups");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Navigation("AdminLogs");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Navigation("ConnectionLogs");
+
+                    b.Navigation("Rounds");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Navigation("BanHits");
+
+                    b.Navigation("Unban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Navigation("Unban");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Postgres/20240623005121_BanTemplate.cs b/Content.Server.Database/Migrations/Postgres/20240623005121_BanTemplate.cs
new file mode 100644
index 0000000000..192e87ac96
--- /dev/null
+++ b/Content.Server.Database/Migrations/Postgres/20240623005121_BanTemplate.cs
@@ -0,0 +1,42 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Postgres
+{
+    /// <inheritdoc />
+    public partial class BanTemplate : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "ban_template",
+                columns: table => new
+                {
+                    ban_template_id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    title = table.Column<string>(type: "text", nullable: false),
+                    length = table.Column<TimeSpan>(type: "interval", nullable: false),
+                    reason = table.Column<string>(type: "text", nullable: false),
+                    exempt_flags = table.Column<int>(type: "integer", nullable: false),
+                    severity = table.Column<int>(type: "integer", nullable: false),
+                    auto_delete = table.Column<bool>(type: "boolean", nullable: false),
+                    hidden = table.Column<bool>(type: "boolean", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_ban_template", x => x.ban_template_id);
+                });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "ban_template");
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs b/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
index ea5d006692..cb9fdde4d5 100644
--- a/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
+++ b/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
@@ -512,6 +512,51 @@ namespace Content.Server.Database.Migrations.Postgres
                     b.ToTable("assigned_user_id", (string)null);
                 });
 
+            modelBuilder.Entity("Content.Server.Database.BanTemplate", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_template_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<bool>("AutoDelete")
+                        .HasColumnType("boolean")
+                        .HasColumnName("auto_delete");
+
+                    b.Property<int>("ExemptFlags")
+                        .HasColumnType("integer")
+                        .HasColumnName("exempt_flags");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("boolean")
+                        .HasColumnName("hidden");
+
+                    b.Property<TimeSpan>("Length")
+                        .HasColumnType("interval")
+                        .HasColumnName("length");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("reason");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("integer")
+                        .HasColumnName("severity");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("title");
+
+                    b.HasKey("Id")
+                        .HasName("PK_ban_template");
+
+                    b.ToTable("ban_template", (string)null);
+                });
+
             modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
                 {
                     b.Property<int>("Id")
diff --git a/Content.Server.Database/Migrations/Sqlite/20240623005113_BanTemplate.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20240623005113_BanTemplate.Designer.cs
new file mode 100644
index 0000000000..acce21c2bd
--- /dev/null
+++ b/Content.Server.Database/Migrations/Sqlite/20240623005113_BanTemplate.Designer.cs
@@ -0,0 +1,1883 @@
+// <auto-generated />
+using System;
+using Content.Server.Database;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Sqlite
+{
+    [DbContext(typeof(SqliteServerDbContext))]
+    [Migration("20240623005113_BanTemplate")]
+    partial class BanTemplate
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "8.0.0");
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<int?>("AdminRankId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("title");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_admin");
+
+                    b.HasIndex("AdminRankId")
+                        .HasDatabaseName("IX_admin_admin_rank_id");
+
+                    b.ToTable("admin", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_flag_id");
+
+                    b.Property<Guid>("AdminId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("admin_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("flag");
+
+                    b.Property<bool>("Negative")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("negative");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_flag");
+
+                    b.HasIndex("AdminId")
+                        .HasDatabaseName("IX_admin_flag_admin_id");
+
+                    b.HasIndex("Flag", "AdminId")
+                        .IsUnique();
+
+                    b.ToTable("admin_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Id")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_log_id");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("date");
+
+                    b.Property<sbyte>("Impact")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("impact");
+
+                    b.Property<string>("Json")
+                        .IsRequired()
+                        .HasColumnType("jsonb")
+                        .HasColumnName("json");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("type");
+
+                    b.HasKey("RoundId", "Id")
+                        .HasName("PK_admin_log");
+
+                    b.HasIndex("Date");
+
+                    b.HasIndex("Type")
+                        .HasDatabaseName("IX_admin_log_type");
+
+                    b.ToTable("admin_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("LogId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("log_id");
+
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.HasKey("RoundId", "LogId", "PlayerUserId")
+                        .HasName("PK_admin_log_player");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_log_player_player_user_id");
+
+                    b.ToTable("admin_log_player", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_messages_id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<bool>("Dismissed")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("dismissed");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Seen")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("seen");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_messages");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_messages_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_messages_round_id");
+
+                    b.ToTable("admin_messages", null, t =>
+                        {
+                            t.HasCheckConstraint("NotDismissedAndSeen", "NOT dismissed OR seen");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_notes_id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Secret")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("secret");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_notes");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_notes_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_notes_round_id");
+
+                    b.ToTable("admin_notes", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank");
+
+                    b.ToTable("admin_rank", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_flag_id");
+
+                    b.Property<int>("AdminRankId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("flag");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank_flag");
+
+                    b.HasIndex("AdminRankId");
+
+                    b.HasIndex("Flag", "AdminRankId")
+                        .IsUnique();
+
+                    b.ToTable("admin_rank_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_watchlists_id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_watchlists");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_watchlists_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_watchlists_round_id");
+
+                    b.ToTable("admin_watchlists", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("antag_id");
+
+                    b.Property<string>("AntagName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("antag_name");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_antag");
+
+                    b.HasIndex("ProfileId", "AntagName")
+                        .IsUnique();
+
+                    b.ToTable("antag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AssignedUserId", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("assigned_user_id_id");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_assigned_user_id");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.HasIndex("UserName")
+                        .IsUnique();
+
+                    b.ToTable("assigned_user_id", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.BanTemplate", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_template_id");
+
+                    b.Property<bool>("AutoDelete")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("auto_delete");
+
+                    b.Property<int>("ExemptFlags")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("exempt_flags");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("hidden");
+
+                    b.Property<TimeSpan>("Length")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("length");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("reason");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("severity");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("title");
+
+                    b.HasKey("Id")
+                        .HasName("PK_ban_template");
+
+                    b.ToTable("ban_template", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("connection_log_id");
+
+                    b.Property<string>("Address")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("address");
+
+                    b.Property<byte?>("Denied")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("denied");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("BLOB")
+                        .HasColumnName("hwid");
+
+                    b.Property<int>("ServerId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasDefaultValue(0)
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("time");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_connection_log");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_connection_log_server_id");
+
+                    b.HasIndex("Time");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("connection_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("job_id");
+
+                    b.Property<string>("JobName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("job_name");
+
+                    b.Property<int>("Priority")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("priority");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_job");
+
+                    b.HasIndex("ProfileId");
+
+                    b.HasIndex("ProfileId", "JobName")
+                        .IsUnique();
+
+                    b.HasIndex(new[] { "ProfileId" }, "IX_job_one_high_priority")
+                        .IsUnique()
+                        .HasFilter("priority = 3");
+
+                    b.ToTable("job", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.PlayTime", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("play_time_id");
+
+                    b.Property<Guid>("PlayerId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_id");
+
+                    b.Property<TimeSpan>("TimeSpent")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("time_spent");
+
+                    b.Property<string>("Tracker")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("tracker");
+
+                    b.HasKey("Id")
+                        .HasName("PK_play_time");
+
+                    b.HasIndex("PlayerId", "Tracker")
+                        .IsUnique();
+
+                    b.ToTable("play_time", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("player_id");
+
+                    b.Property<DateTime>("FirstSeenTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("first_seen_time");
+
+                    b.Property<DateTime?>("LastReadRules")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_read_rules");
+
+                    b.Property<string>("LastSeenAddress")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_seen_address");
+
+                    b.Property<byte[]>("LastSeenHWId")
+                        .HasColumnType("BLOB")
+                        .HasColumnName("last_seen_hwid");
+
+                    b.Property<DateTime>("LastSeenTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_seen_time");
+
+                    b.Property<string>("LastSeenUserName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_seen_user_name");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_player");
+
+                    b.HasAlternateKey("UserId")
+                        .HasName("ak_player_user_id");
+
+                    b.HasIndex("LastSeenUserName");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("player", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("preference_id");
+
+                    b.Property<string>("AdminOOCColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("admin_ooc_color");
+
+                    b.Property<int>("SelectedCharacterSlot")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("selected_character_slot");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_preference");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("preference", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.Property<int>("Age")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("age");
+
+                    b.Property<string>("CharacterName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("char_name");
+
+                    b.Property<string>("EyeColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("eye_color");
+
+                    b.Property<string>("FacialHairColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("facial_hair_color");
+
+                    b.Property<string>("FacialHairName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("facial_hair_name");
+
+                    b.Property<string>("FlavorText")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("flavor_text");
+
+                    b.Property<string>("Gender")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("gender");
+
+                    b.Property<string>("HairColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("hair_color");
+
+                    b.Property<string>("HairName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("hair_name");
+
+                    b.Property<byte[]>("Markings")
+                        .HasColumnType("jsonb")
+                        .HasColumnName("markings");
+
+                    b.Property<int>("PreferenceId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("preference_id");
+
+                    b.Property<int>("PreferenceUnavailable")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("pref_unavailable");
+
+                    b.Property<string>("Sex")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("sex");
+
+                    b.Property<string>("SkinColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("skin_color");
+
+                    b.Property<int>("Slot")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("slot");
+
+                    b.Property<int>("SpawnPriority")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("spawn_priority");
+
+                    b.Property<string>("Species")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("species");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile");
+
+                    b.HasIndex("PreferenceId")
+                        .HasDatabaseName("IX_profile_preference_id");
+
+                    b.HasIndex("Slot", "PreferenceId")
+                        .IsUnique();
+
+                    b.ToTable("profile", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadout", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_loadout_id");
+
+                    b.Property<string>("LoadoutName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("loadout_name");
+
+                    b.Property<int>("ProfileLoadoutGroupId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_loadout_group_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_loadout");
+
+                    b.HasIndex("ProfileLoadoutGroupId");
+
+                    b.ToTable("profile_loadout", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_loadout_group_id");
+
+                    b.Property<string>("GroupName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("group_name");
+
+                    b.Property<int>("ProfileRoleLoadoutId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_role_loadout_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_loadout_group");
+
+                    b.HasIndex("ProfileRoleLoadoutId");
+
+                    b.ToTable("profile_loadout_group", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_role_loadout_id");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.Property<string>("RoleName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("role_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_role_loadout");
+
+                    b.HasIndex("ProfileId");
+
+                    b.ToTable("profile_role_loadout", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.RoleWhitelist", b =>
+                {
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("role_id");
+
+                    b.HasKey("PlayerUserId", "RoleId")
+                        .HasName("PK_role_whitelists");
+
+                    b.ToTable("role_whitelists", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("ServerId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime?>("StartDate")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("start_date");
+
+                    b.HasKey("Id")
+                        .HasName("PK_round");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_round_server_id");
+
+                    b.HasIndex("StartDate");
+
+                    b.ToTable("round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_id");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server");
+
+                    b.ToTable("server", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_ban_id");
+
+                    b.Property<string>("Address")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("address");
+
+                    b.Property<bool>("AutoDelete")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("auto_delete");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<int>("ExemptFlags")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("exempt_flags");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("BLOB")
+                        .HasColumnName("hwid");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("reason");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_ban_round_id");
+
+                    b.ToTable("server_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanExemption", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<int>("Flags")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("flags");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_server_ban_exemption");
+
+                    b.ToTable("server_ban_exemption", null, t =>
+                        {
+                            t.HasCheckConstraint("FlagsNotZero", "flags != 0");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_ban_hit_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.Property<int>("ConnectionId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("connection_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban_hit");
+
+                    b.HasIndex("BanId")
+                        .HasDatabaseName("IX_server_ban_hit_ban_id");
+
+                    b.HasIndex("ConnectionId")
+                        .HasDatabaseName("IX_server_ban_hit_connection_id");
+
+                    b.ToTable("server_ban_hit", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_role_ban_id");
+
+                    b.Property<string>("Address")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("address");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("BLOB")
+                        .HasColumnName("hwid");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("reason");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("role_id");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_role_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_role_ban_round_id");
+
+                    b.ToTable("server_role_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("role_unban_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_role_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("unban_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("trait_id");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.Property<string>("TraitName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("trait_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_trait");
+
+                    b.HasIndex("ProfileId", "TraitName")
+                        .IsUnique();
+
+                    b.ToTable("trait", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.UploadedResourceLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("uploaded_resource_log_id");
+
+                    b.Property<byte[]>("Data")
+                        .IsRequired()
+                        .HasColumnType("BLOB")
+                        .HasColumnName("data");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("date");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("path");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_uploaded_resource_log");
+
+                    b.ToTable("uploaded_resource_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Whitelist", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_whitelist");
+
+                    b.ToTable("whitelist", (string)null);
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.Property<int>("PlayersId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("players_id");
+
+                    b.Property<int>("RoundsId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("rounds_id");
+
+                    b.HasKey("PlayersId", "RoundsId")
+                        .HasName("PK_player_round");
+
+                    b.HasIndex("RoundsId")
+                        .HasDatabaseName("IX_player_round_rounds_id");
+
+                    b.ToTable("player_round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "AdminRank")
+                        .WithMany("Admins")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_admin_rank_admin_rank_id");
+
+                    b.Navigation("AdminRank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Admin", "Admin")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_flag_admin_admin_id");
+
+                    b.Navigation("Admin");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("RoundId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_round_round_id");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.AdminLog", "Log")
+                        .WithMany("Players")
+                        .HasForeignKey("RoundId", "LogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_admin_log_round_id_log_id");
+
+                    b.Navigation("Log");
+
+                    b.Navigation("Player");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminMessagesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminMessagesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminMessagesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminMessagesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_messages_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_messages_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminNotesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminNotesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminNotesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminNotesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_notes_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_notes_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "Rank")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_rank_flag_admin_rank_admin_rank_id");
+
+                    b.Navigation("Rank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminWatchlistsCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminWatchlistsDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminWatchlistsLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminWatchlistsReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_watchlists_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_watchlists_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Antags")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_antag_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("ConnectionLogs")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .IsRequired()
+                        .HasConstraintName("FK_connection_log_server_server_id");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Jobs")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_job_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.HasOne("Content.Server.Database.Preference", "Preference")
+                        .WithMany("Profiles")
+                        .HasForeignKey("PreferenceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_preference_preference_id");
+
+                    b.Navigation("Preference");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadout", b =>
+                {
+                    b.HasOne("Content.Server.Database.ProfileLoadoutGroup", "ProfileLoadoutGroup")
+                        .WithMany("Loadouts")
+                        .HasForeignKey("ProfileLoadoutGroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_loadout_profile_loadout_group_profile_loadout_group_id");
+
+                    b.Navigation("ProfileLoadoutGroup");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.HasOne("Content.Server.Database.ProfileRoleLoadout", "ProfileRoleLoadout")
+                        .WithMany("Groups")
+                        .HasForeignKey("ProfileRoleLoadoutId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_loadout_group_profile_role_loadout_profile_role_loadout_id");
+
+                    b.Navigation("ProfileRoleLoadout");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Loadouts")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_role_loadout_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.RoleWhitelist", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("JobWhitelists")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_role_whitelists_player_player_user_id");
+
+                    b.Navigation("Player");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("Rounds")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_round_server_server_id");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_ban_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithMany("BanHits")
+                        .HasForeignKey("BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_server_ban_ban_id");
+
+                    b.HasOne("Content.Server.Database.ConnectionLog", "Connection")
+                        .WithMany("BanHits")
+                        .HasForeignKey("ConnectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_connection_log_connection_id");
+
+                    b.Navigation("Ban");
+
+                    b.Navigation("Connection");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerRoleBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerRoleBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_role_ban_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerRoleBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerRoleUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_role_unban_server_role_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_unban_server_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Traits")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_trait_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", null)
+                        .WithMany()
+                        .HasForeignKey("PlayersId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_player_players_id");
+
+                    b.HasOne("Content.Server.Database.Round", null)
+                        .WithMany()
+                        .HasForeignKey("RoundsId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_round_rounds_id");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Navigation("Players");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Navigation("Admins");
+
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Navigation("BanHits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Navigation("AdminLogs");
+
+                    b.Navigation("AdminMessagesCreated");
+
+                    b.Navigation("AdminMessagesDeleted");
+
+                    b.Navigation("AdminMessagesLastEdited");
+
+                    b.Navigation("AdminMessagesReceived");
+
+                    b.Navigation("AdminNotesCreated");
+
+                    b.Navigation("AdminNotesDeleted");
+
+                    b.Navigation("AdminNotesLastEdited");
+
+                    b.Navigation("AdminNotesReceived");
+
+                    b.Navigation("AdminServerBansCreated");
+
+                    b.Navigation("AdminServerBansLastEdited");
+
+                    b.Navigation("AdminServerRoleBansCreated");
+
+                    b.Navigation("AdminServerRoleBansLastEdited");
+
+                    b.Navigation("AdminWatchlistsCreated");
+
+                    b.Navigation("AdminWatchlistsDeleted");
+
+                    b.Navigation("AdminWatchlistsLastEdited");
+
+                    b.Navigation("AdminWatchlistsReceived");
+
+                    b.Navigation("JobWhitelists");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Navigation("Profiles");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Navigation("Antags");
+
+                    b.Navigation("Jobs");
+
+                    b.Navigation("Loadouts");
+
+                    b.Navigation("Traits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.Navigation("Loadouts");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.Navigation("Groups");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Navigation("AdminLogs");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Navigation("ConnectionLogs");
+
+                    b.Navigation("Rounds");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Navigation("BanHits");
+
+                    b.Navigation("Unban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Navigation("Unban");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Sqlite/20240623005113_BanTemplate.cs b/Content.Server.Database/Migrations/Sqlite/20240623005113_BanTemplate.cs
new file mode 100644
index 0000000000..ffe5a47550
--- /dev/null
+++ b/Content.Server.Database/Migrations/Sqlite/20240623005113_BanTemplate.cs
@@ -0,0 +1,41 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Sqlite
+{
+    /// <inheritdoc />
+    public partial class BanTemplate : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "ban_template",
+                columns: table => new
+                {
+                    ban_template_id = table.Column<int>(type: "INTEGER", nullable: false)
+                        .Annotation("Sqlite:Autoincrement", true),
+                    title = table.Column<string>(type: "TEXT", nullable: false),
+                    length = table.Column<TimeSpan>(type: "TEXT", nullable: false),
+                    reason = table.Column<string>(type: "TEXT", nullable: false),
+                    exempt_flags = table.Column<int>(type: "INTEGER", nullable: false),
+                    severity = table.Column<int>(type: "INTEGER", nullable: false),
+                    auto_delete = table.Column<bool>(type: "INTEGER", nullable: false),
+                    hidden = table.Column<bool>(type: "INTEGER", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_ban_template", x => x.ban_template_id);
+                });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "ban_template");
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs b/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
index 17f87cf2e3..efc6682191 100644
--- a/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
+++ b/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
@@ -483,6 +483,49 @@ namespace Content.Server.Database.Migrations.Sqlite
                     b.ToTable("assigned_user_id", (string)null);
                 });
 
+            modelBuilder.Entity("Content.Server.Database.BanTemplate", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_template_id");
+
+                    b.Property<bool>("AutoDelete")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("auto_delete");
+
+                    b.Property<int>("ExemptFlags")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("exempt_flags");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("hidden");
+
+                    b.Property<TimeSpan>("Length")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("length");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("reason");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("severity");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("title");
+
+                    b.HasKey("Id")
+                        .HasName("PK_ban_template");
+
+                    b.ToTable("ban_template", (string)null);
+                });
+
             modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
                 {
                     b.Property<int>("Id")
diff --git a/Content.Server.Database/Model.cs b/Content.Server.Database/Model.cs
index d57b829905..dea8f9558a 100644
--- a/Content.Server.Database/Model.cs
+++ b/Content.Server.Database/Model.cs
@@ -41,6 +41,7 @@ namespace Content.Server.Database
         public DbSet<AdminWatchlist> AdminWatchlists { get; set; } = null!;
         public DbSet<AdminMessage> AdminMessages { get; set; } = null!;
         public DbSet<RoleWhitelist> RoleWhitelists { get; set; } = null!;
+        public DbSet<BanTemplate> BanTemplate { get; set; } = null!;
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
@@ -1134,4 +1135,57 @@ namespace Content.Server.Database
         [Required]
         public string RoleId { get; set; } = default!;
     }
+
+    /// <summary>
+    /// Defines a template that admins can use to quickly fill out ban information.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// This information is not currently used by the game itself, but it is used by SS14.Admin.
+    /// </para>
+    /// </remarks>
+    public sealed class BanTemplate
+    {
+        public int Id { get; set; }
+
+        /// <summary>
+        /// Title of the ban template. This is purely for reference by admins and not copied into the ban.
+        /// </summary>
+        public required string Title { get; set; }
+
+        /// <summary>
+        /// How long the ban should last. 0 for permanent.
+        /// </summary>
+        public TimeSpan Length { get; set; }
+
+        /// <summary>
+        /// The reason for the ban.
+        /// </summary>
+        /// <seealso cref="ServerBan.Reason"/>
+        public string Reason { get; set; } = "";
+
+        /// <summary>
+        /// Exemptions granted to the ban.
+        /// </summary>
+        /// <seealso cref="ServerBan.ExemptFlags"/>
+        public ServerBanExemptFlags ExemptFlags { get; set; }
+
+        /// <summary>
+        /// Severity of the ban
+        /// </summary>
+        /// <seealso cref="ServerBan.Severity"/>
+        public NoteSeverity Severity { get; set; }
+
+        /// <summary>
+        /// Ban will be automatically deleted once expired.
+        /// </summary>
+        /// <seealso cref="ServerBan.AutoDelete"/>
+        public bool AutoDelete { get; set; }
+
+        /// <summary>
+        /// Ban is not visible to players in the remarks menu.
+        /// </summary>
+        /// <seealso cref="ServerBan.Hidden"/>
+        public bool Hidden { get; set; }
+    }
 }
diff --git a/Content.Server/Access/LogWireAction.cs b/Content.Server/Access/LogWireAction.cs
new file mode 100644
index 0000000000..1e97d5c9d6
--- /dev/null
+++ b/Content.Server/Access/LogWireAction.cs
@@ -0,0 +1,74 @@
+using Content.Server.Wires;
+using Content.Shared.Access;
+using Content.Shared.Access.Components;
+using Content.Shared.Access.Systems;
+using Content.Shared.Emag.Components;
+using Content.Shared.Wires;
+
+namespace Content.Server.Access;
+
+public sealed partial class LogWireAction : ComponentWireAction<AccessReaderComponent>
+{
+    public override Color Color { get; set; } = Color.Blue;
+    public override string Name { get; set; } = "wire-name-log";
+
+    [DataField]
+    public int PulseTimeout = 30;
+
+    [DataField]
+    public LocId PulseLog = "log-wire-pulse-access-log";
+
+    private AccessReaderSystem _access = default!;
+
+    public override StatusLightState? GetLightState(Wire wire, AccessReaderComponent comp)
+    {
+        return comp.LoggingDisabled ? StatusLightState.Off : StatusLightState.On;
+    }
+
+    public override object StatusKey => AccessWireActionKey.Status;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        _access = EntityManager.System<AccessReaderSystem>();
+    }
+
+    public override bool Cut(EntityUid user, Wire wire, AccessReaderComponent comp)
+    {
+        WiresSystem.TryCancelWireAction(wire.Owner, PulseTimeoutKey.Key);
+        comp.LoggingDisabled = true;
+        EntityManager.Dirty(wire.Owner, comp);
+        return true;
+    }
+
+    public override bool Mend(EntityUid user, Wire wire, AccessReaderComponent comp)
+    {
+        comp.LoggingDisabled = false;
+        return true;
+    }
+
+    public override void Pulse(EntityUid user, Wire wire, AccessReaderComponent comp)
+    {
+        _access.LogAccess((wire.Owner, comp), Loc.GetString(PulseLog));
+        comp.LoggingDisabled = true;
+        WiresSystem.StartWireAction(wire.Owner, PulseTimeout, PulseTimeoutKey.Key, new TimedWireEvent(AwaitPulseCancel, wire));
+    }
+
+    public override void Update(Wire wire)
+    {
+        if (!IsPowered(wire.Owner))
+            WiresSystem.TryCancelWireAction(wire.Owner, PulseTimeoutKey.Key);
+    }
+
+    private void AwaitPulseCancel(Wire wire)
+    {
+        if (!wire.IsCut && EntityManager.TryGetComponent<AccessReaderComponent>(wire.Owner, out var comp))
+            comp.LoggingDisabled = false;
+    }
+
+    private enum PulseTimeoutKey : byte
+    {
+        Key
+    }
+}
diff --git a/Content.Server/Atmos/Piping/EntitySystems/AtmosUnsafeUnanchorSystem.cs b/Content.Server/Atmos/Piping/EntitySystems/AtmosUnsafeUnanchorSystem.cs
index fcb3ccde68..f594866fa2 100644
--- a/Content.Server/Atmos/Piping/EntitySystems/AtmosUnsafeUnanchorSystem.cs
+++ b/Content.Server/Atmos/Piping/EntitySystems/AtmosUnsafeUnanchorSystem.cs
@@ -82,7 +82,10 @@ namespace Content.Server.Atmos.Piping.EntitySystems
                     continue;
 
                 var difference = pipe.Air.Pressure - environment.Pressure;
-                lost += difference * environment.Volume / (environment.Temperature * Atmospherics.R);
+                lost += Math.Min(
+                            pipe.Volume / pipe.Air.Volume * pipe.Air.TotalMoles,
+                            difference * environment.Volume / (environment.Temperature * Atmospherics.R)
+                        );
                 timesLost++;
             }
 
diff --git a/Content.Server/Atmos/Piping/Other/Components/GasMinerComponent.cs b/Content.Server/Atmos/Piping/Other/Components/GasMinerComponent.cs
index e6d8ec790d..18a0b9b078 100644
--- a/Content.Server/Atmos/Piping/Other/Components/GasMinerComponent.cs
+++ b/Content.Server/Atmos/Piping/Other/Components/GasMinerComponent.cs
@@ -25,6 +25,9 @@ namespace Content.Server.Atmos.Piping.Other.Components
         [DataField("spawnTemperature")]
         public float SpawnTemperature { get; set; } = Atmospherics.T20C;
 
+        /// <summary>
+        ///     Number of moles created per second when the miner is working.
+        /// </summary>
         [ViewVariables(VVAccess.ReadWrite)]
         [DataField("spawnAmount")]
         public float SpawnAmount { get; set; } = Atmospherics.MolesCellStandard * 20f;
diff --git a/Content.Server/Atmos/Piping/Other/EntitySystems/GasMinerSystem.cs b/Content.Server/Atmos/Piping/Other/EntitySystems/GasMinerSystem.cs
index aa206dbc68..251ee79764 100644
--- a/Content.Server/Atmos/Piping/Other/EntitySystems/GasMinerSystem.cs
+++ b/Content.Server/Atmos/Piping/Other/EntitySystems/GasMinerSystem.cs
@@ -24,18 +24,22 @@ namespace Content.Server.Atmos.Piping.Other.EntitySystems
         private void OnMinerUpdated(Entity<GasMinerComponent> ent, ref AtmosDeviceUpdateEvent args)
         {
             var miner = ent.Comp;
-            if (!CheckMinerOperation(ent, out var environment) || !miner.Enabled || !miner.SpawnGas.HasValue || miner.SpawnAmount <= 0f)
+
+            // SpawnAmount is declared in mol/s so to get the amount of gas we hope to mine, we have to multiply this by
+            // how long we have been waiting to spawn it and further cap the number according to the miner's state.
+            var toSpawn = CapSpawnAmount(ent, miner.SpawnAmount * args.dt, out var environment);
+            if (toSpawn <= 0f || environment == null || !miner.Enabled || !miner.SpawnGas.HasValue)
                 return;
 
             // Time to mine some gas.
 
             var merger = new GasMixture(1) { Temperature = miner.SpawnTemperature };
-            merger.SetMoles(miner.SpawnGas.Value, miner.SpawnAmount);
+            merger.SetMoles(miner.SpawnGas.Value, toSpawn);
 
             _atmosphereSystem.Merge(environment, merger);
         }
 
-        private bool CheckMinerOperation(Entity<GasMinerComponent> ent, [NotNullWhen(true)] out GasMixture? environment)
+        private float CapSpawnAmount(Entity<GasMinerComponent> ent, float toSpawnTarget, [NotNullWhen(true)] out GasMixture? environment)
         {
             var (uid, miner) = ent;
             var transform = Transform(uid);
@@ -47,33 +51,30 @@ namespace Content.Server.Atmos.Piping.Other.EntitySystems
             if (_atmosphereSystem.IsTileSpace(transform.GridUid, transform.MapUid, position))
             {
                 miner.Broken = true;
-                return false;
+                return 0f;
             }
 
             // Air-blocked location.
             if (environment == null)
             {
                 miner.Broken = true;
-                return false;
+                return 0f;
             }
 
-            // External pressure above threshold.
-            if (!float.IsInfinity(miner.MaxExternalPressure) &&
-                environment.Pressure > miner.MaxExternalPressure - miner.SpawnAmount * miner.SpawnTemperature * Atmospherics.R / environment.Volume)
-            {
-                miner.Broken = true;
-                return false;
-            }
+            // How many moles could we theoretically spawn. Cap by pressure and amount.
+            var allowableMoles = Math.Min(
+                (miner.MaxExternalPressure - environment.Pressure) * environment.Volume / (miner.SpawnTemperature * Atmospherics.R),
+                miner.MaxExternalAmount - environment.TotalMoles);
 
-            // External gas amount above threshold.
-            if (!float.IsInfinity(miner.MaxExternalAmount) && environment.TotalMoles > miner.MaxExternalAmount)
-            {
+            var toSpawnReal = Math.Clamp(allowableMoles, 0f, toSpawnTarget);
+
+            if (toSpawnReal < Atmospherics.GasMinMoles) {
                 miner.Broken = true;
-                return false;
+                return 0f;
             }
 
             miner.Broken = false;
-            return true;
+            return toSpawnReal;
         }
     }
 }
diff --git a/Content.Server/Atmos/Piping/Unary/Components/GasVentPumpComponent.cs b/Content.Server/Atmos/Piping/Unary/Components/GasVentPumpComponent.cs
index 2ba4603a9b..7d702904fb 100644
--- a/Content.Server/Atmos/Piping/Unary/Components/GasVentPumpComponent.cs
+++ b/Content.Server/Atmos/Piping/Unary/Components/GasVentPumpComponent.cs
@@ -10,7 +10,7 @@ namespace Content.Server.Atmos.Piping.Unary.Components
     public sealed partial class GasVentPumpComponent : Component
     {
         [ViewVariables(VVAccess.ReadWrite)]
-        public bool Enabled { get; set; } = true;
+        public bool Enabled { get; set; } = false;
 
         [ViewVariables]
         public bool IsDirty { get; set; } = false;
@@ -40,7 +40,7 @@ namespace Content.Server.Atmos.Piping.Unary.Components
         /// </summary>
         [ViewVariables(VVAccess.ReadWrite)]
         [DataField("underPressureLockoutThreshold")]
-        public float UnderPressureLockoutThreshold = 60; // this must be tuned in conjunction with atmos.mmos_spacing_speed
+        public float UnderPressureLockoutThreshold = 80; // this must be tuned in conjunction with atmos.mmos_spacing_speed
 
         /// <summary>
         ///     Pressure locked vents still leak a little (leading to eventual pressurization of sealed sections)
diff --git a/Content.Server/Atmos/Piping/Unary/Components/GasVentScrubberComponent.cs b/Content.Server/Atmos/Piping/Unary/Components/GasVentScrubberComponent.cs
index 064077a8db..33168d9db9 100644
--- a/Content.Server/Atmos/Piping/Unary/Components/GasVentScrubberComponent.cs
+++ b/Content.Server/Atmos/Piping/Unary/Components/GasVentScrubberComponent.cs
@@ -10,7 +10,7 @@ namespace Content.Server.Atmos.Piping.Unary.Components
     public sealed partial class GasVentScrubberComponent : Component
     {
         [ViewVariables(VVAccess.ReadWrite)]
-        public bool Enabled { get; set; } = true;
+        public bool Enabled { get; set; } = false;
 
         [ViewVariables]
         public bool IsDirty { get; set; } = false;
diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs
index 8951f8a947..2859c7f19d 100644
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs
@@ -83,13 +83,18 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
             var timeDelta = args.dt;
             var pressureDelta = timeDelta * vent.TargetPressureChange;
 
+            var lockout = (environment.Pressure < vent.UnderPressureLockoutThreshold);
+            if (vent.UnderPressureLockout != lockout) // update visuals only if this changes
+            {
+                vent.UnderPressureLockout = lockout;
+                UpdateState(uid, vent);
+            }
+
             if (vent.PumpDirection == VentPumpDirection.Releasing && pipe.Air.Pressure > 0)
             {
                 if (environment.Pressure > vent.MaxPressure)
                     return;
 
-                vent.UnderPressureLockout = (environment.Pressure < vent.UnderPressureLockoutThreshold);
-
                 if ((vent.PressureChecks & VentPressureBound.ExternalBound) != 0)
                 {
                     // Vents cannot supply high pressures from an almost empty pipe, instead it's proportional to the pipe
@@ -267,7 +272,10 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
             }
             else if (vent.PumpDirection == VentPumpDirection.Releasing)
             {
-                _appearance.SetData(uid, VentPumpVisuals.State, VentPumpState.Out, appearance);
+                if (vent.UnderPressureLockout & !vent.PressureLockoutOverride)
+                    _appearance.SetData(uid, VentPumpVisuals.State, VentPumpState.Lockout, appearance);
+                else
+                    _appearance.SetData(uid, VentPumpVisuals.State, VentPumpState.Out, appearance);
             }
             else if (vent.PumpDirection == VentPumpDirection.Siphoning)
             {
@@ -281,7 +289,7 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
                 return;
             if (args.IsInDetailsRange)
             {
-                if (pumpComponent.UnderPressureLockout & !pumpComponent.PressureLockoutOverride)
+                if (pumpComponent.PumpDirection == VentPumpDirection.Releasing & pumpComponent.UnderPressureLockout & !pumpComponent.PressureLockoutOverride)
                 {
                     args.PushMarkup(Loc.GetString("gas-vent-pump-uvlo"));
                 }
diff --git a/Content.Server/Body/Systems/BloodstreamSystem.cs b/Content.Server/Body/Systems/BloodstreamSystem.cs
index eaa7b62f25..a8a86028d4 100644
--- a/Content.Server/Body/Systems/BloodstreamSystem.cs
+++ b/Content.Server/Body/Systems/BloodstreamSystem.cs
@@ -1,6 +1,6 @@
 using Content.Server.Body.Components;
 using Content.Server.Chemistry.Containers.EntitySystems;
-using Content.Server.Chemistry.ReactionEffects;
+using Content.Server.EntityEffects.Effects;
 using Content.Server.Fluids.EntitySystems;
 using Content.Server.Forensics;
 using Content.Server.Popups;
diff --git a/Content.Server/Body/Systems/MetabolizerSystem.cs b/Content.Server/Body/Systems/MetabolizerSystem.cs
index 8394d9999b..5ba3c6ee58 100644
--- a/Content.Server/Body/Systems/MetabolizerSystem.cs
+++ b/Content.Server/Body/Systems/MetabolizerSystem.cs
@@ -6,6 +6,7 @@ using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Database;
+using Content.Shared.EntityEffects;
 using Content.Shared.FixedPoint;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
@@ -193,8 +194,7 @@ namespace Content.Server.Body.Systems
                     }
 
                     var actualEntity = ent.Comp2?.Body ?? solutionEntityUid.Value;
-                    var args = new ReagentEffectArgs(actualEntity, ent, solution, proto, mostToRemove,
-                        EntityManager, null, scale);
+                    var args = new EntityEffectReagentArgs(actualEntity, EntityManager, ent, solution, mostToRemove, proto, null, scale);
 
                     // do all effects, if conditions apply
                     foreach (var effect in entry.Effects)
diff --git a/Content.Server/Body/Systems/RespiratorSystem.cs b/Content.Server/Body/Systems/RespiratorSystem.cs
index 5461f68db2..5fbd0c4814 100644
--- a/Content.Server/Body/Systems/RespiratorSystem.cs
+++ b/Content.Server/Body/Systems/RespiratorSystem.cs
@@ -3,8 +3,8 @@ using Content.Server.Atmos.EntitySystems;
 using Content.Server.Body.Components;
 using Content.Server.Chat.Systems;
 using Content.Server.Chemistry.Containers.EntitySystems;
-using Content.Server.Chemistry.ReagentEffectConditions;
-using Content.Server.Chemistry.ReagentEffects;
+using Content.Server.EntityEffects.EffectConditions;
+using Content.Server.EntityEffects.Effects;
 using Content.Shared.Alert;
 using Content.Shared.Atmos;
 using Content.Shared.Body.Components;
@@ -13,6 +13,7 @@ using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Damage;
 using Content.Shared.Database;
+using Content.Shared.EntityEffects;
 using Content.Shared.Mobs.Systems;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
@@ -261,7 +262,7 @@ public sealed class RespiratorSystem : EntitySystem
         // TODO generalize condition checks
         // this is pretty janky, but I just want to bodge a method that checks if an entity can breathe a gas mixture
         // Applying actual reaction effects require a full ReagentEffectArgs struct.
-        bool CanMetabolize(ReagentEffect effect)
+        bool CanMetabolize(EntityEffect effect)
         {
             if (effect.Conditions == null)
                 return true;
diff --git a/Content.Server/Botany/SeedPrototype.cs b/Content.Server/Botany/SeedPrototype.cs
index 0ae56bc5fc..b2882d8e94 100644
--- a/Content.Server/Botany/SeedPrototype.cs
+++ b/Content.Server/Botany/SeedPrototype.cs
@@ -1,7 +1,7 @@
 using Content.Server.Botany.Components;
 using Content.Server.Botany.Systems;
 using Content.Shared.Atmos;
-using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
@@ -80,7 +80,7 @@ public partial struct SeedChemQuantity
 
 // TODO reduce the number of friends to a reasonable level. Requires ECS-ing things like plant holder component.
 [Virtual, DataDefinition]
-[Access(typeof(BotanySystem), typeof(PlantHolderSystem), typeof(SeedExtractorSystem), typeof(PlantHolderComponent), typeof(ReagentEffect), typeof(MutationSystem))]
+[Access(typeof(BotanySystem), typeof(PlantHolderSystem), typeof(SeedExtractorSystem), typeof(PlantHolderComponent), typeof(EntityEffect), typeof(MutationSystem))]
 public partial class SeedData
 {
     #region Tracking
diff --git a/Content.Server/Chat/TypingIndicator/TypingIndicatorSystem.cs b/Content.Server/Chat/TypingIndicator/TypingIndicatorSystem.cs
index c923738930..d180a958ca 100644
--- a/Content.Server/Chat/TypingIndicator/TypingIndicatorSystem.cs
+++ b/Content.Server/Chat/TypingIndicator/TypingIndicatorSystem.cs
@@ -1,64 +1,7 @@
-using Content.Shared.ActionBlocker;
 using Content.Shared.Chat.TypingIndicator;
-using Robust.Shared.Player;
 
 namespace Content.Server.Chat.TypingIndicator;
 
-// Server-side typing system
-// It receives networked typing events from clients
-// And sync typing indicator using appearance component
 public sealed class TypingIndicatorSystem : SharedTypingIndicatorSystem
 {
-    [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
-    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-        SubscribeLocalEvent<PlayerAttachedEvent>(OnPlayerAttached);
-        SubscribeLocalEvent<TypingIndicatorComponent, PlayerDetachedEvent>(OnPlayerDetached);
-        SubscribeNetworkEvent<TypingChangedEvent>(OnClientTypingChanged);
-    }
-
-    private void OnPlayerAttached(PlayerAttachedEvent ev)
-    {
-        // when player poses entity we want to make sure that there is typing indicator
-        EnsureComp<TypingIndicatorComponent>(ev.Entity);
-        // we also need appearance component to sync visual state
-        EnsureComp<AppearanceComponent>(ev.Entity);
-    }
-
-    private void OnPlayerDetached(EntityUid uid, TypingIndicatorComponent component, PlayerDetachedEvent args)
-    {
-        // player left entity body - hide typing indicator
-        SetTypingIndicatorEnabled(uid, false);
-    }
-
-    private void OnClientTypingChanged(TypingChangedEvent ev, EntitySessionEventArgs args)
-    {
-        var uid = args.SenderSession.AttachedEntity;
-        if (!Exists(uid))
-        {
-            Log.Warning($"Client {args.SenderSession} sent TypingChangedEvent without an attached entity.");
-            return;
-        }
-
-        // check if this entity can speak or emote
-        if (!_actionBlocker.CanEmote(uid.Value) && !_actionBlocker.CanSpeak(uid.Value))
-        {
-            // nah, make sure that typing indicator is disabled
-            SetTypingIndicatorEnabled(uid.Value, false);
-            return;
-        }
-
-        SetTypingIndicatorEnabled(uid.Value, ev.IsTyping);
-    }
-
-    private void SetTypingIndicatorEnabled(EntityUid uid, bool isEnabled, AppearanceComponent? appearance = null)
-    {
-        if (!Resolve(uid, ref appearance, false))
-            return;
-
-        _appearance.SetData(uid, TypingIndicatorVisuals.IsTyping, isEnabled, appearance);
-    }
 }
diff --git a/Content.Server/Chemistry/EntitySystems/HypospraySystem.cs b/Content.Server/Chemistry/EntitySystems/HypospraySystem.cs
index 7b70497c7d..c5bdb39816 100644
--- a/Content.Server/Chemistry/EntitySystems/HypospraySystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/HypospraySystem.cs
@@ -1,7 +1,7 @@
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Components.SolutionManager;
-using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Chemistry;
 using Content.Shared.Database;
 using Content.Shared.FixedPoint;
 using Content.Shared.Forensics;
diff --git a/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs b/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs
deleted file mode 100644
index 56509a0953..0000000000
--- a/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-using Content.Server.Fluids.EntitySystems;
-using Content.Shared.Audio;
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Coordinates.Helpers;
-using Content.Shared.Database;
-using Content.Shared.FixedPoint;
-using Content.Shared.Maps;
-using JetBrains.Annotations;
-using Robust.Server.GameObjects;
-using Robust.Shared.Audio;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Map;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Server.Chemistry.ReactionEffects
-{
-    /// <summary>
-    /// Basically smoke and foam reactions.
-    /// </summary>
-    [UsedImplicitly]
-    [DataDefinition]
-    public sealed partial class AreaReactionEffect : ReagentEffect
-    {
-        /// <summary>
-        /// How many seconds will the effect stay, counting after fully spreading.
-        /// </summary>
-        [DataField("duration")] private float _duration = 10;
-
-        /// <summary>
-        /// How many units of reaction for 1 smoke entity.
-        /// </summary>
-        [DataField] public FixedPoint2 OverflowThreshold = FixedPoint2.New(2.5);
-
-        /// <summary>
-        /// The entity prototype that will be spawned as the effect.
-        /// </summary>
-        [DataField("prototypeId", required: true, customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))]
-        private string _prototypeId = default!;
-
-        /// <summary>
-        /// Sound that will get played when this reaction effect occurs.
-        /// </summary>
-        [DataField("sound", required: true)] private SoundSpecifier _sound = default!;
-
-        public override bool ShouldLog => true;
-
-        protected override string ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-            => Loc.GetString("reagent-effect-guidebook-area-reaction",
-                    ("duration", _duration)
-                );
-
-        public override LogImpact LogImpact => LogImpact.High;
-
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (args.Source == null)
-                return;
-
-            var spreadAmount = (int) Math.Max(0, Math.Ceiling((args.Quantity / OverflowThreshold).Float()));
-            var splitSolution = args.Source.SplitSolution(args.Source.Volume);
-            var transform = args.EntityManager.GetComponent<TransformComponent>(args.SolutionEntity);
-            var mapManager = IoCManager.Resolve<IMapManager>();
-            var mapSys = args.EntityManager.System<MapSystem>();
-            var sys = args.EntityManager.System<TransformSystem>();
-            var mapCoords = sys.GetMapCoordinates(args.SolutionEntity, xform: transform);
-
-            if (!mapManager.TryFindGridAt(mapCoords, out var gridUid, out var grid) ||
-                !mapSys.TryGetTileRef(gridUid, grid, transform.Coordinates, out var tileRef) ||
-                tileRef.Tile.IsSpace())
-            {
-                return;
-            }
-
-            var coords = mapSys.MapToGrid(gridUid, mapCoords);
-            var ent = args.EntityManager.SpawnEntity(_prototypeId, coords.SnapToGrid());
-
-            var smoke = args.EntityManager.System<SmokeSystem>();
-            smoke.StartSmoke(ent, splitSolution, _duration, spreadAmount);
-
-            var audio = args.EntityManager.System<SharedAudioSystem>();
-            audio.PlayPvs(_sound, args.SolutionEntity, AudioHelpers.WithVariation(0.125f));
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReactionEffects/ExplosionReactionEffect.cs b/Content.Server/Chemistry/ReactionEffects/ExplosionReactionEffect.cs
deleted file mode 100644
index 2771f79c3a..0000000000
--- a/Content.Server/Chemistry/ReactionEffects/ExplosionReactionEffect.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-using Content.Server.Explosion.EntitySystems;
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Database;
-using Content.Shared.Explosion;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using System.Text.Json.Serialization;
-
-namespace Content.Server.Chemistry.ReactionEffects
-{
-    [DataDefinition]
-    public sealed partial class ExplosionReactionEffect : ReagentEffect
-    {
-        /// <summary>
-        ///     The type of explosion. Determines damage types and tile break chance scaling.
-        /// </summary>
-        [DataField(required: true, customTypeSerializer: typeof(PrototypeIdSerializer<ExplosionPrototype>))]
-        [JsonIgnore]
-        public string ExplosionType = default!;
-
-        /// <summary>
-        ///     The max intensity the explosion can have at a given tile. Places an upper limit of damage and tile break
-        ///     chance.
-        /// </summary>
-        [DataField]
-        [JsonIgnore]
-        public float MaxIntensity = 5;
-
-        /// <summary>
-        ///     How quickly intensity drops off as you move away from the epicenter
-        /// </summary>
-        [DataField]
-        [JsonIgnore]
-        public float IntensitySlope = 1;
-
-        /// <summary>
-        ///     The maximum total intensity that this chemical reaction can achieve. Basically here to prevent people
-        ///     from creating a nuke by collecting enough potassium and water.
-        /// </summary>
-        /// <remarks>
-        ///     A slope of 1 and MaxTotalIntensity of 100 corresponds to a radius of around 4.5 tiles.
-        /// </remarks>
-        [DataField]
-        [JsonIgnore]
-        public float MaxTotalIntensity = 100;
-
-        /// <summary>
-        ///     The intensity of the explosion per unit reaction.
-        /// </summary>
-        [DataField]
-        [JsonIgnore]
-        public float IntensityPerUnit = 1;
-
-        public override bool ShouldLog => true;
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-            => Loc.GetString("reagent-effect-guidebook-explosion-reaction-effect", ("chance", Probability));
-        public override LogImpact LogImpact => LogImpact.High;
-
-        public override void Effect(ReagentEffectArgs args)
-        {
-            var intensity = MathF.Min((float) args.Quantity * IntensityPerUnit, MaxTotalIntensity);
-
-            args.EntityManager.System<ExplosionSystem>()
-                .QueueExplosion(
-                args.SolutionEntity,
-                ExplosionType,
-                intensity,
-                IntensitySlope,
-                MaxIntensity);
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReactionEffects/SolutionTemperatureEffects.cs b/Content.Server/Chemistry/ReactionEffects/SolutionTemperatureEffects.cs
deleted file mode 100644
index ec58754883..0000000000
--- a/Content.Server/Chemistry/ReactionEffects/SolutionTemperatureEffects.cs
+++ /dev/null
@@ -1,121 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReactionEffects
-{
-    /// <summary>
-    ///     Sets the temperature of the solution involved with the reaction to a new value.
-    /// </summary>
-    [DataDefinition]
-    public sealed partial class SetSolutionTemperatureEffect : ReagentEffect
-    {
-        /// <summary>
-        ///     The temperature to set the solution to.
-        /// </summary>
-        [DataField("temperature", required: true)] private float _temperature;
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-            => Loc.GetString("reagent-effect-guidebook-set-solution-temperature-effect",
-                ("chance", Probability), ("temperature", _temperature));
-
-        public override void Effect(ReagentEffectArgs args)
-        {
-            var solution = args.Source;
-            if (solution == null)
-                return;
-
-            solution.Temperature = _temperature;
-        }
-    }
-
-    /// <summary>
-    ///     Adjusts the temperature of the solution involved in the reaction.
-    /// </summary>
-    [DataDefinition]
-    public sealed partial class AdjustSolutionTemperatureEffect : ReagentEffect
-    {
-        /// <summary>
-        ///     The change in temperature.
-        /// </summary>
-        [DataField("delta", required: true)] private float _delta;
-
-        /// <summary>
-        ///     The minimum temperature this effect can reach.
-        /// </summary>
-        [DataField("minTemp")] private float _minTemp = 0.0f;
-
-        /// <summary>
-        ///     The maximum temperature this effect can reach.
-        /// </summary>
-        [DataField("maxTemp")] private float _maxTemp = float.PositiveInfinity;
-
-        /// <summary>
-        ///     If true, then scale ranges by intensity. If not, the ranges are the same regardless of reactant amount.
-        /// </summary>
-        [DataField("scaled")] private bool _scaled;
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-            => Loc.GetString("reagent-effect-guidebook-adjust-solution-temperature-effect",
-                ("chance", Probability), ("deltasign", MathF.Sign(_delta)), ("mintemp", _minTemp), ("maxtemp", _maxTemp));
-
-        public override void Effect(ReagentEffectArgs args)
-        {
-            var solution = args.Source;
-            if (solution == null || solution.Volume == 0)
-                return;
-
-            var deltaT = _scaled ? _delta * (float) args.Quantity : _delta;
-            solution.Temperature = Math.Clamp(solution.Temperature + deltaT, _minTemp, _maxTemp);
-        }
-    }
-
-    /// <summary>
-    ///     Adjusts the thermal energy of the solution involved in the reaction.
-    /// </summary>
-    public sealed partial class AdjustSolutionThermalEnergyEffect : ReagentEffect
-    {
-        /// <summary>
-        ///     The change in energy.
-        /// </summary>
-        [DataField("delta", required: true)] private float _delta;
-
-        /// <summary>
-        ///     The minimum temperature this effect can reach.
-        /// </summary>
-        [DataField("minTemp")] private float _minTemp = 0.0f;
-
-        /// <summary>
-        ///     The maximum temperature this effect can reach.
-        /// </summary>
-        [DataField("maxTemp")] private float _maxTemp = float.PositiveInfinity;
-
-        /// <summary>
-        ///     If true, then scale ranges by intensity. If not, the ranges are the same regardless of reactant amount.
-        /// </summary>
-        [DataField("scaled")] private bool _scaled;
-
-        public override void Effect(ReagentEffectArgs args)
-        {
-            var solution = args.Source;
-            if (solution == null || solution.Volume == 0)
-                return;
-
-            if (_delta > 0 && solution.Temperature >= _maxTemp)
-                return;
-            if (_delta < 0 && solution.Temperature <= _minTemp)
-                return;
-
-            var heatCap = solution.GetHeatCapacity(null);
-            var deltaT = _scaled
-                ? _delta / heatCap * (float) args.Quantity
-                : _delta / heatCap;
-
-            solution.Temperature = Math.Clamp(solution.Temperature + deltaT, _minTemp, _maxTemp);
-        }
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-            => Loc.GetString("reagent-effect-guidebook-adjust-solution-temperature-effect",
-                ("chance", Probability), ("deltasign", MathF.Sign(_delta)), ("mintemp", _minTemp), ("maxtemp", _maxTemp));
-    }
-
-}
diff --git a/Content.Server/Chemistry/ReagentEffectConditions/BodyTemperature.cs b/Content.Server/Chemistry/ReagentEffectConditions/BodyTemperature.cs
deleted file mode 100644
index 9c47bb58ab..0000000000
--- a/Content.Server/Chemistry/ReagentEffectConditions/BodyTemperature.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using Content.Server.Temperature.Components;
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffectConditions
-{
-    /// <summary>
-    ///     Requires the solution entity to be above or below a certain temperature.
-    ///     Used for things like cryoxadone and pyroxadone.
-    /// </summary>
-    public sealed partial class Temperature : ReagentEffectCondition
-    {
-        [DataField]
-        public float Min = 0;
-
-        [DataField]
-        public float Max = float.PositiveInfinity;
-        public override bool Condition(ReagentEffectArgs args)
-        {
-            if (args.EntityManager.TryGetComponent(args.SolutionEntity, out TemperatureComponent? temp))
-            {
-                if (temp.CurrentTemperature > Min && temp.CurrentTemperature < Max)
-                    return true;
-            }
-
-            return false;
-        }
-
-        public override string GuidebookExplanation(IPrototypeManager prototype)
-        {
-            return Loc.GetString("reagent-effect-condition-guidebook-body-temperature",
-                ("max", float.IsPositiveInfinity(Max) ? (float) int.MaxValue : Max),
-                ("min", Min));
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffectConditions/JobCondition.cs b/Content.Server/Chemistry/ReagentEffectConditions/JobCondition.cs
deleted file mode 100644
index 0ede690049..0000000000
--- a/Content.Server/Chemistry/ReagentEffectConditions/JobCondition.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System.Linq;
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Mobs;
-using Content.Shared.Mobs.Components;
-using Content.Shared.Localizations;
-using Robust.Shared.Prototypes;
-using Content.Shared.Mind;
-using Content.Shared.Mind.Components;
-using Content.Shared.Roles;
-using Content.Shared.Roles.Jobs;
-using Content.Shared.Station;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using Robust.Shared.IoC;
-
-namespace Content.Server.Chemistry.ReagentEffectConditions
-{    
-    public sealed partial class JobCondition : ReagentEffectCondition
-    {
-        [DataField(required: true)] public List<ProtoId<JobPrototype>> Job;
-                
-        public override bool Condition(ReagentEffectArgs args)
-        {   
-            args.EntityManager.TryGetComponent<MindContainerComponent>(args.SolutionEntity, out var mindContainer);
-            if (mindContainer != null && mindContainer.Mind != null)
-            {
-                var prototypeManager = IoCManager.Resolve<IPrototypeManager>();
-                if (args.EntityManager.TryGetComponent<JobComponent>(mindContainer?.Mind, out var comp) && prototypeManager.TryIndex(comp.Prototype, out var prototype))
-                {
-                    foreach (var jobId in Job)
-                    {
-                        if (prototype.ID == jobId)
-                        {
-                            return true;
-                        }
-                    }
-                }
-            }
-            
-            return false;
-        }
-        
-        public override string GuidebookExplanation(IPrototypeManager prototype)
-        {
-            var localizedNames = Job.Select(jobId => prototype.Index(jobId).LocalizedName).ToList();
-            return Loc.GetString("reagent-effect-condition-guidebook-job-condition", ("job", ContentLocalizationManager.FormatListToOr(localizedNames)));
-        }
-    }
-}
-
diff --git a/Content.Server/Chemistry/ReagentEffectConditions/MobStateCondition.cs b/Content.Server/Chemistry/ReagentEffectConditions/MobStateCondition.cs
deleted file mode 100644
index 377eb7d906..0000000000
--- a/Content.Server/Chemistry/ReagentEffectConditions/MobStateCondition.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Mobs;
-using Content.Shared.Mobs.Components;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffectConditions
-{
-    public sealed partial class MobStateCondition : ReagentEffectCondition
-    {
-        [DataField]
-        public MobState Mobstate = MobState.Alive;
-
-        public override bool Condition(ReagentEffectArgs args)
-        {
-            if (args.EntityManager.TryGetComponent(args.SolutionEntity, out MobStateComponent? mobState))
-            {
-                if (mobState.CurrentState == Mobstate)
-                    return true;
-            }
-
-            return false;
-        }
-
-        public override string GuidebookExplanation(IPrototypeManager prototype)
-        {
-            return Loc.GetString("reagent-effect-condition-guidebook-mob-state-condition", ("state", Mobstate));
-        }
-    }
-}
-
diff --git a/Content.Server/Chemistry/ReagentEffectConditions/OrganType.cs b/Content.Server/Chemistry/ReagentEffectConditions/OrganType.cs
deleted file mode 100644
index 986c3d79c8..0000000000
--- a/Content.Server/Chemistry/ReagentEffectConditions/OrganType.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using Content.Server.Body.Components;
-using Content.Shared.Body.Prototypes;
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Server.Chemistry.ReagentEffectConditions
-{
-    /// <summary>
-    ///     Requires that the metabolizing organ is or is not tagged with a certain MetabolizerType
-    /// </summary>
-    public sealed partial class OrganType : ReagentEffectCondition
-    {
-        [DataField(required: true, customTypeSerializer: typeof(PrototypeIdSerializer<MetabolizerTypePrototype>))]
-        public string Type = default!;
-
-        /// <summary>
-        ///     Does this condition pass when the organ has the type, or when it doesn't have the type?
-        /// </summary>
-        [DataField]
-        public bool ShouldHave = true;
-
-        public override bool Condition(ReagentEffectArgs args)
-        {
-            if (args.OrganEntity == null)
-                return false;
-
-            return Condition(args.OrganEntity.Value, args.EntityManager);
-        }
-
-        public bool Condition(Entity<MetabolizerComponent?> metabolizer, IEntityManager entMan)
-        {
-            metabolizer.Comp ??= entMan.GetComponentOrNull<MetabolizerComponent>(metabolizer.Owner);
-            if (metabolizer.Comp != null
-                && metabolizer.Comp.MetabolizerTypes != null
-                && metabolizer.Comp.MetabolizerTypes.Contains(Type))
-                return ShouldHave;
-            return !ShouldHave;
-        }
-
-        public override string GuidebookExplanation(IPrototypeManager prototype)
-        {
-            return Loc.GetString("reagent-effect-condition-guidebook-organ-type",
-                ("name", prototype.Index<MetabolizerTypePrototype>(Type).LocalizedName),
-                ("shouldhave", ShouldHave));
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffectConditions/ReagentThreshold.cs b/Content.Server/Chemistry/ReagentEffectConditions/ReagentThreshold.cs
deleted file mode 100644
index 6ac1549ab0..0000000000
--- a/Content.Server/Chemistry/ReagentEffectConditions/ReagentThreshold.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.FixedPoint;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffectConditions
-{
-    /// <summary>
-    ///     Used for implementing reagent effects that require a certain amount of reagent before it should be applied.
-    ///     For instance, overdoses.
-    ///
-    ///     This can also trigger on -other- reagents, not just the one metabolizing. By default, it uses the
-    ///     one being metabolized.
-    /// </summary>
-    public sealed partial class ReagentThreshold : ReagentEffectCondition
-    {
-        [DataField]
-        public FixedPoint2 Min = FixedPoint2.Zero;
-
-        [DataField]
-        public FixedPoint2 Max = FixedPoint2.MaxValue;
-
-        // TODO use ReagentId
-        [DataField]
-        public string? Reagent;
-
-        public override bool Condition(ReagentEffectArgs args)
-        {
-            var reagent = Reagent ?? args.Reagent?.ID;
-            if (reagent == null)
-                return true; // No condition to apply.
-
-            var quant = FixedPoint2.Zero;
-            if (args.Source != null)
-                quant = args.Source.GetTotalPrototypeQuantity(reagent);
-
-            return quant >= Min && quant <= Max;
-        }
-
-        public override string GuidebookExplanation(IPrototypeManager prototype)
-        {
-            ReagentPrototype? reagentProto = null;
-            if (Reagent is not null)
-                prototype.TryIndex(Reagent, out reagentProto);
-
-            return Loc.GetString("reagent-effect-condition-guidebook-reagent-threshold",
-                ("reagent", reagentProto?.LocalizedName ?? Loc.GetString("reagent-effect-condition-guidebook-this-reagent")),
-                ("max", Max == FixedPoint2.MaxValue ? (float) int.MaxValue : Max.Float()),
-                ("min", Min.Float()));
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffectConditions/SolutionTemperature.cs b/Content.Server/Chemistry/ReagentEffectConditions/SolutionTemperature.cs
deleted file mode 100644
index 4387f2ba93..0000000000
--- a/Content.Server/Chemistry/ReagentEffectConditions/SolutionTemperature.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffectConditions
-{
-    /// <summary>
-    ///     Requires the solution to be above or below a certain temperature.
-    ///     Used for things like explosives.
-    /// </summary>
-    public sealed partial class SolutionTemperature : ReagentEffectCondition
-    {
-        [DataField]
-        public float Min = 0.0f;
-
-        [DataField]
-        public float Max = float.PositiveInfinity;
-        public override bool Condition(ReagentEffectArgs args)
-        {
-            if (args.Source == null)
-                return false;
-            if (args.Source.Temperature < Min)
-                return false;
-            if (args.Source.Temperature > Max)
-                return false;
-
-            return true;
-        }
-
-        public override string GuidebookExplanation(IPrototypeManager prototype)
-        {
-            return Loc.GetString("reagent-effect-condition-guidebook-solution-temperature",
-                ("max", float.IsPositiveInfinity(Max) ? (float) int.MaxValue : Max),
-                ("min", Min));
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffectConditions/TotalDamage.cs b/Content.Server/Chemistry/ReagentEffectConditions/TotalDamage.cs
deleted file mode 100644
index 49630ef9ab..0000000000
--- a/Content.Server/Chemistry/ReagentEffectConditions/TotalDamage.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Damage;
-using Content.Shared.FixedPoint;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffectConditions
-{
-    public sealed partial class TotalDamage : ReagentEffectCondition
-    {
-        [DataField]
-        public FixedPoint2 Max = FixedPoint2.MaxValue;
-
-        [DataField]
-        public FixedPoint2 Min = FixedPoint2.Zero;
-
-        public override bool Condition(ReagentEffectArgs args)
-        {
-            if (args.EntityManager.TryGetComponent(args.SolutionEntity, out DamageableComponent? damage))
-            {
-                var total = damage.TotalDamage;
-                if (total > Min && total < Max)
-                    return true;
-            }
-
-            return false;
-        }
-
-        public override string GuidebookExplanation(IPrototypeManager prototype)
-        {
-            return Loc.GetString("reagent-effect-condition-guidebook-total-damage",
-                ("max", Max == FixedPoint2.MaxValue ? (float) int.MaxValue : Max.Float()),
-                ("min", Min.Float()));
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffectConditions/TotalHunger.cs b/Content.Server/Chemistry/ReagentEffectConditions/TotalHunger.cs
deleted file mode 100644
index 1dd12e632a..0000000000
--- a/Content.Server/Chemistry/ReagentEffectConditions/TotalHunger.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Nutrition.Components;
-using Content.Shared.FixedPoint;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffectConditions
-{
-    public sealed partial class Hunger : ReagentEffectCondition
-    {
-        [DataField]
-        public float Max = float.PositiveInfinity;
-
-        [DataField]
-        public float Min = 0;
-
-        public override bool Condition(ReagentEffectArgs args)
-        {
-            if (args.EntityManager.TryGetComponent(args.SolutionEntity, out HungerComponent? hunger))
-            {
-                var total = hunger.CurrentHunger;
-                if (total > Min && total < Max)
-                    return true;
-            }
-
-            return false;
-        }
-
-        public override string GuidebookExplanation(IPrototypeManager prototype)
-        {
-            return Loc.GetString("reagent-effect-condition-guidebook-total-hunger",
-                ("max", float.IsPositiveInfinity(Max) ? (float) int.MaxValue : Max),
-                ("min", Min));
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/AddToSolutionReaction.cs b/Content.Server/Chemistry/ReagentEffects/AddToSolutionReaction.cs
deleted file mode 100644
index 2447814f94..0000000000
--- a/Content.Server/Chemistry/ReagentEffects/AddToSolutionReaction.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using Content.Server.Chemistry.Containers.EntitySystems;
-using Content.Shared.Chemistry.Reagent;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffects
-{
-    [UsedImplicitly]
-    public sealed partial class AddToSolutionReaction : ReagentEffect
-    {
-        [DataField("solution")]
-        private string _solution = "reagents";
-
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (args.Reagent == null)
-                return;
-
-            // TODO see if this is correct
-            var solutionContainerSystem = args.EntityManager.System<SolutionContainerSystem>();
-            if (!solutionContainerSystem.TryGetSolution(args.SolutionEntity, _solution, out var solutionContainer))
-                return;
-
-            if (solutionContainerSystem.TryAddReagent(solutionContainer.Value, args.Reagent.ID, args.Quantity, out var accepted))
-                args.Source?.RemoveReagent(args.Reagent.ID, accepted);
-        }
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
-            Loc.GetString("reagent-effect-guidebook-add-to-solution-reaction", ("chance", Probability));
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/ChemCleanBloodstream.cs b/Content.Server/Chemistry/ReagentEffects/ChemCleanBloodstream.cs
deleted file mode 100644
index ace73c84f3..0000000000
--- a/Content.Server/Chemistry/ReagentEffects/ChemCleanBloodstream.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using Content.Server.Body.Systems;
-using Content.Shared.Chemistry.Reagent;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReactionEffects
-{
-    /// <summary>
-    /// Basically smoke and foam reactions.
-    /// </summary>
-    [UsedImplicitly]
-    public sealed partial class ChemCleanBloodstream : ReagentEffect
-    {
-        [DataField]
-        public float CleanseRate = 3.0f;
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-            => Loc.GetString("reagent-effect-guidebook-chem-clean-bloodstream", ("chance", Probability));
-
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (args.Source == null || args.Reagent == null)
-                return;
-
-            var cleanseRate = CleanseRate;
-
-            cleanseRate *= args.Scale;
-
-            var bloodstreamSys = args.EntityManager.System<BloodstreamSystem>();
-            bloodstreamSys.FlushChemicals(args.SolutionEntity, args.Reagent.ID, cleanseRate);
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/ChemHealEyeDamage.cs b/Content.Server/Chemistry/ReagentEffects/ChemHealEyeDamage.cs
deleted file mode 100644
index 206b8ed04d..0000000000
--- a/Content.Server/Chemistry/ReagentEffects/ChemHealEyeDamage.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Eye.Blinding;
-using Content.Shared.Eye.Blinding.Systems;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffects
-{
-    /// <summary>
-    /// Heal or apply eye damage
-    /// </summary>
-    [UsedImplicitly]
-    public sealed partial class ChemHealEyeDamage : ReagentEffect
-    {
-        /// <summary>
-        /// How much eye damage to add.
-        /// </summary>
-        [DataField]
-        public int Amount = -1;
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-            => Loc.GetString("reagent-effect-guidebook-cure-eye-damage", ("chance", Probability), ("deltasign", MathF.Sign(Amount)));
-
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (args.Scale != 1f) // huh?
-                return;
-
-            args.EntityManager.EntitySysManager.GetEntitySystem<BlindableSystem>().AdjustEyeDamage(args.SolutionEntity, Amount);
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/Electrocute.cs b/Content.Server/Chemistry/ReagentEffects/Electrocute.cs
deleted file mode 100644
index 272a0fce42..0000000000
--- a/Content.Server/Chemistry/ReagentEffects/Electrocute.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using Content.Server.Electrocution;
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffects;
-
-public sealed partial class Electrocute : ReagentEffect
-{
-    [DataField] public int ElectrocuteTime = 2;
-
-    [DataField] public int ElectrocuteDamageScale = 5;
-
-    /// <remarks>
-    ///     true - refresh electrocute time,  false - accumulate electrocute time
-    /// </remarks>
-    [DataField] public bool Refresh = true;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-electrocute", ("chance", Probability), ("time", ElectrocuteTime));
-
-    public override bool ShouldLog => true;
-
-    public override void Effect(ReagentEffectArgs args)
-    {
-        args.EntityManager.System<ElectrocutionSystem>().TryDoElectrocution(args.SolutionEntity, null,
-            Math.Max((args.Quantity * ElectrocuteDamageScale).Int(), 1), TimeSpan.FromSeconds(ElectrocuteTime), Refresh, ignoreInsulation: true);
-
-        if (args.Reagent != null)
-            args.Source?.RemoveReagent(args.Reagent.ID, args.Quantity);
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/ExtinguishReaction.cs b/Content.Server/Chemistry/ReagentEffects/ExtinguishReaction.cs
deleted file mode 100644
index 69aaf5cdcd..0000000000
--- a/Content.Server/Chemistry/ReagentEffects/ExtinguishReaction.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using Content.Server.Atmos.Components;
-using Content.Server.Atmos.EntitySystems;
-using Content.Shared.Chemistry.Reagent;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffects
-{
-    [UsedImplicitly]
-    public sealed partial class ExtinguishReaction : ReagentEffect
-    {
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-            => Loc.GetString("reagent-effect-guidebook-extinguish-reaction", ("chance", Probability));
-
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (!args.EntityManager.TryGetComponent(args.SolutionEntity, out FlammableComponent? flammable)) return;
-
-            var flammableSystem = args.EntityManager.System<FlammableSystem>();
-            flammableSystem.Extinguish(args.SolutionEntity, flammable);
-            flammableSystem.AdjustFireStacks(args.SolutionEntity, -1.5f * (float) args.Quantity, flammable);
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/FlammableReaction.cs b/Content.Server/Chemistry/ReagentEffects/FlammableReaction.cs
deleted file mode 100644
index 5b36967f6a..0000000000
--- a/Content.Server/Chemistry/ReagentEffects/FlammableReaction.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using Content.Server.Atmos.Components;
-using Content.Server.Atmos.EntitySystems;
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Database;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffects
-{
-    [UsedImplicitly]
-    public sealed partial class FlammableReaction : ReagentEffect
-    {
-        [DataField]
-        public float Multiplier = 0.05f;
-
-        public override bool ShouldLog => true;
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-            => Loc.GetString("reagent-effect-guidebook-flammable-reaction", ("chance", Probability));
-
-        public override LogImpact LogImpact => LogImpact.Medium;
-
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (!args.EntityManager.TryGetComponent(args.SolutionEntity, out FlammableComponent? flammable))
-                return;
-
-            args.EntityManager.System<FlammableSystem>().AdjustFireStacks(args.SolutionEntity, args.Quantity.Float() * Multiplier, flammable);
-
-            if (args.Reagent != null)
-                args.Source?.RemoveReagent(args.Reagent.ID, args.Quantity);
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/ModifyLungGas.cs b/Content.Server/Chemistry/ReagentEffects/ModifyLungGas.cs
deleted file mode 100644
index e7466fbc85..0000000000
--- a/Content.Server/Chemistry/ReagentEffects/ModifyLungGas.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using Content.Server.Body.Components;
-using Content.Shared.Atmos;
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffects;
-
-public sealed partial class ModifyLungGas : ReagentEffect
-{
-    [DataField("ratios", required: true)]
-    private Dictionary<Gas, float> _ratios = default!;
-
-    // JUSTIFICATION: This is internal magic that players never directly interact with.
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => null;
-
-    public override void Effect(ReagentEffectArgs args)
-    {
-        if (!args.EntityManager.TryGetComponent<LungComponent>(args.OrganEntity, out var lung))
-            return;
-
-        foreach (var (gas, ratio) in _ratios)
-        {
-            var quantity = ratio * args.Quantity.Float() / Atmospherics.BreathMolesToReagentMultiplier;
-            if (quantity < 0)
-                quantity = Math.Max(quantity, -lung.Air[(int)gas]);
-            lung.Air.AdjustMoles(gas, quantity);
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/MovespeedModifier.cs b/Content.Server/Chemistry/ReagentEffects/MovespeedModifier.cs
deleted file mode 100644
index e538a011f6..0000000000
--- a/Content.Server/Chemistry/ReagentEffects/MovespeedModifier.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Movement.Systems;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
-
-namespace Content.Server.Chemistry.ReagentEffects
-{
-    /// <summary>
-    /// Default metabolism for stimulants and tranqs. Attempts to find a MovementSpeedModifier on the target,
-    /// adding one if not there and to change the movespeed
-    /// </summary>
-    public sealed partial class MovespeedModifier : ReagentEffect
-    {
-        /// <summary>
-        /// How much the entities' walk speed is multiplied by.
-        /// </summary>
-        [DataField]
-        public float WalkSpeedModifier { get; set; } = 1;
-
-        /// <summary>
-        /// How much the entities' run speed is multiplied by.
-        /// </summary>
-        [DataField]
-        public float SprintSpeedModifier { get; set; } = 1;
-
-        /// <summary>
-        /// How long the modifier applies (in seconds) when metabolized.
-        /// </summary>
-        [DataField]
-        public float StatusLifetime = 2f;
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        {
-            return Loc.GetString("reagent-effect-guidebook-movespeed-modifier",
-                ("chance", Probability),
-                ("walkspeed", WalkSpeedModifier),
-                ("time", StatusLifetime));
-        }
-
-        /// <summary>
-        /// Remove reagent at set rate, changes the movespeed modifiers and adds a MovespeedModifierMetabolismComponent if not already there.
-        /// </summary>
-        public override void Effect(ReagentEffectArgs args)
-        {
-            var status = args.EntityManager.EnsureComponent<MovespeedModifierMetabolismComponent>(args.SolutionEntity);
-
-            // Only refresh movement if we need to.
-            var modified = !status.WalkSpeedModifier.Equals(WalkSpeedModifier) ||
-                           !status.SprintSpeedModifier.Equals(SprintSpeedModifier);
-
-            status.WalkSpeedModifier = WalkSpeedModifier;
-            status.SprintSpeedModifier = SprintSpeedModifier;
-
-            // only going to scale application time
-            var statusLifetime = StatusLifetime;
-            statusLifetime *= args.Scale;
-
-            IncreaseTimer(status, statusLifetime);
-
-            if (modified)
-                args.EntityManager.System<MovementSpeedModifierSystem>().RefreshMovementSpeedModifiers(args.SolutionEntity);
-
-        }
-        public void IncreaseTimer(MovespeedModifierMetabolismComponent status, float time)
-        {
-            var gameTiming = IoCManager.Resolve<IGameTiming>();
-
-            var offsetTime = Math.Max(status.ModifierTimer.TotalSeconds, gameTiming.CurTime.TotalSeconds);
-
-            status.ModifierTimer = TimeSpan.FromSeconds(offsetTime + time);
-            status.Dirty();
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/Oxygenate.cs b/Content.Server/Chemistry/ReagentEffects/Oxygenate.cs
deleted file mode 100644
index 6c5ab155e4..0000000000
--- a/Content.Server/Chemistry/ReagentEffects/Oxygenate.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using Content.Server.Body.Components;
-using Content.Server.Body.Systems;
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffects;
-
-public sealed partial class Oxygenate : ReagentEffect
-{
-    [DataField]
-    public float Factor = 1f;
-
-    // JUSTIFICATION: This is internal magic that players never directly interact with.
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => null;
-
-    public override void Effect(ReagentEffectArgs args)
-    {
-        if (args.EntityManager.TryGetComponent<RespiratorComponent>(args.SolutionEntity, out var resp))
-        {
-            var respSys = args.EntityManager.System<RespiratorSystem>();
-            respSys.UpdateSaturation(args.SolutionEntity, args.Quantity.Float() * Factor, resp);
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustAttribute.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustAttribute.cs
deleted file mode 100644
index 9bd8fdaa68..0000000000
--- a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustAttribute.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using Content.Server.Botany.Components;
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-using System.Diagnostics.CodeAnalysis;
-
-namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
-{
-    [ImplicitDataDefinitionForInheritors]
-    public abstract partial class PlantAdjustAttribute : ReagentEffect
-    {
-        [DataField]
-        public float Amount { get; protected set; } = 1;
-
-        /// <summary>
-        /// Localisation key for the name of the adjusted attribute. Used for guidebook descriptions.
-        /// </summary>
-        [DataField]
-        public abstract string GuidebookAttributeName { get; set; }
-
-        /// <summary>
-        /// Whether the attribute in question is a good thing. Used for guidebook descriptions to determine the color of the number.
-        /// </summary>
-        [DataField]
-        public virtual bool GuidebookIsAttributePositive { get; protected set; } = true;
-
-        /// <summary>
-        ///     Checks if the plant holder can metabolize the reagent or not. Checks if it has an alive plant by default.
-        /// </summary>
-        /// <param name="plantHolder">The entity holding the plant</param>
-        /// <param name="plantHolderComponent">The plant holder component</param>
-        /// <param name="entityManager">The entity manager</param>
-        /// <param name="mustHaveAlivePlant">Whether to check if it has an alive plant or not</param>
-        /// <returns></returns>
-        public bool CanMetabolize(EntityUid plantHolder, [NotNullWhen(true)] out PlantHolderComponent? plantHolderComponent,
-            IEntityManager entityManager,
-            bool mustHaveAlivePlant = true)
-        {
-            plantHolderComponent = null;
-
-            if (!entityManager.TryGetComponent(plantHolder, out plantHolderComponent)
-                                    || mustHaveAlivePlant && (plantHolderComponent.Seed == null || plantHolderComponent.Dead))
-                return false;
-
-            return true;
-        }
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        {
-            string color;
-            if (GuidebookIsAttributePositive ^ Amount < 0.0)
-            {
-                color = "green";
-            }
-            else
-            {
-                color = "red";
-            }
-            return Loc.GetString("reagent-effect-guidebook-plant-attribute", ("attribute", Loc.GetString(GuidebookAttributeName)), ("amount", Amount.ToString("0.00")), ("colorName", color), ("chance", Probability));
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustHealth.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustHealth.cs
deleted file mode 100644
index af74c17de7..0000000000
--- a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustHealth.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Content.Server.Botany.Systems;
-using Content.Shared.Chemistry.Reagent;
-
-namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
-{
-    public sealed partial class PlantAdjustHealth : PlantAdjustAttribute
-    {
-        public override string GuidebookAttributeName { get; set; } = "plant-attribute-health";
-
-
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (!CanMetabolize(args.SolutionEntity, out var plantHolderComp, args.EntityManager))
-                return;
-
-            var plantHolder = args.EntityManager.System<PlantHolderSystem>();
-
-            plantHolderComp.Health += Amount;
-            plantHolder.CheckHealth(args.SolutionEntity, plantHolderComp);
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustMutationLevel.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustMutationLevel.cs
deleted file mode 100644
index cf0983bc51..0000000000
--- a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustMutationLevel.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-
-namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
-{
-    public sealed partial class PlantAdjustMutationLevel : PlantAdjustAttribute
-    {
-        public override string GuidebookAttributeName { get; set; } = "plant-attribute-mutation-level";
-
-
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (!CanMetabolize(args.SolutionEntity, out var plantHolderComp, args.EntityManager))
-                return;
-
-            plantHolderComp.MutationLevel += Amount * plantHolderComp.MutationMod;
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustMutationMod.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustMutationMod.cs
deleted file mode 100644
index b43e885388..0000000000
--- a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustMutationMod.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using JetBrains.Annotations;
-
-namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
-{
-    [UsedImplicitly]
-    public sealed partial class PlantAdjustMutationMod : PlantAdjustAttribute
-    {
-        public override string GuidebookAttributeName { get; set; } = "plant-attribute-mutation-mod";
-
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (!CanMetabolize(args.SolutionEntity, out var plantHolderComp, args.EntityManager))
-                return;
-
-            plantHolderComp.MutationMod += Amount;
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustNutrition.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustNutrition.cs
deleted file mode 100644
index 68bb59870d..0000000000
--- a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustNutrition.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Content.Server.Botany.Systems;
-using Content.Shared.Chemistry.Reagent;
-using JetBrains.Annotations;
-
-namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
-{
-    [UsedImplicitly]
-    public sealed partial class PlantAdjustNutrition : PlantAdjustAttribute
-    {
-        public override string GuidebookAttributeName { get; set; } = "plant-attribute-nutrition";
-
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (!CanMetabolize(args.SolutionEntity, out var plantHolderComp, args.EntityManager, mustHaveAlivePlant: false))
-                return;
-
-            var plantHolder = args.EntityManager.System<PlantHolderSystem>();
-
-            plantHolder.AdjustNutrient(args.SolutionEntity, Amount, plantHolderComp);
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustPests.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustPests.cs
deleted file mode 100644
index 9e9787d030..0000000000
--- a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustPests.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using JetBrains.Annotations;
-
-namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
-{
-    [UsedImplicitly]
-    public sealed partial class PlantAdjustPests : PlantAdjustAttribute
-    {
-        public override string GuidebookAttributeName { get; set; } = "plant-attribute-pests";
-        public override bool GuidebookIsAttributePositive { get; protected set; } = false;
-
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (!CanMetabolize(args.SolutionEntity, out var plantHolderComp, args.EntityManager))
-                return;
-
-            plantHolderComp.PestLevel += Amount;
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustToxins.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustToxins.cs
deleted file mode 100644
index 2279f74910..0000000000
--- a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustToxins.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using JetBrains.Annotations;
-
-namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
-{
-    [UsedImplicitly]
-    public sealed partial class PlantAdjustToxins : PlantAdjustAttribute
-    {
-        public override string GuidebookAttributeName { get; set; } = "plant-attribute-toxins";
-        public override bool GuidebookIsAttributePositive { get; protected set; } = false;
-
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (!CanMetabolize(args.SolutionEntity, out var plantHolderComp, args.EntityManager))
-                return;
-
-            plantHolderComp.Toxins += Amount;
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustWater.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustWater.cs
deleted file mode 100644
index a1c184d3b7..0000000000
--- a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustWater.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Content.Server.Botany.Systems;
-using Content.Shared.Chemistry.Reagent;
-using JetBrains.Annotations;
-
-namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
-{
-    [UsedImplicitly]
-    public sealed partial class PlantAdjustWater : PlantAdjustAttribute
-    {
-        public override string GuidebookAttributeName { get; set; } = "plant-attribute-water";
-
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (!CanMetabolize(args.SolutionEntity, out var plantHolderComp, args.EntityManager, mustHaveAlivePlant: false))
-                return;
-
-            var plantHolder = args.EntityManager.System<PlantHolderSystem>();
-
-            plantHolder.AdjustWater(args.SolutionEntity, Amount, plantHolderComp);
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustWeeds.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustWeeds.cs
deleted file mode 100644
index 82958e97a1..0000000000
--- a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustWeeds.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using JetBrains.Annotations;
-
-namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
-{
-    [UsedImplicitly]
-    public sealed partial class PlantAdjustWeeds : PlantAdjustAttribute
-    {
-        public override string GuidebookAttributeName { get; set; } = "plant-attribute-weeds";
-        public override bool GuidebookIsAttributePositive { get; protected set; } = false;
-
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (!CanMetabolize(args.SolutionEntity, out var plantHolderComp, args.EntityManager))
-                return;
-
-            plantHolderComp.WeedLevel += Amount;
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAffectGrowth.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAffectGrowth.cs
deleted file mode 100644
index e92b1954c0..0000000000
--- a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAffectGrowth.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Content.Server.Botany.Systems;
-using Content.Shared.Chemistry.Reagent;
-using JetBrains.Annotations;
-
-namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
-{
-    [UsedImplicitly]
-    public sealed partial class PlantAffectGrowth : PlantAdjustAttribute
-    {
-        public override string GuidebookAttributeName { get; set; } = "plant-attribute-growth";
-
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (!CanMetabolize(args.SolutionEntity, out var plantHolderComp, args.EntityManager))
-                return;
-
-            var plantHolder = args.EntityManager.System<PlantHolderSystem>();
-
-            plantHolder.AffectGrowth(args.SolutionEntity, (int) Amount, plantHolderComp);
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantCryoxadone.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantCryoxadone.cs
deleted file mode 100644
index 55a7e5c97b..0000000000
--- a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantCryoxadone.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using Content.Server.Botany.Components;
-using Content.Shared.Chemistry.Reagent;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-
-namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
-{
-    [UsedImplicitly]
-    [DataDefinition]
-    public sealed partial class PlantCryoxadone : ReagentEffect
-    {
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (!args.EntityManager.TryGetComponent(args.SolutionEntity, out PlantHolderComponent? plantHolderComp)
-            || plantHolderComp.Seed == null || plantHolderComp.Dead)
-                return;
-
-            var deviation = 0;
-            var seed = plantHolderComp.Seed;
-            var random = IoCManager.Resolve<IRobustRandom>();
-            if (plantHolderComp.Age > seed.Maturation)
-                deviation = (int) Math.Max(seed.Maturation - 1, plantHolderComp.Age - random.Next(7, 10));
-            else
-                deviation = (int) (seed.Maturation / seed.GrowthStages);
-            plantHolderComp.Age -= deviation;
-            plantHolderComp.SkipAging++;
-            plantHolderComp.ForceUpdate = true;
-        }
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("reagent-effect-guidebook-plant-cryoxadone", ("chance", Probability));
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantDiethylamine.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantDiethylamine.cs
deleted file mode 100644
index c98f0be78c..0000000000
--- a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantDiethylamine.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using Content.Server.Botany.Components;
-using Content.Server.Botany.Systems;
-using Content.Shared.Chemistry.Reagent;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-
-namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
-{
-    [UsedImplicitly]
-    [DataDefinition]
-    public sealed partial class PlantDiethylamine : ReagentEffect
-    {
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (!args.EntityManager.TryGetComponent(args.SolutionEntity, out PlantHolderComponent? plantHolderComp)
-                                    || plantHolderComp.Seed == null || plantHolderComp.Dead ||
-                                    plantHolderComp.Seed.Immutable)
-                return;
-
-
-            var plantHolder = args.EntityManager.System<PlantHolderSystem>();
-
-            var random = IoCManager.Resolve<IRobustRandom>();
-
-            if (random.Prob(0.1f))
-            {
-                plantHolder.EnsureUniqueSeed(args.SolutionEntity, plantHolderComp);
-                plantHolderComp.Seed.Lifespan++;
-            }
-
-            if (random.Prob(0.1f))
-            {
-                plantHolder.EnsureUniqueSeed(args.SolutionEntity, plantHolderComp);
-                plantHolderComp.Seed.Endurance++;
-            }
-        }
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("reagent-effect-guidebook-plant-diethylamine", ("chance", Probability));
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantPhalanximine.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantPhalanximine.cs
deleted file mode 100644
index 7aaca63b7d..0000000000
--- a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantPhalanximine.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using Content.Server.Botany.Components;
-using Content.Shared.Chemistry.Reagent;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
-{
-    [UsedImplicitly]
-    [DataDefinition]
-    public sealed partial class PlantPhalanximine : ReagentEffect
-    {
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (!args.EntityManager.TryGetComponent(args.SolutionEntity, out PlantHolderComponent? plantHolderComp)
-                                    || plantHolderComp.Seed == null || plantHolderComp.Dead ||
-                                    plantHolderComp.Seed.Immutable)
-                return;
-
-            plantHolderComp.Seed.Viable = true;
-        }
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("reagent-effect-guidebook-plant-phalanximine", ("chance", Probability));
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/RobustHarvest.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/RobustHarvest.cs
deleted file mode 100644
index 4a01cdf51f..0000000000
--- a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/RobustHarvest.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using Content.Server.Botany.Components;
-using Content.Server.Botany.Systems;
-using Content.Shared.Chemistry.Reagent;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-
-namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
-{
-    [UsedImplicitly]
-    [DataDefinition]
-    public sealed partial class RobustHarvest : ReagentEffect
-    {
-        [DataField]
-        public int PotencyLimit = 50;
-
-        [DataField]
-        public int PotencyIncrease = 3;
-
-        [DataField]
-        public int PotencySeedlessThreshold = 30;
-
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (!args.EntityManager.TryGetComponent(args.SolutionEntity, out PlantHolderComponent? plantHolderComp)
-                                    || plantHolderComp.Seed == null || plantHolderComp.Dead ||
-                                    plantHolderComp.Seed.Immutable)
-                return;
-
-
-            var plantHolder = args.EntityManager.System<PlantHolderSystem>();
-            var random = IoCManager.Resolve<IRobustRandom>();
-
-            if (plantHolderComp.Seed.Potency < PotencyLimit)
-            {
-                plantHolder.EnsureUniqueSeed(args.SolutionEntity, plantHolderComp);
-                plantHolderComp.Seed.Potency = Math.Min(plantHolderComp.Seed.Potency + PotencyIncrease, PotencyLimit);
-
-                if (plantHolderComp.Seed.Potency > PotencySeedlessThreshold)
-                {
-                    plantHolderComp.Seed.Seedless = true;
-                }
-            }
-            else if (plantHolderComp.Seed.Yield > 1 && random.Prob(0.1f))
-            {
-                // Too much of a good thing reduces yield
-                plantHolder.EnsureUniqueSeed(args.SolutionEntity, plantHolderComp);
-                plantHolderComp.Seed.Yield--;
-            }
-        }
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("reagent-effect-guidebook-plant-robust-harvest", ("seedlesstreshold", PotencySeedlessThreshold), ("limit", PotencyLimit), ("increase", PotencyIncrease), ("chance", Probability));
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/SatiateThirst.cs b/Content.Server/Chemistry/ReagentEffects/SatiateThirst.cs
deleted file mode 100644
index 8813813c24..0000000000
--- a/Content.Server/Chemistry/ReagentEffects/SatiateThirst.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Nutrition.Components;
-using Content.Shared.Nutrition.EntitySystems;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffects
-{
-    /// <summary>
-    /// Default metabolism for drink reagents. Attempts to find a ThirstComponent on the target,
-    /// and to update it's thirst values.
-    /// </summary>
-    public sealed partial class SatiateThirst : ReagentEffect
-    {
-        private const float DefaultHydrationFactor = 3.0f;
-
-        /// How much thirst is satiated each metabolism tick. Not currently tied to
-        /// rate or anything.
-        [DataField("factor")]
-        public float HydrationFactor { get; set; } = DefaultHydrationFactor;
-
-        /// Satiate thirst if a ThirstComponent can be found
-        public override void Effect(ReagentEffectArgs args)
-        {
-            var uid = args.SolutionEntity;
-            if (args.EntityManager.TryGetComponent(uid, out ThirstComponent? thirst))
-                args.EntityManager.System<ThirstSystem>().ModifyThirst(uid, thirst, HydrationFactor);
-        }
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-            => Loc.GetString("reagent-effect-guidebook-satiate-thirst", ("chance", Probability), ("relative",  HydrationFactor / DefaultHydrationFactor));
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/StatusEffects/GenericStatusEffect.cs b/Content.Server/Chemistry/ReagentEffects/StatusEffects/GenericStatusEffect.cs
deleted file mode 100644
index 66454b25fd..0000000000
--- a/Content.Server/Chemistry/ReagentEffects/StatusEffects/GenericStatusEffect.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.StatusEffect;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffects.StatusEffects
-{
-    /// <summary>
-    ///     Adds a generic status effect to the entity,
-    ///     not worrying about things like how to affect the time it lasts for
-    ///     or component fields or anything. Just adds a component to an entity
-    ///     for a given time. Easy.
-    /// </summary>
-    /// <remarks>
-    ///     Can be used for things like adding accents or something. I don't know. Go wild.
-    /// </remarks>
-    [UsedImplicitly]
-    public sealed partial class GenericStatusEffect : ReagentEffect
-    {
-        [DataField(required: true)]
-        public string Key = default!;
-
-        [DataField]
-        public string Component = String.Empty;
-
-        [DataField]
-        public float Time = 2.0f;
-
-        /// <remarks>
-        ///     true - refresh status effect time,  false - accumulate status effect time
-        /// </remarks>
-        [DataField]
-        public bool Refresh = true;
-
-        /// <summary>
-        ///     Should this effect add the status effect, remove time from it, or set its cooldown?
-        /// </summary>
-        [DataField]
-        public StatusEffectMetabolismType Type = StatusEffectMetabolismType.Add;
-
-        public override void Effect(ReagentEffectArgs args)
-        {
-            var statusSys = args.EntityManager.EntitySysManager.GetEntitySystem<StatusEffectsSystem>();
-
-            var time = Time;
-            time *= args.Scale;
-
-            if (Type == StatusEffectMetabolismType.Add && Component != String.Empty)
-            {
-                statusSys.TryAddStatusEffect(args.SolutionEntity, Key, TimeSpan.FromSeconds(time), Refresh, Component);
-            }
-            else if (Type == StatusEffectMetabolismType.Remove)
-            {
-                statusSys.TryRemoveTime(args.SolutionEntity, Key, TimeSpan.FromSeconds(time));
-            }
-            else if (Type == StatusEffectMetabolismType.Set)
-            {
-                statusSys.TrySetTime(args.SolutionEntity, Key, TimeSpan.FromSeconds(time));
-            }
-        }
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString(
-            "reagent-effect-guidebook-status-effect",
-            ("chance", Probability),
-            ("type", Type),
-            ("time", Time),
-            ("key", $"reagent-effect-status-effect-{Key}"));
-    }
-
-    public enum StatusEffectMetabolismType
-    {
-        Add,
-        Remove,
-        Set
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/StatusEffects/Jitter.cs b/Content.Server/Chemistry/ReagentEffects/StatusEffects/Jitter.cs
deleted file mode 100644
index 7ee70957b7..0000000000
--- a/Content.Server/Chemistry/ReagentEffects/StatusEffects/Jitter.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Jittering;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffects.StatusEffects
-{
-    /// <summary>
-    ///     Adds the jitter status effect to a mob.
-    ///     This doesn't use generic status effects because it needs to
-    ///     take in some parameters that JitterSystem needs.
-    /// </summary>
-    public sealed partial class Jitter : ReagentEffect
-    {
-        [DataField]
-        public float Amplitude = 10.0f;
-
-        [DataField]
-        public float Frequency = 4.0f;
-
-        [DataField]
-        public float Time = 2.0f;
-
-        /// <remarks>
-        ///     true - refresh jitter time,  false - accumulate jitter time
-        /// </remarks>
-        [DataField]
-        public bool Refresh = true;
-
-        public override void Effect(ReagentEffectArgs args)
-        {
-            var time = Time;
-            time *= args.Scale;
-
-            args.EntityManager.EntitySysManager.GetEntitySystem<SharedJitteringSystem>()
-                .DoJitter(args.SolutionEntity, TimeSpan.FromSeconds(time), Refresh, Amplitude, Frequency);
-        }
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
-            Loc.GetString("reagent-effect-guidebook-jittering", ("chance", Probability));
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffects/WashCreamPieReaction.cs b/Content.Server/Chemistry/ReagentEffects/WashCreamPieReaction.cs
deleted file mode 100644
index a71a42c25f..0000000000
--- a/Content.Server/Chemistry/ReagentEffects/WashCreamPieReaction.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Content.Server.Nutrition.EntitySystems;
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Nutrition.Components;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chemistry.ReagentEffects
-{
-    [UsedImplicitly]
-    public sealed partial class WashCreamPieReaction : ReagentEffect
-    {
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-            => Loc.GetString("reagent-effect-guidebook-wash-cream-pie-reaction", ("chance", Probability));
-
-        public override void Effect(ReagentEffectArgs args)
-        {
-            if (!args.EntityManager.TryGetComponent(args.SolutionEntity, out CreamPiedComponent? creamPied)) return;
-
-            args.EntityManager.System<CreamPieSystem>().SetCreamPied(args.SolutionEntity, creamPied, false);
-        }
-    }
-}
diff --git a/Content.Server/Connection/ConnectionManager.cs b/Content.Server/Connection/ConnectionManager.cs
index f22ff9b7d5..d7c3e4cf74 100644
--- a/Content.Server/Connection/ConnectionManager.cs
+++ b/Content.Server/Connection/ConnectionManager.cs
@@ -1,7 +1,9 @@
 using System.Collections.Immutable;
+using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text.Json.Nodes;
 using System.Threading.Tasks;
+using Content.Server.Chat.Managers;
 using Content.Server.Database;
 using Content.Server.GameTicking;
 using Content.Server.Preferences.Managers;
@@ -10,7 +12,9 @@ using Content.Shared.GameTicking;
 using Content.Shared.Players.PlayTimeTracking;
 using Robust.Server.Player;
 using Robust.Shared.Configuration;
+using Robust.Shared.Enums;
 using Robust.Shared.Network;
+using Robust.Shared.Player;
 using Robust.Shared.Timing;
 
 /*
@@ -50,6 +54,7 @@ namespace Content.Server.Connection
         [Dependency] private readonly ServerDbEntryManager _serverDbEntry = default!;
         [Dependency] private readonly IGameTiming _gameTiming = default!;
         [Dependency] private readonly ILogManager _logManager = default!;
+        [Dependency] private readonly IChatManager _chatManager = default!;
 
         private readonly Dictionary<NetUserId, TimeSpan> _temporaryBypasses = [];
         private ISawmill _sawmill = default!;
@@ -60,6 +65,7 @@ namespace Content.Server.Connection
 
             _netMgr.Connecting += NetMgrOnConnecting;
             _netMgr.AssignUserIdCallback = AssignUserIdCallback;
+            _plyMgr.PlayerStatusChanged += PlayerStatusChanged;
             // Approval-based IP bans disabled because they don't play well with Happy Eyeballs.
             // _netMgr.HandleApprovalCallback = HandleApproval;
         }
@@ -128,6 +134,42 @@ namespace Content.Server.Connection
             }
         }
 
+        private async void PlayerStatusChanged(object? sender, SessionStatusEventArgs args)
+        {
+            if (args.NewStatus == SessionStatus.Connected)
+            {
+                AdminAlertIfSharedConnection(args.Session);
+            }
+        }
+
+        private void AdminAlertIfSharedConnection(ICommonSession newSession)
+        {
+            var playerThreshold = _cfg.GetCVar(CCVars.AdminAlertMinPlayersSharingConnection);
+            if (playerThreshold < 0)
+                return;
+
+            var addr = newSession.Channel.RemoteEndPoint.Address;
+
+            var otherConnectionsFromAddress = _plyMgr.Sessions.Where(session =>
+                    session.Status is SessionStatus.Connected or SessionStatus.InGame
+                    && session.Channel.RemoteEndPoint.Address.Equals(addr)
+                    && session.UserId != newSession.UserId)
+                .ToList();
+
+            var otherConnectionCount = otherConnectionsFromAddress.Count;
+            if (otherConnectionCount + 1 < playerThreshold) // Add one for the total, not just others, using the address
+                return;
+
+            var username = newSession.Name;
+            var otherUsernames = string.Join(", ",
+                otherConnectionsFromAddress.Select(session => session.Name));
+
+            _chatManager.SendAdminAlert(Loc.GetString("admin-alert-shared-connection",
+                ("player", username),
+                ("otherCount", otherConnectionCount),
+                ("otherList", otherUsernames)));
+        }
+
         /*
          * TODO: Jesus H Christ what is this utter mess of a function
          * TODO: Break this apart into is constituent steps.
diff --git a/Content.Server/Connection/GrantConnectBypassCommand.cs b/Content.Server/Connection/GrantConnectBypassCommand.cs
index e2d0d7338a..f611eee04e 100644
--- a/Content.Server/Connection/GrantConnectBypassCommand.cs
+++ b/Content.Server/Connection/GrantConnectBypassCommand.cs
@@ -4,7 +4,7 @@ using Robust.Shared.Console;
 
 namespace Content.Server.Connection;
 
-[AdminCommand(AdminFlags.Admin)]
+[AdminCommand(AdminFlags.Moderator)]
 public sealed class GrantConnectBypassCommand : LocalizedCommands
 {
     private static readonly TimeSpan DefaultDuration = TimeSpan.FromHours(1);
diff --git a/Content.Server/Construction/Conditions/AmeShieldIntegrity.cs b/Content.Server/Construction/Conditions/AmeShieldIntegrity.cs
new file mode 100644
index 0000000000..f76fb6d3f7
--- /dev/null
+++ b/Content.Server/Construction/Conditions/AmeShieldIntegrity.cs
@@ -0,0 +1,43 @@
+using Content.Server.Ame.Components;
+using Content.Shared.Construction;
+using JetBrains.Annotations;
+using Content.Shared.Examine;
+
+namespace Content.Server.Construction.Conditions;
+
+[UsedImplicitly]
+[DataDefinition]
+public sealed partial class AmeShieldIntegrity : IGraphCondition
+{
+    [DataField]
+    public float IntegrityThreshold = 80;
+
+    /// <summary>
+    /// If true, checks for the integrity being above the threshold.
+    /// if false, checks for it being below.
+    /// </summary>
+    [DataField]
+    public bool CheckAbove = true;
+
+    public bool Condition(EntityUid uid, IEntityManager entityManager)
+    {
+        if (!entityManager.TryGetComponent<AmeShieldComponent>(uid, out var shield))
+            return true;
+
+        if (CheckAbove)
+        {
+            return shield.CoreIntegrity >= IntegrityThreshold;
+        }
+        return shield.CoreIntegrity < IntegrityThreshold;
+    }
+
+    public bool DoExamine(ExaminedEvent args)
+    {
+        return false;
+    }
+
+    public IEnumerable<ConstructionGuideEntry> GenerateGuideEntry()
+    {
+        yield return new ConstructionGuideEntry();
+    }
+}
diff --git a/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs b/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
index e63c03bd5e..aa1ab3dacc 100644
--- a/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
+++ b/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
@@ -17,6 +17,7 @@ using Content.Shared.Disposal.Components;
 using Content.Shared.DoAfter;
 using Content.Shared.DragDrop;
 using Content.Shared.Emag.Systems;
+using Content.Shared.Explosion;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.IdentityManagement;
@@ -76,6 +77,7 @@ public sealed class DisposalUnitSystem : SharedDisposalUnitSystem
         SubscribeLocalEvent<DisposalUnitComponent, AfterInteractUsingEvent>(OnAfterInteractUsing);
         SubscribeLocalEvent<DisposalUnitComponent, DragDropTargetEvent>(OnDragDropOn);
         SubscribeLocalEvent<DisposalUnitComponent, DestructionEventArgs>(OnDestruction);
+        SubscribeLocalEvent<DisposalUnitComponent, BeforeExplodeEvent>(OnExploded);
 
         SubscribeLocalEvent<DisposalUnitComponent, GetVerbsEvent<InteractionVerb>>(AddInsertVerb);
         SubscribeLocalEvent<DisposalUnitComponent, GetVerbsEvent<AlternativeVerb>>(AddDisposalAltVerbs);
@@ -778,6 +780,12 @@ public sealed class DisposalUnitSystem : SharedDisposalUnitSystem
         Joints.RecursiveClearJoints(inserted);
         UpdateVisualState(uid, component);
     }
+
+    private void OnExploded(Entity<DisposalUnitComponent> ent, ref BeforeExplodeEvent args)
+    {
+        args.Contents.AddRange(ent.Comp.Container.ContainedEntities);
+    }
+
 }
 
 /// <summary>
diff --git a/Content.Server/Doors/Systems/FirelockSystem.cs b/Content.Server/Doors/Systems/FirelockSystem.cs
index 7cb31b5b4e..93ee18f683 100644
--- a/Content.Server/Doors/Systems/FirelockSystem.cs
+++ b/Content.Server/Doors/Systems/FirelockSystem.cs
@@ -93,7 +93,7 @@ namespace Content.Server.Doors.Systems
             if (!TryComp<DoorComponent>(uid, out var doorComponent))
                 return;
 
-            if (args.AlarmType == AtmosAlarmType.Normal || args.AlarmType == AtmosAlarmType.Warning)
+            if (args.AlarmType == AtmosAlarmType.Normal)
             {
                 if (doorComponent.State == DoorState.Closed)
                     _doorSystem.TryOpen(uid);
diff --git a/Content.Server/EntityEffects/EffectConditions/BodyTemperature.cs b/Content.Server/EntityEffects/EffectConditions/BodyTemperature.cs
new file mode 100644
index 0000000000..9f68bec918
--- /dev/null
+++ b/Content.Server/EntityEffects/EffectConditions/BodyTemperature.cs
@@ -0,0 +1,35 @@
+using Content.Server.Temperature.Components;
+using Content.Shared.EntityEffects;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.EffectConditions;
+
+/// <summary>
+///     Requires the target entity to be above or below a certain temperature.
+///     Used for things like cryoxadone and pyroxadone.
+/// </summary>
+public sealed partial class Temperature : EntityEffectCondition
+{
+    [DataField]
+    public float Min = 0;
+
+    [DataField]
+    public float Max = float.PositiveInfinity;
+    public override bool Condition(EntityEffectBaseArgs args)
+    {
+        if (args.EntityManager.TryGetComponent(args.TargetEntity, out TemperatureComponent? temp))
+        {
+            if (temp.CurrentTemperature > Min && temp.CurrentTemperature < Max)
+                return true;
+        }
+
+        return false;
+    }
+
+    public override string GuidebookExplanation(IPrototypeManager prototype)
+    {
+        return Loc.GetString("reagent-effect-condition-guidebook-body-temperature",
+            ("max", float.IsPositiveInfinity(Max) ? (float) int.MaxValue : Max),
+            ("min", Min));
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffectConditions/HasTagCondition.cs b/Content.Server/EntityEffects/EffectConditions/HasTagCondition.cs
similarity index 76%
rename from Content.Server/Chemistry/ReagentEffectConditions/HasTagCondition.cs
rename to Content.Server/EntityEffects/EffectConditions/HasTagCondition.cs
index d185c7e0a7..b0428b41bf 100644
--- a/Content.Server/Chemistry/ReagentEffectConditions/HasTagCondition.cs
+++ b/Content.Server/EntityEffects/EffectConditions/HasTagCondition.cs
@@ -1,13 +1,13 @@
-using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using Content.Shared.Tag;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Server.Chemistry.ReagentEffectConditions;
+namespace Content.Server.EntityEffects.EffectConditions;
 
 [UsedImplicitly]
-public sealed partial class HasTag : ReagentEffectCondition
+public sealed partial class HasTag : EntityEffectCondition
 {
     [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<TagPrototype>))]
     public string Tag = default!;
@@ -15,9 +15,9 @@ public sealed partial class HasTag : ReagentEffectCondition
     [DataField]
     public bool Invert = false;
 
-    public override bool Condition(ReagentEffectArgs args)
+    public override bool Condition(EntityEffectBaseArgs args)
     {
-        if (args.EntityManager.TryGetComponent<TagComponent>(args.SolutionEntity, out var tag))
+        if (args.EntityManager.TryGetComponent<TagComponent>(args.TargetEntity, out var tag))
             return args.EntityManager.System<TagSystem>().HasTag(tag, Tag) ^ Invert;
 
         return false;
diff --git a/Content.Server/EntityEffects/EffectConditions/JobCondition.cs b/Content.Server/EntityEffects/EffectConditions/JobCondition.cs
new file mode 100644
index 0000000000..20d67d6de0
--- /dev/null
+++ b/Content.Server/EntityEffects/EffectConditions/JobCondition.cs
@@ -0,0 +1,49 @@
+using System.Linq;
+using Content.Shared.EntityEffects;
+using Content.Shared.Mobs;
+using Content.Shared.Mobs.Components;
+using Content.Shared.Localizations;
+using Robust.Shared.Prototypes;
+using Content.Shared.Mind;
+using Content.Shared.Mind.Components;
+using Content.Shared.Roles;
+using Content.Shared.Roles.Jobs;
+using Content.Shared.Station;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using Robust.Shared.IoC;
+
+namespace Content.Server.EntityEffects.EffectConditions;
+
+public sealed partial class JobCondition : EntityEffectCondition
+{
+    [DataField(required: true)] public List<ProtoId<JobPrototype>> Job;
+                
+    public override bool Condition(EntityEffectBaseArgs args)
+    {   
+        args.EntityManager.TryGetComponent<MindContainerComponent>(args.TargetEntity, out var mindContainer);
+        if (mindContainer != null && mindContainer.Mind != null)
+        {
+            var prototypeManager = IoCManager.Resolve<IPrototypeManager>();
+            if (args.EntityManager.TryGetComponent<JobComponent>(mindContainer?.Mind, out var comp) && prototypeManager.TryIndex(comp.Prototype, out var prototype))
+            {
+                foreach (var jobId in Job)
+                {
+                    if (prototype.ID == jobId)
+                    {
+                        return true;
+                    }
+                }
+            }
+        }
+            
+        return false;
+    }
+        
+    public override string GuidebookExplanation(IPrototypeManager prototype)
+    {
+        var localizedNames = Job.Select(jobId => prototype.Index(jobId).LocalizedName).ToList();
+        return Loc.GetString("reagent-effect-condition-guidebook-job-condition", ("job", ContentLocalizationManager.FormatListToOr(localizedNames)));
+    }
+}
+
+
diff --git a/Content.Server/EntityEffects/EffectConditions/MobStateCondition.cs b/Content.Server/EntityEffects/EffectConditions/MobStateCondition.cs
new file mode 100644
index 0000000000..d676b29bf9
--- /dev/null
+++ b/Content.Server/EntityEffects/EffectConditions/MobStateCondition.cs
@@ -0,0 +1,29 @@
+using Content.Shared.EntityEffects;
+using Content.Shared.Mobs;
+using Content.Shared.Mobs.Components;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.EffectConditions;
+
+public sealed partial class MobStateCondition : EntityEffectCondition
+{
+    [DataField]
+    public MobState Mobstate = MobState.Alive;
+
+    public override bool Condition(EntityEffectBaseArgs args)
+    {
+        if (args.EntityManager.TryGetComponent(args.TargetEntity, out MobStateComponent? mobState))
+        {
+            if (mobState.CurrentState == Mobstate)
+                return true;
+        }
+
+        return false;
+    }
+
+    public override string GuidebookExplanation(IPrototypeManager prototype)
+    {
+        return Loc.GetString("reagent-effect-condition-guidebook-mob-state-condition", ("state", Mobstate));
+    }
+}
+
diff --git a/Content.Server/EntityEffects/EffectConditions/OrganType.cs b/Content.Server/EntityEffects/EffectConditions/OrganType.cs
new file mode 100644
index 0000000000..fc52608fab
--- /dev/null
+++ b/Content.Server/EntityEffects/EffectConditions/OrganType.cs
@@ -0,0 +1,53 @@
+using Content.Server.Body.Components;
+using Content.Shared.Body.Prototypes;
+using Content.Shared.EntityEffects;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+
+namespace Content.Server.EntityEffects.EffectConditions;
+
+/// <summary>
+///     Requires that the metabolizing organ is or is not tagged with a certain MetabolizerType
+/// </summary>
+public sealed partial class OrganType : EntityEffectCondition
+{
+    [DataField(required: true, customTypeSerializer: typeof(PrototypeIdSerializer<MetabolizerTypePrototype>))]
+    public string Type = default!;
+
+    /// <summary>
+    ///     Does this condition pass when the organ has the type, or when it doesn't have the type?
+    /// </summary>
+    [DataField]
+    public bool ShouldHave = true;
+
+    public override bool Condition(EntityEffectBaseArgs args)
+    {
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            if (reagentArgs.OrganEntity == null)
+                return false;
+
+            return Condition(reagentArgs.OrganEntity.Value, reagentArgs.EntityManager);
+        }
+
+        // TODO: Someone needs to figure out how to do this for non-reagent effects.
+        throw new NotImplementedException();
+    }
+
+    public bool Condition(Entity<MetabolizerComponent?> metabolizer, IEntityManager entMan)
+    {
+        metabolizer.Comp ??= entMan.GetComponentOrNull<MetabolizerComponent>(metabolizer.Owner);
+        if (metabolizer.Comp != null
+            && metabolizer.Comp.MetabolizerTypes != null
+            && metabolizer.Comp.MetabolizerTypes.Contains(Type))
+            return ShouldHave;
+        return !ShouldHave;
+    }
+
+    public override string GuidebookExplanation(IPrototypeManager prototype)
+    {
+        return Loc.GetString("reagent-effect-condition-guidebook-organ-type",
+            ("name", prototype.Index<MetabolizerTypePrototype>(Type).LocalizedName),
+            ("shouldhave", ShouldHave));
+    }
+}
diff --git a/Content.Server/EntityEffects/EffectConditions/ReagentThreshold.cs b/Content.Server/EntityEffects/EffectConditions/ReagentThreshold.cs
new file mode 100644
index 0000000000..6cbd7b4ea5
--- /dev/null
+++ b/Content.Server/EntityEffects/EffectConditions/ReagentThreshold.cs
@@ -0,0 +1,57 @@
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.EffectConditions;
+
+/// <summary>
+///     Used for implementing reagent effects that require a certain amount of reagent before it should be applied.
+///     For instance, overdoses.
+///
+///     This can also trigger on -other- reagents, not just the one metabolizing. By default, it uses the
+///     one being metabolized.
+/// </summary>
+public sealed partial class ReagentThreshold : EntityEffectCondition
+{
+    [DataField]
+    public FixedPoint2 Min = FixedPoint2.Zero;
+
+    [DataField]
+    public FixedPoint2 Max = FixedPoint2.MaxValue;
+
+    // TODO use ReagentId
+    [DataField]
+    public string? Reagent;
+
+    public override bool Condition(EntityEffectBaseArgs args)
+    {
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            var reagent = Reagent ?? reagentArgs.Reagent?.ID;
+            if (reagent == null)
+                return true; // No condition to apply.
+
+            var quant = FixedPoint2.Zero;
+            if (reagentArgs.Source != null)
+                quant = reagentArgs.Source.GetTotalPrototypeQuantity(reagent);
+
+            return quant >= Min && quant <= Max;
+        }
+
+        // TODO: Someone needs to figure out how to do this for non-reagent effects.
+        throw new NotImplementedException();
+    }
+
+    public override string GuidebookExplanation(IPrototypeManager prototype)
+    {
+        ReagentPrototype? reagentProto = null;
+        if (Reagent is not null)
+            prototype.TryIndex(Reagent, out reagentProto);
+
+        return Loc.GetString("reagent-effect-condition-guidebook-reagent-threshold",
+            ("reagent", reagentProto?.LocalizedName ?? Loc.GetString("reagent-effect-condition-guidebook-this-reagent")),
+            ("max", Max == FixedPoint2.MaxValue ? (float) int.MaxValue : Max.Float()),
+            ("min", Min.Float()));
+    }
+}
diff --git a/Content.Server/EntityEffects/EffectConditions/SolutionTemperature.cs b/Content.Server/EntityEffects/EffectConditions/SolutionTemperature.cs
new file mode 100644
index 0000000000..b964435db5
--- /dev/null
+++ b/Content.Server/EntityEffects/EffectConditions/SolutionTemperature.cs
@@ -0,0 +1,40 @@
+using Content.Shared.EntityEffects;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.EffectConditions;
+
+/// <summary>
+///     Requires the solution to be above or below a certain temperature.
+///     Used for things like explosives.
+/// </summary>
+public sealed partial class SolutionTemperature : EntityEffectCondition
+{
+    [DataField]
+    public float Min = 0.0f;
+
+    [DataField]
+    public float Max = float.PositiveInfinity;
+    public override bool Condition(EntityEffectBaseArgs args)
+    {
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            if (reagentArgs.Source == null)
+                return false;
+            if (reagentArgs.Source.Temperature < Min)
+                return false;
+            if (reagentArgs.Source.Temperature > Max)
+                return false;
+            return true;
+        }
+
+        // TODO: Someone needs to figure out how to do this for non-reagent effects.
+        throw new NotImplementedException();
+    }
+
+    public override string GuidebookExplanation(IPrototypeManager prototype)
+    {
+        return Loc.GetString("reagent-effect-condition-guidebook-solution-temperature",
+            ("max", float.IsPositiveInfinity(Max) ? (float) int.MaxValue : Max),
+            ("min", Min));
+    }
+}
diff --git a/Content.Server/EntityEffects/EffectConditions/TotalDamage.cs b/Content.Server/EntityEffects/EffectConditions/TotalDamage.cs
new file mode 100644
index 0000000000..2d039a1ac8
--- /dev/null
+++ b/Content.Server/EntityEffects/EffectConditions/TotalDamage.cs
@@ -0,0 +1,34 @@
+using Content.Shared.EntityEffects;
+using Content.Shared.Damage;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.EffectConditions;
+
+public sealed partial class TotalDamage : EntityEffectCondition
+{
+    [DataField]
+    public FixedPoint2 Max = FixedPoint2.MaxValue;
+
+    [DataField]
+    public FixedPoint2 Min = FixedPoint2.Zero;
+
+    public override bool Condition(EntityEffectBaseArgs args)
+    {
+        if (args.EntityManager.TryGetComponent(args.TargetEntity, out DamageableComponent? damage))
+        {
+            var total = damage.TotalDamage;
+            if (total > Min && total < Max)
+                return true;
+        }
+
+        return false;
+    }
+
+    public override string GuidebookExplanation(IPrototypeManager prototype)
+    {
+        return Loc.GetString("reagent-effect-condition-guidebook-total-damage",
+            ("max", Max == FixedPoint2.MaxValue ? (float) int.MaxValue : Max.Float()),
+            ("min", Min.Float()));
+    }
+}
diff --git a/Content.Server/EntityEffects/EffectConditions/TotalHunger.cs b/Content.Server/EntityEffects/EffectConditions/TotalHunger.cs
new file mode 100644
index 0000000000..84ad4c2240
--- /dev/null
+++ b/Content.Server/EntityEffects/EffectConditions/TotalHunger.cs
@@ -0,0 +1,34 @@
+using Content.Shared.EntityEffects;
+using Content.Shared.Nutrition.Components;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.EffectConditions;
+
+public sealed partial class Hunger : EntityEffectCondition
+{
+    [DataField]
+    public float Max = float.PositiveInfinity;
+
+    [DataField]
+    public float Min = 0;
+
+    public override bool Condition(EntityEffectBaseArgs args)
+    {
+        if (args.EntityManager.TryGetComponent(args.TargetEntity, out HungerComponent? hunger))
+        {
+            var total = hunger.CurrentHunger;
+            if (total > Min && total < Max)
+                return true;
+        }
+
+        return false;
+    }
+
+    public override string GuidebookExplanation(IPrototypeManager prototype)
+    {
+        return Loc.GetString("reagent-effect-condition-guidebook-total-hunger",
+            ("max", float.IsPositiveInfinity(Max) ? (float) int.MaxValue : Max),
+            ("min", Min));
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffects/ActivateArtifact.cs b/Content.Server/EntityEffects/Effects/ActivateArtifact.cs
similarity index 56%
rename from Content.Server/Chemistry/ReagentEffects/ActivateArtifact.cs
rename to Content.Server/EntityEffects/Effects/ActivateArtifact.cs
index 41af90f60a..3e97388499 100644
--- a/Content.Server/Chemistry/ReagentEffects/ActivateArtifact.cs
+++ b/Content.Server/EntityEffects/Effects/ActivateArtifact.cs
@@ -1,15 +1,16 @@
-using Content.Server.Xenoarchaeology.XenoArtifacts;
+using Content.Server.Xenoarchaeology.XenoArtifacts;
 using Content.Shared.Chemistry.Reagent;
 using Robust.Shared.Prototypes;
+using Content.Shared.EntityEffects;
 
-namespace Content.Server.Chemistry.ReagentEffects;
+namespace Content.Server.EntityEffects.Effects;
 
-public sealed partial class ActivateArtifact : ReagentEffect
+public sealed partial class ActivateArtifact : EntityEffect
 {
-    public override void Effect(ReagentEffectArgs args)
+    public override void Effect(EntityEffectBaseArgs args)
     {
         var artifact = args.EntityManager.EntitySysManager.GetEntitySystem<ArtifactSystem>();
-        artifact.TryActivateArtifact(args.SolutionEntity);
+        artifact.TryActivateArtifact(args.TargetEntity);
     }
 
     protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
diff --git a/Content.Server/EntityEffects/Effects/AddToSolutionReaction.cs b/Content.Server/EntityEffects/Effects/AddToSolutionReaction.cs
new file mode 100644
index 0000000000..10fb667ca4
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/AddToSolutionReaction.cs
@@ -0,0 +1,38 @@
+using Content.Server.Chemistry.Containers.EntitySystems;
+using Content.Shared.EntityEffects;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.Effects
+{
+    [UsedImplicitly]
+    public sealed partial class AddToSolutionReaction : EntityEffect
+    {
+        [DataField("solution")]
+        private string _solution = "reagents";
+
+        public override void Effect(EntityEffectBaseArgs args)
+        {
+            if (args is EntityEffectReagentArgs reagentArgs) {
+                if (reagentArgs.Reagent == null)
+                    return;
+
+                // TODO see if this is correct
+                var solutionContainerSystem = reagentArgs.EntityManager.System<SolutionContainerSystem>();
+                if (!solutionContainerSystem.TryGetSolution(reagentArgs.TargetEntity, _solution, out var solutionContainer))
+                    return;
+
+                if (solutionContainerSystem.TryAddReagent(solutionContainer.Value, reagentArgs.Reagent.ID, reagentArgs.Quantity, out var accepted))
+                    reagentArgs.Source?.RemoveReagent(reagentArgs.Reagent.ID, accepted);
+
+                return;
+            }
+
+            // TODO: Someone needs to figure out how to do this for non-reagent effects.
+            throw new NotImplementedException();
+        }
+
+        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
+            Loc.GetString("reagent-effect-guidebook-add-to-solution-reaction", ("chance", Probability));
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffects/AdjustAlert.cs b/Content.Server/EntityEffects/Effects/AdjustAlert.cs
similarity index 76%
rename from Content.Server/Chemistry/ReagentEffects/AdjustAlert.cs
rename to Content.Server/EntityEffects/Effects/AdjustAlert.cs
index 40858176bd..3bf57b309d 100644
--- a/Content.Server/Chemistry/ReagentEffects/AdjustAlert.cs
+++ b/Content.Server/EntityEffects/Effects/AdjustAlert.cs
@@ -1,11 +1,11 @@
-using Content.Shared.Alert;
-using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Alert;
+using Content.Shared.EntityEffects;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 
-namespace Content.Server.Chemistry.ReagentEffects;
+namespace Content.Server.EntityEffects.Effects;
 
-public sealed partial class AdjustAlert : ReagentEffect
+public sealed partial class AdjustAlert : EntityEffect
 {
     /// <summary>
     /// The specific Alert that will be adjusted
@@ -34,15 +34,15 @@ public sealed partial class AdjustAlert : ReagentEffect
     //JUSTIFICATION: This just changes some visuals, doesn't need to be documented.
     protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => null;
 
-    public override void Effect(ReagentEffectArgs args)
+    public override void Effect(EntityEffectBaseArgs args)
     {
         var alertSys = args.EntityManager.EntitySysManager.GetEntitySystem<AlertsSystem>();
-        if (!args.EntityManager.HasComponent<AlertsComponent>(args.SolutionEntity))
+        if (!args.EntityManager.HasComponent<AlertsComponent>(args.TargetEntity))
             return;
 
         if (Clear && Time <= 0)
         {
-                alertSys.ClearAlert(args.SolutionEntity, AlertType);
+            alertSys.ClearAlert(args.TargetEntity, AlertType);
         }
         else
         {
@@ -52,7 +52,7 @@ public sealed partial class AdjustAlert : ReagentEffect
             if ((ShowCooldown || Clear) && Time > 0)
                 cooldown = (timing.CurTime, timing.CurTime + TimeSpan.FromSeconds(Time));
 
-            alertSys.ShowAlert(args.SolutionEntity, AlertType, cooldown: cooldown, autoRemove: Clear, showCooldown: ShowCooldown);
+            alertSys.ShowAlert(args.TargetEntity, AlertType, cooldown: cooldown, autoRemove: Clear, showCooldown: ShowCooldown);
         }
 
     }
diff --git a/Content.Server/Chemistry/ReagentEffects/AdjustReagent.cs b/Content.Server/EntityEffects/Effects/AdjustReagent.cs
similarity index 58%
rename from Content.Server/Chemistry/ReagentEffects/AdjustReagent.cs
rename to Content.Server/EntityEffects/Effects/AdjustReagent.cs
index 16d69edd9a..71117d6ec5 100644
--- a/Content.Server/Chemistry/ReagentEffects/AdjustReagent.cs
+++ b/Content.Server/EntityEffects/Effects/AdjustReagent.cs
@@ -1,14 +1,15 @@
 using Content.Shared.Body.Prototypes;
 using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using Content.Shared.FixedPoint;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Server.Chemistry.ReagentEffects
+namespace Content.Server.EntityEffects.Effects
 {
     [UsedImplicitly]
-    public sealed partial class AdjustReagent : ReagentEffect
+    public sealed partial class AdjustReagent : EntityEffect
     {
         /// <summary>
         ///     The reagent ID to remove. Only one of this and <see cref="Group"/> should be active.
@@ -27,36 +28,43 @@ namespace Content.Server.Chemistry.ReagentEffects
         [DataField(required: true)]
         public FixedPoint2 Amount = default!;
 
-        public override void Effect(ReagentEffectArgs args)
+        public override void Effect(EntityEffectBaseArgs args)
         {
-            if (args.Source == null)
-                return;
-
-            var amount = Amount;
-            amount *= args.Scale;
-
-            if (Reagent != null)
+            if (args is EntityEffectReagentArgs reagentArgs)
             {
-                if (amount < 0 && args.Source.ContainsPrototype(Reagent))
-                    args.Source.RemoveReagent(Reagent, -amount);
-                if (amount > 0)
-                    args.Source.AddReagent(Reagent, amount);
-            }
-            else if (Group != null)
-            {
-                var prototypeMan = IoCManager.Resolve<IPrototypeManager>();
-                foreach (var quant in args.Source.Contents.ToArray())
+                if (reagentArgs.Source == null)
+                    return;
+
+                var amount = Amount;
+                amount *= reagentArgs.Scale;
+
+                if (Reagent != null)
                 {
-                    var proto = prototypeMan.Index<ReagentPrototype>(quant.Reagent.Prototype);
-                    if (proto.Metabolisms != null && proto.Metabolisms.ContainsKey(Group))
+                    if (amount < 0 && reagentArgs.Source.ContainsPrototype(Reagent))
+                        reagentArgs.Source.RemoveReagent(Reagent, -amount);
+                    if (amount > 0)
+                        reagentArgs.Source.AddReagent(Reagent, amount);
+                }
+                else if (Group != null)
+                {
+                    var prototypeMan = IoCManager.Resolve<IPrototypeManager>();
+                    foreach (var quant in reagentArgs.Source.Contents.ToArray())
                     {
-                        if (amount < 0)
-                            args.Source.RemoveReagent(quant.Reagent, amount);
-                        if (amount > 0)
-                            args.Source.AddReagent(quant.Reagent, amount);
+                        var proto = prototypeMan.Index<ReagentPrototype>(quant.Reagent.Prototype);
+                        if (proto.Metabolisms != null && proto.Metabolisms.ContainsKey(Group))
+                        {
+                            if (amount < 0)
+                                reagentArgs.Source.RemoveReagent(quant.Reagent, amount);
+                            if (amount > 0)
+                                reagentArgs.Source.AddReagent(quant.Reagent, amount);
+                        }
                     }
                 }
+                return;
             }
+
+            // TODO: Someone needs to figure out how to do this for non-reagent effects.
+            throw new NotImplementedException();
         }
 
         protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
diff --git a/Content.Server/Chemistry/ReagentEffects/AdjustTemperature.cs b/Content.Server/EntityEffects/Effects/AdjustTemperature.cs
similarity index 56%
rename from Content.Server/Chemistry/ReagentEffects/AdjustTemperature.cs
rename to Content.Server/EntityEffects/Effects/AdjustTemperature.cs
index 9b97572067..3c5c77c309 100644
--- a/Content.Server/Chemistry/ReagentEffects/AdjustTemperature.cs
+++ b/Content.Server/EntityEffects/Effects/AdjustTemperature.cs
@@ -1,11 +1,11 @@
 using Content.Server.Temperature.Components;
 using Content.Server.Temperature.Systems;
-using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Chemistry.ReagentEffects
+namespace Content.Server.EntityEffects.Effects
 {
-    public sealed partial class AdjustTemperature : ReagentEffect
+    public sealed partial class AdjustTemperature : EntityEffect
     {
         [DataField]
         public float Amount;
@@ -16,16 +16,19 @@ namespace Content.Server.Chemistry.ReagentEffects
                 ("deltasign", MathF.Sign(Amount)),
                 ("amount", MathF.Abs(Amount)));
 
-        public override void Effect(ReagentEffectArgs args)
+        public override void Effect(EntityEffectBaseArgs args)
         {
-            if (args.EntityManager.TryGetComponent(args.SolutionEntity, out TemperatureComponent? temp))
+            if (args.EntityManager.TryGetComponent(args.TargetEntity, out TemperatureComponent? temp))
             {
                 var sys = args.EntityManager.EntitySysManager.GetEntitySystem<TemperatureSystem>();
                 var amount = Amount;
 
-                amount *= args.Scale;
+                if (args is EntityEffectReagentArgs reagentArgs)
+                {
+                    amount *= reagentArgs.Scale.Float();
+                }
 
-                sys.ChangeHeat(args.SolutionEntity, amount, true, temp);
+                sys.ChangeHeat(args.TargetEntity, amount, true, temp);
             }
         }
     }
diff --git a/Content.Server/EntityEffects/Effects/AreaReactionEffect.cs b/Content.Server/EntityEffects/Effects/AreaReactionEffect.cs
new file mode 100644
index 0000000000..481f1fc27c
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/AreaReactionEffect.cs
@@ -0,0 +1,91 @@
+using Content.Server.Fluids.EntitySystems;
+using Content.Shared.Audio;
+using Content.Shared.Coordinates.Helpers;
+using Content.Shared.Database;
+using Content.Shared.EntityEffects;
+using Content.Shared.FixedPoint;
+using Content.Shared.Maps;
+using JetBrains.Annotations;
+using Robust.Server.GameObjects;
+using Robust.Shared.Audio;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Map;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+
+namespace Content.Server.EntityEffects.Effects;
+
+/// <summary>
+/// Basically smoke and foam reactions.
+/// </summary>
+[UsedImplicitly]
+[DataDefinition]
+public sealed partial class AreaReactionEffect : EntityEffect
+{
+    /// <summary>
+    /// How many seconds will the effect stay, counting after fully spreading.
+    /// </summary>
+    [DataField("duration")] private float _duration = 10;
+
+    /// <summary>
+    /// How many units of reaction for 1 smoke entity.
+    /// </summary>
+    [DataField] public FixedPoint2 OverflowThreshold = FixedPoint2.New(2.5);
+
+    /// <summary>
+    /// The entity prototype that will be spawned as the effect.
+    /// </summary>
+    [DataField("prototypeId", required: true, customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))]
+    private string _prototypeId = default!;
+
+    /// <summary>
+    /// Sound that will get played when this reaction effect occurs.
+    /// </summary>
+    [DataField("sound", required: true)] private SoundSpecifier _sound = default!;
+
+    public override bool ShouldLog => true;
+
+    protected override string ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+            => Loc.GetString("reagent-effect-guidebook-area-reaction",
+                    ("duration", _duration)
+                );
+
+    public override LogImpact LogImpact => LogImpact.High;
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            if (reagentArgs.Source == null)
+                return;
+
+            var spreadAmount = (int) Math.Max(0, Math.Ceiling((reagentArgs.Quantity / OverflowThreshold).Float()));
+            var splitSolution = reagentArgs.Source.SplitSolution(reagentArgs.Source.Volume);
+            var transform = reagentArgs.EntityManager.GetComponent<TransformComponent>(reagentArgs.TargetEntity);
+            var mapManager = IoCManager.Resolve<IMapManager>();
+            var mapSys = reagentArgs.EntityManager.System<MapSystem>();
+            var sys = reagentArgs.EntityManager.System<TransformSystem>();
+            var mapCoords = sys.GetMapCoordinates(reagentArgs.TargetEntity, xform: transform);
+
+            if (!mapManager.TryFindGridAt(mapCoords, out var gridUid, out var grid) ||
+                !mapSys.TryGetTileRef(gridUid, grid, transform.Coordinates, out var tileRef) ||
+                tileRef.Tile.IsSpace())
+            {
+                return;
+            }
+
+            var coords = mapSys.MapToGrid(gridUid, mapCoords);
+            var ent = reagentArgs.EntityManager.SpawnEntity(_prototypeId, coords.SnapToGrid());
+
+            var smoke = reagentArgs.EntityManager.System<SmokeSystem>();
+            smoke.StartSmoke(ent, splitSolution, _duration, spreadAmount);
+
+            var audio = reagentArgs.EntityManager.System<SharedAudioSystem>();
+            audio.PlayPvs(_sound, reagentArgs.TargetEntity, AudioHelpers.WithVariation(0.125f));
+            return;
+        }
+
+        // TODO: Someone needs to figure out how to do this for non-reagent effects.
+        throw new NotImplementedException();
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffects/CauseZombieInfection.cs b/Content.Server/EntityEffects/Effects/CauseZombieInfection.cs
similarity index 65%
rename from Content.Server/Chemistry/ReagentEffects/CauseZombieInfection.cs
rename to Content.Server/EntityEffects/Effects/CauseZombieInfection.cs
index 96c57f7465..b71e6a30e0 100644
--- a/Content.Server/Chemistry/ReagentEffects/CauseZombieInfection.cs
+++ b/Content.Server/EntityEffects/Effects/CauseZombieInfection.cs
@@ -1,22 +1,21 @@
 using Content.Server.Zombies;
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.Configuration;
+using Content.Shared.EntityEffects;
 using Robust.Shared.Prototypes;
 using Content.Shared.Zombies;
 
-namespace Content.Server.Chemistry.ReagentEffects;
+namespace Content.Server.EntityEffects.Effects;
 
-public sealed partial class CauseZombieInfection : ReagentEffect
+public sealed partial class CauseZombieInfection : EntityEffect
 {
     protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
         => Loc.GetString("reagent-effect-guidebook-cause-zombie-infection", ("chance", Probability));
 
     // Adds the Zombie Infection Components
-    public override void Effect(ReagentEffectArgs args)
+    public override void Effect(EntityEffectBaseArgs args)
     {
         var entityManager = args.EntityManager;
-        entityManager.EnsureComponent<ZombifyOnDeathComponent>(args.SolutionEntity);
-        entityManager.EnsureComponent<PendingZombieComponent>(args.SolutionEntity);
+        entityManager.EnsureComponent<ZombifyOnDeathComponent>(args.TargetEntity);
+        entityManager.EnsureComponent<PendingZombieComponent>(args.TargetEntity);
     }
 }
 
diff --git a/Content.Server/EntityEffects/Effects/ChemCleanBloodstream.cs b/Content.Server/EntityEffects/Effects/ChemCleanBloodstream.cs
new file mode 100644
index 0000000000..b7f6f0dc88
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/ChemCleanBloodstream.cs
@@ -0,0 +1,40 @@
+using Content.Server.Body.Systems;
+using Content.Shared.EntityEffects;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.Effects;
+
+/// <summary>
+/// Basically smoke and foam reactions.
+/// </summary>
+[UsedImplicitly]
+public sealed partial class ChemCleanBloodstream : EntityEffect
+{
+    [DataField]
+    public float CleanseRate = 3.0f;
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-chem-clean-bloodstream", ("chance", Probability));
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        
+        var cleanseRate = CleanseRate;
+
+        var bloodstreamSys = args.EntityManager.System<BloodstreamSystem>();
+
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            if (reagentArgs.Source == null || reagentArgs.Reagent == null)
+                return;
+
+            cleanseRate *= reagentArgs.Scale.Float();
+            bloodstreamSys.FlushChemicals(args.TargetEntity, reagentArgs.Reagent.ID, cleanseRate);
+        }
+        else
+        {
+            bloodstreamSys.FlushChemicals(args.TargetEntity, "", cleanseRate);
+        }
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/ChemHealEyeDamage.cs b/Content.Server/EntityEffects/Effects/ChemHealEyeDamage.cs
new file mode 100644
index 0000000000..42fc9ffa9f
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/ChemHealEyeDamage.cs
@@ -0,0 +1,31 @@
+using Content.Shared.EntityEffects;
+using Content.Shared.Eye.Blinding.Systems;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.Effects;
+
+/// <summary>
+/// Heal or apply eye damage
+/// </summary>
+[UsedImplicitly]
+public sealed partial class ChemHealEyeDamage : EntityEffect
+{
+    /// <summary>
+    /// How much eye damage to add.
+    /// </summary>
+    [DataField]
+    public int Amount = -1;
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-cure-eye-damage", ("chance", Probability), ("deltasign", MathF.Sign(Amount)));
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (args is EntityEffectReagentArgs reagentArgs)
+            if (reagentArgs.Scale != 1f) // huh?
+                return;
+
+        args.EntityManager.EntitySysManager.GetEntitySystem<BlindableSystem>().AdjustEyeDamage(args.TargetEntity, Amount);
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffects/ChemVomit.cs b/Content.Server/EntityEffects/Effects/ChemVomit.cs
similarity index 65%
rename from Content.Server/Chemistry/ReagentEffects/ChemVomit.cs
rename to Content.Server/EntityEffects/Effects/ChemVomit.cs
index 851c0adf5f..0d1bac87d1 100644
--- a/Content.Server/Chemistry/ReagentEffects/ChemVomit.cs
+++ b/Content.Server/EntityEffects/Effects/ChemVomit.cs
@@ -1,15 +1,15 @@
 using Content.Server.Medical;
-using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Chemistry.ReagentEffects
+namespace Content.Server.EntityEffects.Effects
 {
     /// <summary>
     /// Forces you to vomit.
     /// </summary>
     [UsedImplicitly]
-    public sealed partial class ChemVomit : ReagentEffect
+    public sealed partial class ChemVomit : EntityEffect
     {
         /// How many units of thirst to add each time we vomit
         [DataField]
@@ -21,14 +21,15 @@ namespace Content.Server.Chemistry.ReagentEffects
         protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
             => Loc.GetString("reagent-effect-guidebook-chem-vomit", ("chance", Probability));
 
-        public override void Effect(ReagentEffectArgs args)
+        public override void Effect(EntityEffectBaseArgs args)
         {
-            if (args.Scale != 1f)
-                return;
+            if (args is EntityEffectReagentArgs reagentArgs)
+                if (reagentArgs.Scale != 1f)
+                    return;
 
             var vomitSys = args.EntityManager.EntitySysManager.GetEntitySystem<VomitSystem>();
 
-            vomitSys.Vomit(args.SolutionEntity, ThirstAmount, HungerAmount);
+            vomitSys.Vomit(args.TargetEntity, ThirstAmount, HungerAmount);
         }
     }
 }
diff --git a/Content.Server/Chemistry/ReactionEffects/CreateEntityReactionEffect.cs b/Content.Server/EntityEffects/Effects/CreateEntityReactionEffect.cs
similarity index 80%
rename from Content.Server/Chemistry/ReactionEffects/CreateEntityReactionEffect.cs
rename to Content.Server/EntityEffects/Effects/CreateEntityReactionEffect.cs
index 0d5acc1722..5288cb587d 100644
--- a/Content.Server/Chemistry/ReactionEffects/CreateEntityReactionEffect.cs
+++ b/Content.Server/EntityEffects/Effects/CreateEntityReactionEffect.cs
@@ -1,12 +1,11 @@
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.GameObjects;
+using Content.Shared.EntityEffects;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Server.Chemistry.ReactionEffects;
+namespace Content.Server.EntityEffects.Effects;
 
 [DataDefinition]
-public sealed partial class CreateEntityReactionEffect : ReagentEffect
+public sealed partial class CreateEntityReactionEffect : EntityEffect
 {
     /// <summary>
     ///     What entity to create.
@@ -26,15 +25,17 @@ public sealed partial class CreateEntityReactionEffect : ReagentEffect
             ("entname", IoCManager.Resolve<IPrototypeManager>().Index<EntityPrototype>(Entity).Name),
             ("amount", Number));
 
-    public override void Effect(ReagentEffectArgs args)
+    public override void Effect(EntityEffectBaseArgs args)
     {
-        var transform = args.EntityManager.GetComponent<TransformComponent>(args.SolutionEntity);
+        var transform = args.EntityManager.GetComponent<TransformComponent>(args.TargetEntity);
         var transformSystem = args.EntityManager.System<SharedTransformSystem>();
-        var quantity = Number * args.Quantity.Int();
+        var quantity = (int)Number;
+        if (args is EntityEffectReagentArgs reagentArgs)
+            quantity *= reagentArgs.Quantity.Int();
 
         for (var i = 0; i < quantity; i++)
         {
-            var uid = args.EntityManager.SpawnEntity(Entity, transformSystem.GetMapCoordinates(args.SolutionEntity, xform: transform));
+            var uid = args.EntityManager.SpawnEntity(Entity, transformSystem.GetMapCoordinates(args.TargetEntity, xform: transform));
             transformSystem.AttachToGridOrMap(uid);
 
             // TODO figure out how to properly spawn inside of containers
diff --git a/Content.Server/Chemistry/ReagentEffects/CreateGas.cs b/Content.Server/EntityEffects/Effects/CreateGas.cs
similarity index 62%
rename from Content.Server/Chemistry/ReagentEffects/CreateGas.cs
rename to Content.Server/EntityEffects/Effects/CreateGas.cs
index c1da3c48db..fb57a43c48 100644
--- a/Content.Server/Chemistry/ReagentEffects/CreateGas.cs
+++ b/Content.Server/EntityEffects/Effects/CreateGas.cs
@@ -1,12 +1,12 @@
-using Content.Server.Atmos.EntitySystems;
+using Content.Server.Atmos.EntitySystems;
 using Content.Shared.Atmos;
-using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Database;
+using Content.Shared.EntityEffects;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Chemistry.ReagentEffects;
+namespace Content.Server.EntityEffects.Effects;
 
-public sealed partial class CreateGas : ReagentEffect
+public sealed partial class CreateGas : EntityEffect
 {
     [DataField(required: true)]
     public Gas Gas = default!;
@@ -31,15 +31,22 @@ public sealed partial class CreateGas : ReagentEffect
 
     public override LogImpact LogImpact => LogImpact.High;
 
-    public override void Effect(ReagentEffectArgs args)
+    public override void Effect(EntityEffectBaseArgs args)
     {
         var atmosSys = args.EntityManager.EntitySysManager.GetEntitySystem<AtmosphereSystem>();
 
-        var tileMix = atmosSys.GetContainingMixture(args.SolutionEntity, false, true);
+        var tileMix = atmosSys.GetContainingMixture(args.TargetEntity, false, true);
 
         if (tileMix != null)
         {
-            tileMix.AdjustMoles(Gas, args.Quantity.Float() * Multiplier);
+            if (args is EntityEffectReagentArgs reagentArgs)
+            {
+                tileMix.AdjustMoles(Gas, reagentArgs.Quantity.Float() * Multiplier);
+            }
+            else
+            {
+                tileMix.AdjustMoles(Gas, Multiplier);
+            }
         }
     }
 }
diff --git a/Content.Server/Chemistry/ReagentEffects/CureZombieInfection.cs b/Content.Server/EntityEffects/Effects/CureZombieInfection.cs
similarity index 73%
rename from Content.Server/Chemistry/ReagentEffects/CureZombieInfection.cs
rename to Content.Server/EntityEffects/Effects/CureZombieInfection.cs
index 20e2c015c4..8dfc2de055 100644
--- a/Content.Server/Chemistry/ReagentEffects/CureZombieInfection.cs
+++ b/Content.Server/EntityEffects/Effects/CureZombieInfection.cs
@@ -1,12 +1,11 @@
 using Content.Server.Zombies;
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.Configuration;
+using Content.Shared.EntityEffects;
 using Robust.Shared.Prototypes;
 using Content.Shared.Zombies;
 
-namespace Content.Server.Chemistry.ReagentEffects;
+namespace Content.Server.EntityEffects.Effects;
 
-public sealed partial class CureZombieInfection : ReagentEffect
+public sealed partial class CureZombieInfection : EntityEffect
 {
     [DataField]
     public bool Innoculate;
@@ -20,18 +19,18 @@ public sealed partial class CureZombieInfection : ReagentEffect
     }
 
     // Removes the Zombie Infection Components
-    public override void Effect(ReagentEffectArgs args)
+    public override void Effect(EntityEffectBaseArgs args)
     {
         var entityManager = args.EntityManager;
-        if (entityManager.HasComponent<IncurableZombieComponent>(args.SolutionEntity))
+        if (entityManager.HasComponent<IncurableZombieComponent>(args.TargetEntity))
             return;
 
-        entityManager.RemoveComponent<ZombifyOnDeathComponent>(args.SolutionEntity);
-        entityManager.RemoveComponent<PendingZombieComponent>(args.SolutionEntity);
+        entityManager.RemoveComponent<ZombifyOnDeathComponent>(args.TargetEntity);
+        entityManager.RemoveComponent<PendingZombieComponent>(args.TargetEntity);
 
         if (Innoculate)
         {
-            entityManager.EnsureComponent<ZombieImmuneComponent>(args.SolutionEntity);
+            entityManager.EnsureComponent<ZombieImmuneComponent>(args.TargetEntity);
         }
     }
 }
diff --git a/Content.Server/Chemistry/ReagentEffects/Drunk.cs b/Content.Server/EntityEffects/Effects/Drunk.cs
similarity index 64%
rename from Content.Server/Chemistry/ReagentEffects/Drunk.cs
rename to Content.Server/EntityEffects/Effects/Drunk.cs
index dbce995ca2..493560e5b9 100644
--- a/Content.Server/Chemistry/ReagentEffects/Drunk.cs
+++ b/Content.Server/EntityEffects/Effects/Drunk.cs
@@ -1,10 +1,10 @@
-using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Drunk;
+using Content.Shared.EntityEffects;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Chemistry.ReagentEffects;
+namespace Content.Server.EntityEffects.Effects;
 
-public sealed partial class Drunk : ReagentEffect
+public sealed partial class Drunk : EntityEffect
 {
     /// <summary>
     ///     BoozePower is how long each metabolism cycle will make the drunk effect last for.
@@ -21,13 +21,15 @@ public sealed partial class Drunk : ReagentEffect
     protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
         => Loc.GetString("reagent-effect-guidebook-drunk", ("chance", Probability));
 
-    public override void Effect(ReagentEffectArgs args)
+    public override void Effect(EntityEffectBaseArgs args)
     {
         var boozePower = BoozePower;
 
-        boozePower *= args.Scale;
-
+        if (args is EntityEffectReagentArgs reagentArgs) {
+            boozePower *= reagentArgs.Scale.Float();
+        }
+        
         var drunkSys = args.EntityManager.EntitySysManager.GetEntitySystem<SharedDrunkSystem>();
-        drunkSys.TryApplyDrunkenness(args.SolutionEntity, boozePower, SlurSpeech);
+        drunkSys.TryApplyDrunkenness(args.TargetEntity, boozePower, SlurSpeech);
     }
 }
diff --git a/Content.Server/EntityEffects/Effects/Electrocute.cs b/Content.Server/EntityEffects/Effects/Electrocute.cs
new file mode 100644
index 0000000000..f6a5f1a2da
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Electrocute.cs
@@ -0,0 +1,38 @@
+using Content.Server.Electrocution;
+using Content.Shared.EntityEffects;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.Effects;
+
+public sealed partial class Electrocute : EntityEffect
+{
+    [DataField] public int ElectrocuteTime = 2;
+
+    [DataField] public int ElectrocuteDamageScale = 5;
+
+    /// <remarks>
+    ///     true - refresh electrocute time,  false - accumulate electrocute time
+    /// </remarks>
+    [DataField] public bool Refresh = true;
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-electrocute", ("chance", Probability), ("time", ElectrocuteTime));
+
+    public override bool ShouldLog => true;
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            reagentArgs.EntityManager.System<ElectrocutionSystem>().TryDoElectrocution(reagentArgs.TargetEntity, null,
+                Math.Max((reagentArgs.Quantity * ElectrocuteDamageScale).Int(), 1), TimeSpan.FromSeconds(ElectrocuteTime), Refresh, ignoreInsulation: true);
+
+            if (reagentArgs.Reagent != null)
+                reagentArgs.Source?.RemoveReagent(reagentArgs.Reagent.ID, reagentArgs.Quantity);
+        } else
+        {
+            args.EntityManager.System<ElectrocutionSystem>().TryDoElectrocution(args.TargetEntity, null,
+                Math.Max(ElectrocuteDamageScale, 1), TimeSpan.FromSeconds(ElectrocuteTime), Refresh, ignoreInsulation: true);
+        }
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffects/Emote.cs b/Content.Server/EntityEffects/Effects/Emote.cs
similarity index 72%
rename from Content.Server/Chemistry/ReagentEffects/Emote.cs
rename to Content.Server/EntityEffects/Effects/Emote.cs
index db6de6cc75..00bdaec455 100644
--- a/Content.Server/Chemistry/ReagentEffects/Emote.cs
+++ b/Content.Server/EntityEffects/Effects/Emote.cs
@@ -1,17 +1,17 @@
 using Content.Server.Chat.Systems;
 using Content.Shared.Chat.Prototypes;
-using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Server.Chemistry.ReagentEffects;
+namespace Content.Server.EntityEffects.Effects;
 
 /// <summary>
 ///     Tries to force someone to emote (scream, laugh, etc). Still respects whitelists/blacklists and other limits of the specified emote unless forced.
 /// </summary>
 [UsedImplicitly]
-public sealed partial class Emote : ReagentEffect
+public sealed partial class Emote : EntityEffect
 {
     [DataField("emote", customTypeSerializer: typeof(PrototypeIdSerializer<EmotePrototype>))]
     public string? EmoteId;
@@ -26,16 +26,16 @@ public sealed partial class Emote : ReagentEffect
     protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
         => null;
 
-    public override void Effect(ReagentEffectArgs args)
+    public override void Effect(EntityEffectBaseArgs args)
     {
         if (EmoteId == null)
             return;
 
         var chatSys = args.EntityManager.System<ChatSystem>();
         if (ShowInChat)
-            chatSys.TryEmoteWithChat(args.SolutionEntity, EmoteId, ChatTransmitRange.GhostRangeLimit, forceEmote: Force);
+            chatSys.TryEmoteWithChat(args.TargetEntity, EmoteId, ChatTransmitRange.GhostRangeLimit, forceEmote: Force);
         else
-            chatSys.TryEmoteWithoutChat(args.SolutionEntity, EmoteId);
+            chatSys.TryEmoteWithoutChat(args.TargetEntity, EmoteId);
 
     }
 }
diff --git a/Content.Server/Chemistry/ReactionEffects/EmpReactionEffect.cs b/Content.Server/EntityEffects/Effects/EmpReactionEffect.cs
similarity index 67%
rename from Content.Server/Chemistry/ReactionEffects/EmpReactionEffect.cs
rename to Content.Server/EntityEffects/Effects/EmpReactionEffect.cs
index 9a320ffc39..ec7801f083 100644
--- a/Content.Server/Chemistry/ReactionEffects/EmpReactionEffect.cs
+++ b/Content.Server/EntityEffects/Effects/EmpReactionEffect.cs
@@ -1,16 +1,17 @@
 using Content.Server.Emp;
+using Content.Shared.EntityEffects;
 using Content.Shared.Chemistry.Reagent;
 using Robust.Server.GameObjects;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Chemistry.ReactionEffects;
+namespace Content.Server.EntityEffects.Effects;
 
 
 [DataDefinition]
-public sealed partial class EmpReactionEffect : ReagentEffect
+public sealed partial class EmpReactionEffect : EntityEffect
 {
     /// <summary>
-    ///     Impulse range per unit of reagent
+    ///     Impulse range per unit of quantity
     /// </summary>
     [DataField("rangePerUnit")]
     public float EmpRangePerUnit = 0.5f;
@@ -36,14 +37,20 @@ public sealed partial class EmpReactionEffect : ReagentEffect
     protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
             => Loc.GetString("reagent-effect-guidebook-emp-reaction-effect", ("chance", Probability));
 
-    public override void Effect(ReagentEffectArgs args)
+    public override void Effect(EntityEffectBaseArgs args)
     {
         var tSys = args.EntityManager.System<TransformSystem>();
-        var transform = args.EntityManager.GetComponent<TransformComponent>(args.SolutionEntity);
-        var range = MathF.Min((float) (args.Quantity*EmpRangePerUnit), EmpMaxRange);
+        var transform = args.EntityManager.GetComponent<TransformComponent>(args.TargetEntity);
+
+        var range = EmpRangePerUnit;
+
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            range = MathF.Min((float) (reagentArgs.Quantity * EmpRangePerUnit), EmpMaxRange);
+        }
 
         args.EntityManager.System<EmpSystem>()
-            .EmpPulse(tSys.GetMapCoordinates(args.SolutionEntity, xform: transform),
+            .EmpPulse(tSys.GetMapCoordinates(args.TargetEntity, xform: transform),
             range,
             EnergyConsumption,
             DisableDuration);
diff --git a/Content.Server/EntityEffects/Effects/ExplosionReactionEffect.cs b/Content.Server/EntityEffects/Effects/ExplosionReactionEffect.cs
new file mode 100644
index 0000000000..689757d044
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/ExplosionReactionEffect.cs
@@ -0,0 +1,77 @@
+using Content.Server.Explosion.EntitySystems;
+using Content.Shared.Database;
+using Content.Shared.EntityEffects;
+using Content.Shared.Explosion;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using System.Text.Json.Serialization;
+
+namespace Content.Server.EntityEffects.Effects;
+
+[DataDefinition]
+public sealed partial class ExplosionReactionEffect : EntityEffect
+{
+    /// <summary>
+    ///     The type of explosion. Determines damage types and tile break chance scaling.
+    /// </summary>
+    [DataField(required: true, customTypeSerializer: typeof(PrototypeIdSerializer<ExplosionPrototype>))]
+    [JsonIgnore]
+    public string ExplosionType = default!;
+
+    /// <summary>
+    ///     The max intensity the explosion can have at a given tile. Places an upper limit of damage and tile break
+    ///     chance.
+    /// </summary>
+    [DataField]
+    [JsonIgnore]
+    public float MaxIntensity = 5;
+
+    /// <summary>
+    ///     How quickly intensity drops off as you move away from the epicenter
+    /// </summary>
+    [DataField]
+    [JsonIgnore]
+    public float IntensitySlope = 1;
+
+    /// <summary>
+    ///     The maximum total intensity that this chemical reaction can achieve. Basically here to prevent people
+    ///     from creating a nuke by collecting enough potassium and water.
+    /// </summary>
+    /// <remarks>
+    ///     A slope of 1 and MaxTotalIntensity of 100 corresponds to a radius of around 4.5 tiles.
+    /// </remarks>
+    [DataField]
+    [JsonIgnore]
+    public float MaxTotalIntensity = 100;
+
+    /// <summary>
+    ///     The intensity of the explosion per unit reaction.
+    /// </summary>
+    [DataField]
+    [JsonIgnore]
+    public float IntensityPerUnit = 1;
+
+    public override bool ShouldLog => true;
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-explosion-reaction-effect", ("chance", Probability));
+    public override LogImpact LogImpact => LogImpact.High;
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        var intensity = IntensityPerUnit;
+
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            intensity = MathF.Min((float) reagentArgs.Quantity * IntensityPerUnit, MaxTotalIntensity);
+        }
+
+        args.EntityManager.System<ExplosionSystem>()
+            .QueueExplosion(
+            args.TargetEntity,
+            ExplosionType,
+            intensity,
+            IntensitySlope,
+            MaxIntensity);
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/ExtinguishReaction.cs b/Content.Server/EntityEffects/Effects/ExtinguishReaction.cs
new file mode 100644
index 0000000000..6d7e7c2fcd
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/ExtinguishReaction.cs
@@ -0,0 +1,36 @@
+using Content.Server.Atmos.Components;
+using Content.Server.Atmos.EntitySystems;
+using Content.Shared.EntityEffects;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.Effects
+{
+    [UsedImplicitly]
+    public sealed partial class ExtinguishReaction : EntityEffect
+    {
+        /// <summary>
+        ///     Amount of firestacks reduced.
+        /// </summary>
+        [DataField]
+        public float FireStacksAdjustment = -1.5f;
+
+        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+            => Loc.GetString("reagent-effect-guidebook-extinguish-reaction", ("chance", Probability));
+
+        public override void Effect(EntityEffectBaseArgs args)
+        {
+            if (!args.EntityManager.TryGetComponent(args.TargetEntity, out FlammableComponent? flammable)) return;
+
+            var flammableSystem = args.EntityManager.System<FlammableSystem>();
+            flammableSystem.Extinguish(args.TargetEntity, flammable);
+            if (args is EntityEffectReagentArgs reagentArgs)
+            {
+                flammableSystem.AdjustFireStacks(reagentArgs.TargetEntity, FireStacksAdjustment * (float) reagentArgs.Quantity, flammable);
+            } else
+            {
+                flammableSystem.AdjustFireStacks(args.TargetEntity, FireStacksAdjustment, flammable);
+            }
+        }
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/FlammableReaction.cs b/Content.Server/EntityEffects/Effects/FlammableReaction.cs
new file mode 100644
index 0000000000..edd499ab4a
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/FlammableReaction.cs
@@ -0,0 +1,45 @@
+using Content.Server.Atmos.Components;
+using Content.Server.Atmos.EntitySystems;
+using Content.Shared.Database;
+using Content.Shared.EntityEffects;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.Effects
+{
+    [UsedImplicitly]
+    public sealed partial class FlammableReaction : EntityEffect
+    {
+        [DataField]
+        public float Multiplier = 0.05f;
+
+        [DataField]
+        public float MultiplierOnExisting = 1f;
+
+        public override bool ShouldLog => true;
+
+        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+            => Loc.GetString("reagent-effect-guidebook-flammable-reaction", ("chance", Probability));
+
+        public override LogImpact LogImpact => LogImpact.Medium;
+
+        public override void Effect(EntityEffectBaseArgs args)
+        {
+            if (!args.EntityManager.TryGetComponent(args.TargetEntity, out FlammableComponent? flammable))
+                return;
+
+            var multiplier = flammable.FireStacks == 0f ? Multiplier : MultiplierOnExisting;
+            var quantity = 1f;
+            if (args is EntityEffectReagentArgs reagentArgs)
+            {
+                quantity = reagentArgs.Quantity.Float();
+                reagentArgs.EntityManager.System<FlammableSystem>().AdjustFireStacks(args.TargetEntity, quantity * multiplier, flammable);
+                if (reagentArgs.Reagent != null)
+                    reagentArgs.Source?.RemoveReagent(reagentArgs.Reagent.ID, reagentArgs.Quantity);
+            } else
+            {
+                args.EntityManager.System<FlammableSystem>().AdjustFireStacks(args.TargetEntity, multiplier, flammable);
+            }
+        }
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffects/HealthChange.cs b/Content.Server/EntityEffects/Effects/HealthChange.cs
similarity index 84%
rename from Content.Server/Chemistry/ReagentEffects/HealthChange.cs
rename to Content.Server/EntityEffects/Effects/HealthChange.cs
index 24880cfd37..fd2a658745 100644
--- a/Content.Server/Chemistry/ReagentEffects/HealthChange.cs
+++ b/Content.Server/EntityEffects/Effects/HealthChange.cs
@@ -1,6 +1,6 @@
-using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Prototypes;
+using Content.Shared.EntityEffects;
 using Content.Shared.FixedPoint;
 using Content.Shared.Localizations;
 using JetBrains.Annotations;
@@ -8,16 +8,16 @@ using Robust.Shared.Prototypes;
 using System.Linq;
 using System.Text.Json.Serialization;
 
-namespace Content.Server.Chemistry.ReagentEffects
+namespace Content.Server.EntityEffects.Effects
 {
     /// <summary>
-    /// Default metabolism for medicine reagents.
+    /// Default metabolism used for medicine reagents.
     /// </summary>
     [UsedImplicitly]
-    public sealed partial class HealthChange : ReagentEffect
+    public sealed partial class HealthChange : EntityEffect
     {
         /// <summary>
-        /// Damage to apply every metabolism cycle. Damage Ignores resistances.
+        /// Damage to apply every cycle. Damage Ignores resistances.
         /// </summary>
         [DataField(required: true)]
         [JsonPropertyName("damage")]
@@ -26,6 +26,7 @@ namespace Content.Server.Chemistry.ReagentEffects
         /// <summary>
         ///     Should this effect scale the damage by the amount of chemical in the solution?
         ///     Useful for touch reactions, like styptic powder or acid.
+        ///     Only usable if the EntityEffectBaseArgs is an EntityEffectReagentArgs.
         /// </summary>
         [DataField]
         [JsonPropertyName("scaleByQuantity")]
@@ -110,13 +111,17 @@ namespace Content.Server.Chemistry.ReagentEffects
                 ("healsordeals", healsordeals));
         }
 
-        public override void Effect(ReagentEffectArgs args)
+        public override void Effect(EntityEffectBaseArgs args)
         {
-            var scale = ScaleByQuantity ? args.Quantity : FixedPoint2.New(1);
-            scale *= args.Scale;
+            var scale = FixedPoint2.New(1);
+
+            if (args is EntityEffectReagentArgs reagentArgs)
+            {
+                scale = ScaleByQuantity ? reagentArgs.Quantity * reagentArgs.Scale : reagentArgs.Scale;
+            }
 
             args.EntityManager.System<DamageableSystem>().TryChangeDamage(
-                args.SolutionEntity,
+                args.TargetEntity,
                 Damage * scale,
                 IgnoreResistances,
                 interruptsDoAfters: false);
diff --git a/Content.Server/Chemistry/ReagentEffects/Ignite.cs b/Content.Server/EntityEffects/Effects/Ignite.cs
similarity index 50%
rename from Content.Server/Chemistry/ReagentEffects/Ignite.cs
rename to Content.Server/EntityEffects/Effects/Ignite.cs
index 6c5d47711f..cca2a301fd 100644
--- a/Content.Server/Chemistry/ReagentEffects/Ignite.cs
+++ b/Content.Server/EntityEffects/Effects/Ignite.cs
@@ -1,14 +1,14 @@
-using Content.Server.Atmos.EntitySystems;
-using Content.Shared.Chemistry.Reagent;
+using Content.Server.Atmos.EntitySystems;
 using Content.Shared.Database;
+using Content.Shared.EntityEffects;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Chemistry.ReagentEffects;
+namespace Content.Server.EntityEffects.Effects;
 
 /// <summary>
 ///     Ignites a mob.
 /// </summary>
-public sealed partial class Ignite : ReagentEffect
+public sealed partial class Ignite : EntityEffect
 {
     public override bool ShouldLog => true;
 
@@ -17,9 +17,15 @@ public sealed partial class Ignite : ReagentEffect
 
     public override LogImpact LogImpact => LogImpact.Medium;
 
-    public override void Effect(ReagentEffectArgs args)
+    public override void Effect(EntityEffectBaseArgs args)
     {
         var flamSys = args.EntityManager.System<FlammableSystem>();
-        flamSys.Ignite(args.SolutionEntity, args.OrganEntity ?? args.SolutionEntity);
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            flamSys.Ignite(reagentArgs.TargetEntity, reagentArgs.OrganEntity ?? reagentArgs.TargetEntity);
+        } else
+        {
+            flamSys.Ignite(args.TargetEntity, args.TargetEntity);
+        }
     }
 }
diff --git a/Content.Server/Chemistry/ReagentEffects/MakeSentient.cs b/Content.Server/EntityEffects/Effects/MakeSentient.cs
similarity index 87%
rename from Content.Server/Chemistry/ReagentEffects/MakeSentient.cs
rename to Content.Server/EntityEffects/Effects/MakeSentient.cs
index be8dbbaf52..c487043848 100644
--- a/Content.Server/Chemistry/ReagentEffects/MakeSentient.cs
+++ b/Content.Server/EntityEffects/Effects/MakeSentient.cs
@@ -1,20 +1,20 @@
 using Content.Server.Ghost.Roles.Components;
 using Content.Server.Speech.Components;
-using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using Content.Shared.Mind.Components;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Chemistry.ReagentEffects;
+namespace Content.Server.EntityEffects.Effects;
 
-public sealed partial class MakeSentient : ReagentEffect
+public sealed partial class MakeSentient : EntityEffect
 {
     protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
         => Loc.GetString("reagent-effect-guidebook-make-sentient", ("chance", Probability));
 
-    public override void Effect(ReagentEffectArgs args)
+    public override void Effect(EntityEffectBaseArgs args)
     {
         var entityManager = args.EntityManager;
-        var uid = args.SolutionEntity;
+        var uid = args.TargetEntity;
 
         // Let affected entities speak normally to make this effect different from, say, the "random sentience" event
         // This also works on entities that already have a mind
diff --git a/Content.Server/Chemistry/ReagentEffects/ModifyBleedAmount.cs b/Content.Server/EntityEffects/Effects/ModifyBleedAmount.cs
similarity index 50%
rename from Content.Server/Chemistry/ReagentEffects/ModifyBleedAmount.cs
rename to Content.Server/EntityEffects/Effects/ModifyBleedAmount.cs
index ecd9c86255..58bc304f5e 100644
--- a/Content.Server/Chemistry/ReagentEffects/ModifyBleedAmount.cs
+++ b/Content.Server/EntityEffects/Effects/ModifyBleedAmount.cs
@@ -1,11 +1,11 @@
-using Content.Server.Body.Components;
+using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
-using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Chemistry.ReagentEffects;
+namespace Content.Server.EntityEffects.Effects;
 
-public sealed partial class ModifyBleedAmount : ReagentEffect
+public sealed partial class ModifyBleedAmount : EntityEffect
 {
     [DataField]
     public bool Scaled = false;
@@ -17,15 +17,19 @@ public sealed partial class ModifyBleedAmount : ReagentEffect
         => Loc.GetString("reagent-effect-guidebook-modify-bleed-amount", ("chance", Probability),
             ("deltasign", MathF.Sign(Amount)));
 
-    public override void Effect(ReagentEffectArgs args)
+    public override void Effect(EntityEffectBaseArgs args)
     {
-        if (args.EntityManager.TryGetComponent<BloodstreamComponent>(args.SolutionEntity, out var blood))
+        if (args.EntityManager.TryGetComponent<BloodstreamComponent>(args.TargetEntity, out var blood))
         {
             var sys = args.EntityManager.System<BloodstreamSystem>();
-            var amt = Scaled ? Amount * args.Quantity.Float() : Amount;
-            amt *= args.Scale;
+            var amt = Amount;
+            if (args is EntityEffectReagentArgs reagentArgs) {
+                if (Scaled)
+                    amt *= reagentArgs.Quantity.Float();
+                amt *= reagentArgs.Scale.Float();
+            }
 
-            sys.TryModifyBleedAmount(args.SolutionEntity, amt, blood);
+            sys.TryModifyBleedAmount(args.TargetEntity, amt, blood);
         }
     }
 }
diff --git a/Content.Server/Chemistry/ReagentEffects/ModifyBloodLevel.cs b/Content.Server/EntityEffects/Effects/ModifyBloodLevel.cs
similarity index 52%
rename from Content.Server/Chemistry/ReagentEffects/ModifyBloodLevel.cs
rename to Content.Server/EntityEffects/Effects/ModifyBloodLevel.cs
index b136ff9bb8..d8aca7d284 100644
--- a/Content.Server/Chemistry/ReagentEffects/ModifyBloodLevel.cs
+++ b/Content.Server/EntityEffects/Effects/ModifyBloodLevel.cs
@@ -1,12 +1,12 @@
-using Content.Server.Body.Components;
+using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
-using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Chemistry.ReagentEffects;
+namespace Content.Server.EntityEffects.Effects;
 
-public sealed partial class ModifyBloodLevel : ReagentEffect
+public sealed partial class ModifyBloodLevel : EntityEffect
 {
     [DataField]
     public bool Scaled = false;
@@ -18,15 +18,20 @@ public sealed partial class ModifyBloodLevel : ReagentEffect
         => Loc.GetString("reagent-effect-guidebook-modify-blood-level", ("chance", Probability),
             ("deltasign", MathF.Sign(Amount.Float())));
 
-    public override void Effect(ReagentEffectArgs args)
+    public override void Effect(EntityEffectBaseArgs args)
     {
-        if (args.EntityManager.TryGetComponent<BloodstreamComponent>(args.SolutionEntity, out var blood))
+        if (args.EntityManager.TryGetComponent<BloodstreamComponent>(args.TargetEntity, out var blood))
         {
             var sys = args.EntityManager.System<BloodstreamSystem>();
-            var amt = Scaled ? Amount * args.Quantity : Amount;
-            amt *= args.Scale;
+            var amt = Amount;
+            if (args is EntityEffectReagentArgs reagentArgs)
+            {
+                if (Scaled)
+                    amt *= reagentArgs.Quantity;
+                amt *= reagentArgs.Scale;
+            }
 
-            sys.TryModifyBloodLevel(args.SolutionEntity, amt, blood);
+            sys.TryModifyBloodLevel(args.TargetEntity, amt, blood);
         }
     }
 }
diff --git a/Content.Server/EntityEffects/Effects/ModifyLungGas.cs b/Content.Server/EntityEffects/Effects/ModifyLungGas.cs
new file mode 100644
index 0000000000..b4f35e3d56
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/ModifyLungGas.cs
@@ -0,0 +1,49 @@
+using Content.Server.Body.Components;
+using Content.Shared.Atmos;
+using Content.Shared.EntityEffects;
+using Robust.Shared.Prototypes;
+using Content.Shared.EntityEffects;
+
+namespace Content.Server.EntityEffects.Effects;
+
+public sealed partial class ModifyLungGas : EntityEffect
+{
+    [DataField("ratios", required: true)]
+    private Dictionary<Gas, float> _ratios = default!;
+
+    // JUSTIFICATION: This is internal magic that players never directly interact with.
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => null;
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+
+        LungComponent? lung;
+        float amount = 1f;
+
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            if (!args.EntityManager.TryGetComponent<LungComponent>(reagentArgs.OrganEntity, out var organLung))
+                return;
+            lung = organLung;
+            amount = reagentArgs.Quantity.Float();
+        }
+        else
+        {
+            if (!args.EntityManager.TryGetComponent<LungComponent>(args.TargetEntity, out var organLung)) //Likely needs to be modified to ensure it works correctly
+                return;
+            lung = organLung;
+        }
+
+        if (lung != null)
+        {
+            foreach (var (gas, ratio) in _ratios)
+            {
+                var quantity = ratio * amount / Atmospherics.BreathMolesToReagentMultiplier;
+                if (quantity < 0)
+                    quantity = Math.Max(quantity, -lung.Air[(int) gas]);
+                lung.Air.AdjustMoles(gas, quantity);
+            }
+        }
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/MovespeedModifier.cs b/Content.Server/EntityEffects/Effects/MovespeedModifier.cs
new file mode 100644
index 0000000000..ac1f143e9f
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/MovespeedModifier.cs
@@ -0,0 +1,78 @@
+using Content.Shared.Chemistry.Components;
+using Content.Shared.EntityEffects;
+using Content.Shared.Movement.Systems;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+
+namespace Content.Server.EntityEffects.Effects;
+
+/// <summary>
+/// Default metabolism for stimulants and tranqs. Attempts to find a MovementSpeedModifier on the target,
+/// adding one if not there and to change the movespeed
+/// </summary>
+public sealed partial class MovespeedModifier : EntityEffect
+{
+    /// <summary>
+    /// How much the entities' walk speed is multiplied by.
+    /// </summary>
+    [DataField]
+    public float WalkSpeedModifier { get; set; } = 1;
+
+    /// <summary>
+    /// How much the entities' run speed is multiplied by.
+    /// </summary>
+    [DataField]
+    public float SprintSpeedModifier { get; set; } = 1;
+
+    /// <summary>
+    /// How long the modifier applies (in seconds).
+    /// Is scaled by reagent amount if used with an EntityEffectReagentArgs.
+    /// </summary>
+    [DataField]
+    public float StatusLifetime = 2f;
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+    {
+        return Loc.GetString("reagent-effect-guidebook-movespeed-modifier",
+            ("chance", Probability),
+            ("walkspeed", WalkSpeedModifier),
+            ("time", StatusLifetime));
+    }
+
+    /// <summary>
+    /// Remove reagent at set rate, changes the movespeed modifiers and adds a MovespeedModifierMetabolismComponent if not already there.
+    /// </summary>
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        var status = args.EntityManager.EnsureComponent<MovespeedModifierMetabolismComponent>(args.TargetEntity);
+
+        // Only refresh movement if we need to.
+        var modified = !status.WalkSpeedModifier.Equals(WalkSpeedModifier) ||
+                       !status.SprintSpeedModifier.Equals(SprintSpeedModifier);
+
+        status.WalkSpeedModifier = WalkSpeedModifier;
+        status.SprintSpeedModifier = SprintSpeedModifier;
+
+        // only going to scale application time
+        var statusLifetime = StatusLifetime;
+
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            statusLifetime *= reagentArgs.Scale.Float();
+        }
+
+        IncreaseTimer(status, statusLifetime);
+
+        if (modified)
+            args.EntityManager.System<MovementSpeedModifierSystem>().RefreshMovementSpeedModifiers(args.TargetEntity);
+    }
+    public void IncreaseTimer(MovespeedModifierMetabolismComponent status, float time)
+    {
+        var gameTiming = IoCManager.Resolve<IGameTiming>();
+
+        var offsetTime = Math.Max(status.ModifierTimer.TotalSeconds, gameTiming.CurTime.TotalSeconds);
+
+        status.ModifierTimer = TimeSpan.FromSeconds(offsetTime + time);
+        status.Dirty();
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Oxygenate.cs b/Content.Server/EntityEffects/Effects/Oxygenate.cs
new file mode 100644
index 0000000000..60383188c9
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Oxygenate.cs
@@ -0,0 +1,32 @@
+using Content.Server.Body.Components;
+using Content.Server.Body.Systems;
+using Content.Shared.EntityEffects;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.Effects;
+
+public sealed partial class Oxygenate : EntityEffect
+{
+    [DataField]
+    public float Factor = 1f;
+
+    // JUSTIFICATION: This is internal magic that players never directly interact with.
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => null;
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+
+        var multiplier = 1f;
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            multiplier = reagentArgs.Quantity.Float();
+        }
+
+        if (args.EntityManager.TryGetComponent<RespiratorComponent>(args.TargetEntity, out var resp))
+        {
+            var respSys = args.EntityManager.System<RespiratorSystem>();
+            respSys.UpdateSaturation(args.TargetEntity, multiplier * Factor, resp);
+        }
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffects/Paralyze.cs b/Content.Server/EntityEffects/Effects/Paralyze.cs
similarity index 62%
rename from Content.Server/Chemistry/ReagentEffects/Paralyze.cs
rename to Content.Server/EntityEffects/Effects/Paralyze.cs
index d5d913f37d..ba020dd39b 100644
--- a/Content.Server/Chemistry/ReagentEffects/Paralyze.cs
+++ b/Content.Server/EntityEffects/Effects/Paralyze.cs
@@ -1,10 +1,10 @@
 using Content.Server.Stunnable;
-using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Chemistry.ReagentEffects;
+namespace Content.Server.EntityEffects.Effects;
 
-public sealed partial class Paralyze : ReagentEffect
+public sealed partial class Paralyze : EntityEffect
 {
     [DataField] public double ParalyzeTime = 2;
 
@@ -18,12 +18,16 @@ public sealed partial class Paralyze : ReagentEffect
             ("chance", Probability),
             ("time", ParalyzeTime));
 
-    public override void Effect(ReagentEffectArgs args)
+    public override void Effect(EntityEffectBaseArgs args)
     {
         var paralyzeTime = ParalyzeTime;
-        paralyzeTime *= args.Scale;
 
-        args.EntityManager.System<StunSystem>().TryParalyze(args.SolutionEntity, TimeSpan.FromSeconds(paralyzeTime), Refresh);
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            paralyzeTime *= (double)reagentArgs.Scale;
+        }
+
+        args.EntityManager.System<StunSystem>().TryParalyze(args.TargetEntity, TimeSpan.FromSeconds(paralyzeTime), Refresh);
     }
 }
 
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustAttribute.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustAttribute.cs
new file mode 100644
index 0000000000..5133fe502f
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustAttribute.cs
@@ -0,0 +1,61 @@
+using Content.Server.Botany.Components;
+using Content.Shared.EntityEffects;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
+
+[ImplicitDataDefinitionForInheritors]
+public abstract partial class PlantAdjustAttribute : EntityEffect
+{
+    [DataField]
+    public float Amount { get; protected set; } = 1;
+
+    /// <summary>
+    /// Localisation key for the name of the adjusted attribute. Used for guidebook descriptions.
+    /// </summary>
+    [DataField]
+    public abstract string GuidebookAttributeName { get; set; }
+
+    /// <summary>
+    /// Whether the attribute in question is a good thing. Used for guidebook descriptions to determine the color of the number.
+    /// </summary>
+    [DataField]
+    public virtual bool GuidebookIsAttributePositive { get; protected set; } = true;
+
+    /// <summary>
+    ///     Checks if the plant holder can metabolize the reagent or not. Checks if it has an alive plant by default.
+    /// </summary>
+    /// <param name="plantHolder">The entity holding the plant</param>
+    /// <param name="plantHolderComponent">The plant holder component</param>
+    /// <param name="entityManager">The entity manager</param>
+    /// <param name="mustHaveAlivePlant">Whether to check if it has an alive plant or not</param>
+    /// <returns></returns>
+    public bool CanMetabolize(EntityUid plantHolder, [NotNullWhen(true)] out PlantHolderComponent? plantHolderComponent,
+        IEntityManager entityManager,
+        bool mustHaveAlivePlant = true)
+    {
+        plantHolderComponent = null;
+
+        if (!entityManager.TryGetComponent(plantHolder, out plantHolderComponent)
+                                || mustHaveAlivePlant && (plantHolderComponent.Seed == null || plantHolderComponent.Dead))
+            return false;
+
+        return true;
+    }
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+    {
+        string color;
+        if (GuidebookIsAttributePositive ^ Amount < 0.0)
+        {
+            color = "green";
+        }
+        else
+        {
+            color = "red";
+        }
+        return Loc.GetString("reagent-effect-guidebook-plant-attribute", ("attribute", Loc.GetString(GuidebookAttributeName)), ("amount", Amount.ToString("0.00")), ("colorName", color), ("chance", Probability));
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustHealth.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustHealth.cs
new file mode 100644
index 0000000000..774f6ec48c
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustHealth.cs
@@ -0,0 +1,21 @@
+using Content.Server.Botany.Systems;
+using Content.Shared.EntityEffects;
+
+namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
+
+public sealed partial class PlantAdjustHealth : PlantAdjustAttribute
+{
+    public override string GuidebookAttributeName { get; set; } = "plant-attribute-health";
+    
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (!CanMetabolize(args.TargetEntity, out var plantHolderComp, args.EntityManager))
+            return;
+
+        var plantHolder = args.EntityManager.System<PlantHolderSystem>();
+
+        plantHolderComp.Health += Amount;
+        plantHolder.CheckHealth(args.TargetEntity, plantHolderComp);
+    }
+}
+
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationLevel.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationLevel.cs
new file mode 100644
index 0000000000..bf41a21bcb
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationLevel.cs
@@ -0,0 +1,16 @@
+using Content.Shared.EntityEffects;
+
+namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
+
+public sealed partial class PlantAdjustMutationLevel : PlantAdjustAttribute
+{
+    public override string GuidebookAttributeName { get; set; } = "plant-attribute-mutation-level";
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (!CanMetabolize(args.TargetEntity, out var plantHolderComp, args.EntityManager))
+            return;
+
+        plantHolderComp.MutationLevel += Amount * plantHolderComp.MutationMod;
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationMod.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationMod.cs
new file mode 100644
index 0000000000..6ed793e614
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationMod.cs
@@ -0,0 +1,19 @@
+using Content.Shared.EntityEffects;
+using JetBrains.Annotations;
+
+namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
+
+[UsedImplicitly]
+public sealed partial class PlantAdjustMutationMod : PlantAdjustAttribute
+{
+    public override string GuidebookAttributeName { get; set; } = "plant-attribute-mutation-mod";
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (!CanMetabolize(args.TargetEntity, out var plantHolderComp, args.EntityManager))
+            return;
+
+        plantHolderComp.MutationMod += Amount;
+    }
+}
+
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustNutrition.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustNutrition.cs
new file mode 100644
index 0000000000..b9389afacd
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustNutrition.cs
@@ -0,0 +1,21 @@
+using Content.Server.Botany.Systems;
+using Content.Shared.EntityEffects;
+using JetBrains.Annotations;
+
+namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
+
+[UsedImplicitly]
+public sealed partial class PlantAdjustNutrition : PlantAdjustAttribute
+{
+    public override string GuidebookAttributeName { get; set; } = "plant-attribute-nutrition";
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (!CanMetabolize(args.TargetEntity, out var plantHolderComp, args.EntityManager, mustHaveAlivePlant: false))
+            return;
+
+        var plantHolder = args.EntityManager.System<PlantHolderSystem>();
+
+        plantHolder.AdjustNutrient(args.TargetEntity, Amount, plantHolderComp);
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustPests.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustPests.cs
new file mode 100644
index 0000000000..219529bfc4
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustPests.cs
@@ -0,0 +1,20 @@
+using Content.Shared.EntityEffects;
+using JetBrains.Annotations;
+
+namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
+
+[UsedImplicitly]
+public sealed partial class PlantAdjustPests : PlantAdjustAttribute
+{
+    public override string GuidebookAttributeName { get; set; } = "plant-attribute-pests";
+    public override bool GuidebookIsAttributePositive { get; protected set; } = false;
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (!CanMetabolize(args.TargetEntity, out var plantHolderComp, args.EntityManager))
+            return;
+
+        plantHolderComp.PestLevel += Amount;
+    }
+}
+
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustToxins.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustToxins.cs
new file mode 100644
index 0000000000..ab1baa4285
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustToxins.cs
@@ -0,0 +1,20 @@
+using Content.Shared.EntityEffects;
+using JetBrains.Annotations;
+
+namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
+
+[UsedImplicitly]
+public sealed partial class PlantAdjustToxins : PlantAdjustAttribute
+{
+    public override string GuidebookAttributeName { get; set; } = "plant-attribute-toxins";
+    public override bool GuidebookIsAttributePositive { get; protected set; } = false;
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (!CanMetabolize(args.TargetEntity, out var plantHolderComp, args.EntityManager))
+            return;
+
+        plantHolderComp.Toxins += Amount;
+    }
+}
+
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustWater.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustWater.cs
new file mode 100644
index 0000000000..41774977d5
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustWater.cs
@@ -0,0 +1,22 @@
+using Content.Server.Botany.Systems;
+using Content.Shared.EntityEffects;
+using JetBrains.Annotations;
+
+namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
+
+[UsedImplicitly]
+public sealed partial class PlantAdjustWater : PlantAdjustAttribute
+{
+    public override string GuidebookAttributeName { get; set; } = "plant-attribute-water";
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (!CanMetabolize(args.TargetEntity, out var plantHolderComp, args.EntityManager, mustHaveAlivePlant: false))
+            return;
+
+        var plantHolder = args.EntityManager.System<PlantHolderSystem>();
+
+        plantHolder.AdjustWater(args.TargetEntity, Amount, plantHolderComp);
+    }
+}
+
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustWeeds.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustWeeds.cs
new file mode 100644
index 0000000000..421e31998d
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustWeeds.cs
@@ -0,0 +1,19 @@
+using Content.Shared.EntityEffects;
+using JetBrains.Annotations;
+
+namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
+
+[UsedImplicitly]
+public sealed partial class PlantAdjustWeeds : PlantAdjustAttribute
+{
+    public override string GuidebookAttributeName { get; set; } = "plant-attribute-weeds";
+    public override bool GuidebookIsAttributePositive { get; protected set; } = false;
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (!CanMetabolize(args.TargetEntity, out var plantHolderComp, args.EntityManager))
+            return;
+
+        plantHolderComp.WeedLevel += Amount;
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAffectGrowth.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAffectGrowth.cs
new file mode 100644
index 0000000000..397eace399
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAffectGrowth.cs
@@ -0,0 +1,22 @@
+using Content.Server.Botany.Systems;
+using Content.Shared.EntityEffects;
+using JetBrains.Annotations;
+
+namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
+
+[UsedImplicitly]
+public sealed partial class PlantAffectGrowth : PlantAdjustAttribute
+{
+    public override string GuidebookAttributeName { get; set; } = "plant-attribute-growth";
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (!CanMetabolize(args.TargetEntity, out var plantHolderComp, args.EntityManager))
+            return;
+
+        var plantHolder = args.EntityManager.System<PlantHolderSystem>();
+
+        plantHolder.AffectGrowth(args.TargetEntity, (int) Amount, plantHolderComp);
+    }
+}
+
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantCryoxadone.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantCryoxadone.cs
new file mode 100644
index 0000000000..7fe4b7a170
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantCryoxadone.cs
@@ -0,0 +1,32 @@
+using Content.Server.Botany.Components;
+using Content.Shared.EntityEffects;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+
+namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
+
+[UsedImplicitly]
+[DataDefinition]
+public sealed partial class PlantCryoxadone : EntityEffect
+{
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (!args.EntityManager.TryGetComponent(args.TargetEntity, out PlantHolderComponent? plantHolderComp)
+        || plantHolderComp.Seed == null || plantHolderComp.Dead)
+            return;
+
+        var deviation = 0;
+        var seed = plantHolderComp.Seed;
+        var random = IoCManager.Resolve<IRobustRandom>();
+        if (plantHolderComp.Age > seed.Maturation)
+            deviation = (int) Math.Max(seed.Maturation - 1, plantHolderComp.Age - random.Next(7, 10));
+        else
+            deviation = (int) (seed.Maturation / seed.GrowthStages);
+        plantHolderComp.Age -= deviation;
+        plantHolderComp.SkipAging++;
+        plantHolderComp.ForceUpdate = true;
+    }
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("reagent-effect-guidebook-plant-cryoxadone", ("chance", Probability));
+}
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantDiethylamine.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantDiethylamine.cs
new file mode 100644
index 0000000000..36b6a83342
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantDiethylamine.cs
@@ -0,0 +1,41 @@
+using Content.Server.Botany.Components;
+using Content.Server.Botany.Systems;
+using Content.Shared.EntityEffects;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+
+namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
+
+[UsedImplicitly]
+[DataDefinition]
+public sealed partial class PlantDiethylamine : EntityEffect
+{
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (!args.EntityManager.TryGetComponent(args.TargetEntity, out PlantHolderComponent? plantHolderComp)
+                                || plantHolderComp.Seed == null || plantHolderComp.Dead ||
+                                plantHolderComp.Seed.Immutable)
+            return;
+
+
+        var plantHolder = args.EntityManager.System<PlantHolderSystem>();
+
+        var random = IoCManager.Resolve<IRobustRandom>();
+
+        if (random.Prob(0.1f))
+        {
+            plantHolder.EnsureUniqueSeed(args.TargetEntity, plantHolderComp);
+            plantHolderComp.Seed.Lifespan++;
+        }
+
+        if (random.Prob(0.1f))
+        {
+            plantHolder.EnsureUniqueSeed(args.TargetEntity, plantHolderComp);
+            plantHolderComp.Seed.Endurance++;
+        }
+    }
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("reagent-effect-guidebook-plant-diethylamine", ("chance", Probability));
+}
+
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantPhalanximine.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantPhalanximine.cs
new file mode 100644
index 0000000000..96d98bfbf2
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantPhalanximine.cs
@@ -0,0 +1,23 @@
+using Content.Server.Botany.Components;
+using Content.Shared.EntityEffects;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
+
+[UsedImplicitly]
+[DataDefinition]
+public sealed partial class PlantPhalanximine : EntityEffect
+{
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (!args.EntityManager.TryGetComponent(args.TargetEntity, out PlantHolderComponent? plantHolderComp)
+                                || plantHolderComp.Seed == null || plantHolderComp.Dead ||
+                                plantHolderComp.Seed.Immutable)
+            return;
+
+        plantHolderComp.Seed.Viable = true;
+    }
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("reagent-effect-guidebook-plant-phalanximine", ("chance", Probability));
+}
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/RobustHarvest.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/RobustHarvest.cs
new file mode 100644
index 0000000000..695cb96675
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/PlantMetabolism/RobustHarvest.cs
@@ -0,0 +1,53 @@
+using Content.Server.Botany.Components;
+using Content.Server.Botany.Systems;
+using Content.Shared.EntityEffects;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+
+namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
+
+[UsedImplicitly]
+[DataDefinition]
+public sealed partial class RobustHarvest : EntityEffect
+{
+    [DataField]
+    public int PotencyLimit = 50;
+
+    [DataField]
+    public int PotencyIncrease = 3;
+
+    [DataField]
+    public int PotencySeedlessThreshold = 30;
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (!args.EntityManager.TryGetComponent(args.TargetEntity, out PlantHolderComponent? plantHolderComp)
+                                || plantHolderComp.Seed == null || plantHolderComp.Dead ||
+                                plantHolderComp.Seed.Immutable)
+            return;
+
+
+        var plantHolder = args.EntityManager.System<PlantHolderSystem>();
+        var random = IoCManager.Resolve<IRobustRandom>();
+
+        if (plantHolderComp.Seed.Potency < PotencyLimit)
+        {
+            plantHolder.EnsureUniqueSeed(args.TargetEntity, plantHolderComp);
+            plantHolderComp.Seed.Potency = Math.Min(plantHolderComp.Seed.Potency + PotencyIncrease, PotencyLimit);
+
+            if (plantHolderComp.Seed.Potency > PotencySeedlessThreshold)
+            {
+                plantHolderComp.Seed.Seedless = true;
+            }
+        }
+        else if (plantHolderComp.Seed.Yield > 1 && random.Prob(0.1f))
+        {
+            // Too much of a good thing reduces yield
+            plantHolder.EnsureUniqueSeed(args.TargetEntity, plantHolderComp);
+            plantHolderComp.Seed.Yield--;
+        }
+    }
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("reagent-effect-guidebook-plant-robust-harvest", ("seedlesstreshold", PotencySeedlessThreshold), ("limit", PotencyLimit), ("increase", PotencyIncrease), ("chance", Probability));
+}
diff --git a/Content.Server/Chemistry/ReagentEffects/Polymorph.cs b/Content.Server/EntityEffects/Effects/Polymorph.cs
similarity index 80%
rename from Content.Server/Chemistry/ReagentEffects/Polymorph.cs
rename to Content.Server/EntityEffects/Effects/Polymorph.cs
index fea372125e..00a5c6613d 100644
--- a/Content.Server/Chemistry/ReagentEffects/Polymorph.cs
+++ b/Content.Server/EntityEffects/Effects/Polymorph.cs
@@ -1,13 +1,14 @@
 using Content.Server.Polymorph.Components;
 using Content.Server.Polymorph.Systems;
-using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using Content.Shared.Polymorph;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using Content.Shared.EntityEffects;
 
-namespace Content.Server.Chemistry.ReagentEffects;
+namespace Content.Server.EntityEffects.Effects;
 
-public sealed partial class Polymorph : ReagentEffect
+public sealed partial class Polymorph : EntityEffect
 {
     /// <summary>
     ///     What polymorph prototype is used on effect
@@ -20,10 +21,10 @@ public sealed partial class Polymorph : ReagentEffect
             ("chance", Probability), ("entityname",
                 prototype.Index<EntityPrototype>(prototype.Index<PolymorphPrototype>(PolymorphPrototype).Configuration.Entity).Name));
 
-    public override void Effect(ReagentEffectArgs args)
+    public override void Effect(EntityEffectBaseArgs args)
     {
         var entityManager = args.EntityManager;
-        var uid = args.SolutionEntity;
+        var uid = args.TargetEntity;
         var polySystem = entityManager.System<PolymorphSystem>();
 
         // Make it into a prototype
diff --git a/Content.Server/Chemistry/ReagentEffects/PopupMessage.cs b/Content.Server/EntityEffects/Effects/PopupMessage.cs
similarity index 60%
rename from Content.Server/Chemistry/ReagentEffects/PopupMessage.cs
rename to Content.Server/EntityEffects/Effects/PopupMessage.cs
index 8278e95c1d..ac22b13051 100644
--- a/Content.Server/Chemistry/ReagentEffects/PopupMessage.cs
+++ b/Content.Server/EntityEffects/Effects/PopupMessage.cs
@@ -1,12 +1,11 @@
-using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using Content.Shared.Popups;
-using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 
-namespace Content.Server.Chemistry.ReagentEffects
+namespace Content.Server.EntityEffects.Effects
 {
-    public sealed partial class PopupMessage : ReagentEffect
+    public sealed partial class PopupMessage : EntityEffect
     {
         [DataField(required: true)]
         public string[] Messages = default!;
@@ -21,20 +20,30 @@ namespace Content.Server.Chemistry.ReagentEffects
         protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
             => null;
 
-        public override void Effect(ReagentEffectArgs args)
+        public override void Effect(EntityEffectBaseArgs args)
         {
             var popupSys = args.EntityManager.EntitySysManager.GetEntitySystem<SharedPopupSystem>();
             var random = IoCManager.Resolve<IRobustRandom>();
 
             var msg = random.Pick(Messages);
-            var msgArgs = new (string, object)[] {
-                ("entity", args.SolutionEntity),
-                ("organ", args.OrganEntity.GetValueOrDefault()),
+            var msgArgs = new (string, object)[]
+            {
+                ("entity", args.TargetEntity),
             };
+
+            if (args is EntityEffectReagentArgs reagentArgs)
+            {
+                msgArgs = new (string, object)[]
+                {
+                    ("entity", reagentArgs.TargetEntity),
+                    ("organ", reagentArgs.OrganEntity.GetValueOrDefault()),
+                };
+            }
+
             if (Type == PopupRecipients.Local)
-                popupSys.PopupEntity(Loc.GetString(msg, msgArgs), args.SolutionEntity, args.SolutionEntity, VisualType);
+                popupSys.PopupEntity(Loc.GetString(msg, msgArgs), args.TargetEntity, args.TargetEntity, VisualType);
             else if (Type == PopupRecipients.Pvs)
-                popupSys.PopupEntity(Loc.GetString(msg, msgArgs), args.SolutionEntity, VisualType);
+                popupSys.PopupEntity(Loc.GetString(msg, msgArgs), args.TargetEntity, VisualType);
         }
     }
 
diff --git a/Content.Server/Chemistry/ReagentEffects/ReduceRotting.cs b/Content.Server/EntityEffects/Effects/ReduceRotting.cs
similarity index 61%
rename from Content.Server/Chemistry/ReagentEffects/ReduceRotting.cs
rename to Content.Server/EntityEffects/Effects/ReduceRotting.cs
index cea4f85332..5c00492744 100644
--- a/Content.Server/Chemistry/ReagentEffects/ReduceRotting.cs
+++ b/Content.Server/EntityEffects/Effects/ReduceRotting.cs
@@ -1,15 +1,16 @@
 using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 using Content.Server.Atmos.Rotting;
 
-namespace Content.Server.Chemistry.ReagentEffects
+namespace Content.Server.EntityEffects.Effects
 {
     /// <summary>
     /// Reduces the rotting accumulator on the patient, making them revivable.
     /// </summary>
     [UsedImplicitly]
-    public sealed partial class ReduceRotting : ReagentEffect
+    public sealed partial class ReduceRotting : EntityEffect
     {
         [DataField("seconds")]
         public double RottingAmount = 10;
@@ -18,14 +19,17 @@ namespace Content.Server.Chemistry.ReagentEffects
             => Loc.GetString("reagent-effect-guidebook-reduce-rotting",
                 ("chance", Probability),
                 ("time", RottingAmount));
-        public override void Effect(ReagentEffectArgs args)
+        public override void Effect(EntityEffectBaseArgs args)
         {
-            if (args.Scale != 1f)
-                return;
+            if (args is EntityEffectReagentArgs reagentArgs)
+            {
+                if (reagentArgs.Scale != 1f)
+                    return;
+            }
 
             var rottingSys = args.EntityManager.EntitySysManager.GetEntitySystem<RottingSystem>();
 
-            rottingSys.ReduceAccumulator(args.SolutionEntity, TimeSpan.FromSeconds(RottingAmount));
+            rottingSys.ReduceAccumulator(args.TargetEntity, TimeSpan.FromSeconds(RottingAmount));
         }
     }
 }
diff --git a/Content.Server/Chemistry/ReagentEffects/ResetNarcolepsy.cs b/Content.Server/EntityEffects/Effects/ResetNarcolepsy.cs
similarity index 63%
rename from Content.Server/Chemistry/ReagentEffects/ResetNarcolepsy.cs
rename to Content.Server/EntityEffects/Effects/ResetNarcolepsy.cs
index fa4f910891..f9564712ad 100644
--- a/Content.Server/Chemistry/ReagentEffects/ResetNarcolepsy.cs
+++ b/Content.Server/EntityEffects/Effects/ResetNarcolepsy.cs
@@ -1,15 +1,16 @@
 using Content.Server.Traits.Assorted;
 using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Chemistry.ReagentEffects;
+namespace Content.Server.EntityEffects.Effects;
 
 /// <summary>
 /// Reset narcolepsy timer
 /// </summary>
 [UsedImplicitly]
-public sealed partial class ResetNarcolepsy : ReagentEffect
+public sealed partial class ResetNarcolepsy : EntityEffect
 {
     /// <summary>
     /// The # of seconds the effect resets the narcolepsy timer to
@@ -20,11 +21,12 @@ public sealed partial class ResetNarcolepsy : ReagentEffect
     protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
         => Loc.GetString("reagent-effect-guidebook-reset-narcolepsy", ("chance", Probability));
 
-    public override void Effect(ReagentEffectArgs args)
+    public override void Effect(EntityEffectBaseArgs args)
     {
-        if (args.Scale != 1f)
-            return;
+        if (args is EntityEffectReagentArgs reagentArgs)
+            if (reagentArgs.Scale != 1f)
+                return;
 
-        args.EntityManager.EntitySysManager.GetEntitySystem<NarcolepsySystem>().AdjustNarcolepsyTimer(args.SolutionEntity, TimerReset);
+        args.EntityManager.EntitySysManager.GetEntitySystem<NarcolepsySystem>().AdjustNarcolepsyTimer(args.TargetEntity, TimerReset);
     }
 }
diff --git a/Content.Server/Chemistry/ReagentEffects/SatiateHunger.cs b/Content.Server/EntityEffects/Effects/SatiateHunger.cs
similarity index 53%
rename from Content.Server/Chemistry/ReagentEffects/SatiateHunger.cs
rename to Content.Server/EntityEffects/Effects/SatiateHunger.cs
index be77202255..dd58654dff 100644
--- a/Content.Server/Chemistry/ReagentEffects/SatiateHunger.cs
+++ b/Content.Server/EntityEffects/Effects/SatiateHunger.cs
@@ -1,31 +1,40 @@
-using Content.Server.Nutrition.Components;
+using Content.Server.Nutrition.Components;
 using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using Content.Shared.Nutrition.Components;
 using Content.Shared.Nutrition.EntitySystems;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Chemistry.ReagentEffects
+namespace Content.Server.EntityEffects.Effects
 {
     /// <summary>
     /// Attempts to find a HungerComponent on the target,
     /// and to update it's hunger values.
     /// </summary>
-    public sealed partial class SatiateHunger : ReagentEffect
+    public sealed partial class SatiateHunger : EntityEffect
     {
         private const float DefaultNutritionFactor = 3.0f;
 
         /// <summary>
-        ///     How much hunger is satiated when 1u of the reagent is metabolized
+        ///     How much hunger is satiated.
+        ///     Is multiplied by quantity if used with EntityEffectReagentArgs.
         /// </summary>
         [DataField("factor")] public float NutritionFactor { get; set; } = DefaultNutritionFactor;
 
         //Remove reagent at set rate, satiate hunger if a HungerComponent can be found
-        public override void Effect(ReagentEffectArgs args)
+        public override void Effect(EntityEffectBaseArgs args)
         {
             var entman = args.EntityManager;
-            if (!entman.TryGetComponent(args.SolutionEntity, out HungerComponent? hunger))
+            if (!entman.TryGetComponent(args.TargetEntity, out HungerComponent? hunger))
                 return;
-            entman.System<HungerSystem>().ModifyHunger(args.SolutionEntity, NutritionFactor * (float) args.Quantity, hunger);
+            if (args is EntityEffectReagentArgs reagentArgs)
+            {
+                entman.System<HungerSystem>().ModifyHunger(reagentArgs.TargetEntity, NutritionFactor * (float) reagentArgs.Quantity, hunger);
+            }
+            else
+            {
+                entman.System<HungerSystem>().ModifyHunger(args.TargetEntity, NutritionFactor, hunger);
+            }
         }
 
         protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
diff --git a/Content.Server/EntityEffects/Effects/SatiateThirst.cs b/Content.Server/EntityEffects/Effects/SatiateThirst.cs
new file mode 100644
index 0000000000..d0dbe4371b
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/SatiateThirst.cs
@@ -0,0 +1,32 @@
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
+using Content.Shared.Nutrition.Components;
+using Content.Shared.Nutrition.EntitySystems;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.Effects;
+
+/// <summary>
+/// Default metabolism for drink reagents. Attempts to find a ThirstComponent on the target,
+/// and to update it's thirst values.
+/// </summary>
+public sealed partial class SatiateThirst : EntityEffect
+{
+    private const float DefaultHydrationFactor = 3.0f;
+
+    /// How much thirst is satiated each tick. Not currently tied to
+    /// rate or anything.
+    [DataField("factor")]
+    public float HydrationFactor { get; set; } = DefaultHydrationFactor;
+
+    /// Satiate thirst if a ThirstComponent can be found
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        var uid = args.TargetEntity;
+        if (args.EntityManager.TryGetComponent(uid, out ThirstComponent? thirst))
+            args.EntityManager.System<ThirstSystem>().ModifyThirst(uid, thirst, HydrationFactor);
+    }
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-satiate-thirst", ("chance", Probability), ("relative",  HydrationFactor / DefaultHydrationFactor));
+}
diff --git a/Content.Server/EntityEffects/Effects/SolutionTemperatureEffects.cs b/Content.Server/EntityEffects/Effects/SolutionTemperatureEffects.cs
new file mode 100644
index 0000000000..85c20dbcd1
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/SolutionTemperatureEffects.cs
@@ -0,0 +1,144 @@
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.Effects;
+
+/// <summary>
+///     Sets the temperature of the solution involved with the reaction to a new value.
+/// </summary>
+[DataDefinition]
+public sealed partial class SetSolutionTemperatureEffect : EntityEffect
+{
+    /// <summary>
+    ///     The temperature to set the solution to.
+    /// </summary>
+    [DataField("temperature", required: true)] private float _temperature;
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-set-solution-temperature-effect",
+            ("chance", Probability), ("temperature", _temperature));
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            var solution = reagentArgs.Source;
+            if (solution == null)
+                return;
+
+            solution.Temperature = _temperature;
+
+            return;
+        }
+
+        // TODO: Someone needs to figure out how to do this for non-reagent effects.
+        throw new NotImplementedException();
+    }
+}
+
+/// <summary>
+///     Adjusts the temperature of the solution involved in the reaction.
+/// </summary>
+[DataDefinition]
+public sealed partial class AdjustSolutionTemperatureEffect : EntityEffect
+{
+    /// <summary>
+    ///     The change in temperature.
+    /// </summary>
+    [DataField("delta", required: true)] private float _delta;
+
+    /// <summary>
+    ///     The minimum temperature this effect can reach.
+    /// </summary>
+    [DataField("minTemp")] private float _minTemp = 0.0f;
+
+    /// <summary>
+    ///     The maximum temperature this effect can reach.
+    /// </summary>
+    [DataField("maxTemp")] private float _maxTemp = float.PositiveInfinity;
+
+    /// <summary>
+    ///     If true, then scale ranges by intensity. If not, the ranges are the same regardless of reactant amount.
+    /// </summary>
+    [DataField("scaled")] private bool _scaled;
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-adjust-solution-temperature-effect",
+            ("chance", Probability), ("deltasign", MathF.Sign(_delta)), ("mintemp", _minTemp), ("maxtemp", _maxTemp));
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            var solution = reagentArgs.Source;
+            if (solution == null || solution.Volume == 0)
+                return;
+
+            var deltaT = _scaled ? _delta * (float) reagentArgs.Quantity : _delta;
+            solution.Temperature = Math.Clamp(solution.Temperature + deltaT, _minTemp, _maxTemp);
+
+            return;
+        }
+
+        // TODO: Someone needs to figure out how to do this for non-reagent effects.
+        throw new NotImplementedException();
+    }
+}
+
+/// <summary>
+///     Adjusts the thermal energy of the solution involved in the reaction.
+/// </summary>
+public sealed partial class AdjustSolutionThermalEnergyEffect : EntityEffect
+{
+    /// <summary>
+    ///     The change in energy.
+    /// </summary>
+    [DataField("delta", required: true)] private float _delta;
+
+    /// <summary>
+    ///     The minimum temperature this effect can reach.
+    /// </summary>
+    [DataField("minTemp")] private float _minTemp = 0.0f;
+
+    /// <summary>
+    ///     The maximum temperature this effect can reach.
+    /// </summary>
+    [DataField("maxTemp")] private float _maxTemp = float.PositiveInfinity;
+
+    /// <summary>
+    ///     If true, then scale ranges by intensity. If not, the ranges are the same regardless of reactant amount.
+    /// </summary>
+    [DataField("scaled")] private bool _scaled;
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            var solution = reagentArgs.Source;
+            if (solution == null || solution.Volume == 0)
+                return;
+
+            if (_delta > 0 && solution.Temperature >= _maxTemp)
+                return;
+            if (_delta < 0 && solution.Temperature <= _minTemp)
+                return;
+
+            var heatCap = solution.GetHeatCapacity(null);
+            var deltaT = _scaled
+                ? _delta / heatCap * (float) reagentArgs.Quantity
+                : _delta / heatCap;
+
+            solution.Temperature = Math.Clamp(solution.Temperature + deltaT, _minTemp, _maxTemp);
+
+            return;
+        }
+
+        // TODO: Someone needs to figure out how to do this for non-reagent effects.
+        throw new NotImplementedException();
+    }
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-adjust-solution-temperature-effect",
+            ("chance", Probability), ("deltasign", MathF.Sign(_delta)), ("mintemp", _minTemp), ("maxtemp", _maxTemp));
+}
diff --git a/Content.Server/EntityEffects/Effects/StatusEffects/GenericStatusEffect.cs b/Content.Server/EntityEffects/Effects/StatusEffects/GenericStatusEffect.cs
new file mode 100644
index 0000000000..bb9bbf3446
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/StatusEffects/GenericStatusEffect.cs
@@ -0,0 +1,77 @@
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
+using Content.Shared.StatusEffect;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.Effects.StatusEffects;
+
+/// <summary>
+///     Adds a generic status effect to the entity,
+///     not worrying about things like how to affect the time it lasts for
+///     or component fields or anything. Just adds a component to an entity
+///     for a given time. Easy.
+/// </summary>
+/// <remarks>
+///     Can be used for things like adding accents or something. I don't know. Go wild.
+/// </remarks>
+[UsedImplicitly]
+public sealed partial class GenericStatusEffect : EntityEffect
+{
+    [DataField(required: true)]
+    public string Key = default!;
+
+    [DataField]
+    public string Component = String.Empty;
+
+    [DataField]
+    public float Time = 2.0f;
+
+    /// <remarks>
+    ///     true - refresh status effect time,  false - accumulate status effect time
+    /// </remarks>
+    [DataField]
+    public bool Refresh = true;
+
+    /// <summary>
+    ///     Should this effect add the status effect, remove time from it, or set its cooldown?
+    /// </summary>
+    [DataField]
+    public StatusEffectMetabolismType Type = StatusEffectMetabolismType.Add;
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        var statusSys = args.EntityManager.EntitySysManager.GetEntitySystem<StatusEffectsSystem>();
+
+        var time = Time;
+        if (args is EntityEffectReagentArgs reagentArgs)
+            time *= reagentArgs.Scale.Float();
+
+        if (Type == StatusEffectMetabolismType.Add && Component != String.Empty)
+        {
+            statusSys.TryAddStatusEffect(args.TargetEntity, Key, TimeSpan.FromSeconds(time), Refresh, Component);
+        }
+        else if (Type == StatusEffectMetabolismType.Remove)
+        {
+            statusSys.TryRemoveTime(args.TargetEntity, Key, TimeSpan.FromSeconds(time));
+        }
+        else if (Type == StatusEffectMetabolismType.Set)
+        {
+            statusSys.TrySetTime(args.TargetEntity, Key, TimeSpan.FromSeconds(time));
+        }
+    }
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString(
+        "reagent-effect-guidebook-status-effect",
+        ("chance", Probability),
+        ("type", Type),
+        ("time", Time),
+        ("key", $"reagent-effect-status-effect-{Key}"));
+}
+
+public enum StatusEffectMetabolismType
+{
+    Add,
+    Remove,
+    Set
+}
diff --git a/Content.Server/EntityEffects/Effects/StatusEffects/Jitter.cs b/Content.Server/EntityEffects/Effects/StatusEffects/Jitter.cs
new file mode 100644
index 0000000000..dbca4fad58
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/StatusEffects/Jitter.cs
@@ -0,0 +1,42 @@
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
+using Content.Shared.Jittering;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.Effects.StatusEffects;
+
+/// <summary>
+///     Adds the jitter status effect to a mob.
+///     This doesn't use generic status effects because it needs to
+///     take in some parameters that JitterSystem needs.
+/// </summary>
+public sealed partial class Jitter : EntityEffect
+{
+    [DataField]
+    public float Amplitude = 10.0f;
+
+    [DataField]
+    public float Frequency = 4.0f;
+
+    [DataField]
+    public float Time = 2.0f;
+
+    /// <remarks>
+    ///     true - refresh jitter time,  false - accumulate jitter time
+    /// </remarks>
+    [DataField]
+    public bool Refresh = true;
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        var time = Time;
+        if (args is EntityEffectReagentArgs reagentArgs)
+            time *= reagentArgs.Scale.Float();
+
+        args.EntityManager.EntitySysManager.GetEntitySystem<SharedJitteringSystem>()
+            .DoJitter(args.TargetEntity, TimeSpan.FromSeconds(time), Refresh, Amplitude, Frequency);
+    }
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
+        Loc.GetString("reagent-effect-guidebook-jittering", ("chance", Probability));
+}
diff --git a/Content.Server/EntityEffects/Effects/WashCreamPieReaction.cs b/Content.Server/EntityEffects/Effects/WashCreamPieReaction.cs
new file mode 100644
index 0000000000..67bfac6335
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/WashCreamPieReaction.cs
@@ -0,0 +1,22 @@
+using Content.Server.Nutrition.EntitySystems;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
+using Content.Shared.Nutrition.Components;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.Effects;
+
+[UsedImplicitly]
+public sealed partial class WashCreamPieReaction : EntityEffect
+{
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-wash-cream-pie-reaction", ("chance", Probability));
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (!args.EntityManager.TryGetComponent(args.TargetEntity, out CreamPiedComponent? creamPied)) return;
+
+        args.EntityManager.System<CreamPieSystem>().SetCreamPied(args.TargetEntity, creamPied, false);
+    }
+}
diff --git a/Content.Server/Chemistry/ReagentEffects/WearableReaction.cs b/Content.Server/EntityEffects/Effects/WearableReaction.cs
similarity index 50%
rename from Content.Server/Chemistry/ReagentEffects/WearableReaction.cs
rename to Content.Server/EntityEffects/Effects/WearableReaction.cs
index d9f8414995..9655bbc073 100644
--- a/Content.Server/Chemistry/ReagentEffects/WearableReaction.cs
+++ b/Content.Server/EntityEffects/Effects/WearableReaction.cs
@@ -1,17 +1,19 @@
 using Content.Shared.Inventory;
 using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Chemistry.ReagentEffects;
+namespace Content.Server.EntityEffects.Effects.Effects;
 
 /// <summary>
-/// A reaction effect that consumes the required amount of reagent and spawns PrototypeID in the
-/// entity's Slot. Used to implement the water droplet effect for arachnids.
+/// A reaction effect that spawns a PrototypeID in the entity's Slot, and attempts to consume the reagent if EntityEffectReagentArgs.
+/// Used to implement the water droplet effect for arachnids.
 /// </summary>
-public sealed partial class WearableReaction : ReagentEffect
+public sealed partial class WearableReaction : EntityEffect
 {
     /// <summary>
     /// Minimum quantity of reagent required to trigger this effect.
+    /// Only used with EntityEffectReagentArgs.
     /// </summary>
     [DataField]
     public float AmountThreshold = 1f;
@@ -30,13 +32,17 @@ public sealed partial class WearableReaction : ReagentEffect
 
     protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => null;
 
-    public override void Effect(ReagentEffectArgs args)
+    public override void Effect(EntityEffectBaseArgs args)
     {
-        if (args.Reagent == null || args.Quantity < AmountThreshold)
-            return;
-
         // SpawnItemInSlot returns false if slot is already occupied
-        if (args.EntityManager.System<InventorySystem>().SpawnItemInSlot(args.SolutionEntity, Slot, PrototypeID))
-            args.Source?.RemoveReagent(args.Reagent.ID, AmountThreshold);
+        if (args.EntityManager.System<InventorySystem>().SpawnItemInSlot(args.TargetEntity, Slot, PrototypeID))
+        {
+            if (args is EntityEffectReagentArgs reagentArgs)
+            {
+                if (reagentArgs.Reagent == null || reagentArgs.Quantity < AmountThreshold)
+                    return;
+                reagentArgs.Source?.RemoveReagent(reagentArgs.Reagent.ID, AmountThreshold);
+            }
+        }
     }
 }
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
index 8734c054d6..b9f0f6fdb7 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
@@ -423,7 +423,10 @@ public sealed partial class ExplosionSystem : EntitySystem
     {
         var value = MathF.Round((1f - component.DamageCoefficient) * 100, 1);
 
+        if (value == 0)
+            return;
+
         args.Msg.PushNewline();
-        args.Msg.AddMarkup(Loc.GetString(component.Examine, ("value", value)));
+        args.Msg.AddMarkupOrThrow(Loc.GetString(component.Examine, ("value", value)));
     }
 }
diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs
index 2eaf19170b..8cdae84a93 100644
--- a/Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs
+++ b/Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs
@@ -2,7 +2,7 @@ using Content.Server.Chemistry.Containers.EntitySystems;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reaction;
-using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Chemistry;
 using Content.Shared.Clothing;
 using Content.Shared.CombatMode.Pacification;
 using Content.Shared.Database;
diff --git a/Content.Server/Fluids/EntitySystems/SmokeSystem.cs b/Content.Server/Fluids/EntitySystems/SmokeSystem.cs
index 9638dabf28..78693bfdbc 100644
--- a/Content.Server/Fluids/EntitySystems/SmokeSystem.cs
+++ b/Content.Server/Fluids/EntitySystems/SmokeSystem.cs
@@ -2,7 +2,7 @@ using Content.Server.Administration.Logs;
 using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
 using Content.Server.Chemistry.Containers.EntitySystems;
-using Content.Server.Chemistry.ReactionEffects;
+using Content.Server.EntityEffects.Effects;
 using Content.Server.Spreader;
 using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Components;
diff --git a/Content.Server/GameTicking/Commands/ForceMapCommand.cs b/Content.Server/GameTicking/Commands/ForceMapCommand.cs
index 5d2191fb52..4cc30ff38a 100644
--- a/Content.Server/GameTicking/Commands/ForceMapCommand.cs
+++ b/Content.Server/GameTicking/Commands/ForceMapCommand.cs
@@ -29,8 +29,19 @@ namespace Content.Server.GameTicking.Commands
             var gameMap = IoCManager.Resolve<IGameMapManager>();
             var name = args[0];
 
+            // An empty string clears the forced map
+            if (!string.IsNullOrEmpty(name) && !gameMap.CheckMapExists(name))
+            {
+                shell.WriteLine(Loc.GetString("forcemap-command-map-not-found", ("map", name)));
+                return;
+            }
+
             _configurationManager.SetCVar(CCVars.GameMap, name);
-            shell.WriteLine(Loc.GetString("forcemap-command-success", ("map", name)));
+
+            if (string.IsNullOrEmpty(name))
+                shell.WriteLine(Loc.GetString("forcemap-command-cleared"));
+            else
+                shell.WriteLine(Loc.GetString("forcemap-command-success", ("map", name)));
         }
 
         public CompletionResult GetCompletion(IConsoleShell shell, string[] args)
diff --git a/Content.Server/GameTicking/GameTicker.RoundFlow.cs b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
index d67b8d96e3..c957e0eb96 100644
--- a/Content.Server/GameTicking/GameTicker.RoundFlow.cs
+++ b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
@@ -622,11 +622,6 @@ namespace Content.Server.GameTicking
             }
         }
 
-        public TimeSpan RoundDuration()
-        {
-            return _gameTiming.CurTime.Subtract(RoundStartTimeSpan);
-        }
-
         private void AnnounceRound()
         {
             if (CurrentPreset == null) return;
diff --git a/Content.Server/GuideGenerator/ChemistryJsonGenerator.cs b/Content.Server/GuideGenerator/ChemistryJsonGenerator.cs
index 7e107ce1a5..8fd088408c 100644
--- a/Content.Server/GuideGenerator/ChemistryJsonGenerator.cs
+++ b/Content.Server/GuideGenerator/ChemistryJsonGenerator.cs
@@ -5,6 +5,7 @@ using System.Text.Json.Serialization;
 using Content.Shared.Chemistry.Reaction;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Damage;
+using Content.Shared.EntityEffects;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Prototypes;
 
@@ -40,8 +41,8 @@ public sealed class ChemistryJsonGenerator
             WriteIndented = true,
             Converters =
             {
-                new UniversalJsonConverter<ReagentEffect>(),
-                new UniversalJsonConverter<ReagentEffectCondition>(),
+                new UniversalJsonConverter<EntityEffect>(),
+                new UniversalJsonConverter<EntityEffectCondition>(),
                 new UniversalJsonConverter<ReagentEffectsEntry>(),
                 new UniversalJsonConverter<DamageSpecifier>(),
                 new FixedPointJsonConverter()
diff --git a/Content.Server/GuideGenerator/ReactionJsonGenerator.cs b/Content.Server/GuideGenerator/ReactionJsonGenerator.cs
index 123dd5f8eb..06c230d607 100644
--- a/Content.Server/GuideGenerator/ReactionJsonGenerator.cs
+++ b/Content.Server/GuideGenerator/ReactionJsonGenerator.cs
@@ -2,7 +2,7 @@ using System.IO;
 using System.Linq;
 using System.Text.Json;
 using Content.Shared.Chemistry.Reaction;
-using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.GuideGenerator;
@@ -24,7 +24,7 @@ public sealed class ReactionJsonGenerator
             WriteIndented = true,
             Converters =
             {
-                new UniversalJsonConverter<ReagentEffect>(),
+                new UniversalJsonConverter<EntityEffect>(),
             }
         };
 
diff --git a/Content.Server/GuideGenerator/ReagentEntry.cs b/Content.Server/GuideGenerator/ReagentEntry.cs
index ab9e758206..8b597ad61b 100644
--- a/Content.Server/GuideGenerator/ReagentEntry.cs
+++ b/Content.Server/GuideGenerator/ReagentEntry.cs
@@ -4,6 +4,7 @@ using Content.Server.Body.Components;
 using Content.Shared.Body.Prototypes;
 using Content.Shared.Chemistry.Reaction;
 using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.GuideGenerator;
@@ -61,7 +62,7 @@ public sealed class ReactionEntry
     public Dictionary<string, float> Products { get; }
 
     [JsonPropertyName("effects")]
-    public List<ReagentEffect> Effects { get; }
+    public List<EntityEffect> Effects { get; }
 
     public ReactionEntry(ReactionPrototype proto)
     {
diff --git a/Content.Server/Labels/Label/LabelSystem.cs b/Content.Server/Labels/Label/LabelSystem.cs
index 17d18918fe..cbf29e16a2 100644
--- a/Content.Server/Labels/Label/LabelSystem.cs
+++ b/Content.Server/Labels/Label/LabelSystem.cs
@@ -5,7 +5,6 @@ using Content.Shared.Examine;
 using Content.Shared.Labels;
 using Content.Shared.Labels.Components;
 using Content.Shared.Labels.EntitySystems;
-using Content.Shared.NameModifier.EntitySystems;
 using JetBrains.Annotations;
 using Robust.Shared.Containers;
 
@@ -19,7 +18,6 @@ namespace Content.Server.Labels
     {
         [Dependency] private readonly ItemSlotsSystem _itemSlotsSystem = default!;
         [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-        [Dependency] private readonly NameModifierSystem _nameMod = default!;
 
         public const string ContainerName = "paper_label";
 
@@ -27,7 +25,6 @@ namespace Content.Server.Labels
         {
             base.Initialize();
 
-            SubscribeLocalEvent<LabelComponent, MapInitEvent>(OnLabelCompMapInit);
             SubscribeLocalEvent<PaperLabelComponent, ComponentInit>(OnComponentInit);
             SubscribeLocalEvent<PaperLabelComponent, ComponentRemove>(OnComponentRemove);
             SubscribeLocalEvent<PaperLabelComponent, EntInsertedIntoContainerMessage>(OnContainerModified);
@@ -35,17 +32,6 @@ namespace Content.Server.Labels
             SubscribeLocalEvent<PaperLabelComponent, ExaminedEvent>(OnExamined);
         }
 
-        private void OnLabelCompMapInit(EntityUid uid, LabelComponent component, MapInitEvent args)
-        {
-            if (!string.IsNullOrEmpty(component.CurrentLabel))
-            {
-                component.CurrentLabel = Loc.GetString(component.CurrentLabel);
-                Dirty(uid, component);
-            }
-
-            _nameMod.RefreshNameModifiers(uid);
-        }
-
         /// <summary>
         /// Apply or remove a label on an entity.
         /// </summary>
@@ -59,7 +45,7 @@ namespace Content.Server.Labels
                 label = EnsureComp<LabelComponent>(uid);
 
             label.CurrentLabel = text;
-            _nameMod.RefreshNameModifiers(uid);
+            NameMod.RefreshNameModifiers(uid);
 
             Dirty(uid, label);
         }
diff --git a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
index aa2ed71d8f..b8e334fb0d 100644
--- a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
@@ -1,7 +1,7 @@
 using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
 using Content.Server.Chemistry.Containers.EntitySystems;
-using Content.Server.Chemistry.ReagentEffects;
+using Content.Server.EntityEffects.Effects;
 using Content.Server.Fluids.EntitySystems;
 using Content.Server.Forensics;
 using Content.Server.Inventory;
@@ -15,6 +15,7 @@ using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Database;
 using Content.Shared.DoAfter;
+using Content.Shared.EntityEffects;
 using Content.Shared.FixedPoint;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
diff --git a/Content.Server/Power/Components/ApcComponent.cs b/Content.Server/Power/Components/ApcComponent.cs
index 8f74146b45..bee8defc43 100644
--- a/Content.Server/Power/Components/ApcComponent.cs
+++ b/Content.Server/Power/Components/ApcComponent.cs
@@ -11,12 +11,9 @@ public sealed partial class ApcComponent : BaseApcNetComponent
     [DataField("onReceiveMessageSound")]
     public SoundSpecifier OnReceiveMessageSound = new SoundPathSpecifier("/Audio/Machines/machine_switch.ogg");
 
-    [DataField("lastChargeState")]
     public ApcChargeState LastChargeState;
-    [DataField("lastChargeStateTime", customTypeSerializer: typeof(TimeOffsetSerializer))]
-    public TimeSpan LastChargeStateTime;
+    public TimeSpan? LastChargeStateTime;
 
-    [DataField("lastExternalState")]
     public ApcExternalPowerState LastExternalState;
 
     /// <summary>
@@ -24,7 +21,6 @@ public sealed partial class ApcComponent : BaseApcNetComponent
     /// Done after every <see cref="VisualsChangeDelay"/> to show the latest load.
     /// If charge state changes it will be instantly updated.
     /// </summary>
-    [DataField("lastUiUpdate", customTypeSerializer: typeof(TimeOffsetSerializer))]
     public TimeSpan LastUiUpdate;
 
     [DataField("enabled")]
@@ -33,6 +29,11 @@ public sealed partial class ApcComponent : BaseApcNetComponent
     [DataField("hasAccess")]
     public bool HasAccess = false;
 
+    /// <summary>
+    /// APC state needs to always be updated after first processing tick.
+    /// </summary>
+    public bool NeedStateUpdate;
+
     public const float HighPowerThreshold = 0.9f;
     public static TimeSpan VisualsChangeDelay = TimeSpan.FromSeconds(1);
 
diff --git a/Content.Server/Power/EntitySystems/ApcSystem.cs b/Content.Server/Power/EntitySystems/ApcSystem.cs
index d88edd85cb..52c19c302c 100644
--- a/Content.Server/Power/EntitySystems/ApcSystem.cs
+++ b/Content.Server/Power/EntitySystems/ApcSystem.cs
@@ -32,7 +32,7 @@ public sealed class ApcSystem : EntitySystem
         UpdatesAfter.Add(typeof(PowerNetSystem));
 
         SubscribeLocalEvent<ApcComponent, BoundUIOpenedEvent>(OnBoundUiOpen);
-        SubscribeLocalEvent<ApcComponent, MapInitEvent>(OnApcInit);
+        SubscribeLocalEvent<ApcComponent, ComponentStartup>(OnApcStartup);
         SubscribeLocalEvent<ApcComponent, ChargeChangedEvent>(OnBatteryChargeChanged);
         SubscribeLocalEvent<ApcComponent, ApcToggleMainBreakerMessage>(OnToggleMainBreaker);
         SubscribeLocalEvent<ApcComponent, GotEmaggedEvent>(OnEmagged);
@@ -50,6 +50,11 @@ public sealed class ApcSystem : EntitySystem
                 apc.LastUiUpdate = _gameTiming.CurTime;
                 UpdateUIState(uid, apc, battery);
             }
+
+            if (apc.NeedStateUpdate)
+            {
+                UpdateApcState(uid, apc, battery);
+            }
         }
     }
 
@@ -59,9 +64,11 @@ public sealed class ApcSystem : EntitySystem
         UpdateApcState(uid, component);
     }
 
-    private void OnApcInit(EntityUid uid, ApcComponent component, MapInitEvent args)
+    private static void OnApcStartup(EntityUid uid, ApcComponent component, ComponentStartup args)
     {
-        UpdateApcState(uid, component);
+        // We cannot update immediately, as various network/battery state is not valid yet.
+        // Defer until the next tick.
+        component.NeedStateUpdate = true;
     }
 
     //Update the HasAccess var for UI to read
@@ -119,15 +126,18 @@ public sealed class ApcSystem : EntitySystem
         if (!Resolve(uid, ref apc, ref battery, false))
             return;
 
-        var newState = CalcChargeState(uid, battery.NetworkBattery);
-        if (newState != apc.LastChargeState && apc.LastChargeStateTime + ApcComponent.VisualsChangeDelay < _gameTiming.CurTime)
+        if (apc.LastChargeStateTime == null || apc.LastChargeStateTime + ApcComponent.VisualsChangeDelay < _gameTiming.CurTime)
         {
-            apc.LastChargeState = newState;
-            apc.LastChargeStateTime = _gameTiming.CurTime;
-
-            if (TryComp(uid, out AppearanceComponent? appearance))
+            var newState = CalcChargeState(uid, battery.NetworkBattery);
+            if (newState != apc.LastChargeState)
             {
-                _appearance.SetData(uid, ApcVisuals.ChargeState, newState, appearance);
+                apc.LastChargeState = newState;
+                apc.LastChargeStateTime = _gameTiming.CurTime;
+
+                if (TryComp(uid, out AppearanceComponent? appearance))
+                {
+                    _appearance.SetData(uid, ApcVisuals.ChargeState, newState, appearance);
+                }
             }
         }
 
@@ -137,6 +147,8 @@ public sealed class ApcSystem : EntitySystem
             apc.LastExternalState = extPowerState;
             UpdateUIState(uid, apc, battery);
         }
+
+        apc.NeedStateUpdate = false;
     }
 
     public void UpdateUIState(EntityUid uid,
diff --git a/Content.Server/Singularity/EntitySystems/ContainmentFieldSystem.cs b/Content.Server/Singularity/EntitySystems/ContainmentFieldSystem.cs
index 561db76a47..3944e94c20 100644
--- a/Content.Server/Singularity/EntitySystems/ContainmentFieldSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/ContainmentFieldSystem.cs
@@ -26,7 +26,7 @@ public sealed class ContainmentFieldSystem : EntitySystem
     {
         var otherBody = args.OtherEntity;
 
-        if (HasComp<SpaceGarbageComponent>(otherBody))
+        if (component.DestroyGarbage && HasComp<SpaceGarbageComponent>(otherBody))
         {
             _popupSystem.PopupEntity(Loc.GetString("comp-field-vaporized", ("entity", otherBody)), uid, PopupType.LargeCaution);
             QueueDel(otherBody);
diff --git a/Content.Server/Speech/Components/AccentWearerNameClothingComponent.cs b/Content.Server/Speech/Components/AccentWearerNameClothingComponent.cs
deleted file mode 100644
index 288eaa8dcb..0000000000
--- a/Content.Server/Speech/Components/AccentWearerNameClothingComponent.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Content.Server.Speech.EntitySystems;
-
-namespace Content.Server.Speech.Components;
-
-/// <summary>
-/// Applies any accent components on this item to the name of the wearer while worn.
-/// </summary>
-[RegisterComponent]
-[Access(typeof(AccentWearerNameClothingSystem))]
-public sealed partial class AccentWearerNameClothingComponent : Component;
diff --git a/Content.Server/Speech/EntitySystems/AccentWearerNameClothingSystem.cs b/Content.Server/Speech/EntitySystems/AccentWearerNameClothingSystem.cs
deleted file mode 100644
index fc381c5998..0000000000
--- a/Content.Server/Speech/EntitySystems/AccentWearerNameClothingSystem.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using Content.Server.Speech.Components;
-using Content.Shared.Clothing;
-using Content.Shared.Inventory;
-using Content.Shared.NameModifier.EntitySystems;
-
-namespace Content.Server.Speech.EntitySystems;
-
-/// <inheritdoc cref="AccentWearerNameClothingComponent"/>
-public sealed class AccentWearerNameClothingSystem : EntitySystem
-{
-    [Dependency] private readonly NameModifierSystem _nameMod = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<AccentWearerNameClothingComponent, ClothingGotEquippedEvent>(OnGotEquipped);
-        SubscribeLocalEvent<AccentWearerNameClothingComponent, ClothingGotUnequippedEvent>(OnGotUnequipped);
-        SubscribeLocalEvent<AccentWearerNameClothingComponent, InventoryRelayedEvent<RefreshNameModifiersEvent>>(OnRefreshNameModifiers);
-    }
-
-    private void OnGotEquipped(Entity<AccentWearerNameClothingComponent> ent, ref ClothingGotEquippedEvent args)
-    {
-        _nameMod.RefreshNameModifiers(args.Wearer);
-    }
-
-    private void OnGotUnequipped(Entity<AccentWearerNameClothingComponent> ent, ref ClothingGotUnequippedEvent args)
-    {
-        _nameMod.RefreshNameModifiers(args.Wearer);
-    }
-
-    private void OnRefreshNameModifiers(Entity<AccentWearerNameClothingComponent> ent, ref InventoryRelayedEvent<RefreshNameModifiersEvent> args)
-    {
-        var ev = new AccentGetEvent(ent, args.Args.BaseName);
-        RaiseLocalEvent(ent, ev);
-        // Use a negative priority since we're going to bulldoze any earlier changes
-        args.Args.AddModifier("comp-accent-wearer-name-clothing-format", -1, ("accentedName", ev.Message));
-    }
-}
diff --git a/Content.Server/Tabletop/TabletopSystem.cs b/Content.Server/Tabletop/TabletopSystem.cs
index caa319a0b7..f152648e21 100644
--- a/Content.Server/Tabletop/TabletopSystem.cs
+++ b/Content.Server/Tabletop/TabletopSystem.cs
@@ -1,5 +1,6 @@
 using Content.Server.Popups;
 using Content.Server.Tabletop.Components;
+using Content.Shared.CCVar;
 using Content.Shared.Hands.Components;
 using Content.Shared.Interaction;
 using Content.Shared.Item;
@@ -9,6 +10,7 @@ using Content.Shared.Tabletop.Events;
 using Content.Shared.Verbs;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
+using Robust.Shared.Configuration;
 using Robust.Shared.Enums;
 using Robust.Shared.Map;
 using Robust.Shared.Player;
@@ -23,6 +25,7 @@ namespace Content.Server.Tabletop
         [Dependency] private readonly EyeSystem _eye = default!;
         [Dependency] private readonly ViewSubscriberSystem _viewSubscriberSystem = default!;
         [Dependency] private readonly PopupSystem _popupSystem = default!;
+        [Dependency] private readonly IConfigurationManager _cfg = default!;
 
         public override void Initialize()
         {
@@ -73,6 +76,9 @@ namespace Content.Server.Tabletop
 
         private void OnInteractUsing(EntityUid uid, TabletopGameComponent component, InteractUsingEvent args)
         {
+            if (!_cfg.GetCVar(CCVars.GameTabletopPlace))
+                return;
+
             if (!EntityManager.TryGetComponent(args.User, out HandsComponent? hands))
                 return;
 
diff --git a/Content.Server/Tiles/LavaComponent.cs b/Content.Server/Tiles/LavaComponent.cs
deleted file mode 100644
index 1f36e8ffb0..0000000000
--- a/Content.Server/Tiles/LavaComponent.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using Robust.Shared.Audio;
-using Robust.Shared.GameStates;
-
-namespace Content.Server.Tiles;
-
-/// <summary>
-/// Applies flammable and damage while vaulting.
-/// </summary>
-[RegisterComponent, Access(typeof(LavaSystem))]
-public sealed partial class LavaComponent : Component
-{
-    /// <summary>
-    /// Sound played if something disintegrates in lava.
-    /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField("soundDisintegration")]
-    public SoundSpecifier DisintegrationSound = new SoundPathSpecifier("/Audio/Effects/lightburn.ogg");
-
-    /// <summary>
-    /// How many fire stacks are applied per second.
-    /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField("fireStacks")]
-    public float FireStacks = 1.25f;
-}
diff --git a/Content.Server/Tiles/LavaSystem.cs b/Content.Server/Tiles/LavaSystem.cs
deleted file mode 100644
index 51bd6f8475..0000000000
--- a/Content.Server/Tiles/LavaSystem.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using Content.Server.Atmos.Components;
-using Content.Server.Atmos.EntitySystems;
-using Content.Shared.StepTrigger.Systems;
-
-namespace Content.Server.Tiles;
-
-public sealed class LavaSystem : EntitySystem
-{
-    [Dependency] private readonly FlammableSystem _flammable = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-        SubscribeLocalEvent<LavaComponent, StepTriggeredOffEvent>(OnLavaStepTriggered);
-        SubscribeLocalEvent<LavaComponent, StepTriggerAttemptEvent>(OnLavaStepTriggerAttempt);
-    }
-
-    private void OnLavaStepTriggerAttempt(EntityUid uid, LavaComponent component, ref StepTriggerAttemptEvent args)
-    {
-        if (!HasComp<FlammableComponent>(args.Tripper))
-            return;
-
-        args.Continue = true;
-    }
-
-    private void OnLavaStepTriggered(EntityUid uid, LavaComponent component, ref StepTriggeredOffEvent args)
-    {
-        var otherUid = args.Tripper;
-
-        if (TryComp<FlammableComponent>(otherUid, out var flammable))
-        {
-            // Apply the fury of a thousand suns
-            var multiplier = flammable.FireStacks == 0f ? 5f : 1f;
-            _flammable.AdjustFireStacks(otherUid, component.FireStacks * multiplier, flammable);
-            _flammable.Ignite(otherUid, uid, flammable);
-        }
-    }
-}
diff --git a/Content.Server/Tiles/TileEntityEffectComponent.cs b/Content.Server/Tiles/TileEntityEffectComponent.cs
new file mode 100644
index 0000000000..4201af47f9
--- /dev/null
+++ b/Content.Server/Tiles/TileEntityEffectComponent.cs
@@ -0,0 +1,19 @@
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+
+namespace Content.Server.Tiles;
+
+/// <summary>
+/// Applies effects upon stepping onto a tile.
+/// </summary>
+[RegisterComponent, Access(typeof(TileEntityEffectSystem))]
+public sealed partial class TileEntityEffectComponent : Component
+{
+    /// <summary>
+    /// List of effects that should be applied.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite), DataField]
+    public List<EntityEffect> Effects = default!;
+}
diff --git a/Content.Server/Tiles/TileEntityEffectSystem.cs b/Content.Server/Tiles/TileEntityEffectSystem.cs
new file mode 100644
index 0000000000..7149f16e1a
--- /dev/null
+++ b/Content.Server/Tiles/TileEntityEffectSystem.cs
@@ -0,0 +1,32 @@
+using Content.Server.Atmos.Components;
+using Content.Server.Atmos.EntitySystems;
+using Content.Shared.StepTrigger.Systems;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
+
+namespace Content.Server.Tiles;
+
+public sealed class TileEntityEffectSystem : EntitySystem
+{
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<TileEntityEffectComponent, StepTriggeredOffEvent>(OnTileStepTriggered);
+        SubscribeLocalEvent<TileEntityEffectComponent, StepTriggerAttemptEvent>(OnTileStepTriggerAttempt);
+    }
+    private void OnTileStepTriggerAttempt(Entity<TileEntityEffectComponent> ent, ref StepTriggerAttemptEvent args)
+    {
+        args.Continue = true;
+    }
+
+    private void OnTileStepTriggered(Entity<TileEntityEffectComponent> ent, ref StepTriggeredOffEvent args)
+    {
+        var otherUid = args.Tripper;
+
+        foreach (var effect in ent.Comp.Effects)
+        {
+            effect.Effect(new EntityEffectBaseArgs(otherUid, EntityManager));
+        }
+    }
+}
diff --git a/Content.Server/_CP14/Chemistry/ReagentEffect/CP14AffectSolutionTemperature.cs b/Content.Server/_CP14/Chemistry/ReagentEffect/CP14AffectSolutionTemperature.cs
index 08387aa241..6dd76560da 100644
--- a/Content.Server/_CP14/Chemistry/ReagentEffect/CP14AffectSolutionTemperature.cs
+++ b/Content.Server/_CP14/Chemistry/ReagentEffect/CP14AffectSolutionTemperature.cs
@@ -1,5 +1,4 @@
-using Content.Server.Xenoarchaeology.XenoArtifacts;
-using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 
@@ -7,7 +6,7 @@ namespace Content.Server._CP14.Chemistry.ReagentEffect;
 
 [UsedImplicitly]
 [DataDefinition]
-public sealed partial class CP14AffectSolutionTemperature : Shared.Chemistry.Reagent.ReagentEffect
+public sealed partial class CP14AffectSolutionTemperature : EntityEffect
 {
     /// <summary>
     /// Temperature added to the solution. If negative, the solution is cooling.
@@ -15,11 +14,6 @@ public sealed partial class CP14AffectSolutionTemperature : Shared.Chemistry.Rea
     [DataField]
     private float AddTemperature = -300f;
 
-    public override void Effect(ReagentEffectArgs args)
-    {
-        if (args.Source != null)
-            args.Source.Temperature += AddTemperature;
-    }
 
     protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
     {
@@ -27,4 +21,18 @@ public sealed partial class CP14AffectSolutionTemperature : Shared.Chemistry.Rea
             ("chance", Probability),
             ("temperature", AddTemperature));
     }
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            if (reagentArgs.Source != null)
+                reagentArgs.Source.Temperature += AddTemperature;
+
+            return;
+        }
+
+        // TODO: Someone needs to figure out how to do this for non-reagent effects.
+        throw new NotImplementedException();
+    }
 }
diff --git a/Content.Server/_CP14/Chemistry/ReagentEffect/CP14InverseEffect.cs b/Content.Server/_CP14/Chemistry/ReagentEffect/CP14InverseEffect.cs
index 2ee3be5c78..c3d0c88bd2 100644
--- a/Content.Server/_CP14/Chemistry/ReagentEffect/CP14InverseEffect.cs
+++ b/Content.Server/_CP14/Chemistry/ReagentEffect/CP14InverseEffect.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using Content.Shared.FixedPoint;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
@@ -9,7 +10,7 @@ namespace Content.Server._CP14.Chemistry.ReagentEffect;
 
 [UsedImplicitly]
 [DataDefinition]
-public sealed partial class CP14InverseEffect : Shared.Chemistry.Reagent.ReagentEffect
+public sealed partial class CP14InverseEffect : EntityEffect
 {
     [DataField]
     public Dictionary<ProtoId<ReagentPrototype>, ProtoId<ReagentPrototype>> Inversion = new();
@@ -18,30 +19,35 @@ public sealed partial class CP14InverseEffect : Shared.Chemistry.Reagent.Reagent
         return Loc.GetString("cp14-reagent-effect-guidebook-inverse-effect", ("chance", Probability));
     }
 
-    public override void Effect(ReagentEffectArgs args)
+    public override void Effect(EntityEffectBaseArgs args)
     {
-        if (args.Source == null)
-            return;
-
-        if (!args.EntityManager.TryGetComponent<SolutionComponent>(args.SolutionEntity, out var solutionComp))
-            return;
-
-        var solutionContainer = args.EntityManager.System<SharedSolutionContainerSystem>();
-
-        var ent = new Entity<SolutionComponent>(args.SolutionEntity, solutionComp);
-
-        Dictionary<ReagentId, FixedPoint2> taskList = new();
-
-        foreach (var reagent in args.Source.Contents)
+        if (args is EntityEffectReagentArgs reagentArgs)
         {
-            if (Inversion.ContainsKey(reagent.Reagent.Prototype))
-                taskList.Add(reagent.Reagent, reagent.Quantity);
+            if (reagentArgs.Source is null)
+                return;
+
+            if (reagentArgs.SolutionEntity is null)
+                return;
+
+            var solutionContainer = args.EntityManager.System<SharedSolutionContainerSystem>();
+
+            Dictionary<ReagentId, FixedPoint2> taskList = new();
+
+            foreach (var reagent in reagentArgs.Source.Contents)
+            {
+                if (Inversion.ContainsKey(reagent.Reagent.Prototype))
+                    taskList.Add(reagent.Reagent, reagent.Quantity);
+            }
+
+            foreach (var task in taskList)
+            {
+                solutionContainer.RemoveReagent(reagentArgs.SolutionEntity.Value, task.Key, task.Value);
+                solutionContainer.TryAddReagent(reagentArgs.SolutionEntity.Value, Inversion[task.Key.Prototype].Id, task.Value);
+            }
+            return;
         }
 
-        foreach (var task in taskList)
-        {
-            solutionContainer.RemoveReagent(ent, task.Key, task.Value);
-            solutionContainer.TryAddReagent(ent, Inversion[task.Key.Prototype].Id, task.Value);
-        }
+        // TODO: Someone needs to figure out how to do this for non-reagent effects.
+        throw new NotImplementedException();
     }
 }
diff --git a/Content.Shared.Database/LogType.cs b/Content.Shared.Database/LogType.cs
index 33a5d30c6a..eb2b8e1f6f 100644
--- a/Content.Shared.Database/LogType.cs
+++ b/Content.Shared.Database/LogType.cs
@@ -105,4 +105,9 @@ public enum LogType
     /// This is a default value used by <c>PlayerRateLimitManager</c>, though users can use different log types.
     /// </remarks>
     RateLimited = 91,
+
+    /// <summary>
+    /// A player did an item-use interaction of an item they were holding onto another object.
+    /// </summary>
+    InteractUsing = 92,
 }
diff --git a/Content.Shared/Access/Components/AccessReaderComponent.cs b/Content.Shared/Access/Components/AccessReaderComponent.cs
index cbd3f5acd6..903ceab186 100644
--- a/Content.Shared/Access/Components/AccessReaderComponent.cs
+++ b/Content.Shared/Access/Components/AccessReaderComponent.cs
@@ -65,6 +65,13 @@ public sealed partial class AccessReaderComponent : Component
     [DataField, ViewVariables(VVAccess.ReadWrite)]
     public int AccessLogLimit = 20;
 
+    /// <summary>
+    /// If true logging on successful access uses will be disabled.
+    /// Can be set by LOG wire.
+    /// </summary>
+    [DataField]
+    public bool LoggingDisabled;
+
     /// <summary>
     /// Whether or not emag interactions have an effect on this.
     /// </summary>
diff --git a/Content.Shared/Access/Systems/AccessReaderSystem.cs b/Content.Shared/Access/Systems/AccessReaderSystem.cs
index efdbff3bb8..5d1932a959 100644
--- a/Content.Shared/Access/Systems/AccessReaderSystem.cs
+++ b/Content.Shared/Access/Systems/AccessReaderSystem.cs
@@ -382,18 +382,15 @@ public sealed class AccessReaderSystem : EntitySystem
     }
 
     /// <summary>
-    /// Logs an access
+    /// Logs an access for a specific entity.
     /// </summary>
     /// <param name="ent">The reader to log the access on</param>
     /// <param name="accessor">The accessor to log</param>
-    private void LogAccess(Entity<AccessReaderComponent> ent, EntityUid accessor)
+    public void LogAccess(Entity<AccessReaderComponent> ent, EntityUid accessor)
     {
-        if (IsPaused(ent))
+        if (IsPaused(ent) || ent.Comp.LoggingDisabled)
             return;
 
-        if (ent.Comp.AccessLog.Count >= ent.Comp.AccessLogLimit)
-            ent.Comp.AccessLog.Dequeue();
-
         string? name = null;
         if (TryComp<NameIdentifierComponent>(accessor, out var nameIdentifier))
             name = nameIdentifier.FullIdentifier;
@@ -404,7 +401,21 @@ public sealed class AccessReaderSystem : EntitySystem
             && idCard.Comp is { BypassLogging: false, FullName: not null })
             name = idCard.Comp.FullName;
 
-        name ??= Loc.GetString("access-reader-unknown-id");
+        LogAccess(ent, name ?? Loc.GetString("access-reader-unknown-id"));
+    }
+
+    /// <summary>
+    /// Logs an access with a predetermined name
+    /// </summary>
+    /// <param name="ent">The reader to log the access on</param>
+    /// <param name="name">The name to log as</param>
+    public void LogAccess(Entity<AccessReaderComponent> ent, string name)
+    {
+        if (IsPaused(ent) || ent.Comp.LoggingDisabled)
+            return;
+
+        if (ent.Comp.AccessLog.Count >= ent.Comp.AccessLogLimit)
+            ent.Comp.AccessLog.Dequeue();
 
         var stationTime = _gameTiming.CurTime.Subtract(_gameTicker.RoundStartTimeSpan);
         ent.Comp.AccessLog.Enqueue(new AccessRecord(stationTime, name));
diff --git a/Content.Shared/Armor/AllowSuitStorageComponent.cs b/Content.Shared/Armor/AllowSuitStorageComponent.cs
index aa7bce1c87..23ddd89634 100644
--- a/Content.Shared/Armor/AllowSuitStorageComponent.cs
+++ b/Content.Shared/Armor/AllowSuitStorageComponent.cs
@@ -1,3 +1,5 @@
+using Content.Shared.Whitelist;
+
 namespace Content.Shared.Armor;
 
 /// <summary>
@@ -6,5 +8,12 @@ namespace Content.Shared.Armor;
 [RegisterComponent]
 public sealed partial class AllowSuitStorageComponent : Component
 {
-
+    /// <summary>
+    /// Whitelist for what entities are allowed in the suit storage slot.
+    /// </summary>
+    [DataField]
+    public EntityWhitelist Whitelist = new()
+    {
+        Components = new[] {"Item"}
+    };
 }
diff --git a/Content.Shared/Atmos/Atmospherics.cs b/Content.Shared/Atmos/Atmospherics.cs
index 6e640b287b..1e40daf3dd 100644
--- a/Content.Shared/Atmos/Atmospherics.cs
+++ b/Content.Shared/Atmos/Atmospherics.cs
@@ -286,7 +286,8 @@ namespace Content.Shared.Atmos
         ///     (The pressure threshold is so low that it doesn't make sense to do any calculations,
         ///     so it just applies this flat value).
         /// </summary>
-        public const int LowPressureDamage = 4;
+        // Original value is 4, buff back when we have proper ways for players to deal with breaches.
+        public const int LowPressureDamage = 1;
 
         public const float WindowHeatTransferCoefficient = 0.1f;
 
diff --git a/Content.Shared/Atmos/Piping/Unary/Visuals/VentPumpVisuals.cs b/Content.Shared/Atmos/Piping/Unary/Visuals/VentPumpVisuals.cs
index f15ccde5f2..01aeda7b00 100644
--- a/Content.Shared/Atmos/Piping/Unary/Visuals/VentPumpVisuals.cs
+++ b/Content.Shared/Atmos/Piping/Unary/Visuals/VentPumpVisuals.cs
@@ -15,5 +15,6 @@ namespace Content.Shared.Atmos.Visuals
         In,
         Out,
         Welded,
+        Lockout,
     }
 }
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index 7fddbfaf51..4f75473c77 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -440,6 +440,16 @@ namespace Content.Shared.CCVar
         public static readonly CVarDef<bool> RoundEndPVSOverrides =
             CVarDef.Create("game.round_end_pvs_overrides", true, CVar.SERVERONLY);
 
+        /// <summary>
+        /// If true, players can place objects onto tabletop games like chess boards.
+        /// </summary>
+        /// <remarks>
+        /// This feature is currently highly abusable and can easily be used to crash the server,
+        /// so it's off by default.
+        /// </remarks>
+        public static readonly CVarDef<bool> GameTabletopPlace =
+            CVarDef.Create("game.tabletop_place", false, CVar.SERVERONLY);
+
         /*
          * Discord
          */
@@ -835,6 +845,15 @@ namespace Content.Shared.CCVar
         public static readonly CVarDef<bool> ServerBanErasePlayer =
             CVarDef.Create("admin.server_ban_erase_player", false, CVar.ARCHIVE | CVar.SERVER | CVar.REPLICATED);
 
+        /// <summary>
+        ///     Minimum players sharing a connection required to create an alert. -1 to disable the alert.
+        /// </summary>
+        /// <remarks>
+        ///     If you set this to 0 or 1 then it will alert on every connection, so probably don't do that.
+        /// </remarks>
+        public static readonly CVarDef<int> AdminAlertMinPlayersSharingConnection =
+            CVarDef.Create("admin.alert.min_players_sharing_connection", -1, CVar.SERVERONLY);
+
         /// <summary>
         ///     Minimum explosion intensity to create an admin alert message. -1 to disable the alert.
         /// </summary>
diff --git a/Content.Shared/Chat/TypingIndicator/SharedTypingIndicatorSystem.cs b/Content.Shared/Chat/TypingIndicator/SharedTypingIndicatorSystem.cs
index 81ebcfb108..dffe3cc185 100644
--- a/Content.Shared/Chat/TypingIndicator/SharedTypingIndicatorSystem.cs
+++ b/Content.Shared/Chat/TypingIndicator/SharedTypingIndicatorSystem.cs
@@ -1,12 +1,17 @@
+using Content.Shared.ActionBlocker;
 using Content.Shared.Clothing;
+using Robust.Shared.Player;
 
 namespace Content.Shared.Chat.TypingIndicator;
 
 /// <summary>
-///     Sync typing indicator icon between client and server.
+///     Supports typing indicators on entities.
 /// </summary>
 public abstract class SharedTypingIndicatorSystem : EntitySystem
 {
+    [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+
     /// <summary>
     ///     Default ID of <see cref="TypingIndicatorPrototype"/>
     /// </summary>
@@ -16,8 +21,27 @@ public abstract class SharedTypingIndicatorSystem : EntitySystem
     public override void Initialize()
     {
         base.Initialize();
+        SubscribeLocalEvent<PlayerAttachedEvent>(OnPlayerAttached);
+        SubscribeLocalEvent<TypingIndicatorComponent, PlayerDetachedEvent>(OnPlayerDetached);
+
         SubscribeLocalEvent<TypingIndicatorClothingComponent, ClothingGotEquippedEvent>(OnGotEquipped);
         SubscribeLocalEvent<TypingIndicatorClothingComponent, ClothingGotUnequippedEvent>(OnGotUnequipped);
+
+        SubscribeAllEvent<TypingChangedEvent>(OnTypingChanged);
+    }
+
+    private void OnPlayerAttached(PlayerAttachedEvent ev)
+    {
+        // when player poses entity we want to make sure that there is typing indicator
+        EnsureComp<TypingIndicatorComponent>(ev.Entity);
+        // we also need appearance component to sync visual state
+        EnsureComp<AppearanceComponent>(ev.Entity);
+    }
+
+    private void OnPlayerDetached(EntityUid uid, TypingIndicatorComponent component, PlayerDetachedEvent args)
+    {
+        // player left entity body - hide typing indicator
+        SetTypingIndicatorEnabled(uid, false);
     }
 
     private void OnGotEquipped(EntityUid uid, TypingIndicatorClothingComponent component, ClothingGotEquippedEvent args)
@@ -33,6 +57,34 @@ public abstract class SharedTypingIndicatorSystem : EntitySystem
         if (!TryComp<TypingIndicatorComponent>(args.Wearer, out var indicator))
             return;
 
-        indicator.Prototype = SharedTypingIndicatorSystem.InitialIndicatorId;
+        indicator.Prototype = InitialIndicatorId;
+    }
+
+    private void OnTypingChanged(TypingChangedEvent ev, EntitySessionEventArgs args)
+    {
+        var uid = args.SenderSession.AttachedEntity;
+        if (!Exists(uid))
+        {
+            Log.Warning($"Client {args.SenderSession} sent TypingChangedEvent without an attached entity.");
+            return;
+        }
+
+        // check if this entity can speak or emote
+        if (!_actionBlocker.CanEmote(uid.Value) && !_actionBlocker.CanSpeak(uid.Value))
+        {
+            // nah, make sure that typing indicator is disabled
+            SetTypingIndicatorEnabled(uid.Value, false);
+            return;
+        }
+
+        SetTypingIndicatorEnabled(uid.Value, ev.IsTyping);
+    }
+
+    private void SetTypingIndicatorEnabled(EntityUid uid, bool isEnabled, AppearanceComponent? appearance = null)
+    {
+        if (!Resolve(uid, ref appearance, false))
+            return;
+
+        _appearance.SetData(uid, TypingIndicatorVisuals.IsTyping, isEnabled, appearance);
     }
 }
diff --git a/Content.Shared/Chemistry/Reaction/ChemicalReactionSystem.cs b/Content.Shared/Chemistry/Reaction/ChemicalReactionSystem.cs
index 7b7fdcd984..7494804f83 100644
--- a/Content.Shared/Chemistry/Reaction/ChemicalReactionSystem.cs
+++ b/Content.Shared/Chemistry/Reaction/ChemicalReactionSystem.cs
@@ -2,6 +2,7 @@ using Content.Shared.Administration.Logs;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Database;
+using Content.Shared.EntityEffects;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Prototypes;
@@ -197,9 +198,7 @@ namespace Content.Shared.Chemistry.Reaction
 
         private void OnReaction(Entity<SolutionComponent> soln, ReactionPrototype reaction, ReagentPrototype? reagent, FixedPoint2 unitReactions)
         {
-            var args = new ReagentEffectArgs(soln, null, soln.Comp.Solution,
-                reagent,
-                unitReactions, EntityManager, null, 1f);
+            var args = new EntityEffectReagentArgs(soln, EntityManager, null, soln.Comp.Solution, unitReactions, reagent, null, 1f, soln); //CP14 soln add
 
             var posFound = _transformSystem.TryGetMapOrGridCoordinates(soln, out var gridPos);
 
@@ -213,7 +212,7 @@ namespace Content.Shared.Chemistry.Reaction
 
                 if (effect.ShouldLog)
                 {
-                    var entity = args.SolutionEntity;
+                    var entity = args.TargetEntity;
                     _adminLogger.Add(LogType.ReagentEffect, effect.LogImpact,
                         $"Reaction effect {effect.GetType().Name:effect} of reaction {reaction.ID:reaction} applied on entity {ToPrettyString(entity):entity} at Pos:{(posFound ? $"{gridPos:coordinates}" : "[Grid or Map not Found")}");
                 }
diff --git a/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs b/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs
index 584da74539..a58cbbffe7 100644
--- a/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs
+++ b/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Database;
+using Content.Shared.EntityEffects;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
@@ -59,7 +60,7 @@ namespace Content.Shared.Chemistry.Reaction
         /// <summary>
         /// Effects to be triggered when the reaction occurs.
         /// </summary>
-        [DataField("effects", serverOnly: true)] public List<ReagentEffect> Effects = new();
+        [DataField("effects", serverOnly: true)] public List<EntityEffect> Effects = new();
 
         /// <summary>
         /// How dangerous is this effect? Stuff like bicaridine should be low, while things like methamphetamine
diff --git a/Content.Shared/Chemistry/Reaction/ReactiveComponent.cs b/Content.Shared/Chemistry/Reaction/ReactiveComponent.cs
index 310129c6fc..cabdee93c1 100644
--- a/Content.Shared/Chemistry/Reaction/ReactiveComponent.cs
+++ b/Content.Shared/Chemistry/Reaction/ReactiveComponent.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Set;
 
@@ -33,7 +34,7 @@ public sealed partial class ReactiveReagentEffectEntry
     public HashSet<string>? Reagents = null;
 
     [DataField("effects", required: true)]
-    public List<ReagentEffect> Effects = default!;
+    public List<EntityEffect> Effects = default!;
 
     [DataField("groups", readOnly: true, serverOnly: true,
         customTypeSerializer:typeof(PrototypeIdDictionarySerializer<HashSet<ReactionMethod>, ReactiveGroupPrototype>))]
diff --git a/Content.Shared/Chemistry/ReactiveSystem.cs b/Content.Shared/Chemistry/ReactiveSystem.cs
index 57b008de0c..edd75bb0b4 100644
--- a/Content.Shared/Chemistry/ReactiveSystem.cs
+++ b/Content.Shared/Chemistry/ReactiveSystem.cs
@@ -3,102 +3,107 @@ using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Reaction;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Database;
+using Content.Shared.EntityEffects;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 
-namespace Content.Shared.Chemistry
+namespace Content.Shared.Chemistry;
+
+[UsedImplicitly]
+public sealed class ReactiveSystem : EntitySystem
 {
-    [UsedImplicitly]
-    public sealed class ReactiveSystem : EntitySystem
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly IRobustRandom _robustRandom = default!;
+    [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+
+    public void DoEntityReaction(EntityUid uid, Solution solution, ReactionMethod method)
     {
-        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-        [Dependency] private readonly IRobustRandom _robustRandom = default!;
-        [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
-
-        public void DoEntityReaction(EntityUid uid, Solution solution, ReactionMethod method)
+        foreach (var reagent in solution.Contents.ToArray())
         {
-            foreach (var reagent in solution.Contents.ToArray())
-            {
-                ReactionEntity(uid, method, reagent, solution);
-            }
+            ReactionEntity(uid, method, reagent, solution);
         }
+    }
 
-        public void ReactionEntity(EntityUid uid, ReactionMethod method, ReagentQuantity reagentQuantity, Solution? source)
+    public void ReactionEntity(EntityUid uid, ReactionMethod method, ReagentQuantity reagentQuantity, Solution? source)
+    {
+        // We throw if the reagent specified doesn't exist.
+        var proto = _prototypeManager.Index<ReagentPrototype>(reagentQuantity.Reagent.Prototype);
+        ReactionEntity(uid, method, proto, reagentQuantity, source);
+    }
+
+    public void ReactionEntity(EntityUid uid, ReactionMethod method, ReagentPrototype proto,
+        ReagentQuantity reagentQuantity, Solution? source)
+    {
+        if (!TryComp(uid, out ReactiveComponent? reactive))
+            return;
+
+        // If we have a source solution, use the reagent quantity we have left. Otherwise, use the reaction volume specified.
+        var args = new EntityEffectReagentArgs(uid, EntityManager, null, source, source?.GetReagentQuantity(reagentQuantity.Reagent) ?? reagentQuantity.Quantity, proto, method, 1f);
+
+        // First, check if the reagent wants to apply any effects.
+        if (proto.ReactiveEffects != null && reactive.ReactiveGroups != null)
         {
-            // We throw if the reagent specified doesn't exist.
-            var proto = _prototypeManager.Index<ReagentPrototype>(reagentQuantity.Reagent.Prototype);
-            ReactionEntity(uid, method, proto, reagentQuantity, source);
-        }
-
-        public void ReactionEntity(EntityUid uid, ReactionMethod method, ReagentPrototype proto,
-            ReagentQuantity reagentQuantity, Solution? source)
-        {
-            if (!TryComp(uid, out ReactiveComponent? reactive))
-                return;
-
-            // If we have a source solution, use the reagent quantity we have left. Otherwise, use the reaction volume specified.
-            var args = new ReagentEffectArgs(uid, null, source, proto,
-                source?.GetReagentQuantity(reagentQuantity.Reagent) ?? reagentQuantity.Quantity, EntityManager, method, 1f);
-
-            // First, check if the reagent wants to apply any effects.
-            if (proto.ReactiveEffects != null && reactive.ReactiveGroups != null)
+            foreach (var (key, val) in proto.ReactiveEffects)
             {
-                foreach (var (key, val) in proto.ReactiveEffects)
+                if (!val.Methods.Contains(method))
+                    continue;
+
+                if (!reactive.ReactiveGroups.ContainsKey(key))
+                    continue;
+
+                if (!reactive.ReactiveGroups[key].Contains(method))
+                    continue;
+
+                foreach (var effect in val.Effects)
                 {
-                    if (!val.Methods.Contains(method))
+                    if (!effect.ShouldApply(args, _robustRandom))
                         continue;
 
-                    if (!reactive.ReactiveGroups.ContainsKey(key))
-                        continue;
-
-                    if (!reactive.ReactiveGroups[key].Contains(method))
-                        continue;
-
-                    foreach (var effect in val.Effects)
+                    if (effect.ShouldLog)
                     {
-                        if (!effect.ShouldApply(args, _robustRandom))
-                            continue;
-
-                        if (effect.ShouldLog)
-                        {
-                            var entity = args.SolutionEntity;
-                            _adminLogger.Add(LogType.ReagentEffect, effect.LogImpact,
-                                $"Reactive effect {effect.GetType().Name:effect} of reagent {proto.ID:reagent} with method {method} applied on entity {ToPrettyString(entity):entity} at {Transform(entity).Coordinates:coordinates}");
-                        }
-
-                        effect.Effect(args);
+                        var entity = args.TargetEntity;
+                        _adminLogger.Add(LogType.ReagentEffect, effect.LogImpact,
+                            $"Reactive effect {effect.GetType().Name:effect} of reagent {proto.ID:reagent} with method {method} applied on entity {ToPrettyString(entity):entity} at {Transform(entity).Coordinates:coordinates}");
                     }
+
+                    effect.Effect(args);
                 }
             }
+        }
 
-            // Then, check if the prototype has any effects it can apply as well.
-            if (reactive.Reactions != null)
+        // Then, check if the prototype has any effects it can apply as well.
+        if (reactive.Reactions != null)
+        {
+            foreach (var entry in reactive.Reactions)
             {
-                foreach (var entry in reactive.Reactions)
+                if (!entry.Methods.Contains(method))
+                    continue;
+
+                if (entry.Reagents != null && !entry.Reagents.Contains(proto.ID))
+                    continue;
+
+                foreach (var effect in entry.Effects)
                 {
-                    if (!entry.Methods.Contains(method))
+                    if (!effect.ShouldApply(args, _robustRandom))
                         continue;
 
-                    if (entry.Reagents != null && !entry.Reagents.Contains(proto.ID))
-                        continue;
-
-                    foreach (var effect in entry.Effects)
+                    if (effect.ShouldLog)
                     {
-                        if (!effect.ShouldApply(args, _robustRandom))
-                            continue;
-
-                        if (effect.ShouldLog)
-                        {
-                            var entity = args.SolutionEntity;
-                            _adminLogger.Add(LogType.ReagentEffect, effect.LogImpact,
-                                $"Reactive effect {effect.GetType().Name:effect} of {ToPrettyString(entity):entity} using reagent {proto.ID:reagent} with method {method} at {Transform(entity).Coordinates:coordinates}");
-                        }
-
-                        effect.Effect(args);
+                        var entity = args.TargetEntity;
+                        _adminLogger.Add(LogType.ReagentEffect, effect.LogImpact,
+                            $"Reactive effect {effect.GetType().Name:effect} of {ToPrettyString(entity):entity} using reagent {proto.ID:reagent} with method {method} at {Transform(entity).Coordinates:coordinates}");
                     }
+
+                    effect.Effect(args);
                 }
             }
         }
     }
 }
+public enum ReactionMethod
+{
+Touch,
+Injection,
+Ingestion,
+}
diff --git a/Content.Shared/Chemistry/Reagent/ReagentEffect.cs b/Content.Shared/Chemistry/Reagent/ReagentEffect.cs
deleted file mode 100644
index 6d0e85df37..0000000000
--- a/Content.Shared/Chemistry/Reagent/ReagentEffect.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-using System.Linq;
-using System.Text.Json.Serialization;
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Database;
-using Content.Shared.FixedPoint;
-using Content.Shared.Localizations;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-
-namespace Content.Shared.Chemistry.Reagent
-{
-    /// <summary>
-    ///     Reagent effects describe behavior that occurs when a reagent is ingested and metabolized by some
-    ///     organ. They only trigger when all of <see cref="Conditions"/> are satisfied.
-    /// </summary>
-    [ImplicitDataDefinitionForInheritors]
-    [MeansImplicitUse]
-    public abstract partial class ReagentEffect
-    {
-        [JsonPropertyName("id")] private protected string _id => this.GetType().Name;
-        /// <summary>
-        ///     The list of conditions required for the effect to activate. Not required.
-        /// </summary>
-        [JsonPropertyName("conditions")]
-        [DataField("conditions")]
-        public ReagentEffectCondition[]? Conditions;
-
-        public virtual string ReagentEffectFormat => "guidebook-reagent-effect-description";
-
-        protected abstract string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys);
-
-        /// <summary>
-        ///     What's the chance, from 0 to 1, that this effect will occur?
-        /// </summary>
-        [JsonPropertyName("probability")]
-        [DataField("probability")]
-        public float Probability = 1.0f;
-
-        [JsonIgnore]
-        [DataField("logImpact")]
-        public virtual LogImpact LogImpact { get; private set; } = LogImpact.Low;
-
-        /// <summary>
-        ///     Should this reagent effect log at all?
-        /// </summary>
-        [JsonIgnore]
-        [DataField("shouldLog")]
-        public virtual bool ShouldLog { get; private set; } = false;
-
-        public abstract void Effect(ReagentEffectArgs args);
-
-        /// <summary>
-        /// Produces a localized, bbcode'd guidebook description for this effect.
-        /// </summary>
-        /// <returns></returns>
-        public string? GuidebookEffectDescription(IPrototypeManager prototype, IEntitySystemManager entSys)
-        {
-            var effect = ReagentEffectGuidebookText(prototype, entSys);
-            if (effect is null)
-                return null;
-
-            return Loc.GetString(ReagentEffectFormat, ("effect", effect), ("chance", Probability),
-                ("conditionCount", Conditions?.Length ?? 0),
-                ("conditions",
-                    ContentLocalizationManager.FormatList(Conditions?.Select(x => x.GuidebookExplanation(prototype)).ToList() ??
-                                                          new List<string>())));
-        }
-    }
-
-    public static class ReagentEffectExt
-    {
-        public static bool ShouldApply(this ReagentEffect effect, ReagentEffectArgs args,
-            IRobustRandom? random = null)
-        {
-            if (random == null)
-                random = IoCManager.Resolve<IRobustRandom>();
-
-            if (effect.Probability < 1.0f && !random.Prob(effect.Probability))
-                return false;
-
-            if (effect.Conditions != null)
-            {
-                foreach (var cond in effect.Conditions)
-                {
-                    if (!cond.Condition(args))
-                        return false;
-                }
-            }
-
-            return true;
-        }
-    }
-
-    public enum ReactionMethod
-    {
-        Touch,
-        Injection,
-        Ingestion,
-    }
-
-    public readonly record struct ReagentEffectArgs(
-        EntityUid SolutionEntity,
-        EntityUid? OrganEntity,
-        Solution? Source,
-        ReagentPrototype? Reagent,
-        FixedPoint2 Quantity,
-        IEntityManager EntityManager,
-        ReactionMethod? Method,
-        float Scale
-    );
-}
diff --git a/Content.Shared/Chemistry/Reagent/ReagentEffectCondition.cs b/Content.Shared/Chemistry/Reagent/ReagentEffectCondition.cs
deleted file mode 100644
index a32b4fa8e3..0000000000
--- a/Content.Shared/Chemistry/Reagent/ReagentEffectCondition.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System.Text.Json.Serialization;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.Chemistry.Reagent
-{
-    [ImplicitDataDefinitionForInheritors]
-    [MeansImplicitUse]
-    public abstract partial class ReagentEffectCondition
-    {
-        [JsonPropertyName("id")] private protected string _id => this.GetType().Name;
-
-        public abstract bool Condition(ReagentEffectArgs args);
-
-        /// <summary>
-        /// Effect explanations are of the form "[chance to] [action] when [condition] and [condition]"
-        /// </summary>
-        /// <param name="prototype"></param>
-        /// <returns></returns>
-        public abstract string GuidebookExplanation(IPrototypeManager prototype);
-    }
-}
diff --git a/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs b/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs
index 7e96332ebe..fe937b9de4 100644
--- a/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs
+++ b/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs
@@ -1,10 +1,11 @@
-using System.Collections.Frozen;
+using System.Collections.Frozen;
 using System.Linq;
 using System.Text.Json.Serialization;
 using Content.Shared.Administration.Logs;
 using Content.Shared.Body.Prototypes;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Reaction;
+using Content.Shared.EntityEffects;
 using Content.Shared.Database;
 using Content.Shared.FixedPoint;
 using Content.Shared.Nutrition;
@@ -134,7 +135,7 @@ namespace Content.Shared.Chemistry.Reagent
         public List<ITileReaction> TileReactions = new(0);
 
         [DataField("plantMetabolism", serverOnly: true)]
-        public List<ReagentEffect> PlantMetabolisms = new(0);
+        public List<EntityEffect> PlantMetabolisms = new(0);
 
         [DataField]
         public float PricePerUnit;
@@ -170,7 +171,7 @@ namespace Content.Shared.Chemistry.Reagent
 
             var entMan = IoCManager.Resolve<IEntityManager>();
             var random = IoCManager.Resolve<IRobustRandom>();
-            var args = new ReagentEffectArgs(plantHolder.Value, null, solution, this, amount.Quantity, entMan, null, 1f);
+            var args = new EntityEffectReagentArgs(plantHolder.Value, entMan, null, solution, amount.Quantity, this, null, 1f);
             foreach (var plantMetabolizable in PlantMetabolisms)
             {
                 if (!plantMetabolizable.ShouldApply(args, random))
@@ -178,7 +179,7 @@ namespace Content.Shared.Chemistry.Reagent
 
                 if (plantMetabolizable.ShouldLog)
                 {
-                    var entity = args.SolutionEntity;
+                    var entity = args.TargetEntity;
                     entMan.System<SharedAdminLogSystem>().Add(LogType.ReagentEffect, plantMetabolizable.LogImpact,
                         $"Plant metabolism effect {plantMetabolizable.GetType().Name:effect} of reagent {ID:reagent} applied on entity {entMan.ToPrettyString(entity):entity} at {entMan.GetComponent<TransformComponent>(entity).Coordinates:coordinates}");
                 }
@@ -230,7 +231,7 @@ namespace Content.Shared.Chemistry.Reagent
         /// </summary>
         [JsonPropertyName("effects")]
         [DataField("effects", required: true)]
-        public ReagentEffect[] Effects = default!;
+        public EntityEffect[] Effects = default!;
 
         public ReagentEffectsGuideEntry MakeGuideEntry(IPrototypeManager prototype, IEntitySystemManager entSys)
         {
@@ -264,6 +265,6 @@ namespace Content.Shared.Chemistry.Reagent
         public HashSet<ReactionMethod> Methods = default!;
 
         [DataField("effects", required: true)]
-        public ReagentEffect[] Effects = default!;
+        public EntityEffect[] Effects = default!;
     }
 }
diff --git a/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs b/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs
index 66ff5c624a..4198c5c165 100644
--- a/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs
+++ b/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs
@@ -111,19 +111,19 @@ public sealed class ClothingSpeedModifierSystem : EntitySystem
         if (walkModifierPercentage == sprintModifierPercentage)
         {
             if (walkModifierPercentage < 0.0f)
-                msg.AddMarkup(Loc.GetString("clothing-speed-increase-equal-examine", ("walkSpeed", MathF.Abs(walkModifierPercentage)), ("runSpeed", MathF.Abs(sprintModifierPercentage))));
+                msg.AddMarkup(Loc.GetString("clothing-speed-increase-equal-examine", ("walkSpeed", (int) MathF.Abs(walkModifierPercentage)), ("runSpeed", (int) MathF.Abs(sprintModifierPercentage))));
             else
-                msg.AddMarkup(Loc.GetString("clothing-speed-decrease-equal-examine", ("walkSpeed", walkModifierPercentage), ("runSpeed", sprintModifierPercentage)));
+                msg.AddMarkup(Loc.GetString("clothing-speed-decrease-equal-examine", ("walkSpeed", (int) walkModifierPercentage), ("runSpeed", (int) sprintModifierPercentage)));
         }
         else
         {
             if (sprintModifierPercentage < 0.0f)
             {
-                msg.AddMarkup(Loc.GetString("clothing-speed-increase-run-examine", ("runSpeed", MathF.Abs(sprintModifierPercentage))));
+                msg.AddMarkup(Loc.GetString("clothing-speed-increase-run-examine", ("runSpeed", (int) MathF.Abs(sprintModifierPercentage))));
             }
             else if (sprintModifierPercentage > 0.0f)
             {
-                msg.AddMarkup(Loc.GetString("clothing-speed-decrease-run-examine", ("runSpeed", sprintModifierPercentage)));
+                msg.AddMarkup(Loc.GetString("clothing-speed-decrease-run-examine", ("runSpeed", (int) sprintModifierPercentage)));
             }
             if (walkModifierPercentage != 0.0f && sprintModifierPercentage != 0.0f)
             {
@@ -131,11 +131,11 @@ public sealed class ClothingSpeedModifierSystem : EntitySystem
             }
             if (walkModifierPercentage < 0.0f)
             {
-                msg.AddMarkup(Loc.GetString("clothing-speed-increase-walk-examine", ("walkSpeed", MathF.Abs(walkModifierPercentage))));
+                msg.AddMarkup(Loc.GetString("clothing-speed-increase-walk-examine", ("walkSpeed", (int) MathF.Abs(walkModifierPercentage))));
             }
             else if (walkModifierPercentage > 0.0f)
             {
-                msg.AddMarkup(Loc.GetString("clothing-speed-decrease-walk-examine", ("walkSpeed", walkModifierPercentage)));
+                msg.AddMarkup(Loc.GetString("clothing-speed-decrease-walk-examine", ("walkSpeed", (int) walkModifierPercentage)));
             }
         }
 
diff --git a/Content.Shared/Clothing/LoadoutSystem.cs b/Content.Shared/Clothing/LoadoutSystem.cs
index f1b1dc36d9..1bab86e90f 100644
--- a/Content.Shared/Clothing/LoadoutSystem.cs
+++ b/Content.Shared/Clothing/LoadoutSystem.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using Content.Shared.Body.Systems;
 using Content.Shared.Clothing.Components;
 using Content.Shared.Humanoid;
 using Content.Shared.Preferences;
@@ -27,7 +28,8 @@ public sealed class LoadoutSystem : EntitySystem
     {
         base.Initialize();
 
-        SubscribeLocalEvent<LoadoutComponent, MapInitEvent>(OnMapInit);
+        // Wait until the character has all their organs before we give them their loadout
+        SubscribeLocalEvent<LoadoutComponent, MapInitEvent>(OnMapInit, after: [typeof(SharedBodySystem)]);
     }
 
     public static string GetJobPrototype(string? loadout)
diff --git a/Content.Shared/CombatMode/Pacification/PacificationSystem.cs b/Content.Shared/CombatMode/Pacification/PacificationSystem.cs
index a927e1a697..14507ce1f5 100644
--- a/Content.Shared/CombatMode/Pacification/PacificationSystem.cs
+++ b/Content.Shared/CombatMode/Pacification/PacificationSystem.cs
@@ -54,7 +54,8 @@ public sealed class PacificationSystem : EntitySystem
             && !(_timing.CurTime > user.Comp.NextPopupTime))
             return;
 
-        _popup.PopupClient(Loc.GetString(reason, ("entity", target)), user, user);
+        var targetName = Identity.Entity(target, EntityManager);
+        _popup.PopupClient(Loc.GetString(reason, ("entity", targetName)), user, user);
         user.Comp.NextPopupTime = _timing.CurTime + user.Comp.PopupCooldown;
         user.Comp.LastAttackedEntity = target;
     }
diff --git a/Content.Shared/Doors/Systems/SharedFirelockSystem.cs b/Content.Shared/Doors/Systems/SharedFirelockSystem.cs
index 03350d2e64..e613848c5c 100644
--- a/Content.Shared/Doors/Systems/SharedFirelockSystem.cs
+++ b/Content.Shared/Doors/Systems/SharedFirelockSystem.cs
@@ -21,6 +21,7 @@ public abstract class SharedFirelockSystem : EntitySystem
 
         // Access/Prying
         SubscribeLocalEvent<FirelockComponent, BeforeDoorOpenedEvent>(OnBeforeDoorOpened);
+        SubscribeLocalEvent<FirelockComponent, BeforePryEvent>(OnBeforePry);
         SubscribeLocalEvent<FirelockComponent, GetPryTimeModifierEvent>(OnDoorGetPryTimeModifier);
         SubscribeLocalEvent<FirelockComponent, PriedEvent>(OnAfterPried);
 
@@ -60,6 +61,14 @@ public abstract class SharedFirelockSystem : EntitySystem
             WarnPlayer((uid, component), args.User.Value);
     }
 
+    private void OnBeforePry(EntityUid uid, FirelockComponent component, ref BeforePryEvent args)
+    {
+        if (args.Cancelled || !component.Powered || args.StrongPry || args.PryPowered)
+            return;
+
+        args.Cancelled = true;
+    }
+
     private void OnDoorGetPryTimeModifier(EntityUid uid, FirelockComponent component, ref GetPryTimeModifierEvent args)
     {
         WarnPlayer((uid, component), args.User);
diff --git a/Content.Shared/EntityEffects/EntityEffect.cs b/Content.Shared/EntityEffects/EntityEffect.cs
new file mode 100644
index 0000000000..8e0f2247c3
--- /dev/null
+++ b/Content.Shared/EntityEffects/EntityEffect.cs
@@ -0,0 +1,135 @@
+using System.Linq;
+using System.Text.Json.Serialization;
+using Content.Shared.Chemistry;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Database;
+using Content.Shared.FixedPoint;
+using Content.Shared.Localizations;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+using Content.Shared.Chemistry.Reagent;
+using Robust.Shared.Toolshed.TypeParsers;
+
+namespace Content.Shared.EntityEffects;
+
+/// <summary>
+///     Entity effects describe behavior that occurs on different kinds of triggers, e.g. when a reagent is ingested and metabolized by some
+///     organ. They only trigger when all of <see cref="Conditions"/> are satisfied.
+/// </summary>
+[ImplicitDataDefinitionForInheritors]
+[MeansImplicitUse]
+public abstract partial class EntityEffect
+{
+    private protected string _id => this.GetType().Name;
+    /// <summary>
+    ///     The list of conditions required for the effect to activate. Not required.
+    /// </summary>
+    [DataField("conditions")]
+    public EntityEffectCondition[]? Conditions;
+
+    public virtual string ReagentEffectFormat => "guidebook-reagent-effect-description";
+
+    protected abstract string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys);
+
+    /// <summary>
+    ///     What's the chance, from 0 to 1, that this effect will occur?
+    /// </summary>
+    [DataField("probability")]
+    public float Probability = 1.0f;
+
+    public virtual LogImpact LogImpact { get; private set; } = LogImpact.Low;
+
+    /// <summary>
+    ///     Should this entity effect log at all?
+    /// </summary>
+    public virtual bool ShouldLog { get; private set; } = false;
+
+    public abstract void Effect(EntityEffectBaseArgs args);
+
+    /// <summary>
+    /// Produces a localized, bbcode'd guidebook description for this effect.
+    /// </summary>
+    /// <returns></returns>
+    public string? GuidebookEffectDescription(IPrototypeManager prototype, IEntitySystemManager entSys)
+    {
+        var effect = ReagentEffectGuidebookText(prototype, entSys);
+        if (effect is null)
+            return null;
+
+        return Loc.GetString(ReagentEffectFormat, ("effect", effect), ("chance", Probability),
+            ("conditionCount", Conditions?.Length ?? 0),
+            ("conditions",
+                ContentLocalizationManager.FormatList(Conditions?.Select(x => x.GuidebookExplanation(prototype)).ToList() ??
+                                                        new List<string>())));
+    }
+}
+
+public static class EntityEffectExt
+{
+    public static bool ShouldApply(this EntityEffect effect, EntityEffectBaseArgs args,
+        IRobustRandom? random = null)
+    {
+        if (random == null)
+            random = IoCManager.Resolve<IRobustRandom>();
+
+        if (effect.Probability < 1.0f && !random.Prob(effect.Probability))
+            return false;
+
+        if (effect.Conditions != null)
+        {
+            foreach (var cond in effect.Conditions)
+            {
+                if (!cond.Condition(args))
+                    return false;
+            }
+        }
+
+        return true;
+    }
+}
+
+/// <summary>
+///     EntityEffectBaseArgs only contains the target of an effect.
+///     If a trigger wants to include more info (e.g. the quantity of the chemical triggering the effect), it can be extended (see EntityEffectReagentArgs).
+/// </summary>
+public record class EntityEffectBaseArgs
+{
+    public EntityUid TargetEntity;
+
+    public IEntityManager EntityManager = default!;
+
+    public EntityEffectBaseArgs(EntityUid targetEntity, IEntityManager entityManager)
+    {
+        TargetEntity = targetEntity;
+        EntityManager = entityManager;
+    }
+}
+
+public record class EntityEffectReagentArgs : EntityEffectBaseArgs
+{
+    public EntityUid? OrganEntity;
+
+    public Solution? Source;
+
+    public FixedPoint2 Quantity;
+
+    public ReagentPrototype? Reagent;
+
+    public ReactionMethod? Method;
+
+    public FixedPoint2 Scale;
+
+    public Entity<SolutionComponent>? SolutionEntity; //CP14
+
+    public EntityEffectReagentArgs(EntityUid targetEntity, IEntityManager entityManager, EntityUid? organEntity, Solution? source, FixedPoint2 quantity, ReagentPrototype? reagent, ReactionMethod? method, FixedPoint2 scale, Entity<SolutionComponent>? solutionEntity = null) : base(targetEntity, entityManager)
+    {
+        OrganEntity = organEntity;
+        Source = source;
+        Quantity = quantity;
+        Reagent = reagent;
+        Method = method;
+        Scale = scale;
+        SolutionEntity = solutionEntity; //CP14
+    }
+}
diff --git a/Content.Shared/EntityEffects/EntityEffectCondition.cs b/Content.Shared/EntityEffects/EntityEffectCondition.cs
new file mode 100644
index 0000000000..d6028b9f2c
--- /dev/null
+++ b/Content.Shared/EntityEffects/EntityEffectCondition.cs
@@ -0,0 +1,22 @@
+using System.Text.Json.Serialization;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects;
+
+[ImplicitDataDefinitionForInheritors]
+[MeansImplicitUse]
+public abstract partial class EntityEffectCondition
+{
+    [JsonPropertyName("id")] private protected string _id => this.GetType().Name;
+
+    public abstract bool Condition(EntityEffectBaseArgs args);
+
+    /// <summary>
+    /// Effect explanations are of the form "[chance to] [action] when [condition] and [condition]"
+    /// </summary>
+    /// <param name="prototype"></param>
+    /// <returns></returns>
+    public abstract string GuidebookExplanation(IPrototypeManager prototype);
+}
+
diff --git a/Content.Shared/Examine/ExamineSystemShared.Group.cs b/Content.Shared/Examine/ExamineSystemShared.Group.cs
index bd284f321c..22aeeeeab8 100644
--- a/Content.Shared/Examine/ExamineSystemShared.Group.cs
+++ b/Content.Shared/Examine/ExamineSystemShared.Group.cs
@@ -1,3 +1,4 @@
+using Content.Shared.Ghost;
 using Content.Shared.Verbs;
 using Robust.Shared.Utility;
 
@@ -14,6 +15,8 @@ namespace Content.Shared.Examine
             base.Initialize();
 
             SubscribeLocalEvent<GroupExamineComponent, GetVerbsEvent<ExamineVerb>>(OnGroupExamineVerb);
+
+            _ghostQuery = GetEntityQuery<GhostComponent>();
         }
 
         /// <summary>
diff --git a/Content.Shared/Examine/ExamineSystemShared.cs b/Content.Shared/Examine/ExamineSystemShared.cs
index 8831213c35..4100b07483 100644
--- a/Content.Shared/Examine/ExamineSystemShared.cs
+++ b/Content.Shared/Examine/ExamineSystemShared.cs
@@ -3,6 +3,7 @@ using System.Globalization;
 using System.Linq;
 using System.Text;
 using Content.Shared.Eye.Blinding.Components;
+using Content.Shared.Ghost;
 using Content.Shared.Interaction;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
@@ -44,6 +45,8 @@ namespace Content.Shared.Examine
 
         protected const float ExamineBlurrinessMult = 2.5f;
 
+        private EntityQuery<GhostComponent> _ghostQuery;
+
         /// <summary>
         ///     Creates a new examine tooltip with arbitrary info.
         /// </summary>
@@ -54,6 +57,10 @@ namespace Content.Shared.Examine
             if (IsClientSide(entity))
                 return true;
 
+            // Ghosts can see everything.
+            if (_ghostQuery.HasComp(examiner))
+                return true;
+
             // check if the mob is in critical or dead
             if (MobStateSystem.IsIncapacitated(examiner))
                 return false;
diff --git a/Content.Shared/GameTicking/SharedGameTicker.cs b/Content.Shared/GameTicking/SharedGameTicker.cs
index 95ded8727d..cecc1a4381 100644
--- a/Content.Shared/GameTicking/SharedGameTicker.cs
+++ b/Content.Shared/GameTicking/SharedGameTicker.cs
@@ -5,12 +5,14 @@ using Robust.Shared.Replays;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Markdown.Mapping;
 using Robust.Shared.Serialization.Markdown.Value;
+using Robust.Shared.Timing;
 
 namespace Content.Shared.GameTicking
 {
     public abstract class SharedGameTicker : EntitySystem
     {
         [Dependency] private readonly IReplayRecordingManager _replay = default!;
+        [Dependency] private readonly IGameTiming _gameTiming = default!;
 
         // See ideally these would be pulled from the job definition or something.
         // But this is easier, and at least it isn't hardcoded.
@@ -41,6 +43,11 @@ namespace Content.Shared.GameTicking
         {
             metadata["roundId"] = new ValueDataNode(RoundId.ToString());
         }
+
+        public TimeSpan RoundDuration()
+        {
+            return _gameTiming.CurTime.Subtract(RoundStartTimeSpan);
+        }
     }
 
     [Serializable, NetSerializable]
diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs
index 1e4c49211f..48076ca360 100644
--- a/Content.Shared/Interaction/SharedInteractionSystem.cs
+++ b/Content.Shared/Interaction/SharedInteractionSystem.cs
@@ -486,6 +486,21 @@ namespace Content.Shared.Interaction
         public void InteractUsingRanged(EntityUid user, EntityUid used, EntityUid? target,
             EntityCoordinates clickLocation, bool inRangeUnobstructed)
         {
+            if (target != null)
+            {
+                _adminLogger.Add(
+                    LogType.InteractUsing,
+                    LogImpact.Low,
+                    $"{ToPrettyString(user):user} interacted with {ToPrettyString(target):target} using {ToPrettyString(used):used}");
+            }
+            else
+            {
+                _adminLogger.Add(
+                    LogType.InteractUsing,
+                    LogImpact.Low,
+                    $"{ToPrettyString(user):user} interacted with *nothing* using {ToPrettyString(used):used}");
+            }
+
             if (RangedInteractDoBefore(user, used, target, clickLocation, inRangeUnobstructed))
                 return;
 
@@ -926,6 +941,11 @@ namespace Content.Shared.Interaction
             if (checkCanUse && !_actionBlockerSystem.CanUseHeldEntity(user, used))
                 return;
 
+            _adminLogger.Add(
+                LogType.InteractUsing,
+                LogImpact.Low,
+                $"{ToPrettyString(user):user} interacted with {ToPrettyString(target):target} using {ToPrettyString(used):used}");
+
             if (RangedInteractDoBefore(user, used, target, clickLocation, true))
                 return;
 
diff --git a/Content.Shared/Inventory/InventorySystem.Equip.cs b/Content.Shared/Inventory/InventorySystem.Equip.cs
index 7807619da1..ca2c7ce8e5 100644
--- a/Content.Shared/Inventory/InventorySystem.Equip.cs
+++ b/Content.Shared/Inventory/InventorySystem.Equip.cs
@@ -248,9 +248,17 @@ public abstract partial class InventorySystem
                 return false;
 
             if (slotDefinition.DependsOnComponents is { } componentRegistry)
+            {
                 foreach (var (_, entry) in componentRegistry)
+                {
                     if (!HasComp(slotEntity, entry.Component.GetType()))
                         return false;
+
+                    if (TryComp<AllowSuitStorageComponent>(slotEntity, out var comp) &&
+                        _whitelistSystem.IsWhitelistFailOrNull(comp.Whitelist, itemUid))
+                        return false;
+                }
+            }
         }
 
         var fittingInPocket = slotDefinition.SlotFlags.HasFlag(SlotFlags.POCKET) &&
diff --git a/Content.Shared/Labels/EntitySystems/SharedLabelSystem.cs b/Content.Shared/Labels/EntitySystems/SharedLabelSystem.cs
index f1998e524d..eb3a0f185b 100644
--- a/Content.Shared/Labels/EntitySystems/SharedLabelSystem.cs
+++ b/Content.Shared/Labels/EntitySystems/SharedLabelSystem.cs
@@ -7,14 +7,27 @@ namespace Content.Shared.Labels.EntitySystems;
 
 public abstract partial class SharedLabelSystem : EntitySystem
 {
+    [Dependency] protected readonly NameModifierSystem NameMod = default!;
     public override void Initialize()
     {
         base.Initialize();
 
+        SubscribeLocalEvent<LabelComponent, MapInitEvent>(OnLabelCompMapInit);
         SubscribeLocalEvent<LabelComponent, ExaminedEvent>(OnExamine);
         SubscribeLocalEvent<LabelComponent, RefreshNameModifiersEvent>(OnRefreshNameModifiers);
     }
 
+    private void OnLabelCompMapInit(EntityUid uid, LabelComponent component, MapInitEvent args)
+    {
+        if (!string.IsNullOrEmpty(component.CurrentLabel))
+        {
+            component.CurrentLabel = Loc.GetString(component.CurrentLabel);
+            Dirty(uid, component);
+        }
+
+        NameMod.RefreshNameModifiers(uid);
+    }
+
     public virtual void Label(EntityUid uid, string? text, MetaDataComponent? metadata = null, LabelComponent? label = null){}
 
     private void OnExamine(EntityUid uid, LabelComponent? label, ExaminedEvent args)
diff --git a/Content.Shared/MagicMirror/SharedMagicMirrorSystem.cs b/Content.Shared/MagicMirror/SharedMagicMirrorSystem.cs
index 789b484cfd..9f5348a10f 100644
--- a/Content.Shared/MagicMirror/SharedMagicMirrorSystem.cs
+++ b/Content.Shared/MagicMirror/SharedMagicMirrorSystem.cs
@@ -42,7 +42,7 @@ public abstract class SharedMagicMirrorSystem : EntitySystem
             return;
         }
 
-        if (!_interaction.InRangeUnobstructed(uid, component.Target.Value))
+        if (!_interaction.InRangeUnobstructed(component.Target.Value, uid))
             args.Result = BoundUserInterfaceRangeResult.Fail;
     }
 
diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
index f050c3a1c1..45bbc45abe 100644
--- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs
+++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
@@ -387,48 +387,58 @@ namespace Content.Shared.Preferences
             };
         }
 
-        public HumanoidCharacterProfile WithTraitPreference(ProtoId<TraitPrototype> traitId, string? categoryId, bool pref)
+        public HumanoidCharacterProfile WithTraitPreference(ProtoId<TraitPrototype> traitId, IPrototypeManager protoManager)
         {
-            var prototypeManager = IoCManager.Resolve<IPrototypeManager>();
-            var traitProto = prototypeManager.Index(traitId);
+            // null category is assumed to be default.
+            if (!protoManager.TryIndex(traitId, out var traitProto))
+                return new(this);
 
-            TraitCategoryPrototype? categoryProto = null;
-            if (categoryId != null && categoryId != "default")
-                categoryProto = prototypeManager.Index<TraitCategoryPrototype>(categoryId);
+            var category = traitProto.Category;
 
+            // Category not found so dump it.
+            TraitCategoryPrototype? traitCategory = null;
+
+            if (category != null && !protoManager.TryIndex(category, out traitCategory))
+                return new(this);
+
+            var list = new HashSet<ProtoId<TraitPrototype>>(_traitPreferences) { traitId };
+
+            if (traitCategory == null || traitCategory.MaxTraitPoints < 0)
+            {
+                return new(this)
+                {
+                    _traitPreferences = list,
+                };
+            }
+
+            var count = 0;
+            foreach (var trait in list)
+            {
+                // If trait not found or another category don't count its points.
+                if (!protoManager.TryIndex<TraitPrototype>(trait, out var otherProto) ||
+                    otherProto.Category != traitCategory)
+                {
+                    continue;
+                }
+
+                count += otherProto.Cost;
+            }
+
+            if (count > traitCategory.MaxTraitPoints && traitProto.Cost != 0)
+            {
+                return new(this);
+            }
+
+            return new(this)
+            {
+                _traitPreferences = list,
+            };
+        }
+
+        public HumanoidCharacterProfile WithoutTraitPreference(ProtoId<TraitPrototype> traitId, IPrototypeManager protoManager)
+        {
             var list = new HashSet<ProtoId<TraitPrototype>>(_traitPreferences);
-
-            if (pref)
-            {
-                list.Add(traitId);
-
-                if (categoryProto == null || categoryProto.MaxTraitPoints < 0)
-                {
-                    return new(this)
-                    {
-                        _traitPreferences = list,
-                    };
-                }
-
-                var count = 0;
-                foreach (var trait in list)
-                {
-                    var traitProtoTemp = prototypeManager.Index(trait);
-                    count += traitProtoTemp.Cost;
-                }
-
-                if (count > categoryProto.MaxTraitPoints && traitProto.Cost != 0)
-                {
-                    return new(this)
-                    {
-                        _traitPreferences = _traitPreferences,
-                    };
-                }
-            }
-            else
-            {
-                list.Remove(traitId);
-            }
+            list.Remove(traitId);
 
             return new(this)
             {
@@ -605,7 +615,7 @@ namespace Content.Shared.Preferences
             _antagPreferences.UnionWith(antags);
 
             _traitPreferences.Clear();
-            _traitPreferences.UnionWith(traits);
+            _traitPreferences.UnionWith(GetValidTraits(traits, prototypeManager));
 
             // Checks prototypes exist for all loadouts and dump / set to default if not.
             var toRemove = new ValueList<string>();
@@ -627,6 +637,45 @@ namespace Content.Shared.Preferences
             }
         }
 
+        /// <summary>
+        /// Takes in an IEnumerable of traits and returns a List of the valid traits.
+        /// </summary>
+        public List<ProtoId<TraitPrototype>> GetValidTraits(IEnumerable<ProtoId<TraitPrototype>> traits, IPrototypeManager protoManager)
+        {
+            // Track points count for each group.
+            var groups = new Dictionary<string, int>();
+            var result = new List<ProtoId<TraitPrototype>>();
+
+            foreach (var trait in traits)
+            {
+                if (!protoManager.TryIndex(trait, out var traitProto))
+                    continue;
+
+                // Always valid.
+                if (traitProto.Category == null)
+                {
+                    result.Add(trait);
+                    continue;
+                }
+
+                // No category so dump it.
+                if (!protoManager.TryIndex(traitProto.Category, out var category))
+                    continue;
+
+                var existing = groups.GetOrNew(category.ID);
+                existing += traitProto.Cost;
+
+                // Too expensive.
+                if (existing > category.MaxTraitPoints)
+                    continue;
+
+                groups[category.ID] = existing;
+                result.Add(trait);
+            }
+
+            return result;
+        }
+
         public ICharacterProfile Validated(ICommonSession session, IDependencyCollection collection)
         {
             var profile = new HumanoidCharacterProfile(this);
diff --git a/Content.Shared/Preferences/Loadouts/RoleLoadout.cs b/Content.Shared/Preferences/Loadouts/RoleLoadout.cs
index ca6d841616..f943c9ea8a 100644
--- a/Content.Shared/Preferences/Loadouts/RoleLoadout.cs
+++ b/Content.Shared/Preferences/Loadouts/RoleLoadout.cs
@@ -124,9 +124,12 @@ public sealed partial class RoleLoadout : IEquatable<RoleLoadout>
             // If you put invalid ones first but that's your fault for not using sensible defaults
             if (loadouts.Count < groupProto.MinLimit)
             {
-                for (var i = 0; i < Math.Min(groupProto.MinLimit, groupProto.Loadouts.Count); i++)
+                foreach (var protoId in groupProto.Loadouts)
                 {
-                    if (!protoManager.TryIndex(groupProto.Loadouts[i], out var loadoutProto))
+                    if (loadouts.Count >= groupProto.MinLimit)
+                        break;
+
+                    if (!protoManager.TryIndex(protoId, out var loadoutProto))
                         continue;
 
                     var defaultLoadout = new Loadout()
@@ -193,11 +196,10 @@ public sealed partial class RoleLoadout : IEquatable<RoleLoadout>
             if (groupProto.MinLimit > 0)
             {
                 // Apply any loadouts we can.
-                var addedCount = 0;
                 foreach (var protoId in groupProto.Loadouts)
                 {
                     // Reached the limit, time to stop
-                    if (addedCount >= groupProto.MinLimit)
+                    if (loadouts.Count >= groupProto.MinLimit)
                         break;
 
                     if (!protoManager.TryIndex(protoId, out var loadoutProto))
@@ -214,7 +216,6 @@ public sealed partial class RoleLoadout : IEquatable<RoleLoadout>
 
                     loadouts.Add(defaultLoadout);
                     Apply(loadoutProto);
-                    addedCount++;
                 }
             }
         }
diff --git a/Content.Shared/Prying/Components/PryingComponent.cs b/Content.Shared/Prying/Components/PryingComponent.cs
index 6651e2b574..93713e52c6 100644
--- a/Content.Shared/Prying/Components/PryingComponent.cs
+++ b/Content.Shared/Prying/Components/PryingComponent.cs
@@ -43,14 +43,26 @@ public sealed partial class PryingComponent : Component
 /// Cancel to stop the entity from being pried open.
 /// </summary>
 [ByRefEvent]
-public record struct BeforePryEvent(EntityUid User, bool PryPowered, bool Force)
+public record struct BeforePryEvent(EntityUid User, bool PryPowered, bool Force, bool StrongPry)
 {
     public readonly EntityUid User = User;
 
+    /// <summary>
+    /// Whether prying should be allowed even if whatever is being pried is powered.
+    /// </summary>
     public readonly bool PryPowered = PryPowered;
 
+    /// <summary>
+    /// Whether prying should be allowed to go through under most circumstances. (E.g. airlock is bolted).
+    /// Systems may still wish to ignore this occasionally.
+    /// </summary>
     public readonly bool Force = Force;
 
+    /// <summary>
+    /// Whether anything other than bare hands were used. This should only be false if prying is being performed without a prying comp.
+    /// </summary>
+    public readonly bool StrongPry = StrongPry;
+
     public string? Message;
 
     public bool Cancelled;
diff --git a/Content.Shared/Prying/Systems/PryingSystem.cs b/Content.Shared/Prying/Systems/PryingSystem.cs
index 52459c4f74..10c80cfab5 100644
--- a/Content.Shared/Prying/Systems/PryingSystem.cs
+++ b/Content.Shared/Prying/Systems/PryingSystem.cs
@@ -109,7 +109,7 @@ public sealed class PryingSystem : EntitySystem
 
         if (comp != null || Resolve(user, ref comp, false))
         {
-            canev = new BeforePryEvent(user, comp.PryPowered, comp.Force);
+            canev = new BeforePryEvent(user, comp.PryPowered, comp.Force, true);
         }
         else
         {
@@ -119,7 +119,7 @@ public sealed class PryingSystem : EntitySystem
                 return false;
             }
 
-            canev = new BeforePryEvent(user, false, false);
+            canev = new BeforePryEvent(user, false, false, false);
         }
 
         RaiseLocalEvent(target, ref canev);
diff --git a/Content.Shared/Singularity/Components/ContainmentFieldComponent.cs b/Content.Shared/Singularity/Components/ContainmentFieldComponent.cs
index 43163a0c5c..621bbe8ff9 100644
--- a/Content.Shared/Singularity/Components/ContainmentFieldComponent.cs
+++ b/Content.Shared/Singularity/Components/ContainmentFieldComponent.cs
@@ -18,4 +18,10 @@ public sealed partial class ContainmentFieldComponent : Component
     /// </summary>
     [DataField("maxMass")]
     public float MaxMass = 10000f;
+
+    /// <summary>
+    /// Should field vaporize garbage that collides with it?
+    /// </summary>
+    [DataField]
+    public bool DestroyGarbage = true;
 }
diff --git a/Content.Shared/Sound/Components/BaseEmitSoundComponent.cs b/Content.Shared/Sound/Components/BaseEmitSoundComponent.cs
index f997621907..4e6ebb23d2 100644
--- a/Content.Shared/Sound/Components/BaseEmitSoundComponent.cs
+++ b/Content.Shared/Sound/Components/BaseEmitSoundComponent.cs
@@ -1,17 +1,17 @@
 using Robust.Shared.Audio;
 
-namespace Content.Shared.Sound.Components
-{
-    /// <summary>
-    /// Base sound emitter which defines most of the data fields.
-    /// Accepts both single sounds and sound collections.
-    /// </summary>
-    public abstract partial class BaseEmitSoundComponent : Component
-    {
-        public static readonly AudioParams DefaultParams = AudioParams.Default.WithVolume(-2f);
+namespace Content.Shared.Sound.Components;
 
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("sound", required: true)]
-        public SoundSpecifier? Sound;
-    }
+/// <summary>
+/// Base sound emitter which defines most of the data fields.
+/// Accepts both single sounds and sound collections.
+/// </summary>
+public abstract partial class BaseEmitSoundComponent : Component
+{
+    public static readonly AudioParams DefaultParams = AudioParams.Default.WithVolume(-2f);
+
+    [AutoNetworkedField]
+    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField(required: true)]
+    public SoundSpecifier? Sound;
 }
diff --git a/Content.Shared/Storage/Components/SharedMapLayerData.cs b/Content.Shared/Storage/Components/SharedMapLayerData.cs
index 6d2f4a7eaf..da176759f7 100644
--- a/Content.Shared/Storage/Components/SharedMapLayerData.cs
+++ b/Content.Shared/Storage/Components/SharedMapLayerData.cs
@@ -17,21 +17,21 @@ namespace Content.Shared.Storage.Components
     {
         public string Layer = string.Empty;
 
-        [DataField("whitelist", required: true, serverOnly: true)]
-        public EntityWhitelist ServerWhitelist { get; set; } = new();
+        [DataField(required: true)]
+        public EntityWhitelist? Whitelist { get; set; }
 
         /// <summary>
         ///     Minimal amount of entities that are valid for whitelist.
         ///     If it's smaller than minimal amount, layer will be hidden.
         /// </summary>
-        [DataField("minCount")]
+        [DataField]
         public int MinCount = 1;
 
         /// <summary>
         ///     Max amount of entities that are valid for whitelist.
         ///     If it's bigger than max amount, layer will be hidden.
         /// </summary>
-        [DataField("maxCount")]
+        [DataField]
         public int MaxCount = int.MaxValue;
     }
 
diff --git a/Content.Shared/Storage/EntitySystems/SharedItemMapperSystem.cs b/Content.Shared/Storage/EntitySystems/SharedItemMapperSystem.cs
index 2557f8100c..cfa082a9ee 100644
--- a/Content.Shared/Storage/EntitySystems/SharedItemMapperSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedItemMapperSystem.cs
@@ -95,7 +95,7 @@ namespace Content.Shared.Storage.EntitySystems
             var list = new List<string>();
             foreach (var mapLayerData in itemMapper.MapLayers.Values)
             {
-                var count = containedLayers.Count(ent => _whitelistSystem.IsWhitelistPass(mapLayerData.ServerWhitelist, ent));
+                var count = containedLayers.Count(ent => _whitelistSystem.IsWhitelistPass(mapLayerData.Whitelist, ent));
                 if (count >= mapLayerData.MinCount && count <= mapLayerData.MaxCount)
                 {
                     list.Add(mapLayerData.Layer);
diff --git a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
index 01a7c979ee..4b2d10bbc5 100644
--- a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
@@ -100,6 +100,7 @@ public abstract class SharedStorageSystem : EntitySystem
             subs.Event<BoundUIClosedEvent>(OnBoundUIClosed);
         });
 
+        SubscribeLocalEvent<StorageComponent, ComponentRemove>(OnRemove);
         SubscribeLocalEvent<StorageComponent, MapInitEvent>(OnMapInit);
         SubscribeLocalEvent<StorageComponent, GetVerbsEvent<ActivationVerb>>(AddUiVerb);
         SubscribeLocalEvent<StorageComponent, ComponentGetState>(OnStorageGetState);
@@ -137,6 +138,11 @@ public abstract class SharedStorageSystem : EntitySystem
         UpdatePrototypeCache();
     }
 
+    private void OnRemove(Entity<StorageComponent> entity, ref ComponentRemove args)
+    {
+        _ui.CloseUi(entity.Owner, StorageComponent.StorageUiKey.Key);
+    }
+
     private void OnMapInit(Entity<StorageComponent> entity, ref MapInitEvent args)
     {
         UseDelay.SetLength(entity.Owner, entity.Comp.QuickInsertCooldown, QuickInsertUseDelayID);
diff --git a/Content.Shared/Traits/TraitCategoryPrototype.cs b/Content.Shared/Traits/TraitCategoryPrototype.cs
index 1da624173a..00c7fd36af 100644
--- a/Content.Shared/Traits/TraitCategoryPrototype.cs
+++ b/Content.Shared/Traits/TraitCategoryPrototype.cs
@@ -8,6 +8,8 @@ namespace Content.Shared.Traits;
 [Prototype]
 public sealed partial class TraitCategoryPrototype : IPrototype
 {
+    public const string Default = "Default";
+
     [ViewVariables]
     [IdDataField]
     public string ID { get; private set; } = default!;
@@ -19,8 +21,8 @@ public sealed partial class TraitCategoryPrototype : IPrototype
     public LocId Name { get; private set; } = string.Empty;
 
     /// <summary>
-    ///     The maximum number of traits that can be taken in this category. If -1, you can take as many traits as you like.
+    ///     The maximum number of traits that can be taken in this category.
     /// </summary>
     [DataField]
-    public int MaxTraitPoints = -1;
+    public int? MaxTraitPoints;
 }
diff --git a/Content.Shared/Weapons/Reflect/ReflectComponent.cs b/Content.Shared/Weapons/Reflect/ReflectComponent.cs
index 5d8432ac77..8e7b8975d9 100644
--- a/Content.Shared/Weapons/Reflect/ReflectComponent.cs
+++ b/Content.Shared/Weapons/Reflect/ReflectComponent.cs
@@ -21,42 +21,17 @@ public sealed partial class ReflectComponent : Component
     [ViewVariables(VVAccess.ReadWrite), DataField("reflects")]
     public ReflectType Reflects = ReflectType.Energy | ReflectType.NonEnergy;
 
+    /// <summary>
+    /// Probability for a projectile to be reflected.
+    /// </summary>
+    [DataField("reflectProb"), ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
+    public float ReflectProb = 0.25f;
+
     [DataField("spread"), ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
     public Angle Spread = Angle.FromDegrees(45);
 
     [DataField("soundOnReflect")]
     public SoundSpecifier? SoundOnReflect = new SoundPathSpecifier("/Audio/Weapons/Guns/Hits/laser_sear_wall.ogg");
-
-    /// <summary>
-    /// Is the deflection an innate power or something actively maintained? If true, this component grants a flat
-    /// deflection chance rather than a chance that degrades when moving/weightless/stunned/etc.
-    /// </summary>
-    [DataField]
-    public bool Innate = false;
-
-    /// <summary>
-    /// Maximum probability for a projectile to be reflected.
-    /// </summary>
-    [DataField("reflectProb"), ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
-    public float ReflectProb = 0.25f;
-
-    /// <summary>
-    /// The maximum velocity a wielder can move at before losing effectiveness.
-    /// </summary>
-    [DataField]
-    public float VelocityBeforeNotMaxProb = 2.5f; // Walking speed for a human. Suitable for a weightless deflector like an e-sword.
-
-    /// <summary>
-    /// The velocity a wielder has to be moving at to use the minimum effectiveness value.
-    /// </summary>
-    [DataField]
-    public float VelocityBeforeMinProb = 4.5f; // Sprinting speed for a human. Suitable for a weightless deflector like an e-sword.
-
-    /// <summary>
-    /// Minimum probability for a projectile to be reflected.
-    /// </summary>
-    [DataField]
-    public float MinReflectProb = 0.1f;
 }
 
 [Flags]
diff --git a/Content.Shared/Weapons/Reflect/ReflectSystem.cs b/Content.Shared/Weapons/Reflect/ReflectSystem.cs
index 9b89be6202..7a2e733bf7 100644
--- a/Content.Shared/Weapons/Reflect/ReflectSystem.cs
+++ b/Content.Shared/Weapons/Reflect/ReflectSystem.cs
@@ -3,18 +3,16 @@ using System.Numerics;
 using Content.Shared.Administration.Logs;
 using Content.Shared.Alert;
 using Content.Shared.Audio;
-using Content.Shared.Damage.Components;
 using Content.Shared.Database;
-using Content.Shared.Gravity;
 using Content.Shared.Hands;
 using Content.Shared.Inventory;
 using Content.Shared.Inventory.Events;
 using Content.Shared.Item.ItemToggle.Components;
 using Content.Shared.Popups;
 using Content.Shared.Projectiles;
-using Content.Shared.Standing;
 using Content.Shared.Weapons.Ranged.Components;
 using Content.Shared.Weapons.Ranged.Events;
+using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Network;
 using Robust.Shared.Physics.Components;
@@ -38,134 +36,73 @@ public sealed class ReflectSystem : EntitySystem
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly InventorySystem _inventorySystem = default!;
-    [Dependency] private readonly SharedGravitySystem _gravity = default!;
-    [Dependency] private readonly StandingStateSystem _standing = default!;
-    [Dependency] private readonly AlertsSystem _alerts = default!;
-
-    [ValidatePrototypeId<AlertPrototype>]
-    private const string DeflectingAlert = "Deflecting";
 
     public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<ReflectComponent, ProjectileReflectAttemptEvent>(OnObjectReflectProjectileAttempt);
-        SubscribeLocalEvent<ReflectComponent, HitScanReflectAttemptEvent>(OnObjectReflectHitscanAttempt);
+        SubscribeLocalEvent<ReflectComponent, ProjectileReflectAttemptEvent>(OnReflectCollide);
+        SubscribeLocalEvent<ReflectComponent, HitScanReflectAttemptEvent>(OnReflectHitscan);
         SubscribeLocalEvent<ReflectComponent, GotEquippedEvent>(OnReflectEquipped);
         SubscribeLocalEvent<ReflectComponent, GotUnequippedEvent>(OnReflectUnequipped);
         SubscribeLocalEvent<ReflectComponent, GotEquippedHandEvent>(OnReflectHandEquipped);
         SubscribeLocalEvent<ReflectComponent, GotUnequippedHandEvent>(OnReflectHandUnequipped);
         SubscribeLocalEvent<ReflectComponent, ItemToggledEvent>(OnToggleReflect);
 
-        SubscribeLocalEvent<ReflectUserComponent, ProjectileReflectAttemptEvent>(OnUserProjectileReflectAttempt);
-        SubscribeLocalEvent<ReflectUserComponent, HitScanReflectAttemptEvent>(OnUserHitscanReflectAttempt);
+        SubscribeLocalEvent<ReflectUserComponent, ProjectileReflectAttemptEvent>(OnReflectUserCollide);
+        SubscribeLocalEvent<ReflectUserComponent, HitScanReflectAttemptEvent>(OnReflectUserHitscan);
     }
 
-    private void OnUserHitscanReflectAttempt(Entity<ReflectUserComponent> user, ref HitScanReflectAttemptEvent args)
+    private void OnReflectUserHitscan(EntityUid uid, ReflectUserComponent component, ref HitScanReflectAttemptEvent args)
     {
         if (args.Reflected)
             return;
 
-        if (!UserCanReflect(user, out var bestReflectorUid))
-            return;
-
-        if (!TryReflectHitscan(user.Owner, bestReflectorUid.Value, args.Shooter, args.SourceItem, args.Direction, out var dir))
-            return;
-
-        args.Direction = dir.Value;
-        args.Reflected = true;
-    }
-
-    private void OnUserProjectileReflectAttempt(Entity<ReflectUserComponent> user, ref ProjectileReflectAttemptEvent args)
-    {
-        if (args.Cancelled)
-            return;
-
-        if (!TryComp<ReflectiveComponent>(args.ProjUid, out var reflectiveComponent))
-            return;
-
-        if (!UserCanReflect(user, out var bestReflectorUid, (args.ProjUid, reflectiveComponent)))
-            return;
-
-        if (!TryReflectProjectile(user, bestReflectorUid.Value, (args.ProjUid, args.Component)))
-            return;
-
-        args.Cancelled = true;
-    }
-
-    private void OnObjectReflectHitscanAttempt(Entity<ReflectComponent> obj, ref HitScanReflectAttemptEvent args)
-    {
-        if (args.Reflected || (obj.Comp.Reflects & args.Reflective) == 0x0)
-            return;
-
-        if (!TryReflectHitscan(obj, obj, args.Shooter, args.SourceItem, args.Direction, out var dir))
-            return;
-
-        args.Direction = dir.Value;
-        args.Reflected = true;
-    }
-
-    private void OnObjectReflectProjectileAttempt(Entity<ReflectComponent> obj, ref ProjectileReflectAttemptEvent args)
-    {
-        if (args.Cancelled)
-            return;
-
-        if (!TryReflectProjectile(obj, obj, (args.ProjUid, args.Component)))
-            return;
-
-        args.Cancelled = true;
-    }
-
-    /// <summary>
-    /// Can a user reflect something that's hit them? Returns true if so, and the best reflector available in the user's equipment.
-    /// </summary>
-    private bool UserCanReflect(Entity<ReflectUserComponent> user, [NotNullWhen(true)] out Entity<ReflectComponent>? bestReflector, Entity<ReflectiveComponent>? projectile = null)
-    {
-        bestReflector = null;
-
-        foreach (var entityUid in _inventorySystem.GetHandOrInventoryEntities(user.Owner, SlotFlags.WITHOUT_POCKET))
+        foreach (var ent in _inventorySystem.GetHandOrInventoryEntities(uid, SlotFlags.All & ~SlotFlags.POCKET))
         {
-            if (!TryComp<ReflectComponent>(entityUid, out var comp))
+            if (!TryReflectHitscan(uid, ent, args.Shooter, args.SourceItem, args.Direction, out var dir))
                 continue;
 
-            if (!comp.Enabled)
+            args.Direction = dir.Value;
+            args.Reflected = true;
+            break;
+        }
+    }
+
+    private void OnReflectUserCollide(EntityUid uid, ReflectUserComponent component, ref ProjectileReflectAttemptEvent args)
+    {
+        foreach (var ent in _inventorySystem.GetHandOrInventoryEntities(uid, SlotFlags.All & ~SlotFlags.POCKET))
+        {
+            if (!TryReflectProjectile(uid, ent, args.ProjUid))
                 continue;
 
-            if (bestReflector != null && bestReflector.Value.Comp.ReflectProb >= comp.ReflectProb)
-                continue;
+            args.Cancelled = true;
+            break;
+        }
+    }
 
-            if (projectile != null && (comp.Reflects & projectile.Value.Comp.Reflective) == 0x0)
-                continue;
+    private void OnReflectCollide(EntityUid uid, ReflectComponent component, ref ProjectileReflectAttemptEvent args)
+    {
+        if (args.Cancelled)
+            return;
 
-            bestReflector = (entityUid, comp);
+        if (TryReflectProjectile(uid, uid, args.ProjUid, reflect: component))
+            args.Cancelled = true;
+    }
+
+    private bool TryReflectProjectile(EntityUid user, EntityUid reflector, EntityUid projectile, ProjectileComponent? projectileComp = null, ReflectComponent? reflect = null)
+    {
+        if (!Resolve(reflector, ref reflect, false) ||
+            !reflect.Enabled ||
+            !TryComp<ReflectiveComponent>(projectile, out var reflective) ||
+            (reflect.Reflects & reflective.Reflective) == 0x0 ||
+            !_random.Prob(reflect.ReflectProb) ||
+            !TryComp<PhysicsComponent>(projectile, out var physics))
+        {
+            return false;
         }
 
-        return bestReflector != null;
-    }
-
-    private bool TryReflectProjectile(EntityUid user, Entity<ReflectComponent> reflector, Entity<ProjectileComponent> projectile)
-    {
-        if (
-            // Is it on?
-            !reflector.Comp.Enabled ||
-            // Is the projectile deflectable?
-            !TryComp<ReflectiveComponent>(projectile, out var reflective) ||
-            // Does the deflector deflect the type of projecitle?
-            (reflector.Comp.Reflects & reflective.Reflective) == 0x0 ||
-            // Is the projectile correctly set up with physics?
-            !TryComp<PhysicsComponent>(projectile, out var physics) ||
-            // If the user of the reflector is a mob with stamina, is it capable of deflecting?
-            TryComp<StaminaComponent>(user, out var staminaComponent) && staminaComponent.Critical ||
-            _standing.IsDown(reflector)
-        )
-            return false;
-
-        // If this dice roll fails, the shot isn't deflected
-        if (!_random.Prob(GetReflectChance(reflector)))
-            return false;
-
-        // Below handles what happens after being deflected.
-        var rotation = _random.NextAngle(-reflector.Comp.Spread / 2, reflector.Comp.Spread / 2).Opposite();
+        var rotation = _random.NextAngle(-reflect.Spread / 2, reflect.Spread / 2).Opposite();
         var existingVelocity = _physics.GetMapLinearVelocity(projectile, component: physics);
         var relativeVelocity = existingVelocity - _physics.GetMapLinearVelocity(user);
         var newVelocity = rotation.RotateVec(relativeVelocity);
@@ -182,52 +119,63 @@ public sealed class ReflectSystem : EntitySystem
         if (_netManager.IsServer)
         {
             _popup.PopupEntity(Loc.GetString("reflect-shot"), user);
-            _audio.PlayPvs(reflector.Comp.SoundOnReflect, user, AudioHelpers.WithVariation(0.05f, _random));
+            _audio.PlayPvs(reflect.SoundOnReflect, user, AudioHelpers.WithVariation(0.05f, _random));
         }
 
-        _adminLogger.Add(LogType.BulletHit, LogImpact.Medium, $"{ToPrettyString(user)} reflected {ToPrettyString(projectile)} from {ToPrettyString(projectile.Comp.Weapon)} shot by {projectile.Comp.Shooter}");
+        if (Resolve(projectile, ref projectileComp, false))
+        {
+            _adminLogger.Add(LogType.BulletHit, LogImpact.Medium, $"{ToPrettyString(user)} reflected {ToPrettyString(projectile)} from {ToPrettyString(projectileComp.Weapon)} shot by {projectileComp.Shooter}");
 
-        projectile.Comp.Shooter = user;
-        projectile.Comp.Weapon = user;
-        Dirty(projectile);
+            projectileComp.Shooter = user;
+            projectileComp.Weapon = user;
+            Dirty(projectile, projectileComp);
+        }
+        else
+        {
+            _adminLogger.Add(LogType.BulletHit, LogImpact.Medium, $"{ToPrettyString(user)} reflected {ToPrettyString(projectile)}");
+        }
 
         return true;
     }
 
+    private void OnReflectHitscan(EntityUid uid, ReflectComponent component, ref HitScanReflectAttemptEvent args)
+    {
+        if (args.Reflected ||
+            (component.Reflects & args.Reflective) == 0x0)
+        {
+            return;
+        }
+
+        if (TryReflectHitscan(uid, uid, args.Shooter, args.SourceItem, args.Direction, out var dir))
+        {
+            args.Direction = dir.Value;
+            args.Reflected = true;
+        }
+    }
+
     private bool TryReflectHitscan(
         EntityUid user,
-        Entity<ReflectComponent> reflector,
+        EntityUid reflector,
         EntityUid? shooter,
         EntityUid shotSource,
         Vector2 direction,
         [NotNullWhen(true)] out Vector2? newDirection)
     {
-        if (
-            // Is the reflector enabled?
-            !reflector.Comp.Enabled ||
-            // If the user is a mob with stamina, is it capable of deflecting?
-            TryComp<StaminaComponent>(user, out var staminaComponent) && staminaComponent.Critical ||
-            _standing.IsDown(user))
+        if (!TryComp<ReflectComponent>(reflector, out var reflect) ||
+            !reflect.Enabled ||
+            !_random.Prob(reflect.ReflectProb))
         {
             newDirection = null;
             return false;
         }
 
-        // If this dice roll fails, the shot is not deflected.
-        if (!_random.Prob(GetReflectChance(reflector)))
-        {
-            newDirection = null;
-            return false;
-        }
-
-        // Below handles what happens after being deflected.
         if (_netManager.IsServer)
         {
             _popup.PopupEntity(Loc.GetString("reflect-shot"), user);
-            _audio.PlayPvs(reflector.Comp.SoundOnReflect, user, AudioHelpers.WithVariation(0.05f, _random));
+            _audio.PlayPvs(reflect.SoundOnReflect, user, AudioHelpers.WithVariation(0.05f, _random));
         }
 
-        var spread = _random.NextAngle(-reflector.Comp.Spread / 2, reflector.Comp.Spread / 2);
+        var spread = _random.NextAngle(-reflect.Spread / 2, reflect.Spread / 2);
         newDirection = -spread.RotateVec(direction);
 
         if (shooter != null)
@@ -238,106 +186,52 @@ public sealed class ReflectSystem : EntitySystem
         return true;
     }
 
-    private float GetReflectChance(Entity<ReflectComponent> reflector)
-    {
-        /*
-         *  The rules of deflection are as follows:
-         *  If you innately reflect things via magic, biology etc., you always have a full chance.
-         *  If you are standing up and standing still, you're prepared to deflect and have full chance.
-         *  If you have velocity, your deflection chance depends on your velocity, clamped.
-         *  If you are floating, your chance is the minimum value possible.
-         */
-
-        if (reflector.Comp.Innate)
-            return reflector.Comp.ReflectProb;
-
-        if (_gravity.IsWeightless(reflector))
-            return reflector.Comp.MinReflectProb;
-
-        if (!TryComp<PhysicsComponent>(reflector, out var reflectorPhysics))
-            return reflector.Comp.ReflectProb;
-
-        return MathHelper.Lerp(
-            reflector.Comp.MinReflectProb,
-            reflector.Comp.ReflectProb,
-            // Inverse progression between velocities fed in as progression between probabilities. We go high -> low so the output here needs to be _inverted_.
-            1 - Math.Clamp((reflectorPhysics.LinearVelocity.Length() - reflector.Comp.VelocityBeforeNotMaxProb) / (reflector.Comp.VelocityBeforeMinProb - reflector.Comp.VelocityBeforeNotMaxProb), 0, 1)
-        );
-    }
-
-    private void OnReflectEquipped(Entity<ReflectComponent> reflector, ref GotEquippedEvent args)
+    private void OnReflectEquipped(EntityUid uid, ReflectComponent component, GotEquippedEvent args)
     {
         if (_gameTiming.ApplyingState)
             return;
 
         EnsureComp<ReflectUserComponent>(args.Equipee);
-
-        if (reflector.Comp.Enabled)
-            EnableAlert(args.Equipee);
     }
 
-    private void OnReflectUnequipped(Entity<ReflectComponent> reflector, ref GotUnequippedEvent args)
+    private void OnReflectUnequipped(EntityUid uid, ReflectComponent comp, GotUnequippedEvent args)
     {
         RefreshReflectUser(args.Equipee);
     }
 
-    private void OnReflectHandEquipped(Entity<ReflectComponent> reflector, ref GotEquippedHandEvent args)
+    private void OnReflectHandEquipped(EntityUid uid, ReflectComponent component, GotEquippedHandEvent args)
     {
         if (_gameTiming.ApplyingState)
             return;
 
         EnsureComp<ReflectUserComponent>(args.User);
-
-        if (reflector.Comp.Enabled)
-            EnableAlert(args.User);
     }
 
-    private void OnReflectHandUnequipped(Entity<ReflectComponent> reflector, ref GotUnequippedHandEvent args)
+    private void OnReflectHandUnequipped(EntityUid uid, ReflectComponent component, GotUnequippedHandEvent args)
     {
         RefreshReflectUser(args.User);
     }
 
-    private void OnToggleReflect(Entity<ReflectComponent> reflector, ref ItemToggledEvent args)
+    private void OnToggleReflect(EntityUid uid, ReflectComponent comp, ref ItemToggledEvent args)
     {
-        reflector.Comp.Enabled = args.Activated;
-        Dirty(reflector);
-
-        if (args.User == null)
-            return;
-
-        if (reflector.Comp.Enabled)
-            EnableAlert(args.User.Value);
-        else
-            DisableAlert(args.User.Value);
+        comp.Enabled = args.Activated;
+        Dirty(uid, comp);
     }
 
     /// <summary>
-    /// Refreshes whether someone has reflection potential, so we can raise directed events on them.
+    /// Refreshes whether someone has reflection potential so we can raise directed events on them.
     /// </summary>
     private void RefreshReflectUser(EntityUid user)
     {
-        foreach (var ent in _inventorySystem.GetHandOrInventoryEntities(user, SlotFlags.WITHOUT_POCKET))
+        foreach (var ent in _inventorySystem.GetHandOrInventoryEntities(user, SlotFlags.All & ~SlotFlags.POCKET))
         {
             if (!HasComp<ReflectComponent>(ent))
                 continue;
 
             EnsureComp<ReflectUserComponent>(user);
-            EnableAlert(user);
-
             return;
         }
 
         RemCompDeferred<ReflectUserComponent>(user);
-        DisableAlert(user);
-    }
-
-    private void EnableAlert(EntityUid alertee)
-    {
-        _alerts.ShowAlert(alertee, DeflectingAlert);
-    }
-
-    private void DisableAlert(EntityUid alertee)
-    {
-        _alerts.ClearAlert(alertee, DeflectingAlert);
     }
 }
diff --git a/Resources/Audio/Misc/attributions.yml b/Resources/Audio/Misc/attributions.yml
index db13d28d83..b38cb56a89 100644
--- a/Resources/Audio/Misc/attributions.yml
+++ b/Resources/Audio/Misc/attributions.yml
@@ -34,9 +34,9 @@
   source: "https://github.com/ss220-space/Paradise/blob/05043bcfb35c2e7bcf1efbdbfbf976e1a2504bc2/sound/effects/epsilon.ogg"
 
 - files: ["siren.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from Parsdise SS13"
-  source: "https://github.com/ParadiseSS13/Paradise/blob/master/sound/effects/new_siren.ogg"
+  license: "CC0-1.0"
+  copyright: "Created by Bhijin & Myr for Space Station 14"
+  source: "https://github.com/space-wizards/space-station-14"
 
 - files: ["redalert.ogg"]
   license: "CC-BY-SA-3.0"
diff --git a/Resources/Audio/Misc/siren.ogg b/Resources/Audio/Misc/siren.ogg
index 24c4ecca9a..dad08b5dc3 100644
Binary files a/Resources/Audio/Misc/siren.ogg and b/Resources/Audio/Misc/siren.ogg differ
diff --git a/Resources/Audio/StationEvents/attributions.yml b/Resources/Audio/StationEvents/attributions.yml
index e63b18a627..70ecf1d2e7 100644
--- a/Resources/Audio/StationEvents/attributions.yml
+++ b/Resources/Audio/StationEvents/attributions.yml
@@ -6,4 +6,9 @@
 - files: ["clearly_nuclear.ogg"]
   license: "CC-BY-3.0"
   copyright: "Created by mryikes"
-  source: "https://www.youtube.com/watch?v=chix8uz-oUQ"
\ No newline at end of file
+  source: "https://www.youtube.com/watch?v=chix8uz-oUQ"
+
+- files: ["sound_station_14.ogg"]
+  license: "CC-BY-3.0"
+  copyright: "Created by Donchan"
+  source: "https://www.youtube.com/watch?v=4nUpeYLKUns"
\ No newline at end of file
diff --git a/Resources/Audio/StationEvents/sound_station_14.ogg b/Resources/Audio/StationEvents/sound_station_14.ogg
new file mode 100644
index 0000000000..206d29ee5d
Binary files /dev/null and b/Resources/Audio/StationEvents/sound_station_14.ogg differ
diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml
index 84f31adef4..8ba91e2e02 100644
--- a/Resources/Changelog/Admin.yml
+++ b/Resources/Changelog/Admin.yml
@@ -330,5 +330,27 @@ Entries:
   id: 40
   time: '2024-06-21T12:06:07.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/29258
+- author: Chief-Engineer
+  changes:
+  - message: grant_connect_bypass now requires moderator permissions instead of admin.
+    type: Tweak
+  id: 41
+  time: '2024-06-24T21:56:29.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29406
+- author: Chief-Engineer
+  changes:
+  - message: Added the ability to alert for shared connections.
+    type: Add
+  id: 42
+  time: '2024-06-26T13:43:43.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29405
+- author: Repo
+  changes:
+  - message: Changed admin object tab from auto to manual refresh on tab change or
+      button press so that entries don't shift around when selecting an object.
+    type: Tweak
+  id: 43
+  time: '2024-06-28T03:32:57.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28681
 Name: Admin
 Order: 1
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 68ccd7a6d4..c274bcf2d1 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,348 +1,4 @@
 Entries:
-- author: Tayrtahn
-  changes:
-  - message: Some devices may have broken wiring at the start of each round.
-    type: Add
-  id: 6299
-  time: '2024-04-04T06:28:09.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26695
-- author: lzk228
-  changes:
-  - message: Turning off thrusters and gyroscopes now stop consume power.
-    type: Fix
-  id: 6300
-  time: '2024-04-04T06:28:33.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26690
-- author: Aexxie
-  changes:
-  - message: Added the option to disable your OOC Patron name color.
-    type: Add
-  id: 6301
-  time: '2024-04-04T07:20:06.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26653
-- author: DinoWattz
-  changes:
-  - message: Fixed pocket slots being able to hide character snout markings.
-    type: Fix
-  id: 6302
-  time: '2024-04-04T08:35:44.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26708
-- author: VasilisThePikachu
-  changes:
-  - message: Mop buckets and Janitorial Trolleys will not spill their contents as
-      soon as they are pushed.
-    type: Fix
-  - message: Mop buckets are no longer solid. So you can now walk through them.
-    type: Fix
-  id: 6303
-  time: '2024-04-04T08:39:55.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26706
-- author: ZeroDayDaemon
-  changes:
-  - message: Lowered the number of ducks in the duck crate and reduced the price of
-      it.
-    type: Tweak
-  id: 6304
-  time: '2024-04-04T19:30:13.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26729
-- author: PrPleGoo
-  changes:
-  - message: The medical HUD's brightness now scales with lighting again.
-    type: Tweak
-  - message: Most HUD icon's brightness now scale with lighting.
-    type: Tweak
-  id: 6305
-  time: '2024-04-04T23:05:01.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26726
-- author: Daemon
-  changes:
-  - message: Practice projectiles have been given standardized minimal damage.
-    type: Tweak
-  - message: The practice laser gun now works with shooting targets.
-    type: Tweak
-  id: 6306
-  time: '2024-04-05T03:15:02.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26731
-- author: Daemon
-  changes:
-  - message: Shooting targets can now have their popup type changed with a left click
-      to show total damage, damage of a single hit, both, or just a notice that it
-      was hit.
-    type: Tweak
-  id: 6307
-  time: '2024-04-05T07:19:41.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26734
-- author: Vermidia
-  changes:
-  - message: Baseball bats now require a knife to craft
-    type: Tweak
-  id: 6308
-  time: '2024-04-05T15:41:35.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26742
-- author: deltanedas
-  changes:
-  - message: Making fultons now requires cloth and they are faster to make.
-    type: Tweak
-  id: 6309
-  time: '2024-04-05T15:42:12.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26747
-- author: superjj18
-  changes:
-  - message: Broadcasting works again!
-    type: Fix
-  id: 6310
-  time: '2024-04-05T17:29:22.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26750
-- author: Golinth
-  changes:
-  - message: Fixed mindshield icons being glow in the dark
-    type: Fix
-  id: 6311
-  time: '2024-04-05T20:35:32.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26754
-- author: Blackern5000
-  changes:
-  - message: Added sap
-    type: Add
-  - message: Added syrup, it can be made by boiling sap.
-    type: Add
-  - message: Dionae now bleed sap instead of water
-    type: Tweak
-  id: 6312
-  time: '2024-04-05T21:06:12.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25748
-- author: osjarw
-  changes:
-  - message: Thin firelocks are now constructable/deconstructable
-    type: Fix
-  id: 6313
-  time: '2024-04-06T01:55:31.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26745
-- author: BITTERLYNX
-  changes:
-  - message: Rodents are more visually pleasing to burn
-    type: Fix
-  - message: mothroach and hammy also more visually pleasing to burn
-    type: Fix
-  id: 6314
-  time: '2024-04-06T04:41:23.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26758
-- author: Plykiya
-  changes:
-  - message: You can now carefully walk over glass shards and D4.
-    type: Tweak
-  id: 6315
-  time: '2024-04-06T04:49:14.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26763
-- author: PursuitInAshes
-  changes:
-  - message: Sake Bottles can now be found in the booze-o-mat.
-    type: Tweak
-  id: 6316
-  time: '2024-04-06T20:16:47.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26776
-- author: osjarw
-  changes:
-  - message: Removed broken anom behaviour, which causes APE shots to fly through
-      the anom.
-    type: Remove
-  id: 6317
-  time: '2024-04-06T22:27:16.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26775
-- author: Vermidia
-  changes:
-  - message: Water coolers show how full/what they're full of again.
-    type: Fix
-  id: 6318
-  time: '2024-04-06T23:58:57.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26784
-- author: Crotalus
-  changes:
-  - message: Show missing materials in lathe tooltip
-    type: Add
-  id: 6319
-  time: '2024-04-08T03:16:11.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26795
-- author: chromiumboy
-  changes:
-  - message: Fixed the RCD not being able to build on top of puddles
-    type: Fix
-  - message: RCD constructions can no longer be rotated while in progress
-    type: Tweak
-  - message: The RCD now reports construction mode changes to its user
-    type: Add
-  id: 6320
-  time: '2024-04-08T03:17:29.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26792
-- author: lzk228
-  changes:
-  - message: Bombsuit and jani bombsuit are similar now.
-    type: Tweak
-  id: 6321
-  time: '2024-04-08T15:05:58.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26806
-- author: lzk228
-  changes:
-  - message: Clothing restock crate was splitted to clothing and autodrobe restock
-      crates.
-    type: Tweak
-  - message: Clothing is cheaper.
-    type: Tweak
-  id: 6322
-  time: '2024-04-08T15:10:58.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26805
-- author: Hanzdegloker
-  changes:
-  - message: Spears can now be quipped to your suit slot and cost slightly more to
-      make.
-    type: Tweak
-  id: 6323
-  time: '2024-04-08T15:34:35.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26724
-- author: KittenColony
-  changes:
-  - message: Added 13 new gauze wraps for moth that fit their twig bodies
-    type: Add
-  - message: Gauze markings have been moved to the Overlay category, allowing gauze
-      to not take up marking points
-    type: Tweak
-  id: 6324
-  time: '2024-04-09T08:04:51.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25481
-- author: Killerqu00
-  changes:
-  - message: Quartermasters can now skip a single bounty in the list once every 15
-      minutes.
-    type: Add
-  id: 6325
-  time: '2024-04-09T22:18:07.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26537
-- author: SkaldetSkaeg
-  changes:
-  - message: The Flippo lighter is now quieter and has a delay on use.
-    type: Tweak
-  id: 6326
-  time: '2024-04-09T22:20:57.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26846
-- author: notquitehadouken
-  changes:
-  - message: Gave botanists droppers for easier chemical moving.
-    type: Add
-  id: 6327
-  time: '2024-04-10T17:28:03.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26839
-- author: botanySupremist
-  changes:
-  - message: Clipping harvestable plants now yields undamaged seeds.
-    type: Add
-  id: 6328
-  time: '2024-04-10T17:51:25.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25541
-- author: deltanedas
-  changes:
-  - message: Fixed some doors having no access when they should.
-    type: Fix
-  id: 6329
-  time: '2024-04-10T20:06:31.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26858
-- author: Flareguy
-  changes:
-  - message: Added emergency nitrogen lockers. You can scarcely find them in public
-      areas, or scattered around in maintenance tunnels.
-    type: Add
-  id: 6330
-  time: '2024-04-10T21:20:05.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26752
-- author: Jark255
-  changes:
-  - message: Door electronics now require network configurators to change their access
-      settings, rather than doing so by hand.
-    type: Fix
-  id: 6331
-  time: '2024-04-11T12:21:15.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26888
-- author: lunarcomets
-  changes:
-  - message: Cryogenic sleep units now remove crew members from the manifest, and
-      announce when crew members go into cryogenic storage.
-    type: Tweak
-  id: 6332
-  time: '2024-04-11T20:48:46.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26813
-- author: Vermidia
-  changes:
-  - message: Salt and Pepper shakers look like shakers.
-    type: Fix
-  id: 6333
-  time: '2024-04-12T06:44:47.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26899
-- author: liltenhead
-  changes:
-  - message: Reagent slimes are no longer ghost roles.
-    type: Remove
-  id: 6334
-  time: '2024-04-12T06:50:46.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26840
-- author: TokenStyle
-  changes:
-  - message: Notice board can be crafted
-    type: Add
-  id: 6335
-  time: '2024-04-12T06:58:02.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26847
-- author: deltanedas
-  changes:
-  - message: Sterile Swabs now come in dispensers making them easier to use.
-    type: Tweak
-  id: 6336
-  time: '2024-04-12T07:15:04.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/24986
-- author: Ko4erga
-  changes:
-  - message: Strobes added WEE-OOO-WEE-OOO!
-    type: Add
-  id: 6337
-  time: '2024-04-12T08:02:06.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26083
-- author: osjarw
-  changes:
-  - message: Magboots no longer activate artifacts from salvage magnet ranges.
-    type: Fix
-  id: 6338
-  time: '2024-04-13T01:46:00.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26912
-- author: Vasilis
-  changes:
-  - message: Blood (or anything containing uncooked animal proteins) can only be consumed
-      by animal stomach's instead of all but human. Attempting to due so will poison
-      you as intended.
-    type: Fix
-  id: 6339
-  time: '2024-04-13T02:36:29.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26906
-- author: DrSmugleaf
-  changes:
-  - message: Fixed incorrect "Cycled" and "Bolted" popups when wielding and unwielding
-      some guns.
-    type: Fix
-  id: 6340
-  time: '2024-04-13T15:25:54.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26924
-- author: FungiFellow
-  changes:
-  - message: Removed Crusher Dagger from Grapple Module
-    type: Remove
-  id: 6341
-  time: '2024-04-13T15:35:10.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26865
-- author: ShadowCommander
-  changes:
-  - message: Fixed the pull hotkey not pulling the new entity when you are already
-      pulling an entity.
-    type: Fix
-  id: 6342
-  time: '2024-04-13T15:36:05.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26499
 - author: Boaz1111
   changes:
   - message: The doors on the ice expedition map can now be accessed by anyone instead
@@ -3850,3 +3506,327 @@
   id: 6798
   time: '2024-06-21T10:50:53.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/29293
+- author: Macoron
+  changes:
+  - message: Fixed SSD indicator for dwarfs.
+    type: Fix
+  id: 6799
+  time: '2024-06-22T01:11:40.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29310
+- author: EmoGarbage404
+  changes:
+  - message: Deconstructing a damaged AME core now yields steel instead of a full
+      AME flatpack.
+    type: Tweak
+  id: 6800
+  time: '2024-06-22T04:15:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29317
+- author: Errant
+  changes:
+  - message: Items should no longer be missing from backpacks at spawn.
+    type: Fix
+  id: 6801
+  time: '2024-06-22T10:43:18.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29336
+- author: Donchan, marboww
+  changes:
+  - message: New Nuke Detonation Song "Sound Station 14"
+    type: Add
+  id: 6802
+  time: '2024-06-22T15:09:41.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29345
+- author: deltanedas
+  changes:
+  - message: Doors access logging can now be disabled by snipping or pulsing a LOG
+      wire.
+    type: Tweak
+  id: 6803
+  time: '2024-06-22T15:12:58.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29094
+- author: notafet
+  changes:
+  - message: Reduce air alarm sensitivity to plasma, tritium, and carbon dioxide.
+    type: Tweak
+  id: 6804
+  time: '2024-06-22T15:22:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29331
+- author: Damn Feds
+  changes:
+  - message: thief toolbox kits now better describe contents
+    type: Tweak
+  id: 6805
+  time: '2024-06-22T15:44:18.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27771
+- author: lzk228
+  changes:
+  - message: Prying reinforced tile now will give you back metal rod
+    type: Tweak
+  id: 6806
+  time: '2024-06-22T15:47:02.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29084
+- author: nikthechampiongr
+  changes:
+  - message: Locked firelocks can no longer be pried by hand when powered.
+    type: Tweak
+  id: 6807
+  time: '2024-06-22T17:49:50.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29221
+- author: Floofi
+  changes:
+  - message: Added lemon juice to the Boozemat!
+    type: Add
+  id: 6808
+  time: '2024-06-22T23:46:19.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27465
+- author: Cojoke-dot
+  changes:
+  - message: You can now put hats on Medibots
+    type: Add
+  id: 6809
+  time: '2024-06-23T00:28:20.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28584
+- author: WarMechanic
+  changes:
+  - message: The TEG now powers itself once started.
+    type: Tweak
+  id: 6810
+  time: '2024-06-23T01:46:31.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29072
+- author: eoineoineoin
+  changes:
+  - message: Hand labelers can now apply labels to buttons, switches, and levers
+    type: Tweak
+  id: 6811
+  time: '2024-06-23T14:52:30.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29378
+- author: Tayrtahn
+  changes:
+  - message: Jugs in the ChemVend are labeled again.
+    type: Fix
+  id: 6812
+  time: '2024-06-23T17:31:34.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29178
+- author: DrEnzyme
+  changes:
+  - message: Add bagels and poppy seed bagels.
+    type: Add
+  id: 6813
+  time: '2024-06-23T19:33:12.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/24799
+- author: PJB3005
+  changes:
+  - message: Ghosts can now examine details on objects from any range.
+    type: Tweak
+  id: 6814
+  time: '2024-06-24T15:36:53.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29404
+- author: Emisse
+  changes:
+  - message: atmos, elite syndie, and deathsquad hardsuits are now the only fireproof
+      suits
+    type: Tweak
+  id: 6815
+  time: '2024-06-24T22:03:05.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29416
+- author: Bhijn and Myr
+  changes:
+  - message: The colors of the LEDs on the heater and freezer thermomachines has been
+      changed from red/green (respectively) to orange/cyan (respectively). In laymen's
+      terms, this makes thermomachines far more reasonably differentiable for those
+      with colorblindness.
+    type: Tweak
+  id: 6816
+  time: '2024-06-24T22:40:20.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29397
+- author: Elysium206
+  changes:
+  - message: Increased Security Riot shields durability significantly and makes actively
+      blocking better
+    type: Tweak
+  id: 6817
+  time: '2024-06-25T03:56:46.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29239
+- author: Tayrtahn
+  changes:
+  - message: Fixed space ninja's starting with their internals disabled.
+    type: Fix
+  id: 6818
+  time: '2024-06-25T06:28:48.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29213
+- author: PJB3005
+  changes:
+  - message: Low pressure damage now does only 1/4th as much damage. This is a band-aid
+      until better mechanics exists for the crew to deal with breaches of various
+      kinds.
+    type: Remove
+  id: 6819
+  time: '2024-06-26T00:48:26.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29478
+- author: lzk228
+  changes:
+  - message: Blood now has less satiation.
+    type: Tweak
+  id: 6820
+  time: '2024-06-26T02:27:11.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29433
+- author: Veritable-Calamity
+  changes:
+  - message: Moldy food can now be collected in the Janitors' trash bags.
+    type: Fix
+  id: 6821
+  time: '2024-06-26T03:26:59.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29380
+- author: Plykiya
+  changes:
+  - message: You can now interact with magic mirrors.
+    type: Fix
+  id: 6822
+  time: '2024-06-26T14:25:11.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29491
+- author: Doomsdrayk
+  changes:
+  - message: Disposal units no longer protect their contents from nuclear explosions.
+    type: Fix
+  id: 6823
+  time: '2024-06-26T14:25:43.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29438
+- author: Tayrtahn
+  changes:
+  - message: Pills and pill canisters no longer have two labels.
+    type: Fix
+  id: 6824
+  time: '2024-06-27T02:08:57.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29499
+- author: PJB3005
+  changes:
+  - message: You can no longer place items onto tabletop games. The feature could
+      be easily abused to crash the server.
+    type: Remove
+  id: 6825
+  time: '2024-06-27T14:57:55.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29513
+- author: KonstantinAngelov
+  changes:
+  - message: Chef's Cookbook has a more IC name.
+    type: Tweak
+  id: 6826
+  time: '2024-06-27T15:11:33.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29467
+- author: metalgearsloth
+  changes:
+  - message: Ushanka no longer applies an accent to your name.
+    type: Tweak
+  id: 6827
+  time: '2024-06-28T00:08:09.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29524
+- author: JIPDawg
+  changes:
+  - message: Changed the sound of pulling back the foam crossbow from the sound of
+      a Flash to just pulling back a bow.
+    type: Tweak
+  id: 6828
+  time: '2024-06-28T00:23:17.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29508
+- author: Plykiya
+  changes:
+  - message: Do-after bars performed inside containers are hidden from view.
+    type: Add
+  id: 6829
+  time: '2024-06-28T03:34:24.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29487
+- author: slarticodefast
+  changes:
+  - message: Passive vents now have the correct sprite.
+    type: Fix
+  id: 6830
+  time: '2024-06-28T12:33:03.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29536
+- author: Plykiya
+  changes:
+  - message: Icons in the chameleon menu now appear correctly.
+    type: Fix
+  id: 6831
+  time: '2024-06-28T21:21:36.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29539
+- author: DogZeroX
+  changes:
+  - message: Bananium no longer emit rads
+    type: Remove
+  id: 6832
+  time: '2024-06-28T23:28:27.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29545
+- author: TokenStyle
+  changes:
+  - message: Mechs can now be destroyed!
+    type: Tweak
+  id: 6833
+  time: '2024-06-29T03:28:47.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29338
+- author: metalgearsloth
+  changes:
+  - message: Typing indicators are now predicted.
+    type: Fix
+  id: 6834
+  time: '2024-06-29T03:33:56.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29551
+- author: Arteben
+  changes:
+  - message: Added favorite tab for construction!
+    type: Add
+  id: 6835
+  time: '2024-06-29T04:10:00.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26347
+- author: deltanedas
+  changes:
+  - message: Traitors can now be assigned to deconstruct the station's nuke for its
+      precious plutonium core.
+    type: Add
+  - message: Added the Objectives category in the uplink with a Core Extraction Toolbox
+      for deconstructing said nuke.
+    type: Add
+  id: 6836
+  time: '2024-06-29T04:11:31.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26786
+- author: slarticodefast
+  changes:
+  - message: Air vents now have yellow lights if they are in under-pressure lockout.
+    type: Add
+  id: 6837
+  time: '2024-06-29T05:02:48.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29527
+- author: metalgearsloth
+  changes:
+  - message: Fix character traits not being validated.
+    type: Fix
+  id: 6838
+  time: '2024-06-29T05:39:57.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28730
+- author: PJB3005
+  changes:
+  - message: '"Steal plutonium core" traitor objective has been reverted.'
+    type: Remove
+  id: 6839
+  time: '2024-06-29T15:23:03.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29578
+- author: MureixloL
+  changes:
+  - message: Changed some vending machine point lights to match the vendors better.
+    type: Tweak
+  id: 6840
+  time: '2024-06-30T03:46:31.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29590
+- author: metalgearsloth
+  changes:
+  - message: Fix trait categories not respecting unlimited points.
+    type: Fix
+  id: 6841
+  time: '2024-06-30T04:28:49.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29600
+- author: ShadowCommander
+  changes:
+  - message: Fixed sprite layers disappearing when inserting or removing an item on
+      entities such as belts, janitor trolley, clipboard, etc.
+    type: Fix
+  id: 6842
+  time: '2024-06-30T04:34:06.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29461
diff --git a/Resources/ConfigPresets/WizardsDen/wizardsDen.toml b/Resources/ConfigPresets/WizardsDen/wizardsDen.toml
index 46e53c0c88..807b21b469 100644
--- a/Resources/ConfigPresets/WizardsDen/wizardsDen.toml
+++ b/Resources/ConfigPresets/WizardsDen/wizardsDen.toml
@@ -36,6 +36,7 @@ limit = 10.0
 see_own_notes = true
 deadmin_on_join = true
 new_player_threshold = 600
+alert.min_players_sharing_connection = 2
 
 [worldgen]
 enabled = true
diff --git a/Resources/ConfigPresets/WizardsDen/wizardsDenGateway.toml b/Resources/ConfigPresets/WizardsDen/wizardsDenGateway.toml
index cdf5dfbcdd..b0f955bdde 100644
--- a/Resources/ConfigPresets/WizardsDen/wizardsDenGateway.toml
+++ b/Resources/ConfigPresets/WizardsDen/wizardsDenGateway.toml
@@ -13,6 +13,7 @@ panic_bunker.enable_without_admins = false
 panic_bunker.custom_reason = ""
 baby_jail.enabled = true
 baby_jail.show_reason = true
+baby_jail.max_account_age = 5256000 # 10 years. Disabling this check specifically isn't currently supported
 baby_jail.max_overall_minutes = 3000 # 50 hours
 baby_jail.custom_reason = "Sorry! Only new players can join the servers, try joining another one instead!"
 baby_jail.whitelisted_can_bypass = true
diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt
index 15d75d4487..1e41be2bb7 100644
--- a/Resources/Credits/GitHub.txt
+++ b/Resources/Credits/GitHub.txt
@@ -1 +1 @@
-0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aeshus, Aexxie, Afrokada, Agoichi, Ahion, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlexUm418, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, ArchPigeon, Arendian, arimah, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, aspiringLich, avghdev, AzzyIsNotHere, BananaFlambe, Baptr0b0t, BasedUser, beck-thompson, BellwetherLogic, BGare, bhenrich, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, blueDev2, Boaz1111, BobdaBiscuit, brainfood1183, Brandon-Huu, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CakeQ, Callmore, CaptainSqrBeard, Carbonhell, CatTheSystem, Centronias, chairbender, Charlese2, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, Ciac32, clement-or, Clyybber, Cojoke-dot, ColdAutumnRain, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, deepdarkdepths, deepy, Delete69, deltanedas, DerbyX, DexlerXD, dffdff2423, Doctor-Cpu, DoctorBeard, DogZeroX, dontbetank, Doomsdrayk, Doru991, DoubleRiceEddiedd, DoutorWhite, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, Dutch-VanDerLinde, Easypoller, eclips_e, EdenTheLiznerd, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exincore, exp111, Fahasor, FairlySadPanda, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FluidRock, FoLoKe, fooberticus, Fortune117, freeman2651, Froffy025, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, Genkail, Ghagliiarghii, Git-Nivrak, github-actions[bot], gituhabu, GNF54, Golinth, GoodWheatley, Gotimanga, graevy, GreyMario, gusxyz, Gyrandola, h3half, Hanzdegloker, Hardly3D, harikattar, Hebiman, Henry12116, HerCoyote23, hitomishirichan, Hmeister-real, HoofedEar, hord-brayden, hubismal, Hugal31, Huxellberger, Hyenh, iacore, IamVelcroboy, icekot8, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, ItsMeThom, Jackal298, Jackrost, jamessimo, janekvap, Jark255, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JoeHammad1844, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTrotter, K-Dynamic, KaiShibaa, kalane15, kalanosh, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Ko4ergaPunk, komunre, koteq, Krunklehorn, Kukutis96513, kxvvv, Lamrr, LankLTE, lapatison, Leander-0, LetterN, Level10Cybermancer, lever1209, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, luckyshotpictures, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, Mangohydra, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MisterMecky, Mith-randalf, MjrLandWhale, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, musicmanvr, Myakot, Myctai, N3X15, Nairodian, Naive817, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, Nopey, notafet, notquitehadouken, noudoit, noverd, nuke-haus, NULL882, OctoRocket, OldDanceJacket, onoira, osjarw, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, pigeonpeas, pissdemon, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, ProfanedBane, PrPleGoo, ps3moira, Psychpsyo, psykzz, PuroSlavKing, PursuitInAshes, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, RamZ, Rane, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, RiceMar1244, RieBi, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, RumiTiger, Saakra, Samsterious, SaphireLattice, ScalyChimp, scrato, Scribbles0, Serkket, SethLafuente, ShadowCommander, Shadowtheprotogen546, shampunj, SignalWalker, Simyon264, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, snebl, Snowni, snowsignal, SonicHDC, SoulFN, SoulSloth, SpaceManiac, SpeltIncorrectyl, SphiraI, spoogemonster, ssdaniel24, Stealthbomber16, StrawberryMoses, superjj18, SweptWasTaken, Szunti, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, Terraspark4941, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, theomund, theOperand, TheShuEd, TimrodDX, Titian3, tkdrg, tmtmtl30, TokenStyle, tom-leys, tomasalves8, Tomeno, Tornado-Technology, tosatur, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UBlueberry, UKNOWH, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Vermidia, Verslebas, VigersRay, Visne, volundr-, Voomra, Vordenburg, vulppine, wafehling, waylon531, weaversam8, whateverusername0, Willhelm53, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, YuriyKiss, zach-hill, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zerorulez, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zonespace27, Zumorica, Zymem
+0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aeshus, Aexxie, Afrokada, Agoichi, Ahion, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlexUm418, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, ArchPigeon, Arendian, arimah, ArkiveDev, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, aspiringLich, avghdev, AzzyIsNotHere, BananaFlambe, Baptr0b0t, BasedUser, beck-thompson, BellwetherLogic, BGare, bhenrich, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, blueDev2, Boaz1111, BobdaBiscuit, brainfood1183, Brandon-Huu, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CaasGit, CakeQ, Callmore, CaptainSqrBeard, Carbonhell, CatTheSystem, Centronias, chairbender, Charlese2, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, Ciac32, clement-or, Clyybber, Cojoke-dot, ColdAutumnRain, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, deepdarkdepths, deepy, Delete69, deltanedas, DerbyX, DexlerXD, dffdff2423, Doctor-Cpu, DoctorBeard, DogZeroX, dontbetank, Doomsdrayk, Doru991, DoubleRiceEddiedd, DoutorWhite, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, Dutch-VanDerLinde, Easypoller, eclips_e, EdenTheLiznerd, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exincore, exp111, Fahasor, FairlySadPanda, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FluidRock, FoLoKe, fooberticus, Fortune117, freeman2651, Froffy025, Fromoriss, FungiFellow, Futuristic-OK, GalacticChimp, gbasood, Geekyhobo, Genkail, geraeumig, Ghagliiarghii, Git-Nivrak, github-actions[bot], gituhabu, GNF54, Golinth, GoodWheatley, Gotimanga, graevy, GreyMario, gusxyz, Gyrandola, h3half, Hanzdegloker, Hardly3D, harikattar, Hebiman, Henry12116, HerCoyote23, hitomishirichan, Hmeister-real, HolySSSS, HoofedEar, hord-brayden, hubismal, Hugal31, Huxellberger, iacore, IamVelcroboy, icekot8, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, Interrobang01, IProduceWidgets, ItsMeThom, Jackal298, Jackrost, jamessimo, janekvap, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JoeHammad1844, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTrotter, K-Dynamic, KaiShibaa, kalane15, kalanosh, Keer-Sar, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Ko4ergaPunk, komunre, koteq, Krunklehorn, Kukutis96513, kxvvv, Lamrr, LankLTE, lapatison, Leander-0, LetterN, Level10Cybermancer, lever1209, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, luckyshotpictures, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, Mangohydra, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MisterMecky, Mith-randalf, MjrLandWhale, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, musicmanvr, Myakot, Myctai, N3X15, Nairodian, Naive817, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, Nopey, notafet, notquitehadouken, noudoit, noverd, nuke-haus, NULL882, OctoRocket, OldDanceJacket, onoira, osjarw, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, pigeonpeas, pissdemon, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, ProfanedBane, PrPleGoo, ps3moira, Psychpsyo, psykzz, PuroSlavKing, PursuitInAshes, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, RamZ, Rane, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, RiceMar1244, RieBi, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, RumiTiger, Saakra, Samsterious, SaphireLattice, ScalyChimp, scrato, Scribbles0, Serkket, SethLafuente, ShadowCommander, Shadowtheprotogen546, shampunj, SignalWalker, Simyon264, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, snebl, Snowni, snowsignal, SonicHDC, SoulFN, SoulSloth, SpaceManiac, SpeltIncorrectyl, SphiraI, spoogemonster, ssdaniel24, Stealthbomber16, StrawberryMoses, superjj18, SweptWasTaken, Szunti, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, Terraspark4941, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, Theomund, theOperand, TheShuEd, TimrodDX, Titian3, tkdrg, tmtmtl30, TokenStyle, tom-leys, tomasalves8, Tomeno, Tornado-Technology, tosatur, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UBlueberry, UKNOWH, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Vermidia, Verslebas, VigersRay, Visne, volundr-, Voomra, Vordenburg, vulppine, wafehling, WarMechanic, waylon531, weaversam8, whateverusername0, Willhelm53, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, YuriyKiss, zach-hill, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zerorulez, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zonespace27, Zumorica, Zymem
diff --git a/Resources/Locale/en-US/administration/admin-alerts.ftl b/Resources/Locale/en-US/administration/admin-alerts.ftl
new file mode 100644
index 0000000000..40ab4737dc
--- /dev/null
+++ b/Resources/Locale/en-US/administration/admin-alerts.ftl
@@ -0,0 +1 @@
+admin-alert-shared-connection = {$player} is sharing a connection with {$otherCount} connected player(s): {$otherList}
diff --git a/Resources/Locale/en-US/administration/ui/actions.ftl b/Resources/Locale/en-US/administration/ui/actions.ftl
index b067774d0a..3c13d56c94 100644
--- a/Resources/Locale/en-US/administration/ui/actions.ftl
+++ b/Resources/Locale/en-US/administration/ui/actions.ftl
@@ -1,3 +1,4 @@
+admin-player-actions-reason = Reason
 admin-player-actions-bans = Ban List
 admin-player-actions-notes = Notes
 admin-player-actions-kick = Kick
diff --git a/Resources/Locale/en-US/administration/ui/player-list-control.ftl b/Resources/Locale/en-US/administration/ui/player-list-control.ftl
new file mode 100644
index 0000000000..8b5cc195b1
--- /dev/null
+++ b/Resources/Locale/en-US/administration/ui/player-list-control.ftl
@@ -0,0 +1 @@
+player-list-filter = Filter
diff --git a/Resources/Locale/en-US/administration/ui/tabs/admin-tab/teleport.ftl b/Resources/Locale/en-US/administration/ui/tabs/admin-tab/teleport.ftl
new file mode 100644
index 0000000000..8c54d79160
--- /dev/null
+++ b/Resources/Locale/en-US/administration/ui/tabs/admin-tab/teleport.ftl
@@ -0,0 +1 @@
+admin-ui-teleport = Teleport
diff --git a/Resources/Locale/en-US/administration/ui/tabs/adminbus-tab/blueprints.ftl b/Resources/Locale/en-US/administration/ui/tabs/adminbus-tab/blueprints.ftl
new file mode 100644
index 0000000000..75b5ff071a
--- /dev/null
+++ b/Resources/Locale/en-US/administration/ui/tabs/adminbus-tab/blueprints.ftl
@@ -0,0 +1,9 @@
+admin-ui-blueprint-map = Map
+admin-ui-blueprint-path = Path
+admin-ui-blueprint-x = X
+admin-ui-blueprint-y = Y
+admin-ui-blueprint-rotation = Rotation
+
+admin-ui-blueprint-teleport = Teleport to
+admin-ui-blueprint-reset = Reset to default
+admin-ui-blueprint-load = Load Blueprint
diff --git a/Resources/Locale/en-US/administration/ui/tabs/atmos-tab.ftl b/Resources/Locale/en-US/administration/ui/tabs/atmos-tab.ftl
new file mode 100644
index 0000000000..b58bce5286
--- /dev/null
+++ b/Resources/Locale/en-US/administration/ui/tabs/atmos-tab.ftl
@@ -0,0 +1,12 @@
+admin-ui-atmos-add = Add Atmos
+admin-ui-atmos-add-gas = Add Gas
+admin-ui-atmos-fill-gas = Fill Gas
+admin-ui-atmos-set-temperature = Set Temperature
+
+admin-ui-atmos-grid = Grid
+admin-ui-atmos-grid-current = Current
+admin-ui-atmos-tile-x = TileX
+admin-ui-atmos-tile-y = TileY
+admin-ui-atmos-gas = Gas
+admin-ui-atmos-gas-amount = Amount
+admin-ui-atmos-temperature = Temperature
diff --git a/Resources/Locale/en-US/administration/ui/tabs/object-tab.ftl b/Resources/Locale/en-US/administration/ui/tabs/object-tab.ftl
index 0288efcaa4..da84ea4f16 100644
--- a/Resources/Locale/en-US/administration/ui/tabs/object-tab.ftl
+++ b/Resources/Locale/en-US/administration/ui/tabs/object-tab.ftl
@@ -1,2 +1,10 @@
 object-tab-entity-id = Entity ID
 object-tab-object-name = Object name
+
+object-tab-object-type = Object type:
+object-tab-object-search = Search...
+
+object-tab-object-type-grids = Grids
+object-tab-object-type-maps = Maps
+object-tab-object-type-stations = Stations
+object-tab-refresh-button = Refresh
diff --git a/Resources/Locale/en-US/administration/ui/tabs/player-tab.ftl b/Resources/Locale/en-US/administration/ui/tabs/player-tab.ftl
index f9f9f6b5c9..1cca5c7a93 100644
--- a/Resources/Locale/en-US/administration/ui/tabs/player-tab.ftl
+++ b/Resources/Locale/en-US/administration/ui/tabs/player-tab.ftl
@@ -1,4 +1,5 @@
-player-tab-username = Username
+player-tab-player-count = Players: { $count }
+player-tab-username = Username
 player-tab-character = Character
 player-tab-job = Job
 player-tab-antagonist = Antagonist
diff --git a/Resources/Locale/en-US/administration/ui/tabs/round-tab.ftl b/Resources/Locale/en-US/administration/ui/tabs/round-tab.ftl
index 9fd44d7f3a..047bc8cbcb 100644
--- a/Resources/Locale/en-US/administration/ui/tabs/round-tab.ftl
+++ b/Resources/Locale/en-US/administration/ui/tabs/round-tab.ftl
@@ -1,2 +1,5 @@
+administration-ui-round-tab-start-round = Start Round
+administration-ui-round-tab-end-round = End Round
+administration-ui-round-tab-restart-round = Restart Round
 administration-ui-round-tab-restart-round-now = Restart NOW
 
diff --git a/Resources/Locale/en-US/alerts/alerts.ftl b/Resources/Locale/en-US/alerts/alerts.ftl
index 24bc60cbf1..319809da40 100644
--- a/Resources/Locale/en-US/alerts/alerts.ftl
+++ b/Resources/Locale/en-US/alerts/alerts.ftl
@@ -107,6 +107,3 @@ alerts-revenant-essence-desc = The power of souls. It sustains you and is used f
 
 alerts-revenant-corporeal-name = Corporeal
 alerts-revenant-corporeal-desc = You have manifested physically. People around you can see and hurt you.
-
-alerts-deflecting-name = Deflecting
-alerts-deflecting-desc = You have a chance to deflect incoming projectiles. Standing still or moving slowly will increase this chance.
diff --git a/Resources/Locale/en-US/construction/construction-categories.ftl b/Resources/Locale/en-US/construction/construction-categories.ftl
index cb31edad85..5c44da51d1 100644
--- a/Resources/Locale/en-US/construction/construction-categories.ftl
+++ b/Resources/Locale/en-US/construction/construction-categories.ftl
@@ -10,3 +10,6 @@ construction-category-tiles = Tiles
 construction-category-utilities = Utilities
 construction-category-misc = Misc
 construction-category-clothing = Clothing
+construction-category-favorites = Favorites
+construction-add-favorite-button = Add to favorites
+construction-remove-from-favorite-button = Remove from favorites
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 d07f9127a4..39a72260e2 100644
--- a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
+++ b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
@@ -1,15 +1,18 @@
 ## General stuff
 
 ui-options-title = Game Options
+ui-options-tab-accessibility = Accessibility
 ui-options-tab-graphics = Graphics
 ui-options-tab-controls = Controls
 ui-options-tab-audio = Audio
 ui-options-tab-network = Network
 ui-options-tab-misc = General
 
-ui-options-apply = Apply
-ui-options-reset-all = Reset All
-ui-options-default = Default
+ui-options-apply = Save & apply
+ui-options-reset-all = Reset changed
+ui-options-default = Reset to defaults
+
+ui-options-value-percent = { TOSTRING($value, "P0") }
 
 # Misc/General menu
 
@@ -35,10 +38,15 @@ ui-options-restart-sounds = Round Restart Sounds
 ui-options-event-music = Event Music
 ui-options-admin-sounds = Play Admin Sounds
 ui-options-volume-label = Volume
-ui-options-volume-percent = { TOSTRING($volume, "P0") }
 
 ## Graphics menu
 
+ui-options-display-label = Display
+ui-options-quality-label = Quality
+ui-options-misc-label = Misc
+ui-options-interface-label = Interface
+
+
 ui-options-show-held-item = Show held item next to cursor
 ui-options-show-combat-mode-indicators = Show combat mode indicators with cursor
 ui-options-opaque-storage-window = Opaque storage window
@@ -46,13 +54,6 @@ ui-options-show-ooc-patron-color = Show OOC Patreon color
 ui-options-show-looc-on-head = Show LOOC chat above characters head
 ui-options-fancy-speech = Show names in speech bubbles
 ui-options-fancy-name-background = Add background to speech bubble names
-ui-options-enable-color-name = Add colors to character names
-ui-options-colorblind-friendly = Colorblind friendly mode
-ui-options-reduced-motion = Reduce motion of visual effects
-ui-options-chat-window-opacity = Chat window opacity
-ui-options-chat-window-opacity-percent = { TOSTRING($opacity, "P0") }
-ui-options-screen-shake-intensity = Screen shake intensity
-ui-options-screen-shake-percent = { TOSTRING($intensity, "P0") }
 ui-options-vsync = VSync
 ui-options-fullscreen = Fullscreen
 ui-options-lighting-label = Lighting Quality:
@@ -77,7 +78,8 @@ ui-options-hud-theme-retro = Retro
 ui-options-hud-theme-minimalist = Minimalist
 ui-options-hud-theme-ashen = Ashen
 ui-options-vp-stretch = Stretch viewport to fit game window
-ui-options-vp-scale = Fixed viewport scale: x{ $scale }
+ui-options-vp-scale = Fixed viewport scale:
+ui-options-vp-scale-value = x{ $scale }
 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
@@ -90,7 +92,7 @@ ui-options-vp-vertical-fit-tooltip = When enabled, the main viewport will ignore
 ui-options-vp-low-res = Low-resolution viewport
 ui-options-parallax-low-quality = Low-quality Parallax (background)
 ui-options-fps-counter = Show FPS counter
-ui-options-vp-width = Viewport width: { $width }
+ui-options-vp-width = Viewport width:
 ui-options-hud-layout = HUD layout:
 
 ## Controls menu
@@ -267,3 +269,11 @@ ui-options-net-pvs-leave-tooltip = This limits the rate at which the client will
 ## Toggle window console command
 cmd-options-desc = Opens options menu, optionally with a specific tab selected.
 cmd-options-help = Usage: options [tab]
+
+## Accessibility menu
+
+ui-options-enable-color-name = Add colors to character names
+ui-options-colorblind-friendly = Colorblind friendly mode
+ui-options-reduced-motion = Reduce motion of visual effects
+ui-options-chat-window-opacity = Chat window opacity
+ui-options-screen-shake-intensity = Screen shake intensity
diff --git a/Resources/Locale/en-US/game-ticking/forcemap-command.ftl b/Resources/Locale/en-US/game-ticking/forcemap-command.ftl
index df2ca68786..573aa78a28 100644
--- a/Resources/Locale/en-US/game-ticking/forcemap-command.ftl
+++ b/Resources/Locale/en-US/game-ticking/forcemap-command.ftl
@@ -3,5 +3,7 @@
 forcemap-command-description = Forces the game to start with a given map next round.
 forcemap-command-help = forcemap <map ID>
 forcemap-command-need-one-argument = forcemap takes one argument, the path to the map file.
+forcemap-command-map-not-found = No eligible map exists with name { $map }.
 forcemap-command-success = Forced the game to start with map { $map } next round.
+forcemap-command-cleared = Cleared the forced map setting.
 forcemap-command-arg-map = <map ID>
diff --git a/Resources/Locale/en-US/speech/accent-wearer-name-clothing.ftl b/Resources/Locale/en-US/speech/accent-wearer-name-clothing.ftl
deleted file mode 100644
index 49b0fb31aa..0000000000
--- a/Resources/Locale/en-US/speech/accent-wearer-name-clothing.ftl
+++ /dev/null
@@ -1 +0,0 @@
-comp-accent-wearer-name-clothing-format = {$accentedName}
diff --git a/Resources/Locale/en-US/thief/backpack.ftl b/Resources/Locale/en-US/thief/backpack.ftl
index f5d313c8b0..0911bc042b 100644
--- a/Resources/Locale/en-US/thief/backpack.ftl
+++ b/Resources/Locale/en-US/thief/backpack.ftl
@@ -1,8 +1,7 @@
 thief-backpack-window-title = thief toolbox
 
 thief-backpack-window-description =
-    This toolbox is filled with unspecified contents.
-    Now you need to remember what you put in it.
+    Inside are your tools of the trade, which will dissolve when you're ready.
     Choose {$maxCount} different {$maxCount ->
         [1] set
         *[other] sets
@@ -16,51 +15,49 @@ thief-backpack-button-deselect = Select [X]
 
 # Sets
 
-thief-backpack-category-chameleon-name = chameleon's kit
+thief-backpack-category-chameleon-name = chameleon kit
 thief-backpack-category-chameleon-description =
-    Includes a full set of clothing that contains chameleon technology,
-    Contains a chameleon projector to help disguise yourself as objects,
-    You'll be able to disguise yourself as almost anything and anyone.
+    You are everyone and no one; you are a master of disguise.
+    Includes: Set of chameleon clothing, a chameleon projector.
+    Disguise as anyone and anything.
 
-thief-backpack-category-tools-name = bearcatcher's kit
+thief-backpack-category-tools-name = breacher kit
 thief-backpack-category-tools-description =
-    A set of tools for roughing up doors, walls, windows,
-    and anything else that for whatever reason doesn't
-    want to let you in where you need to go.
-    Includes two C4s, a multitool, jaws of life,
-    a pair of advanced welder meson glasses and some insulated gloves.
+    What's that sound? A lil' C4 knockin' at their door.
+    No obstacle can stop you!
+    Includes: Two C4, a multitool, remote signaller, jaws of life,
+    advanced welder, engineering goggles, and insulated gloves.
 
-thief-backpack-category-chemistry-name = chemistry kit
+thief-backpack-category-chemistry-name = anatomy kit
 thief-backpack-category-chemistry-description =
-    A set for those who love to improve their body.
-    It includes a storage implanter,
-    a DNA scrambler implanter,
-    a set of chemicals for a rainy day,
-    and omega soap.
+    You've reached peak physical performance... with a little help.
+    Includes: Storage implanter, DNA scrambler implanter,
+    ephedrine bottle, syringe, empty shaker, and omega soap
 
 thief-backpack-category-syndie-name = syndie kit
 thief-backpack-category-syndie-description =
-    A set of items from a syndicate agent you've robbed
-    in the past. Includes an Agent ID card, Emag, a syndicate pAI,
+    Trinkets from a disavowed past, or stolen from a careless agent?
+    You've made some connections. Whiskey, echo...
+    Includes: Agent ID card, Emag, syndicate pAI, Interdyne cigs,
     and some strange red crystals.
 
-thief-backpack-category-sleeper-name = sleepwalker's kit
+thief-backpack-category-sleeper-name = sleeper kit
 thief-backpack-category-sleeper-description =
-    A set for those who like to sleep in,
-    or for everyone around you to sleep.
-    Includes a set of nocturine vials, a hypopen and
-    a tank of sleeping gas.
+    Until we close our eyes for good, use your illegal prescriptions
+    to keep others asleep.
+    Includes: Sleepy nitrous oxide tank, two nocturine bottles,
+    and a hypopen.
 
-thief-backpack-category-communicator-name = communicator's kit
+thief-backpack-category-communicator-name = communicator kit
 thief-backpack-category-communicator-description =
-    A communication enthusiast's kit. Includes a master key
-    for all station channels, a cybersun pen, a portable
-    crew monitor, a voice chameleon mask and lots of money for business deals.
+    Money is power, and secrets are money. Use your silver tongue
+    and wealth to subvert the station.
+    Includes: Master key for all station channels, a CyberSun pen,
+    voice chameleon mask, and 20k spesos inside a briefcase.
 
-thief-backpack-category-smuggler-name = smuggler's kit
+thief-backpack-category-smuggler-name = smuggler kit
 thief-backpack-category-smuggler-description =
-    A kit for those who like to have big pockets.
-    Includes a fulton beacon, ten fultons, 3 smoke grenades
-    and an invisible crate. You can't move in them,
-    but you can quickly hide or carry valuable loot.
-    This kit also has a cool void cloak to go along with it.
+    All thieves need somewhere to stash their goods in the dark.
+    Don't forget to link your fulton.
+    Includes: Fulton beacon, 10 fultons, 3 smoke grenades,
+    and an invisible crate to hide valuable loot.
diff --git a/Resources/Locale/en-US/wires/log-wire.ftl b/Resources/Locale/en-US/wires/log-wire.ftl
new file mode 100644
index 0000000000..735816a52d
--- /dev/null
+++ b/Resources/Locale/en-US/wires/log-wire.ftl
@@ -0,0 +1 @@
+log-wire-pulse-access-log = ERROR: Electromagnetic spike detected
diff --git a/Resources/Locale/en-US/wires/wire-names.ftl b/Resources/Locale/en-US/wires/wire-names.ftl
index 851241f85c..a1ebec9e7d 100644
--- a/Resources/Locale/en-US/wires/wire-names.ftl
+++ b/Resources/Locale/en-US/wires/wire-names.ftl
@@ -66,3 +66,4 @@ wire-name-bomb-boom = BOOM
 wire-name-bomb-bolt = BOLT
 wire-name-speech = SPKR
 wire-name-listen = MIC
+wire-name-log = LOG
diff --git a/Resources/Maps/Nonstations/nukieplanet.yml b/Resources/Maps/Nonstations/nukieplanet.yml
index 35e00358ec..20fb68f2cc 100644
--- a/Resources/Maps/Nonstations/nukieplanet.yml
+++ b/Resources/Maps/Nonstations/nukieplanet.yml
@@ -1632,11 +1632,13 @@ entities:
     - type: MetaData
     - type: Transform
     - type: Map
+    - type: PhysicsMap
+    - type: GridTree
+    - type: MovedGrids
     - type: FTLDestination
       whitelist:
         tags:
         - Syndicate
-    - type: PhysicsMap
     - type: Broadphase
     - type: OccluderTree
     - type: Parallax
@@ -1645,6 +1647,7 @@ entities:
       space: False
       mixture:
         volume: 2500
+        immutable: True
         temperature: 248.15
         moles:
         - 21.824879
@@ -1660,8 +1663,6 @@ entities:
         - 0
         - 0
     - type: LoadedMap
-    - type: GridTree
-    - type: MovedGrids
 - proto: AirlockExternalGlassNukeopLocked
   entities:
   - uid: 49
@@ -10192,13 +10193,6 @@ entities:
     - type: Transform
       pos: -0.5,-1.5
       parent: 104
-- proto: chem_master
-  entities:
-  - uid: 2444
-    components:
-    - type: Transform
-      pos: 5.5,-10.5
-      parent: 104
 - proto: ChemicalPayload
   entities:
   - uid: 2380
@@ -10218,6 +10212,13 @@ entities:
     - type: Transform
       pos: 4.5,-12.5
       parent: 104
+- proto: ChemMaster
+  entities:
+  - uid: 2444
+    components:
+    - type: Transform
+      pos: 5.5,-10.5
+      parent: 104
 - proto: ChessBoard
   entities:
   - uid: 354
@@ -10366,6 +10367,13 @@ entities:
     - type: Transform
       pos: -14.478909,9.585995
       parent: 104
+- proto: DefibrillatorCabinetFilled
+  entities:
+  - uid: 2538
+    components:
+    - type: Transform
+      pos: -0.5,-11.5
+      parent: 104
 - proto: DresserFilled
   entities:
   - uid: 349
@@ -12902,7 +12910,7 @@ entities:
     - type: Transform
       pos: 23.5,-18.5
       parent: 104
-- proto: soda_dispenser
+- proto: SodaDispenser
   entities:
   - uid: 225
     components:
@@ -12917,11 +12925,15 @@ entities:
     - type: Transform
       pos: 10.5,-6.5
       parent: 104
+    - type: SpamEmitSound
+      enabled: False
   - uid: 1653
     components:
     - type: Transform
       pos: 9.5,-6.5
       parent: 104
+    - type: SpamEmitSound
+      enabled: False
 - proto: SpawnMobLizard
   entities:
   - uid: 2473
diff --git a/Resources/Maps/Shuttles/emergency_box.yml b/Resources/Maps/Shuttles/emergency_box.yml
index 93ca514435..3aa6a3f7ea 100644
--- a/Resources/Maps/Shuttles/emergency_box.yml
+++ b/Resources/Maps/Shuttles/emergency_box.yml
@@ -26,7 +26,7 @@ entities:
       name: NT Evac Box
     - type: Transform
       pos: 0.06253052,0.58707
-      parent: invalid
+      parent: 484
     - type: MapGrid
       chunks:
         0,0:
@@ -492,6 +492,18 @@ entities:
     - type: GasTileOverlay
     - type: RadiationGridResistance
     - type: NavMap
+  - uid: 484
+    components:
+    - type: MetaData
+      name: Map Entity
+    - type: Transform
+    - type: Map
+      mapPaused: True
+    - type: PhysicsMap
+    - type: GridTree
+    - type: MovedGrids
+    - type: Broadphase
+    - type: OccluderTree
 - proto: AirCanister
   entities:
   - uid: 526
@@ -499,8 +511,6 @@ entities:
     - type: Transform
       pos: 14.5,0.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
 - proto: Airlock
   entities:
   - uid: 417
@@ -565,9 +575,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 15.5,12.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 420
     - type: DeviceLinkSource
       linkedPorts:
         420:
@@ -578,9 +585,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 15.5,14.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 184
     - type: DeviceLinkSource
       linkedPorts:
         184:
@@ -1891,8 +1895,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 17.5,-1.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
 - proto: GasPassiveVent
   entities:
   - uid: 436
@@ -1901,8 +1903,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 17.5,-3.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
 - proto: GasPipeBend
   entities:
   - uid: 158
@@ -2278,8 +2278,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 14.5,0.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
 - proto: GasVentPump
   entities:
   - uid: 127
@@ -2287,63 +2285,47 @@ entities:
     - type: Transform
       pos: 3.5,10.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
   - uid: 171
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 2.5,-1.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
   - uid: 492
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 10.5,10.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
   - uid: 499
     components:
     - type: Transform
       pos: 2.5,6.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
   - uid: 500
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 14.5,4.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
   - uid: 501
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 18.5,4.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
   - uid: 502
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 12.5,-3.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
   - uid: 503
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 6.5,-2.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
 - proto: GeneratorBasic15kW
   entities:
   - uid: 294
@@ -2521,6 +2503,13 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 14.5,1.5
       parent: 1
+- proto: LootSpawnerRandomCrateEngineering
+  entities:
+  - uid: 595
+    components:
+    - type: Transform
+      pos: 10.5,10.5
+      parent: 1
 - proto: MaintenanceWeaponSpawner
   entities:
   - uid: 334
@@ -2786,13 +2775,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 14.5,10.5
       parent: 1
-- proto: SalvageMaterialCrateSpawner
-  entities:
-  - uid: 484
-    components:
-    - type: Transform
-      pos: 10.5,10.5
-      parent: 1
 - proto: Screen
   entities:
   - uid: 270
diff --git a/Resources/Maps/Shuttles/emergency_delta.yml b/Resources/Maps/Shuttles/emergency_delta.yml
index 5152862dee..20419b2872 100644
--- a/Resources/Maps/Shuttles/emergency_delta.yml
+++ b/Resources/Maps/Shuttles/emergency_delta.yml
@@ -24,7 +24,7 @@ entities:
       name: NT Evac Delta
     - type: Transform
       pos: -0.5625,0.671875
-      parent: invalid
+      parent: 761
     - type: MapGrid
       chunks:
         0,0:
@@ -395,6 +395,18 @@ entities:
         chunkSize: 4
     - type: GasTileOverlay
     - type: RadiationGridResistance
+  - uid: 761
+    components:
+    - type: MetaData
+      name: Map Entity
+    - type: Transform
+    - type: Map
+      mapPaused: True
+    - type: PhysicsMap
+    - type: GridTree
+    - type: MovedGrids
+    - type: Broadphase
+    - type: OccluderTree
 - proto: AirCanister
   entities:
   - uid: 326
@@ -402,15 +414,11 @@ entities:
     - type: Transform
       pos: -13.5,-3.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
   - uid: 445
     components:
     - type: Transform
       pos: -1.5,-18.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
 - proto: AirlockCommandGlassLocked
   entities:
   - uid: 70
@@ -450,7 +458,7 @@ entities:
     - type: Transform
       pos: -2.5,-17.5
       parent: 1
-- proto: AirlockExternalGlassEasyPry
+- proto: AirlockExternalGlass
   entities:
   - uid: 91
     components:
@@ -497,7 +505,7 @@ entities:
       rot: 3.141592653589793 rad
       pos: -9.5,-4.5
       parent: 1
-- proto: AirlockGlassShuttleEasyPry
+- proto: AirlockGlassShuttle
   entities:
   - uid: 3
     components:
@@ -3154,7 +3162,7 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -9.5,-16.5
       parent: 1
-- proto: MagazinePistolRubber
+- proto: MagazinePistol
   entities:
   - uid: 784
     components:
@@ -3218,6 +3226,13 @@ entities:
     - type: Transform
       pos: -12.5,-16.5
       parent: 1
+- proto: OxygenTankFilled
+  entities:
+  - uid: 799
+    components:
+    - type: Transform
+      pos: -10.44437,-3.5553346
+      parent: 1
 - proto: PaperBin10
   entities:
   - uid: 117
@@ -3541,6 +3556,38 @@ entities:
     - type: Transform
       pos: -2.5,8.5
       parent: 1
+- proto: Screen
+  entities:
+  - uid: 765
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-11.5
+      parent: 1
+  - uid: 766
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -9.5,-15.5
+      parent: 1
+  - uid: 767
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-1.5
+      parent: 1
+  - uid: 768
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -11.5,-1.5
+      parent: 1
+  - uid: 781
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,3.5
+      parent: 1
 - proto: ShotGunCabinetFilled
   entities:
   - uid: 745
@@ -4885,11 +4932,4 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -1.5,2.5
       parent: 1
-- proto: YellowOxygenTankFilled
-  entities:
-  - uid: 799
-    components:
-    - type: Transform
-      pos: -10.44437,-3.5553346
-      parent: 1
 ...
diff --git a/Resources/Maps/atlas.yml b/Resources/Maps/atlas.yml
index d220057d5e..5a2a7d1c3c 100644
--- a/Resources/Maps/atlas.yml
+++ b/Resources/Maps/atlas.yml
@@ -20716,13 +20716,6 @@ entities:
     - type: Transform
       pos: 9.5,-5.5
       parent: 30
-- proto: CrateMindShieldImplants
-  entities:
-  - uid: 8364
-    components:
-    - type: Transform
-      pos: 10.5,23.5
-      parent: 30
 - proto: CrateNPCCow
   entities:
   - uid: 3510
@@ -20737,6 +20730,13 @@ entities:
     - type: Transform
       pos: 38.5,0.5
       parent: 30
+- proto: CrateSecurityTrackingMindshieldImplants
+  entities:
+  - uid: 7876
+    components:
+    - type: Transform
+      pos: 10.5,23.5
+      parent: 30
 - proto: CrateTrackingImplants
   entities:
   - uid: 4557
diff --git a/Resources/Maps/cluster.yml b/Resources/Maps/cluster.yml
index 655c0ff53d..52393f3fb2 100644
--- a/Resources/Maps/cluster.yml
+++ b/Resources/Maps/cluster.yml
@@ -28533,13 +28533,6 @@ entities:
     - type: Transform
       pos: -22.5,24.5
       parent: 1
-- proto: CrateMindShieldImplants
-  entities:
-  - uid: 4120
-    components:
-    - type: Transform
-      pos: 37.5,12.5
-      parent: 1
 - proto: CrateNPCCow
   entities:
   - uid: 5971
@@ -28588,6 +28581,13 @@ entities:
     - type: Transform
       pos: 23.5,14.5
       parent: 1
+- proto: CrateSecurityTrackingMindshieldImplants
+  entities:
+  - uid: 4120
+    components:
+    - type: Transform
+      pos: 37.5,12.5
+      parent: 1
 - proto: CrateServiceJanitorialSupplies
   entities:
   - uid: 7661
diff --git a/Resources/Maps/fland.yml b/Resources/Maps/fland.yml
index 56eb8ec73a..58ff9247b8 100644
--- a/Resources/Maps/fland.yml
+++ b/Resources/Maps/fland.yml
@@ -17557,9 +17557,6 @@ entities:
     - type: Transform
       pos: 80.5,18.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 24281
   - uid: 29006
     components:
     - type: MetaData
@@ -17567,9 +17564,6 @@ entities:
     - type: Transform
       pos: 84.5,18.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 24285
   - uid: 29007
     components:
     - type: MetaData
@@ -17577,9 +17571,6 @@ entities:
     - type: Transform
       pos: 84.5,21.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 24284
   - uid: 29008
     components:
     - type: MetaData
@@ -17587,9 +17578,6 @@ entities:
     - type: Transform
       pos: 80.5,21.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 24282
   - uid: 29009
     components:
     - type: MetaData
@@ -17597,9 +17585,6 @@ entities:
     - type: Transform
       pos: 80.5,24.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 24277
   - uid: 29010
     components:
     - type: MetaData
@@ -17607,9 +17592,6 @@ entities:
     - type: Transform
       pos: 84.5,24.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 24283
   - uid: 29074
     components:
     - type: Transform
@@ -17763,9 +17745,6 @@ entities:
     - type: Transform
       pos: 23.5,0.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 9359
     - type: DeviceLinkSource
       linkedPorts:
         9359:
@@ -17775,9 +17754,6 @@ entities:
     - type: Transform
       pos: 25.5,0.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 9358
     - type: DeviceLinkSource
       linkedPorts:
         9358:
@@ -17787,9 +17763,6 @@ entities:
     - type: Transform
       pos: 25.5,4.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 9357
     - type: DeviceLinkSource
       linkedPorts:
         9357:
@@ -17799,9 +17772,6 @@ entities:
     - type: Transform
       pos: 23.5,4.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 9356
     - type: DeviceLinkSource
       linkedPorts:
         9356:
@@ -17821,9 +17791,6 @@ entities:
     - type: Transform
       pos: 23.5,28.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 9410
     - type: DeviceLinkSource
       linkedPorts:
         9410:
@@ -17833,9 +17800,6 @@ entities:
     - type: Transform
       pos: 23.5,31.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 9409
     - type: DeviceLinkSource
       linkedPorts:
         9409:
@@ -17845,9 +17809,6 @@ entities:
     - type: Transform
       pos: 25.5,31.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 9412
     - type: DeviceLinkSource
       linkedPorts:
         9412:
@@ -17857,9 +17818,6 @@ entities:
     - type: Transform
       pos: 25.5,28.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 9411
     - type: DeviceLinkSource
       linkedPorts:
         9411:
@@ -18545,9 +18503,6 @@ entities:
     - type: Transform
       pos: 113.5,-14.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 23413
     - type: DeviceLinkSource
       linkedPorts:
         23413:
@@ -18675,9 +18630,6 @@ entities:
     - type: Transform
       pos: -47.5,1.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 3716
     - type: DeviceLinkSource
       linkedPorts:
         3716:
@@ -18687,9 +18639,6 @@ entities:
     - type: Transform
       pos: -49.5,1.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 3715
     - type: DeviceLinkSource
       linkedPorts:
         3715:
@@ -18736,9 +18685,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 102.5,-31.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 20641
     - type: DeviceLinkSource
       linkedPorts:
         20641:
@@ -18749,9 +18695,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 99.5,-31.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 20640
     - type: DeviceLinkSource
       linkedPorts:
         20640:
@@ -18761,9 +18704,6 @@ entities:
     - type: Transform
       pos: 111.5,-16.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 23029
     - type: DeviceLinkSource
       linkedPorts:
         23029:
@@ -18778,9 +18718,6 @@ entities:
     - type: Transform
       pos: 109.5,-24.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 24738
     - type: DeviceLinkSource
       linkedPorts:
         24738:
@@ -18790,9 +18727,6 @@ entities:
     - type: Transform
       pos: 109.5,-21.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 24737
     - type: DeviceLinkSource
       linkedPorts:
         24737:
@@ -18802,9 +18736,6 @@ entities:
     - type: Transform
       pos: 102.5,-57.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 26785
     - type: DeviceLinkSource
       linkedPorts:
         26785:
@@ -18814,9 +18745,6 @@ entities:
     - type: Transform
       pos: 102.5,-55.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 26784
     - type: DeviceLinkSource
       linkedPorts:
         26784:
@@ -18826,9 +18754,6 @@ entities:
     - type: Transform
       pos: 115.5,31.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 27107
     - type: DeviceLinkSource
       linkedPorts:
         27107:
@@ -18838,9 +18763,6 @@ entities:
     - type: Transform
       pos: 117.5,31.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 27106
     - type: DeviceLinkSource
       linkedPorts:
         27106:
@@ -18850,9 +18772,6 @@ entities:
     - type: Transform
       pos: 52.5,71.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 33237
     - type: DeviceLinkSource
       linkedPorts:
         33237:
@@ -18862,9 +18781,6 @@ entities:
     - type: Transform
       pos: 52.5,69.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 33236
     - type: DeviceLinkSource
       linkedPorts:
         33236:
@@ -18876,9 +18792,6 @@ entities:
     - type: Transform
       pos: -41.5,-1.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 3000
     - type: DeviceLinkSource
       linkedPorts:
         3000:
@@ -18888,9 +18801,6 @@ entities:
     - type: Transform
       pos: -41.5,-4.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 2999
     - type: DeviceLinkSource
       linkedPorts:
         2999:
@@ -18900,9 +18810,6 @@ entities:
     - type: Transform
       pos: -16.5,-27.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 3743
     - type: DeviceLinkSource
       linkedPorts:
         3743:
@@ -18912,9 +18819,6 @@ entities:
     - type: Transform
       pos: -22.5,-31.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 13618
     - type: DeviceLinkSource
       linkedPorts:
         13618:
@@ -18924,9 +18828,6 @@ entities:
     - type: Transform
       pos: -22.5,-28.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 3749
     - type: DeviceLinkSource
       linkedPorts:
         3749:
@@ -18956,9 +18857,6 @@ entities:
     - type: Transform
       pos: 108.5,-46.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 26787
     - type: DeviceLinkSource
       linkedPorts:
         26787:
@@ -18968,9 +18866,6 @@ entities:
     - type: Transform
       pos: 105.5,-46.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 26786
     - type: DeviceLinkSource
       linkedPorts:
         26786:
@@ -18980,9 +18875,6 @@ entities:
     - type: Transform
       pos: 56.5,67.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 33239
     - type: DeviceLinkSource
       linkedPorts:
         33239:
@@ -18992,9 +18884,6 @@ entities:
     - type: Transform
       pos: 57.5,69.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 33238
     - type: DeviceLinkSource
       linkedPorts:
         33238:
@@ -19102,9 +18991,6 @@ entities:
       linkedPorts:
         3748:
         - DoorStatus: Close
-    - type: DeviceLinkSink
-      links:
-      - 3748
   - uid: 10108
     components:
     - type: Transform
@@ -19161,9 +19047,6 @@ entities:
     - type: Transform
       pos: -38.5,16.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 3834
     - type: DeviceLinkSource
       linkedPorts:
         3834:
@@ -19173,9 +19056,6 @@ entities:
     - type: Transform
       pos: -38.5,14.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 3833
     - type: DeviceLinkSource
       linkedPorts:
         3833:
@@ -19186,9 +19066,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -39.5,67.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 6540
     - type: DeviceLinkSource
       linkedPorts:
         6540:
@@ -19199,9 +19076,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -36.5,67.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 6538
     - type: DeviceLinkSource
       linkedPorts:
         6538:
@@ -19211,9 +19085,6 @@ entities:
     - type: Transform
       pos: 118.5,11.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 23126
     - type: DeviceLinkSource
       linkedPorts:
         23126:
@@ -19223,9 +19094,6 @@ entities:
     - type: Transform
       pos: 122.5,11.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 23125
     - type: DeviceLinkSource
       linkedPorts:
         23125:
@@ -19235,9 +19103,6 @@ entities:
     - type: Transform
       pos: 123.5,6.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 23128
     - type: DeviceLinkSource
       linkedPorts:
         23128:
@@ -19247,9 +19112,6 @@ entities:
     - type: Transform
       pos: 126.5,6.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 23127
     - type: DeviceLinkSource
       linkedPorts:
         23127:
@@ -29404,129 +29266,81 @@ entities:
     - type: Transform
       pos: 22.5,10.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 8645
   - uid: 8642
     components:
     - type: Transform
       pos: 22.5,11.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 8645
   - uid: 11541
     components:
     - type: Transform
       pos: 1.5,-34.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 11543
   - uid: 11542
     components:
     - type: Transform
       pos: 1.5,-38.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 11543
   - uid: 15301
     components:
     - type: Transform
       pos: 60.5,-31.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 15398
   - uid: 15302
     components:
     - type: Transform
       pos: 61.5,-31.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 15398
   - uid: 15303
     components:
     - type: Transform
       pos: 62.5,-31.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 15398
   - uid: 20428
     components:
     - type: Transform
       pos: 99.5,-25.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 20586
   - uid: 20471
     components:
     - type: Transform
       pos: 99.5,-26.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 20586
   - uid: 20588
     components:
     - type: Transform
       pos: 94.5,-26.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 20585
   - uid: 20589
     components:
     - type: Transform
       pos: 99.5,-27.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 20586
   - uid: 25540
     components:
     - type: Transform
       pos: 92.5,-13.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 25543
   - uid: 25541
     components:
     - type: Transform
       pos: 93.5,-13.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 25543
   - uid: 25542
     components:
     - type: Transform
       pos: 94.5,-13.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 25543
   - uid: 26442
     components:
     - type: Transform
       pos: 108.5,-36.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 26443
   - uid: 34659
     components:
     - type: Transform
       pos: 129.5,-3.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 32424
 - proto: BlastDoorOpen
   entities:
   - uid: 1975
@@ -29534,89 +29348,56 @@ entities:
     - type: Transform
       pos: -10.5,-2.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 1976
   - uid: 9400
     components:
     - type: Transform
       pos: 52.5,20.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 9399
   - uid: 9401
     components:
     - type: Transform
       pos: 52.5,21.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 9399
   - uid: 9403
     components:
     - type: Transform
       pos: 52.5,22.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 9399
   - uid: 9404
     components:
     - type: Transform
       pos: 52.5,23.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 9399
   - uid: 9405
     components:
     - type: Transform
       pos: 52.5,24.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 9399
   - uid: 14605
     components:
     - type: Transform
       pos: 45.5,-19.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 14608
   - uid: 14606
     components:
     - type: Transform
       pos: 46.5,-19.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 14608
   - uid: 14607
     components:
     - type: Transform
       pos: 47.5,-19.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 14608
   - uid: 24021
     components:
     - type: Transform
       pos: 64.5,-13.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 24020
   - uid: 24022
     components:
     - type: Transform
       pos: 63.5,-13.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 24020
   - uid: 29875
     components:
     - type: Transform
@@ -29637,33 +29418,21 @@ entities:
     - type: Transform
       pos: 71.5,43.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 31488
   - uid: 31485
     components:
     - type: Transform
       pos: 72.5,43.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 31488
   - uid: 31486
     components:
     - type: Transform
       pos: 73.5,43.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 31488
   - uid: 31487
     components:
     - type: Transform
       pos: 74.5,43.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 31488
 - proto: BlockGameArcade
   entities:
   - uid: 1076
@@ -94807,7 +94576,7 @@ entities:
     - type: Transform
       pos: -9.515972,-16.273252
       parent: 13329
-- proto: ClothingOuterCoatInspector
+- proto: ClothingOuterCoatDetectiveLoadout
   entities:
   - uid: 31694
     components:
@@ -96701,372 +96470,246 @@ entities:
     - type: Transform
       pos: 7.5,-15.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 11497
   - uid: 11496
     components:
     - type: Transform
       pos: 7.5,-14.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 11497
   - uid: 11518
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 10.5,-38.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 11550
   - uid: 11519
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 9.5,-38.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 11550
   - uid: 11520
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 8.5,-38.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 11550
   - uid: 11521
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 7.5,-38.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 11550
   - uid: 11522
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 6.5,-38.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 11550
   - uid: 11523
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 5.5,-38.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 11550
   - uid: 11524
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 4.5,-38.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 11550
   - uid: 11525
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 3.5,-38.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 11550
   - uid: 11526
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 2.5,-38.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 11550
   - uid: 11527
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 1.5,-38.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 11550
   - uid: 11528
     components:
     - type: Transform
       pos: 10.5,-37.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 11550
   - uid: 11529
     components:
     - type: Transform
       pos: 10.5,-36.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 11550
   - uid: 11530
     components:
     - type: Transform
       pos: 10.5,-35.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 11550
   - uid: 11531
     components:
     - type: Transform
       pos: 10.5,-34.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 11550
   - uid: 11532
     components:
     - type: Transform
       pos: 10.5,-33.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 11550
   - uid: 11533
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 1.5,-34.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 11551
   - uid: 11534
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 2.5,-34.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 11551
   - uid: 11535
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 3.5,-34.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 11551
   - uid: 11536
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 4.5,-34.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 11551
   - uid: 11537
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 5.5,-34.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 11551
   - uid: 11538
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 5.5,-33.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 11551
   - uid: 11539
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 5.5,-32.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 11551
   - uid: 11540
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 5.5,-31.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 11551
   - uid: 11827
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 22.5,-8.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 11835
   - uid: 11828
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 21.5,-8.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 11835
   - uid: 11829
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 20.5,-8.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 11835
   - uid: 11830
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 19.5,-8.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 11835
   - uid: 27053
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 130.5,-3.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 27080
   - uid: 27054
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 129.5,-3.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 27080
   - uid: 27055
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 125.5,-8.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 27080
   - uid: 27056
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 124.5,-8.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 27080
   - uid: 27057
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 123.5,-8.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 27080
   - uid: 27058
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 126.5,-8.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 27080
   - uid: 27059
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 126.5,-7.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 27080
   - uid: 27060
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 126.5,-6.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 27080
   - uid: 27061
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 126.5,-5.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 27080
   - uid: 27062
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 126.5,-4.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 27080
   - uid: 27063
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 126.5,-3.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 27080
   - uid: 27064
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 127.5,-3.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 27080
   - uid: 34655
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 131.5,-3.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 27080
 - proto: CrateAirlockKit
   entities:
   - uid: 13122
@@ -176472,9 +176115,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 128.5,-3.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 27081
 - proto: ReinforcedPlasmaWindow
   entities:
   - uid: 5633
@@ -181402,17 +181042,11 @@ entities:
     - type: Transform
       pos: 3.5,7.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 1494
   - uid: 1493
     components:
     - type: Transform
       pos: 4.5,7.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 1494
   - uid: 9595
     components:
     - type: Transform
@@ -181430,43 +181064,28 @@ entities:
     - type: Transform
       pos: -1.5,-8.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 9777
   - uid: 9775
     components:
     - type: Transform
       pos: -0.5,-8.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 9777
   - uid: 9776
     components:
     - type: Transform
       pos: 0.5,-8.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 9777
   - uid: 15304
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 26.5,-20.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 15306
   - uid: 15305
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 26.5,-19.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 15306
 - proto: ShuttersNormalOpen
   entities:
   - uid: 921
@@ -181474,280 +181093,181 @@ entities:
     - type: Transform
       pos: -18.5,23.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 940
   - uid: 922
     components:
     - type: Transform
       pos: -17.5,23.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 940
   - uid: 923
     components:
     - type: Transform
       pos: -16.5,23.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 940
   - uid: 924
     components:
     - type: Transform
       pos: -15.5,23.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 940
   - uid: 925
     components:
     - type: Transform
       pos: -14.5,23.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 940
   - uid: 926
     components:
     - type: Transform
       pos: -13.5,23.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 940
   - uid: 927
     components:
     - type: Transform
       pos: -8.5,16.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 1073
   - uid: 928
     components:
     - type: Transform
       pos: -4.5,16.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 1073
   - uid: 929
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -3.5,18.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 939
   - uid: 930
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -3.5,19.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 939
   - uid: 931
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -3.5,20.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 939
   - uid: 932
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -3.5,21.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 939
   - uid: 933
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -3.5,22.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 939
   - uid: 934
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -9.5,18.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 938
   - uid: 935
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -9.5,19.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 938
   - uid: 936
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -9.5,20.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 938
   - uid: 937
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -9.5,21.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 938
   - uid: 1072
     components:
     - type: Transform
       pos: -11.5,23.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 1073
   - uid: 1311
     components:
     - type: Transform
       pos: -2.5,34.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 1317
   - uid: 1312
     components:
     - type: Transform
       pos: -2.5,35.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 1317
   - uid: 1313
     components:
     - type: Transform
       pos: -2.5,36.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 1317
   - uid: 1314
     components:
     - type: Transform
       pos: -2.5,39.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 1317
   - uid: 1315
     components:
     - type: Transform
       pos: -8.5,43.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 1317
   - uid: 1316
     components:
     - type: Transform
       pos: -11.5,43.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 1317
   - uid: 1432
     components:
     - type: Transform
       pos: -12.5,25.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 1431
   - uid: 4518
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -26.5,38.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 4523
   - uid: 4519
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -26.5,39.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 4523
   - uid: 4520
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -26.5,40.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 4523
   - uid: 4521
     components:
     - type: Transform
       pos: -22.5,43.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 4523
   - uid: 4522
     components:
     - type: Transform
       pos: -21.5,43.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 4523
   - uid: 4748
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -25.5,30.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 4751
   - uid: 4749
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -25.5,31.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 4751
   - uid: 4750
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -25.5,32.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 4751
   - uid: 9389
     components:
     - type: Transform
@@ -181803,186 +181323,120 @@ entities:
     - type: Transform
       pos: 42.5,16.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 10587
   - uid: 10589
     components:
     - type: Transform
       pos: 45.5,16.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 10587
   - uid: 10590
     components:
     - type: Transform
       pos: 47.5,16.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 10587
   - uid: 10591
     components:
     - type: Transform
       pos: 50.5,16.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 10587
   - uid: 10879
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 7.5,-1.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 10877
   - uid: 10880
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 7.5,-0.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 10877
   - uid: 10881
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 7.5,0.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 10877
   - uid: 10882
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 7.5,2.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 10878
   - uid: 10883
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 7.5,3.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 10878
   - uid: 10884
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 7.5,4.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 10878
   - uid: 18460
     components:
     - type: Transform
       pos: 18.5,35.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 18464
   - uid: 18461
     components:
     - type: Transform
       pos: 20.5,35.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 18464
   - uid: 18462
     components:
     - type: Transform
       pos: 22.5,35.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 18464
   - uid: 18463
     components:
     - type: Transform
       pos: 24.5,35.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 18464
   - uid: 18498
     components:
     - type: Transform
       pos: 20.5,42.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 18464
   - uid: 18499
     components:
     - type: Transform
       pos: 21.5,42.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 18464
   - uid: 18500
     components:
     - type: Transform
       pos: 22.5,42.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 18464
   - uid: 18501
     components:
     - type: Transform
       pos: 24.5,42.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 18464
   - uid: 18502
     components:
     - type: Transform
       pos: 25.5,42.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 18464
   - uid: 18503
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 16.5,36.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 18464
   - uid: 18504
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 16.5,37.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 18464
   - uid: 18505
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 16.5,38.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 18464
   - uid: 18758
     components:
     - type: Transform
@@ -182015,17 +181469,11 @@ entities:
     - type: Transform
       pos: 65.5,41.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 31552
   - uid: 31551
     components:
     - type: Transform
       pos: 56.5,42.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 31552
 - proto: ShuttersRadiationOpen
   entities:
   - uid: 25901
@@ -182033,158 +181481,142 @@ entities:
     - type: Transform
       pos: 94.5,-9.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 25903
   - uid: 25902
     components:
     - type: Transform
       pos: 94.5,-1.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 25904
+  - uid: 32378
+    components:
+    - type: Transform
+      pos: 98.5,-4.5
+      parent: 13329
+  - uid: 32379
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 99.5,-3.5
+      parent: 13329
+  - uid: 32380
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 99.5,-4.5
+      parent: 13329
+  - uid: 32381
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 99.5,-5.5
+      parent: 13329
+  - uid: 32456
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 99.5,-7.5
+      parent: 13329
+  - uid: 32702
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 99.5,-7.5
+      parent: 13329
+  - uid: 34226
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 99.5,-6.5
+      parent: 13329
   - uid: 34676
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 117.5,-7.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 34695
   - uid: 34677
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 117.5,-6.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 34695
   - uid: 34678
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 117.5,-5.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 34695
   - uid: 34679
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 117.5,-4.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 34695
   - uid: 34680
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 117.5,-3.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 34695
   - uid: 34681
     components:
     - type: Transform
       pos: 110.5,3.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 34692
   - uid: 34682
     components:
     - type: Transform
       pos: 109.5,3.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 34692
   - uid: 34683
     components:
     - type: Transform
       pos: 108.5,3.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 34692
   - uid: 34684
     components:
     - type: Transform
       pos: 107.5,3.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 34692
   - uid: 34685
     components:
     - type: Transform
       pos: 106.5,3.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 34692
   - uid: 34686
     components:
     - type: Transform
       pos: 110.5,-14.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 34691
   - uid: 34687
     components:
     - type: Transform
       pos: 109.5,-14.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 34691
   - uid: 34688
     components:
     - type: Transform
       pos: 108.5,-14.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 34691
   - uid: 34689
     components:
     - type: Transform
       pos: 107.5,-14.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 34691
   - uid: 34690
     components:
     - type: Transform
       pos: 106.5,-14.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 34691
   - uid: 35310
     components:
     - type: Transform
       pos: 96.5,-0.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 35312
   - uid: 35311
     components:
     - type: Transform
       pos: 99.5,-0.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 35312
 - proto: ShuttleConsoleCircuitboard
   entities:
   - uid: 13064
@@ -182597,6 +182029,43 @@ entities:
       linkedPorts:
         34659:
         - Pressed: Toggle
+  - uid: 32703
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 97.5,-9.5
+      parent: 13329
+    - type: SignalSwitch
+      state: True
+    - type: DeviceLinkSource
+      linkedPorts:
+        32702:
+        - Pressed: Toggle
+        32381:
+        - Pressed: Toggle
+        34226:
+        - Pressed: Toggle
+        32380:
+        - Pressed: Toggle
+        32379:
+        - Pressed: Toggle
+  - uid: 34227
+    components:
+    - type: Transform
+      pos: 97.5,-1.5
+      parent: 13329
+    - type: DeviceLinkSource
+      linkedPorts:
+        32379:
+        - Pressed: Toggle
+        32380:
+        - Pressed: Toggle
+        32381:
+        - Pressed: Toggle
+        34226:
+        - Pressed: Toggle
+        32702:
+        - Pressed: Toggle
   - uid: 34691
     components:
     - type: MetaData
@@ -221788,9 +221257,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 28.5,4.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 10576
   - uid: 9334
     components:
     - type: MetaData
@@ -221799,9 +221265,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 31.5,4.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 10583
   - uid: 9335
     components:
     - type: MetaData
@@ -221810,9 +221273,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 34.5,4.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 10586
   - uid: 9336
     components:
     - type: MetaData
@@ -221821,9 +221281,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 37.5,4.5
       parent: 13329
-    - type: DeviceLinkSink
-      links:
-      - 10578
   - uid: 9423
     components:
     - type: Transform
diff --git a/Resources/Maps/marathon.yml b/Resources/Maps/marathon.yml
index f7a2a60564..7657d84e17 100644
--- a/Resources/Maps/marathon.yml
+++ b/Resources/Maps/marathon.yml
@@ -9112,25 +9112,16 @@ entities:
     - type: Transform
       pos: 19.5,33.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 16041
   - uid: 6414
     components:
     - type: Transform
       pos: 19.5,36.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 16042
   - uid: 6415
     components:
     - type: Transform
       pos: 19.5,39.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 16116
   - uid: 6494
     components:
     - type: Transform
@@ -9761,9 +9752,6 @@ entities:
     - type: Transform
       pos: 26.5,-18.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 8595
     - type: DeviceLinkSource
       linkedPorts:
         8595:
@@ -9786,9 +9774,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -24.5,-58.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 22632
     - type: DeviceLinkSource
       linkedPorts:
         22632:
@@ -9799,9 +9784,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -21.5,-58.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 22631
     - type: DeviceLinkSource
       linkedPorts:
         22631:
@@ -9860,9 +9842,6 @@ entities:
     - type: Transform
       pos: 23.5,-18.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 9254
     - type: DeviceLinkSource
       linkedPorts:
         9254:
@@ -9874,9 +9853,6 @@ entities:
     - type: Transform
       pos: 34.5,-15.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 11800
     - type: DeviceLinkSource
       linkedPorts:
         11800:
@@ -9891,9 +9867,6 @@ entities:
     - type: Transform
       pos: 34.5,-12.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 11658
     - type: DeviceLinkSource
       linkedPorts:
         11658:
@@ -9928,9 +9901,6 @@ entities:
     - type: Transform
       pos: -17.5,-52.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 10136
     - type: DeviceLinkSource
       linkedPorts:
         10136:
@@ -9940,9 +9910,6 @@ entities:
     - type: Transform
       pos: -17.5,-49.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 10135
     - type: DeviceLinkSource
       linkedPorts:
         10135:
@@ -9952,9 +9919,6 @@ entities:
     - type: Transform
       pos: -0.5,60.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 20060
     - type: DeviceLinkSource
       linkedPorts:
         20060:
@@ -9964,9 +9928,6 @@ entities:
     - type: Transform
       pos: -0.5,62.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 20059
     - type: DeviceLinkSource
       linkedPorts:
         20059:
@@ -9983,9 +9944,6 @@ entities:
     - type: Transform
       pos: -0.5,39.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 5390
     - type: DeviceLinkSource
       linkedPorts:
         5390:
@@ -9995,9 +9953,6 @@ entities:
     - type: Transform
       pos: 54.5,30.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 15335
     - type: DeviceLinkSource
       linkedPorts:
         15335:
@@ -10007,9 +9962,6 @@ entities:
     - type: Transform
       pos: 52.5,30.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 15334
     - type: DeviceLinkSource
       linkedPorts:
         15334:
@@ -10024,9 +9976,6 @@ entities:
     - type: Transform
       pos: -35.5,-39.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 21047
     - type: DeviceLinkSource
       linkedPorts:
         21047:
@@ -10036,9 +9985,6 @@ entities:
     - type: Transform
       pos: -37.5,-39.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 18018
     - type: DeviceLinkSource
       linkedPorts:
         18018:
@@ -10048,9 +9994,6 @@ entities:
     - type: Transform
       pos: -52.5,-39.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 21117
     - type: DeviceLinkSource
       linkedPorts:
         21117:
@@ -10060,9 +10003,6 @@ entities:
     - type: Transform
       pos: -50.5,-39.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 21116
     - type: DeviceLinkSource
       linkedPorts:
         21116:
@@ -10152,9 +10092,6 @@ entities:
     - type: Transform
       pos: -0.5,41.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 5391
     - type: DeviceLinkSource
       linkedPorts:
         5391:
@@ -10174,9 +10111,6 @@ entities:
     - type: Transform
       pos: -66.5,43.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 16279
     - type: DeviceLinkSource
       linkedPorts:
         16279:
@@ -10186,9 +10120,6 @@ entities:
     - type: Transform
       pos: -68.5,43.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 16278
     - type: DeviceLinkSource
       linkedPorts:
         16278:
@@ -11157,6 +11088,12 @@ entities:
     - type: Transform
       pos: -20.5,-5.5
       parent: 30
+    - type: Door
+      secondsUntilStateChange: -295.55695
+      state: Opening
+    - type: DeviceLinkSource
+      lastSignals:
+        DoorStatus: True
   - uid: 6880
     components:
     - type: MetaData
@@ -11327,9 +11264,6 @@ entities:
     - type: Transform
       pos: -50.5,62.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 840
     - type: DeviceLinkSource
       linkedPorts:
         840:
@@ -11421,9 +11355,6 @@ entities:
     - type: Transform
       pos: -50.5,59.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 2312
     - type: DeviceLinkSource
       linkedPorts:
         2312:
@@ -12203,6 +12134,10 @@ entities:
       rot: 3.141592653589793 rad
       pos: -24.5,-6.5
       parent: 30
+    - type: Apc
+      hasAccess: True
+      lastExternalState: Good
+      lastChargeState: Full
   - uid: 7079
     components:
     - type: MetaData
@@ -12226,6 +12161,10 @@ entities:
     - type: Transform
       pos: -21.5,-6.5
       parent: 30
+    - type: Apc
+      hasAccess: True
+      lastExternalState: Good
+      lastChargeState: Full
   - uid: 7433
     components:
     - type: MetaData
@@ -12242,6 +12181,10 @@ entities:
       rot: 3.141592653589793 rad
       pos: -31.5,-14.5
       parent: 30
+    - type: Apc
+      hasAccess: True
+      lastExternalState: Good
+      lastChargeState: Full
   - uid: 7610
     components:
     - type: MetaData
@@ -14037,204 +13980,126 @@ entities:
     - type: Transform
       pos: 12.5,40.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 20398
   - uid: 7562
     components:
     - type: Transform
       pos: -42.5,16.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 7920
   - uid: 7563
     components:
     - type: Transform
       pos: -43.5,16.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 7920
   - uid: 9068
     components:
     - type: Transform
       pos: 12.5,-38.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 8570
-      - 9038
   - uid: 9404
     components:
     - type: Transform
       pos: -24.5,-45.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 8609
-      - 8393
   - uid: 9405
     components:
     - type: Transform
       pos: -23.5,-45.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 8609
-      - 8393
   - uid: 9825
     components:
     - type: Transform
       pos: -13.5,-59.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 8818
   - uid: 9826
     components:
     - type: Transform
       pos: -13.5,-58.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 8818
   - uid: 9827
     components:
     - type: Transform
       pos: -13.5,-57.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 8818
   - uid: 9828
     components:
     - type: Transform
       pos: -1.5,-59.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 8821
   - uid: 9829
     components:
     - type: Transform
       pos: -1.5,-58.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 8821
   - uid: 9830
     components:
     - type: Transform
       pos: -1.5,-57.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 8821
   - uid: 11659
     components:
     - type: Transform
       pos: 35.5,-12.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 11761
   - uid: 11682
     components:
     - type: Transform
       pos: 35.5,-15.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 11933
   - uid: 11923
     components:
     - type: Transform
       pos: 38.5,-2.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 8610
   - uid: 11995
     components:
     - type: Transform
       pos: 38.5,-6.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 8863
   - uid: 12059
     components:
     - type: Transform
       pos: 36.5,-6.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 8863
   - uid: 12099
     components:
     - type: Transform
       pos: 36.5,-2.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 8610
   - uid: 13347
     components:
     - type: Transform
       pos: 36.5,14.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 12915
   - uid: 13751
     components:
     - type: Transform
       pos: 48.5,25.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 15985
   - uid: 14512
     components:
     - type: Transform
       pos: 48.5,23.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 15986
   - uid: 16228
     components:
     - type: Transform
       pos: 23.5,24.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 10289
   - uid: 16229
     components:
     - type: Transform
       pos: 22.5,24.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 10289
   - uid: 16230
     components:
     - type: Transform
       pos: 21.5,24.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 10289
   - uid: 16773
     components:
     - type: Transform
       pos: 37.5,14.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 12915
 - proto: BlastDoorOpen
   entities:
   - uid: 2189
@@ -14242,151 +14107,97 @@ entities:
     - type: Transform
       pos: -37.5,61.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 20432
   - uid: 2313
     components:
     - type: Transform
       pos: -26.5,58.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 20432
   - uid: 5078
     components:
     - type: Transform
       pos: -20.5,52.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 4731
   - uid: 5079
     components:
     - type: Transform
       pos: -20.5,51.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 4731
   - uid: 5822
     components:
     - type: Transform
       pos: -20.5,50.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 4731
   - uid: 6299
     components:
     - type: Transform
       pos: -20.5,49.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 4731
   - uid: 9188
     components:
     - type: Transform
       pos: 5.5,-21.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 9184
   - uid: 9189
     components:
     - type: Transform
       pos: 6.5,-21.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 9184
   - uid: 9190
     components:
     - type: Transform
       pos: 7.5,-21.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 9184
   - uid: 15174
     components:
     - type: Transform
       pos: -20.5,48.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 4731
   - uid: 17473
     components:
     - type: Transform
       pos: -26.5,59.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 20432
   - uid: 18838
     components:
     - type: Transform
       pos: -26.5,60.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 20432
   - uid: 18840
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -30.5,61.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 20432
   - uid: 20360
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -29.5,61.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 20432
   - uid: 20389
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -28.5,61.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 20432
   - uid: 20391
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -34.5,61.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 20432
   - uid: 20401
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -33.5,61.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 20432
   - uid: 20402
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -32.5,61.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 20432
 - proto: BlockGameArcade
   entities:
   - uid: 1281
@@ -49645,6 +49456,14 @@ entities:
       - Steel
       - Glass
       - Gold
+- proto: CleanerDispenser
+  entities:
+  - uid: 10299
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -29.5,7.5
+      parent: 30
 - proto: ClosetBombFilled
   entities:
   - uid: 2072
@@ -52288,6 +52107,13 @@ entities:
     - type: Transform
       pos: 40.490578,30.452217
       parent: 30
+- proto: ClothingOuterCoatDetectiveLoadout
+  entities:
+  - uid: 11366
+    components:
+    - type: Transform
+      pos: 4.503509,-14.329939
+      parent: 30
 - proto: ClothingOuterCoatGentle
   entities:
   - uid: 16947
@@ -52301,13 +52127,6 @@ entities:
       parent: 19618
     - type: Physics
       canCollide: False
-- proto: ClothingOuterCoatInspector
-  entities:
-  - uid: 11366
-    components:
-    - type: Transform
-      pos: 4.503509,-14.329939
-      parent: 30
 - proto: ClothingOuterCoatJensen
   entities:
   - uid: 9233
@@ -53106,6 +52925,12 @@ entities:
       parent: 30
 - proto: ComputerCargoOrders
   entities:
+  - uid: 3117
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,42.5
+      parent: 30
   - uid: 11627
     components:
     - type: Transform
@@ -53545,242 +53370,158 @@ entities:
     - type: Transform
       pos: 35.5,-13.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 11677
   - uid: 8466
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 18.5,-3.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 11717
   - uid: 8500
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 17.5,-3.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 11717
   - uid: 8503
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 19.5,-3.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 11717
   - uid: 11639
     components:
     - type: Transform
       pos: 35.5,-11.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 11677
   - uid: 11691
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 20.5,-3.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 11717
   - uid: 11702
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 38.5,-2.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 11866
   - uid: 11755
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 36.5,-2.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 11866
   - uid: 11780
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 35.5,-6.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 12013
   - uid: 11865
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 35.5,-2.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 11866
   - uid: 11926
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 37.5,-6.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 12013
   - uid: 11932
     components:
     - type: Transform
       pos: 35.5,-16.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 11677
   - uid: 11978
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 38.5,-6.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 12013
   - uid: 11979
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 37.5,-2.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 11866
   - uid: 12014
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 34.5,-2.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 11866
   - uid: 12031
     components:
     - type: Transform
       pos: 35.5,-14.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 11677
   - uid: 12047
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 36.5,-6.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 12013
   - uid: 12096
     components:
     - type: Transform
       pos: 35.5,-12.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 11677
   - uid: 12231
     components:
     - type: Transform
       pos: 35.5,-17.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 11677
   - uid: 14522
     components:
     - type: Transform
       pos: 48.5,25.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 15987
   - uid: 14523
     components:
     - type: Transform
       pos: 48.5,24.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 15987
   - uid: 14524
     components:
     - type: Transform
       pos: 48.5,23.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 15987
   - uid: 14525
     components:
     - type: Transform
       pos: 48.5,22.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 15987
   - uid: 14526
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 49.5,22.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 15988
   - uid: 14527
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 50.5,22.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 15988
   - uid: 14528
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 51.5,22.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 15988
   - uid: 14529
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 52.5,22.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 15988
   - uid: 16126
     components:
     - type: Transform
       pos: 35.5,-15.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 11677
 - proto: CornSeeds
   entities:
   - uid: 2348
@@ -55666,6 +55407,11 @@ entities:
       parent: 30
 - proto: DisposalJunction
   entities:
+  - uid: 6948
+    components:
+    - type: Transform
+      pos: -19.5,-5.5
+      parent: 30
   - uid: 7412
     components:
     - type: Transform
@@ -55963,11 +55709,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -18.5,-9.5
       parent: 30
-  - uid: 6948
-    components:
-    - type: Transform
-      pos: -19.5,-5.5
-      parent: 30
   - uid: 6949
     components:
     - type: Transform
@@ -98167,44 +97908,29 @@ entities:
       rot: 3.141592653589793 rad
       pos: 2.5,-30.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 3598
   - uid: 864
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 15.5,-7.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 3189
   - uid: 961
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 15.5,16.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 3115
   - uid: 1753
     components:
     - type: Transform
       pos: -33.5,37.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 5417
   - uid: 7609
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -8.5,-0.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 7440
 - proto: JetpackBlueFilled
   entities:
   - uid: 8311
@@ -99902,9 +99628,6 @@ entities:
     - type: Transform
       pos: 36.5,12.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 15282
 - proto: MachineCentrifuge
   entities:
   - uid: 19439
@@ -101388,6 +101111,13 @@ entities:
     - type: Transform
       pos: 12.5,58.5
       parent: 30
+- proto: ParticleAcceleratorComputerCircuitboard
+  entities:
+  - uid: 11445
+    components:
+    - type: Transform
+      pos: -21.580353,-68.38637
+      parent: 30
 - proto: PartRodMetal
   entities:
   - uid: 9247
@@ -105963,9 +105693,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -32.5,-22.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 6992
   - uid: 7437
     components:
     - type: Transform
@@ -107210,6 +106937,11 @@ entities:
     - type: Transform
       pos: 1.5,-15.5
       parent: 30
+  - uid: 11444
+    components:
+    - type: Transform
+      pos: -21.5,-68.5
+      parent: 30
   - uid: 11737
     components:
     - type: Transform
@@ -108299,9 +108031,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 53.5,22.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 15989
 - proto: ReinforcedGirder
   entities:
   - uid: 21934
@@ -112544,17 +112273,11 @@ entities:
     - type: Transform
       pos: -33.5,8.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 544
   - uid: 543
     components:
     - type: Transform
       pos: -33.5,7.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 544
   - uid: 5557
     components:
     - type: Transform
@@ -112565,91 +112288,51 @@ entities:
     - type: Transform
       pos: 23.5,52.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 13741
-      - 13742
   - uid: 13729
     components:
     - type: Transform
       pos: 24.5,52.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 13741
-      - 13742
   - uid: 13730
     components:
     - type: Transform
       pos: 25.5,52.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 13741
-      - 13742
   - uid: 13731
     components:
     - type: Transform
       pos: 26.5,52.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 13741
-      - 13742
   - uid: 13732
     components:
     - type: Transform
       pos: 27.5,52.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 13741
-      - 13742
   - uid: 13733
     components:
     - type: Transform
       pos: 27.5,54.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 13741
-      - 13742
   - uid: 13734
     components:
     - type: Transform
       pos: 26.5,54.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 13741
-      - 13742
   - uid: 13735
     components:
     - type: Transform
       pos: 25.5,54.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 13741
-      - 13742
   - uid: 13736
     components:
     - type: Transform
       pos: 24.5,54.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 13741
-      - 13742
   - uid: 13737
     components:
     - type: Transform
       pos: 23.5,54.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 13741
-      - 13742
 - proto: ShuttersNormalOpen
   entities:
   - uid: 390
@@ -112658,539 +112341,341 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -10.5,11.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 384
   - uid: 391
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -10.5,9.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 384
   - uid: 392
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -10.5,10.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 384
   - uid: 393
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -10.5,7.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 384
   - uid: 394
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -10.5,8.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 384
   - uid: 395
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -10.5,6.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 384
   - uid: 580
     components:
     - type: Transform
       pos: -3.5,5.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 583
   - uid: 581
     components:
     - type: Transform
       pos: -2.5,5.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 583
   - uid: 582
     components:
     - type: Transform
       pos: -1.5,5.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 583
   - uid: 899
     components:
     - type: Transform
       pos: 29.5,17.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 7673
   - uid: 3176
     components:
     - type: Transform
       pos: -42.5,38.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 3180
   - uid: 3177
     components:
     - type: Transform
       pos: -40.5,38.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 3180
   - uid: 3181
     components:
     - type: Transform
       pos: -48.5,38.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 3180
   - uid: 3182
     components:
     - type: Transform
       pos: -47.5,38.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 3180
   - uid: 3183
     components:
     - type: Transform
       pos: -46.5,38.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 3180
   - uid: 3184
     components:
     - type: Transform
       pos: -44.5,38.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 3180
   - uid: 3185
     components:
     - type: Transform
       pos: -43.5,38.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 3180
   - uid: 3405
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 7.5,8.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 583
   - uid: 4361
     components:
     - type: Transform
       pos: 5.5,5.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 583
   - uid: 4376
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 7.5,7.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 583
   - uid: 4378
     components:
     - type: Transform
       pos: 0.5,5.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 583
   - uid: 4438
     components:
     - type: Transform
       pos: 27.5,17.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 7673
   - uid: 4915
     components:
     - type: Transform
       pos: 1.5,5.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 583
   - uid: 5698
     components:
     - type: Transform
       pos: -39.5,38.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 3180
   - uid: 5700
     components:
     - type: Transform
       pos: -38.5,38.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 3180
   - uid: 5733
     components:
     - type: Transform
       pos: -5.5,5.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 583
   - uid: 5738
     components:
     - type: Transform
       pos: -14.5,36.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 20392
   - uid: 5741
     components:
     - type: Transform
       pos: -15.5,36.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 20392
   - uid: 6785
     components:
     - type: Transform
       pos: -8.5,-5.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 3204
   - uid: 6797
     components:
     - type: Transform
       pos: -9.5,-5.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 3204
   - uid: 6871
     components:
     - type: Transform
       pos: -23.5,-17.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 6869
   - uid: 6882
     components:
     - type: Transform
       pos: -28.5,0.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 8607
   - uid: 6929
     components:
     - type: Transform
       pos: 4.5,5.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 583
   - uid: 6945
     components:
     - type: Transform
       pos: -9.5,5.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 583
   - uid: 7164
     components:
     - type: Transform
       pos: -27.5,-21.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 6868
   - uid: 7829
     components:
     - type: Transform
       pos: -23.5,-21.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 6868
   - uid: 7876
     components:
     - type: Transform
       pos: -27.5,-17.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 6869
   - uid: 7971
     components:
     - type: Transform
       pos: -7.5,-5.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 3204
   - uid: 7972
     components:
     - type: Transform
       pos: -5.5,-5.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 3204
   - uid: 7991
     components:
     - type: Transform
       pos: -6.5,-5.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 3204
   - uid: 7992
     components:
     - type: Transform
       pos: -10.5,-6.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 3204
   - uid: 9238
     components:
     - type: Transform
       pos: -4.5,12.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 20446
   - uid: 9239
     components:
     - type: Transform
       pos: -3.5,12.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 20446
   - uid: 11002
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -40.5,32.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 11008
   - uid: 11006
     components:
     - type: Transform
       pos: -42.5,34.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 11008
   - uid: 11010
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -40.5,31.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 11008
   - uid: 11716
     components:
     - type: Transform
       pos: 26.5,-0.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 12029
   - uid: 11822
     components:
     - type: Transform
       pos: 24.5,-0.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 12029
   - uid: 11823
     components:
     - type: Transform
       pos: 25.5,-0.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 12029
   - uid: 12625
     components:
     - type: Transform
       pos: -5.5,12.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 20446
   - uid: 12656
     components:
     - type: Transform
       pos: 14.5,13.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 20399
   - uid: 12657
     components:
     - type: Transform
       pos: 13.5,13.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 20399
   - uid: 12810
     components:
     - type: Transform
       pos: 24.5,15.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 7673
   - uid: 13075
     components:
     - type: Transform
       pos: 15.5,13.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 20399
   - uid: 14340
     components:
     - type: Transform
       pos: 27.5,12.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 7673
   - uid: 14352
     components:
     - type: Transform
       pos: 28.5,12.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 7673
   - uid: 14355
     components:
     - type: Transform
       pos: 26.5,12.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 7673
   - uid: 20394
     components:
     - type: Transform
       pos: -3.5,36.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 20393
   - uid: 20395
     components:
     - type: Transform
       pos: -4.5,36.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 20393
   - uid: 20445
     components:
     - type: Transform
       pos: -2.5,12.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 20446
   - uid: 20447
     components:
     - type: Transform
       pos: 0.5,12.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 20446
   - uid: 20448
     components:
     - type: Transform
       pos: -0.5,12.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 20446
   - uid: 20449
     components:
     - type: Transform
       pos: -1.5,12.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 20446
   - uid: 21333
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -40.5,30.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 11008
   - uid: 21722
     components:
     - type: Transform
       pos: -0.5,28.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 21721
   - uid: 22424
     components:
     - type: Transform
       pos: 4.5,28.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 21721
 - proto: ShuttersRadiationOpen
   entities:
   - uid: 9182
@@ -123242,6 +122727,11 @@ entities:
     - type: Transform
       pos: -1.5,21.5
       parent: 30
+  - uid: 10292
+    components:
+    - type: Transform
+      pos: 25.5,-9.5
+      parent: 30
   - uid: 10400
     components:
     - type: MetaData
@@ -138991,25 +138481,16 @@ entities:
     - type: Transform
       pos: -43.5,41.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 1982
   - uid: 1760
     components:
     - type: Transform
       pos: -39.5,41.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 1993
   - uid: 1761
     components:
     - type: Transform
       pos: -47.5,41.5
       parent: 30
-    - type: DeviceLinkSink
-      links:
-      - 1981
   - uid: 2230
     components:
     - type: Transform
diff --git a/Resources/Maps/meta.yml b/Resources/Maps/meta.yml
index 44fe035892..a8143f716e 100644
--- a/Resources/Maps/meta.yml
+++ b/Resources/Maps/meta.yml
@@ -55,11 +55,11 @@ entities:
     - type: Transform
     - type: Map
     - type: PhysicsMap
+    - type: GridTree
+    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
     - type: LoadedMap
-    - type: GridTree
-    - type: MovedGrids
   - uid: 5350
     components:
     - type: MetaData
@@ -10451,9 +10451,6 @@ entities:
     - type: Transform
       pos: 60.5,29.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 23562
     - type: DeviceLinkSource
       linkedPorts:
         23562:
@@ -10463,9 +10460,6 @@ entities:
     - type: Transform
       pos: 57.5,29.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 23561
     - type: DeviceLinkSource
       linkedPorts:
         23561:
@@ -10475,9 +10469,6 @@ entities:
     - type: Transform
       pos: 60.5,11.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 23564
     - type: DeviceLinkSource
       linkedPorts:
         23564:
@@ -10487,9 +10478,6 @@ entities:
     - type: Transform
       pos: 57.5,11.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 23563
     - type: DeviceLinkSource
       linkedPorts:
         23563:
@@ -10659,10 +10647,6 @@ entities:
     - type: Transform
       pos: 69.5,32.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 13923
-      - 13924
     - type: DeviceLinkSource
       linkedPorts:
         13923:
@@ -10843,10 +10827,6 @@ entities:
     - type: Transform
       pos: 70.5,34.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 14536
-      - 13924
     - type: DeviceLinkSource
       linkedPorts:
         14536:
@@ -10858,10 +10838,6 @@ entities:
     - type: Transform
       pos: 71.5,32.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 14536
-      - 13923
     - type: DeviceLinkSource
       linkedPorts:
         14536:
@@ -11018,9 +10994,6 @@ entities:
     - type: Transform
       pos: -3.5,52.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 6555
     - type: DeviceLinkSource
       linkedPorts:
         6555:
@@ -11030,9 +11003,6 @@ entities:
     - type: Transform
       pos: -7.5,52.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 7732
     - type: DeviceLinkSource
       linkedPorts:
         7732:
@@ -11042,9 +11012,6 @@ entities:
     - type: Transform
       pos: -11.5,52.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 7810
     - type: DeviceLinkSource
       linkedPorts:
         7810:
@@ -12220,9 +12187,6 @@ entities:
     - type: Transform
       pos: -3.5,49.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 7807
     - type: DeviceLinkSource
       linkedPorts:
         7807:
@@ -12242,9 +12206,6 @@ entities:
     - type: Transform
       pos: -7.5,49.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 7808
     - type: DeviceLinkSource
       linkedPorts:
         7808:
@@ -12254,9 +12215,6 @@ entities:
     - type: Transform
       pos: -11.5,49.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 7809
     - type: DeviceLinkSource
       linkedPorts:
         7809:
@@ -14643,172 +14601,106 @@ entities:
     - type: Transform
       pos: -45.5,15.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 4747
   - uid: 4308
     components:
     - type: Transform
       pos: -43.5,15.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 4747
   - uid: 4746
     components:
     - type: Transform
       pos: -43.5,19.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 4748
   - uid: 5045
     components:
     - type: Transform
       pos: -45.5,19.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 4748
   - uid: 9437
     components:
     - type: Transform
       pos: -40.5,41.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 9439
   - uid: 9438
     components:
     - type: Transform
       pos: -40.5,43.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 9440
   - uid: 10293
     components:
     - type: Transform
       pos: 68.5,-5.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 12022
   - uid: 11486
     components:
     - type: Transform
       pos: 46.5,-35.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 12021
   - uid: 11487
     components:
     - type: Transform
       pos: 48.5,-32.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 12021
   - uid: 19341
     components:
     - type: Transform
       pos: 3.5,-27.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 15373
   - uid: 19343
     components:
     - type: Transform
       pos: 2.5,-27.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 15373
   - uid: 19344
     components:
     - type: Transform
       pos: 1.5,-27.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 15373
   - uid: 19345
     components:
     - type: Transform
       pos: 16.5,-50.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 19439
   - uid: 19346
     components:
     - type: Transform
       pos: 20.5,-50.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 24075
   - uid: 19362
     components:
     - type: Transform
       pos: 12.5,-55.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 19438
   - uid: 19363
     components:
     - type: Transform
       pos: 12.5,-54.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 19438
   - uid: 19364
     components:
     - type: Transform
       pos: 16.5,-55.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 19438
   - uid: 19365
     components:
     - type: Transform
       pos: 16.5,-54.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 19438
   - uid: 23565
     components:
     - type: Transform
       pos: 48.5,21.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 9411
-      - 9410
   - uid: 23566
     components:
     - type: Transform
       pos: 48.5,22.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 9411
-      - 9410
   - uid: 23567
     components:
     - type: Transform
       pos: 48.5,23.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 9411
-      - 9410
 - proto: BlastDoorExterior1Open
   entities:
   - uid: 24634
@@ -14823,73 +14715,46 @@ entities:
     - type: Transform
       pos: -12.5,45.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 10486
   - uid: 10484
     components:
     - type: Transform
       pos: -11.5,45.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 10486
   - uid: 10485
     components:
     - type: Transform
       pos: -10.5,45.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 10486
   - uid: 12456
     components:
     - type: Transform
       pos: 58.5,24.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 12455
   - uid: 12457
     components:
     - type: Transform
       pos: 58.5,25.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 12455
   - uid: 12458
     components:
     - type: Transform
       pos: 58.5,26.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 12455
   - uid: 12459
     components:
     - type: Transform
       pos: 58.5,14.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 12454
   - uid: 12460
     components:
     - type: Transform
       pos: 58.5,15.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 12454
   - uid: 12461
     components:
     - type: Transform
       pos: 58.5,16.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 12454
 - proto: BlockGameArcade
   entities:
   - uid: 7187
@@ -57250,23 +57115,6 @@ entities:
     - type: Transform
       pos: -14.570036,-28.313492
       parent: 5350
-- proto: chem_master
-  entities:
-  - uid: 15620
-    components:
-    - type: Transform
-      pos: -18.5,-22.5
-      parent: 5350
-  - uid: 15632
-    components:
-    - type: Transform
-      pos: -14.5,-26.5
-      parent: 5350
-  - uid: 16120
-    components:
-    - type: Transform
-      pos: -18.5,-24.5
-      parent: 5350
 - proto: ChemDispenser
   entities:
   - uid: 14251
@@ -57313,6 +57161,23 @@ entities:
     - type: Transform
       pos: -23.5,-25.5
       parent: 5350
+- proto: ChemMaster
+  entities:
+  - uid: 15620
+    components:
+    - type: Transform
+      pos: -18.5,-22.5
+      parent: 5350
+  - uid: 15632
+    components:
+    - type: Transform
+      pos: -14.5,-26.5
+      parent: 5350
+  - uid: 16120
+    components:
+    - type: Transform
+      pos: -18.5,-24.5
+      parent: 5350
 - proto: ChessBoard
   entities:
   - uid: 6162
@@ -61026,6 +60891,13 @@ entities:
     - type: Transform
       pos: -54.487633,-18.620468
       parent: 5350
+- proto: ClothingOuterCoatDetectiveLoadout
+  entities:
+  - uid: 23129
+    components:
+    - type: Transform
+      pos: -22.593464,38.504482
+      parent: 5350
 - proto: ClothingOuterCoatGentle
   entities:
   - uid: 13742
@@ -61033,13 +60905,6 @@ entities:
     - type: Transform
       pos: 23.465069,24.654417
       parent: 5350
-- proto: ClothingOuterCoatInspector
-  entities:
-  - uid: 23129
-    components:
-    - type: Transform
-      pos: -22.593464,38.504482
-      parent: 5350
 - proto: ClothingOuterCoatJensen
   entities:
   - uid: 24118
@@ -61731,11 +61596,6 @@ entities:
 - proto: ComputerAlert
   entities:
   - uid: 1272
-    components:
-    - type: Transform
-      pos: -3.5,4.5
-      parent: 5350
-  - uid: 1273
     components:
     - type: Transform
       pos: -1.5,4.5
@@ -62121,6 +61981,11 @@ entities:
       parent: 5350
 - proto: ComputerRadar
   entities:
+  - uid: 1207
+    components:
+    - type: Transform
+      pos: 3.5,2.5
+      parent: 5350
   - uid: 24621
     components:
     - type: Transform
@@ -62203,10 +62068,10 @@ entities:
       parent: 5350
 - proto: ComputerSolarControl
   entities:
-  - uid: 1207
+  - uid: 1273
     components:
     - type: Transform
-      pos: 3.5,2.5
+      pos: -3.5,4.5
       parent: 5350
   - uid: 9058
     components:
@@ -62385,172 +62250,112 @@ entities:
     - type: Transform
       pos: -38.5,7.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 4025
   - uid: 3357
     components:
     - type: Transform
       pos: -38.5,6.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 4025
   - uid: 3849
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -34.5,5.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 3860
   - uid: 3905
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -42.5,19.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 4743
   - uid: 3906
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -43.5,19.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 4743
   - uid: 3907
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -44.5,19.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 4743
   - uid: 3908
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -45.5,19.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 4743
   - uid: 3909
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -45.5,15.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 4744
   - uid: 3910
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -44.5,15.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 4744
   - uid: 3911
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -43.5,15.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 4744
   - uid: 3912
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -42.5,15.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 4744
   - uid: 4022
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -35.5,5.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 3860
   - uid: 4023
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -36.5,5.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 3860
   - uid: 4027
     components:
     - type: Transform
       pos: -38.5,8.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 4025
   - uid: 9394
     components:
     - type: Transform
       pos: -40.5,41.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 9421
   - uid: 9401
     components:
     - type: Transform
       pos: -40.5,42.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 9421
   - uid: 9402
     components:
     - type: Transform
       pos: -40.5,43.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 9421
   - uid: 9418
     components:
     - type: Transform
       pos: -40.5,40.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 9421
   - uid: 9419
     components:
     - type: Transform
       pos: -40.5,39.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 9421
   - uid: 9497
     components:
     - type: Transform
       pos: -40.5,44.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 9421
 - proto: CrateArtifactContainer
   entities:
   - uid: 20961
@@ -92274,10 +92079,14 @@ entities:
   - uid: 14671
     components:
     - type: Transform
+      anchored: False
       pos: -21.5,-28.5
       parent: 5350
     - type: AtmosPipeColor
       color: '#0335FCFF'
+    - type: Physics
+      canCollide: True
+      bodyType: Dynamic
   - uid: 14672
     components:
     - type: Transform
@@ -94682,11 +94491,15 @@ entities:
   - uid: 18471
     components:
     - type: Transform
+      anchored: False
       rot: -1.5707963267948966 rad
       pos: -47.5,-21.5
       parent: 5350
     - type: AtmosPipeColor
       color: '#0335FCFF'
+    - type: Physics
+      canCollide: True
+      bodyType: Dynamic
   - uid: 18472
     components:
     - type: Transform
@@ -117828,17 +117641,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: 24.5,-30.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 19453
   - uid: 19358
     components:
     - type: Transform
       pos: 14.5,-54.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 19438
 - proto: MachineCentrifuge
   entities:
   - uid: 11599
@@ -127837,9 +127644,6 @@ entities:
     - type: Transform
       pos: -40.5,38.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 9421
 - proto: ReinforcedPlasmaWindow
   entities:
   - uid: 11288
@@ -132286,9 +132090,6 @@ entities:
     - type: Transform
       pos: -16.5,-9.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 1495
   - uid: 1543
     components:
     - type: Transform
@@ -132320,9 +132121,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -46.5,-17.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 18402
   - uid: 19405
     components:
     - type: Transform
@@ -132334,46 +132132,28 @@ entities:
     - type: Transform
       pos: 27.5,-57.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 20956
-      - 20957
   - uid: 20959
     components:
     - type: Transform
       pos: 29.5,-57.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 20956
-      - 20957
   - uid: 22274
     components:
     - type: Transform
       pos: 28.5,-57.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 20956
-      - 20957
   - uid: 24656
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -4.5,-33.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 24798
   - uid: 24685
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -4.5,-34.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 24798
   - uid: 24711
     components:
     - type: Transform
@@ -132387,379 +132167,238 @@ entities:
     - type: Transform
       pos: -17.5,-6.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 1369
   - uid: 1368
     components:
     - type: Transform
       pos: -12.5,-6.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 1369
   - uid: 1429
     components:
     - type: Transform
       pos: 2.5,-12.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 2050
   - uid: 1435
     components:
     - type: Transform
       pos: 3.5,-16.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 2050
   - uid: 1441
     components:
     - type: Transform
       pos: -1.5,-17.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 2050
   - uid: 1442
     components:
     - type: Transform
       pos: -2.5,-17.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 2050
   - uid: 1443
     components:
     - type: Transform
       pos: -3.5,-17.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 2050
   - uid: 1444
     components:
     - type: Transform
       pos: 2.5,-17.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 2050
   - uid: 1445
     components:
     - type: Transform
       pos: -7.5,-17.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 2050
   - uid: 1446
     components:
     - type: Transform
       pos: 3.5,-15.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 2050
   - uid: 1447
     components:
     - type: Transform
       pos: 0.5,-12.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 2050
   - uid: 1576
     components:
     - type: Transform
       pos: -5.5,-12.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 2050
   - uid: 1577
     components:
     - type: Transform
       pos: -7.5,-12.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 2050
   - uid: 2415
     components:
     - type: Transform
       pos: 25.5,-6.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 3064
   - uid: 2416
     components:
     - type: Transform
       pos: 24.5,-6.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 3064
   - uid: 2417
     components:
     - type: Transform
       pos: 23.5,-6.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 3064
   - uid: 2418
     components:
     - type: Transform
       pos: 22.5,-6.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 3064
   - uid: 2419
     components:
     - type: Transform
       pos: 21.5,-6.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 3064
   - uid: 2420
     components:
     - type: Transform
       pos: 20.5,-6.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 3064
   - uid: 2421
     components:
     - type: Transform
       pos: 19.5,-6.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 3064
   - uid: 2422
     components:
     - type: Transform
       pos: 32.5,-8.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 3063
   - uid: 2423
     components:
     - type: Transform
       pos: 31.5,-8.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 3063
   - uid: 2424
     components:
     - type: Transform
       pos: 30.5,-8.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 3063
   - uid: 2425
     components:
     - type: Transform
       pos: 29.5,-8.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 3063
   - uid: 2426
     components:
     - type: Transform
       pos: 28.5,-8.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 3063
   - uid: 2427
     components:
     - type: Transform
       pos: 27.5,-8.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 3063
   - uid: 6474
     components:
     - type: Transform
       pos: -15.5,26.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 7364
   - uid: 6897
     components:
     - type: Transform
       pos: -14.5,30.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 7364
   - uid: 7069
     components:
     - type: Transform
       pos: -18.5,26.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 7364
   - uid: 7365
     components:
     - type: Transform
       pos: -17.5,26.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 7364
   - uid: 7745
     components:
     - type: Transform
       pos: -12.5,26.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 6261
   - uid: 7746
     components:
     - type: Transform
       pos: -9.5,26.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 6261
   - uid: 7749
     components:
     - type: Transform
       pos: -7.5,26.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 6261
   - uid: 8903
     components:
     - type: Transform
       pos: -13.5,26.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 6261
   - uid: 8904
     components:
     - type: Transform
       pos: -10.5,26.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 6261
   - uid: 8905
     components:
     - type: Transform
       pos: -6.5,26.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 6261
   - uid: 10420
     components:
     - type: Transform
       pos: -3.5,26.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 6261
   - uid: 10479
     components:
     - type: Transform
       pos: -11.5,52.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 10482
   - uid: 10480
     components:
     - type: Transform
       pos: -7.5,52.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 10482
   - uid: 10481
     components:
     - type: Transform
       pos: -3.5,52.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 10482
   - uid: 14794
     components:
     - type: Transform
       pos: -1.5,26.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 6261
   - uid: 14914
     components:
     - type: Transform
       pos: -14.5,-32.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 14913
   - uid: 14915
     components:
     - type: Transform
       pos: -15.5,-32.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 14913
   - uid: 14916
     components:
     - type: Transform
       pos: -16.5,-32.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 14913
   - uid: 14917
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -18.5,-36.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 14913
   - uid: 14918
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -18.5,-35.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 14913
   - uid: 16241
     components:
     - type: Transform
       pos: -2.5,26.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 6261
   - uid: 19429
     components:
     - type: Transform
@@ -132773,9 +132412,6 @@ entities:
       enabled: True
     - type: Airtight
       airBlocked: True
-    - type: DeviceLinkSink
-      links:
-      - 19435
   - uid: 19430
     components:
     - type: Transform
@@ -132789,9 +132425,6 @@ entities:
       enabled: True
     - type: Airtight
       airBlocked: True
-    - type: DeviceLinkSink
-      links:
-      - 19435
   - uid: 19431
     components:
     - type: Transform
@@ -132805,9 +132438,6 @@ entities:
       enabled: True
     - type: Airtight
       airBlocked: True
-    - type: DeviceLinkSink
-      links:
-      - 19435
   - uid: 19432
     components:
     - type: Transform
@@ -132821,9 +132451,6 @@ entities:
       enabled: True
     - type: Airtight
       airBlocked: True
-    - type: DeviceLinkSink
-      links:
-      - 19435
   - uid: 19433
     components:
     - type: Transform
@@ -132837,9 +132464,6 @@ entities:
       enabled: True
     - type: Airtight
       airBlocked: True
-    - type: DeviceLinkSink
-      links:
-      - 19435
   - uid: 19434
     components:
     - type: Transform
@@ -132853,9 +132477,6 @@ entities:
       enabled: True
     - type: Airtight
       airBlocked: True
-    - type: DeviceLinkSink
-      links:
-      - 19435
   - uid: 19443
     components:
     - type: Transform
@@ -132880,211 +132501,136 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -32.5,-73.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 21657
   - uid: 21650
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -32.5,-71.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 21657
   - uid: 21651
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -32.5,-70.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 21657
   - uid: 21652
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -32.5,-69.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 21657
   - uid: 21653
     components:
     - type: Transform
       pos: -31.5,-74.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 21657
   - uid: 21654
     components:
     - type: Transform
       pos: -28.5,-74.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 21657
   - uid: 21655
     components:
     - type: Transform
       pos: -27.5,-74.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 21657
   - uid: 21656
     components:
     - type: Transform
       pos: -26.5,-74.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 21657
   - uid: 22191
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 9.5,-23.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 22198
   - uid: 22192
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 9.5,-24.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 22198
   - uid: 22193
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 9.5,-25.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 22198
   - uid: 22194
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 9.5,-26.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 22198
   - uid: 22195
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 9.5,-28.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 22198
   - uid: 22196
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 9.5,-30.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 22198
   - uid: 22197
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 9.5,-32.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 22198
   - uid: 24426
     components:
     - type: Transform
       pos: 7.5,43.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 24430
   - uid: 24427
     components:
     - type: Transform
       pos: 8.5,43.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 24430
   - uid: 24428
     components:
     - type: Transform
       pos: 10.5,43.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 24430
   - uid: 24429
     components:
     - type: Transform
       pos: 11.5,43.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 24430
   - uid: 24626
     components:
     - type: Transform
       pos: 19.5,-33.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 24632
   - uid: 24627
     components:
     - type: Transform
       pos: 21.5,-33.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 24632
   - uid: 24628
     components:
     - type: Transform
       pos: 22.5,-33.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 24632
   - uid: 24629
     components:
     - type: Transform
       pos: 19.5,-40.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 24632
   - uid: 24630
     components:
     - type: Transform
       pos: 20.5,-40.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 24632
   - uid: 24631
     components:
     - type: Transform
       pos: 22.5,-40.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 24632
   - uid: 26399
     components:
     - type: Transform
@@ -133098,35 +132644,23 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 54.5,19.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 23583
   - uid: 23579
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 54.5,21.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 23582
   - uid: 23580
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 56.5,23.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 23582
   - uid: 23581
     components:
     - type: Transform
       pos: 56.5,17.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 23583
 - proto: ShuttersWindowOpen
   entities:
   - uid: 15185
@@ -133134,49 +132668,31 @@ entities:
     - type: Transform
       pos: -35.5,-48.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 15183
   - uid: 15186
     components:
     - type: Transform
       pos: -34.5,-48.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 15183
   - uid: 15187
     components:
     - type: Transform
       pos: -33.5,-48.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 15183
   - uid: 15188
     components:
     - type: Transform
       pos: -23.5,-48.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 15184
   - uid: 15189
     components:
     - type: Transform
       pos: -24.5,-48.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 15184
   - uid: 15190
     components:
     - type: Transform
       pos: -25.5,-48.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 15184
 - proto: SignAi
   entities:
   - uid: 9089
@@ -135350,7 +134866,7 @@ entities:
     - type: Transform
       pos: 7.5,2.5
       parent: 5350
-- proto: soda_dispenser
+- proto: SodaDispenser
   entities:
   - uid: 2447
     components:
@@ -163115,25 +162631,16 @@ entities:
     - type: Transform
       pos: -6.5,29.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 5344
   - uid: 8058
     components:
     - type: Transform
       pos: -9.5,29.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 5347
   - uid: 8059
     components:
     - type: Transform
       pos: -12.5,29.5
       parent: 5350
-    - type: DeviceLinkSink
-      links:
-      - 5348
   - uid: 20160
     components:
     - type: Transform
diff --git a/Resources/Maps/oasis.yml b/Resources/Maps/oasis.yml
index 34c01f3a3f..d9d9018051 100644
--- a/Resources/Maps/oasis.yml
+++ b/Resources/Maps/oasis.yml
@@ -171,7 +171,7 @@ entities:
           version: 6
         2,-3:
           ind: 2,-3
-          tiles: gQAAAAAAbwAAAAAAKQAAAAADKQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAKQAAAAABbwAAAAAAKQAAAAABKQAAAAAAbwAAAAAAKQAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAABwAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACYAAAAAABgQAAAAAAKQAAAAADKQAAAAAAgQAAAAAAKQAAAAACKQAAAAADKQAAAAADKQAAAAACKQAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACYAAAAAADgQAAAAAAKQAAAAACKQAAAAAAIQAAAAACKQAAAAAAKQAAAAAAKQAAAAAAKQAAAAABKQAAAAACgQAAAAAAgQAAAAAAJAAAAAAAgQAAAAAAdwAAAAAAYAAAAAACYAAAAAABgQAAAAAAKQAAAAABKQAAAAABgQAAAAAAKQAAAAADJgAAAAAAJgAAAAAAJgAAAAAAKQAAAAADgQAAAAAAKQAAAAABKQAAAAAAKQAAAAACdwAAAAADYAAAAAACYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAADKQAAAAABKQAAAAAAKQAAAAABKQAAAAACgQAAAAAAKQAAAAACKQAAAAAAKQAAAAAAdwAAAAABYAAAAAAAYAAAAAADYAAAAAABYAAAAAADYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAIQAAAAACgQAAAAAAgQAAAAAAKQAAAAADKQAAAAAAKQAAAAADKQAAAAABYAAAAAAAYAAAAAADYAAAAAACYAAAAAACYAAAAAAAYAAAAAADgQAAAAAAKQAAAAABKQAAAAAAKQAAAAADKQAAAAACKQAAAAADIQAAAAAAKQAAAAAAKQAAAAACKQAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAAAKQAAAAAAKQAAAAABKQAAAAAAgQAAAAAAKQAAAAABKQAAAAAAKQAAAAABKQAAAAADKQAAAAACKQAAAAADKQAAAAACKQAAAAABKQAAAAADKQAAAAAAgQAAAAAAKQAAAAABKQAAAAAAKQAAAAADKQAAAAAAgQAAAAAAgQAAAAAAJAAAAAABgQAAAAAAKQAAAAADKQAAAAAAKQAAAAABKQAAAAABKQAAAAABKQAAAAAAKQAAAAACIQAAAAABKQAAAAADKQAAAAAAKQAAAAADKQAAAAADKQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAABKQAAAAACKQAAAAACKQAAAAAAKQAAAAABKQAAAAACKQAAAAACKQAAAAADKQAAAAAAKQAAAAAAKQAAAAABKQAAAAAAKQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA
+          tiles: gQAAAAAAbwAAAAAAKQAAAAADKQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAKQAAAAABbwAAAAAAKQAAAAABKQAAAAAAbwAAAAAAKQAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAAAAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAbwAAAAAAgQAAAAAABwAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACYAAAAAABgQAAAAAAKQAAAAADKQAAAAAAgQAAAAAAKQAAAAACKQAAAAADKQAAAAADKQAAAAACKQAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACYAAAAAADgQAAAAAAKQAAAAACKQAAAAAAIQAAAAACKQAAAAAAKQAAAAAAKQAAAAAAKQAAAAABKQAAAAACgQAAAAAAgQAAAAAAJAAAAAAAgQAAAAAAdwAAAAAAYAAAAAACYAAAAAABgQAAAAAAKQAAAAABKQAAAAABgQAAAAAAKQAAAAADJgAAAAAAJgAAAAAAJgAAAAAAKQAAAAADgQAAAAAAKQAAAAABKQAAAAAAKQAAAAACdwAAAAADYAAAAAACYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAADKQAAAAABKQAAAAAAKQAAAAABKQAAAAACgQAAAAAAKQAAAAACKQAAAAAAKQAAAAAAdwAAAAABYAAAAAAAYAAAAAADYAAAAAABYAAAAAADYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAIQAAAAACgQAAAAAAgQAAAAAAKQAAAAADKQAAAAAAKQAAAAADKQAAAAABYAAAAAAAYAAAAAADYAAAAAACYAAAAAACYAAAAAAAYAAAAAADgQAAAAAAKQAAAAABKQAAAAAAKQAAAAADKQAAAAACKQAAAAADIQAAAAAAKQAAAAAAKQAAAAACKQAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAAAKQAAAAAAKQAAAAABKQAAAAAAgQAAAAAAKQAAAAABKQAAAAAAKQAAAAABKQAAAAADKQAAAAACKQAAAAADKQAAAAACKQAAAAABKQAAAAADKQAAAAAAgQAAAAAAKQAAAAABKQAAAAAAKQAAAAADKQAAAAAAgQAAAAAAgQAAAAAAJAAAAAABgQAAAAAAKQAAAAADKQAAAAAAKQAAAAABKQAAAAABKQAAAAABKQAAAAAAKQAAAAACIQAAAAABKQAAAAADKQAAAAAAKQAAAAADKQAAAAADKQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAABKQAAAAACKQAAAAACKQAAAAAAKQAAAAABKQAAAAACKQAAAAACKQAAAAADKQAAAAAAKQAAAAAAKQAAAAABKQAAAAAAKQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA
           version: 6
         2,-1:
           ind: 2,-1
@@ -183,7 +183,7 @@ entities:
           version: 6
         2,1:
           ind: 2,1
-          tiles: KQAAAAACgQAAAAAAgQAAAAAAgQAAAAAAfwAAAAAAgQAAAAAAfQAAAAABfQAAAAADfQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfQAAAAADfQAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfwAAAAABfwAAAAADfwAAAAAAfQAAAAADfQAAAAABgQAAAAAAgQAAAAAAfQAAAAADfQAAAAABfQAAAAABgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfQAAAAADfwAAAAAAgQAAAAAAgQAAAAAAfwAAAAABgQAAAAAAgQAAAAAAFgAAAAAFfQAAAAADfQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfQAAAAABfwAAAAACgQAAAAAAfAAAAAACfAAAAAACgQAAAAAAgQAAAAAAfQAAAAABfQAAAAACfQAAAAABbwAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfQAAAAAAfwAAAAAAgQAAAAAAfAAAAAABfAAAAAADgQAAAAAAgQAAAAAAfQAAAAACfQAAAAACfQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfwAAAAABfwAAAAADgQAAAAAALwAAAAAALwAAAAAAgQAAAAAAgQAAAAAAfQAAAAACfQAAAAAAfQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfQAAAAADfQAAAAABfQAAAAACgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAcAAAAAAAcQAAAAAAcQAAAAABcQAAAAAAcAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAA
+          tiles: KQAAAAACgQAAAAAAgQAAAAAAgQAAAAAAfwAAAAAAgQAAAAAAfQAAAAABfQAAAAADfQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfQAAAAADfQAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfwAAAAABfwAAAAADfwAAAAAAfQAAAAADfQAAAAABgQAAAAAAgQAAAAAAfQAAAAADfQAAAAAAfQAAAAABgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfQAAAAADfwAAAAAAgQAAAAAAgQAAAAAAfwAAAAABgQAAAAAAgQAAAAAAFgAAAAAFfQAAAAADfQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfQAAAAABfwAAAAACgQAAAAAAfAAAAAACfAAAAAACgQAAAAAAgQAAAAAAfQAAAAABfQAAAAACfQAAAAABbwAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfQAAAAAAfwAAAAAAgQAAAAAAfAAAAAABfAAAAAADgQAAAAAAgQAAAAAAfQAAAAACfQAAAAACfQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfwAAAAABfwAAAAADgQAAAAAALwAAAAAALwAAAAAAgQAAAAAAgQAAAAAAfQAAAAACfQAAAAAAfQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfQAAAAADfQAAAAABfQAAAAACgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAcAAAAAAAcQAAAAAAcQAAAAABcQAAAAAAcAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAA
           version: 6
         -3,-3:
           ind: -3,-3
@@ -203,11 +203,11 @@ entities:
           version: 6
         -3,1:
           ind: -3,1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA
           version: 6
         0,-4:
           ind: 0,-4
-          tiles: gQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAYAAAAAAAYAAAAAADYAAAAAADYAAAAAACYAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAABYAAAAAACYAAAAAABYAAAAAABYAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAADYAAAAAAAYAAAAAACYAAAAAAAYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAYAAAAAADYAAAAAAAYAAAAAAAYAAAAAADYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAYAAAAAACYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAYAAAAAADYAAAAAACbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAABYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAYAAAAAACYAAAAAAAgQAAAAAADwAAAAAADwAAAAADgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAADYAAAAAACgQAAAAAADwAAAAAADwAAAAABgQAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAYAAAAAABYAAAAAABgQAAAAAADwAAAAACDwAAAAABgQAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAADwAAAAAADwAAAAABgQAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAYAAAAAADYAAAAAAAYAAAAAABYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAADYAAAAAABYAAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAACYAAAAAADYAAAAAACYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA
+          tiles: gQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAYAAAAAAAYAAAAAADYAAAAAADYAAAAAACYAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAABYAAAAAACYAAAAAABYAAAAAABYAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAADYAAAAAAAYAAAAAACYAAAAAAAYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAYAAAAAADYAAAAAAAYAAAAAAAYAAAAAADYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAYAAAAAACYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAYAAAAAADYAAAAAACbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAABYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAYAAAAAACYAAAAAAAgQAAAAAADwAAAAAADwAAAAADgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAADYAAAAAACgQAAAAAADwAAAAAADwAAAAABgQAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAYAAAAAABYAAAAAABgQAAAAAADwAAAAACDwAAAAABgQAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAADwAAAAAADwAAAAABgQAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAYAAAAAADYAAAAAAAYAAAAAABYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAADYAAAAAABYAAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAACYAAAAAADYAAAAAACYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA
           version: 6
         -1,-4:
           ind: -1,-4
@@ -223,7 +223,7 @@ entities:
           version: 6
         -4,-2:
           ind: -4,-2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAIgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAYAAAAAACYAAAAAACYAAAAAADYAAAAAACYAAAAAAAYAAAAAACgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAYAAAAAADYAAAAAAAYAAAAAACYAAAAAAAYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAYAAAAAADYAAAAAAAYAAAAAAAYAAAAAACYAAAAAADYAAAAAABbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAADYAAAAAABYAAAAAADYAAAAAABYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAZQAAAAAAZQAAAAABYAAAAAADYAAAAAAAYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAZQAAAAABZQAAAAACYAAAAAABYAAAAAACYAAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAZQAAAAAAZQAAAAAAYAAAAAABYAAAAAAAYAAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAAAYAAAAAACYAAAAAABYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAIgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAYAAAAAACYAAAAAACYAAAAAADYAAAAAACYAAAAAAAYAAAAAACgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAYAAAAAADYAAAAAAAYAAAAAACYAAAAAAAYAAAAAACYAAAAAACgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAYAAAAAADYAAAAAAAYAAAAAAAYAAAAAACYAAAAAADYAAAAAABbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAADYAAAAAABYAAAAAADYAAAAAABYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAZQAAAAAAZQAAAAABYAAAAAADYAAAAAAAYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAZQAAAAABZQAAAAACYAAAAAABYAAAAAACYAAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAZQAAAAAAZQAAAAAAYAAAAAABYAAAAAAAYAAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAAAYAAAAAACYAAAAAABYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA
           version: 6
         -4,-3:
           ind: -4,-3
@@ -243,7 +243,7 @@ entities:
           version: 6
         3,0:
           ind: 3,0
-          tiles: YAAAAAAAYAAAAAACYAAAAAADYAAAAAABYAAAAAAAYAAAAAACYAAAAAAAYAAAAAABYAAAAAABYAAAAAABDAAAAAADYAAAAAAAYAAAAAACYAAAAAACYAAAAAAAgQAAAAAAYAAAAAAAYAAAAAABYAAAAAAAYAAAAAACYAAAAAADYAAAAAADYAAAAAABYAAAAAADYAAAAAACYAAAAAAADAAAAAAAYAAAAAACYAAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAAAYAAAAAADYAAAAAABYAAAAAADYAAAAAAAYAAAAAACYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABLwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAADYAAAAAADYAAAAAACYAAAAAADYAAAAAACYAAAAAABgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACLwAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAADYAAAAAABYAAAAAAAYAAAAAACYAAAAAADYAAAAAACgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACLwAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAACYAAAAAADYAAAAAADYAAAAAAAYAAAAAABgQAAAAAAgQAAAAAALwAAAAAAYAAAAAAALwAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAgAAAAAAAAAAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAAAKQAAAAAAKQAAAAADKQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAACJAAAAAAAJAAAAAADKQAAAAAAgQAAAAAAgAAAAAAAUgAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAABJAAAAAACJAAAAAACKQAAAAACgQAAAAAAgAAAAAAAEgAAAAAAIAAAAAABIAAAAAACIAAAAAABIAAAAAAAIAAAAAAAEgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAAAJAAAAAABJAAAAAADKQAAAAABgQAAAAAAgAAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAgQAAAAAAgQAAAAAAEgAAAAAAEgAAAAAAKQAAAAAAKQAAAAAAKQAAAAABKQAAAAABJAAAAAACJAAAAAAAKQAAAAADgQAAAAAAAAAAAAAA
+          tiles: YAAAAAAAYAAAAAACYAAAAAADYAAAAAABYAAAAAAAYAAAAAACYAAAAAAAYAAAAAABYAAAAAABYAAAAAABDAAAAAADYAAAAAAAYAAAAAACYAAAAAACYAAAAAAAgQAAAAAAYAAAAAAAYAAAAAABYAAAAAAAYAAAAAACYAAAAAADYAAAAAADYAAAAAABYAAAAAADYAAAAAACYAAAAAAADAAAAAAAYAAAAAACYAAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAAAYAAAAAADYAAAAAABYAAAAAADYAAAAAAAYAAAAAACYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABLwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAADYAAAAAADYAAAAAACYAAAAAADYAAAAAACYAAAAAABgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACLwAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAADYAAAAAABYAAAAAAAYAAAAAACYAAAAAADYAAAAAACgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACLwAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAACYAAAAAADYAAAAAADYAAAAAAAYAAAAAABgQAAAAAAgQAAAAAALwAAAAAAYAAAAAAALwAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAgAAAAAAAAAAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAAAKQAAAAAAKQAAAAADKQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAACJAAAAAAAJAAAAAADKQAAAAAAgQAAAAAAgAAAAAAAUgAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAABJAAAAAACJAAAAAACKQAAAAACgQAAAAAAgAAAAAAAEgAAAAAAIAAAAAABIAAAAAACIAAAAAABIAAAAAAAIAAAAAAAEgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAAAJAAAAAABJAAAAAADKQAAAAABgQAAAAAAgAAAAAAAEgAAAAAAIAAAAAAAEgAAAAAAgQAAAAAAgQAAAAAAEgAAAAAAEgAAAAAAKQAAAAAAKQAAAAAAKQAAAAABKQAAAAABJAAAAAACJAAAAAAAKQAAAAADgQAAAAAAAAAAAAAA
           version: 6
         3,-1:
           ind: 3,-1
@@ -263,7 +263,7 @@ entities:
           version: 6
         -2,2:
           ind: -2,2
-          tiles: gQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfQAAAAAAfQAAAAACfQAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAADYAAAAAADYAAAAAABYAAAAAACYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAYAAAAAACYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAYAAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAACYAAAAAAAYAAAAAADYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA
+          tiles: gQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfQAAAAAAfQAAAAACfQAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAADYAAAAAADYAAAAAABYAAAAAACYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAYAAAAAACYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAYAAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAACYAAAAAAAYAAAAAADYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA
           version: 6
         -3,2:
           ind: -3,2
@@ -271,7 +271,7 @@ entities:
           version: 6
         2,-4:
           ind: 2,-4
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAKQAAAAAAKQAAAAACgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKQAAAAAAKQAAAAACKQAAAAADKQAAAAABKQAAAAAAKQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKQAAAAADKQAAAAADKQAAAAACKQAAAAABKQAAAAABKQAAAAABgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKQAAAAAAKQAAAAACKQAAAAABKQAAAAACKQAAAAAAKQAAAAACKQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKQAAAAABKQAAAAABKQAAAAABKQAAAAADKQAAAAABKQAAAAACKQAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKQAAAAACKQAAAAAAKQAAAAABKQAAAAABKQAAAAABKQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKQAAAAAAKQAAAAADKQAAAAACKQAAAAAAKQAAAAADKQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAbwAAAAAAKQAAAAACKQAAAAACbwAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAbwAAAAAAKQAAAAABKQAAAAAAbwAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAbwAAAAAAKQAAAAACKQAAAAACbwAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAbwAAAAAAKQAAAAABKQAAAAACbwAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAbwAAAAAAKQAAAAABKQAAAAAAbwAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAbwAAAAAAKQAAAAACKQAAAAAAbwAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAKQAAAAAAKQAAAAACgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKQAAAAAAKQAAAAACKQAAAAADKQAAAAABKQAAAAAAKQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKQAAAAADKQAAAAADKQAAAAACKQAAAAABKQAAAAABKQAAAAABgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKQAAAAAAKQAAAAACKQAAAAABKQAAAAACKQAAAAAAKQAAAAACKQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKQAAAAABKQAAAAABKQAAAAABKQAAAAADKQAAAAABKQAAAAACKQAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKQAAAAACKQAAAAAAKQAAAAABKQAAAAABKQAAAAABKQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKQAAAAAAKQAAAAADKQAAAAACKQAAAAAAKQAAAAADKQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAbwAAAAAAKQAAAAACKQAAAAACbwAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAbwAAAAAAKQAAAAABKQAAAAAAbwAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAbwAAAAAAKQAAAAACKQAAAAACbwAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAbwAAAAAAKQAAAAABKQAAAAACbwAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAbwAAAAAAKQAAAAABKQAAAAAAbwAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAbwAAAAAAKQAAAAACKQAAAAAAbwAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         1,-4:
           ind: 1,-4
@@ -279,7 +279,7 @@ entities:
           version: 6
         -2,3:
           ind: -2,3
-          tiles: AAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAABwAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAABwAAAAAABwAAAAADBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAFBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAGBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAFBwAAAAAABwAAAAALAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAACBwAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAABwAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAABwAAAAAABwAAAAADBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAFBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAGBwAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAFBwAAAAAABwAAAAALAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAACBwAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,3:
           ind: -1,3
@@ -303,7 +303,7 @@ entities:
           version: 6
         3,1:
           ind: 3,1
-          tiles: EgAAAAAAIAAAAAADEgAAAAAAEgAAAAAAgQAAAAAAEgAAAAAAIAAAAAACgQAAAAAAKQAAAAADgQAAAAAAKQAAAAACJAAAAAACJAAAAAABKQAAAAADgQAAAAAAAAAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAgQAAAAAAgQAAAAAAEgAAAAAAEgAAAAAAKQAAAAAAKQAAAAADKQAAAAACKQAAAAACJAAAAAABJAAAAAAAKQAAAAAAgQAAAAAAAAAAAAAAEgAAAAAAIAAAAAACIAAAAAACIAAAAAAAIAAAAAAAIAAAAAADEgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAAAJAAAAAABJAAAAAAAKQAAAAAAgQAAAAAAAAAAAAAAUgAAAAAAIAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAABUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAACKQAAAAABKQAAAAABKQAAAAADgQAAAAAAgAAAAAAAEgAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAABEgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAEgAAAAAAIAAAAAACIAAAAAABIAAAAAABIAAAAAAAIAAAAAADEgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAA
+          tiles: EgAAAAAAIAAAAAADEgAAAAAAEgAAAAAAgQAAAAAAEgAAAAAAIAAAAAACgQAAAAAAKQAAAAADgQAAAAAAKQAAAAACJAAAAAACJAAAAAABKQAAAAADgQAAAAAAAAAAAAAAEgAAAAAAIAAAAAAAEgAAAAAAgQAAAAAAgQAAAAAAEgAAAAAAEgAAAAAAKQAAAAAAKQAAAAADKQAAAAACKQAAAAACJAAAAAABJAAAAAAAKQAAAAAAgQAAAAAAAAAAAAAAUgAAAAAAIAAAAAACIAAAAAACIAAAAAAAIAAAAAAAIAAAAAADEgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAAAJAAAAAABJAAAAAAAKQAAAAAAgQAAAAAAAAAAAAAAEgAAAAAAIAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAABEgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAACKQAAAAABKQAAAAABKQAAAAADgQAAAAAAgAAAAAAAEgAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAABEgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAEgAAAAAAIAAAAAACIAAAAAABIAAAAAABIAAAAAAAIAAAAAADEgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAA
           version: 6
         3,3:
           ind: 3,3
@@ -347,19 +347,19 @@ entities:
           version: 6
         0,-5:
           ind: 0,-5
-          tiles: AAAAAAAAAAAAAAAAgQAAAAAAYAAAAAADYAAAAAADgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAADgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAADYAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAADYAAAAAAAYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAABYAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAADYAAAAAADgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABYAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAADYAAAAAABgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABYAAAAAACYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABYAAAAAADYAAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAACgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAgQAAAAAAYAAAAAADYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAADgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAADYAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAADYAAAAAAAYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAABYAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAADYAAAAAADgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABYAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAADYAAAAAABgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABYAAAAAACYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABYAAAAAADYAAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAACgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,-5:
           ind: -1,-5
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAADYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAACYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAACYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABYAAAAAABYAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAADYAAAAAADYAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAACYAAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAACYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAADYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAACYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAACYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABYAAAAAABYAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAADYAAAAAADYAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAACYAAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAACYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,-6:
           ind: -1,-6
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAABYAAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABYAAAAAADYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         0,-6:
           ind: 0,-6
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAADYAAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABYAAAAAADYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABYAAAAAAAYAAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -4,-1:
           ind: -4,-1
@@ -468,7 +468,7 @@ entities:
             972: -55,-12
             973: -56,-12
             974: -57,-12
-            3496: -3,-31
+            3491: -3,-31
         - node:
             angle: 3.141592653589793 rad
             color: '#FFFFFFFF'
@@ -479,14 +479,14 @@ entities:
             color: '#FFFFFFFF'
             id: BotGreyscale
           decals:
-            2726: 35,-25
-            2727: 35,-26
-            2728: 32,-25
-            2729: 32,-24
-            2730: 32,-22
-            2841: 7,-38
-            2972: 15,-40
-            2973: 15,-41
+            2721: 35,-25
+            2722: 35,-26
+            2723: 32,-25
+            2724: 32,-24
+            2725: 32,-22
+            2836: 7,-38
+            2967: 15,-40
+            2968: 15,-41
         - node:
             angle: 3.141592653589793 rad
             color: '#FFFFFFFF'
@@ -499,183 +499,183 @@ entities:
             color: '#FFFFFFFF'
             id: BotLeftGreyscale
           decals:
-            2842: 7,-38
+            2837: 7,-38
         - node:
             color: '#FFFFFFFF'
             id: BotRightGreyscale
           decals:
-            2843: 7,-38
+            2838: 7,-38
         - node:
             color: '#FFFFFFFF'
             id: Box
           decals:
             1734: 49,-37
             1735: 49,-38
-            2346: -7,-51
-            2347: -5,-53
+            2341: -7,-51
+            2342: -5,-53
         - node:
             color: '#C74EBDB2'
             id: BrickCornerOverlayNE
           decals:
-            2938: -18,-25
+            2933: -18,-25
         - node:
             color: '#EFB34196'
             id: BrickCornerOverlayNE
           decals:
-            2489: 5,51
-            3103: -3,42
+            2484: 5,51
+            3098: -3,42
         - node:
             color: '#F9801DB2'
             id: BrickCornerOverlayNE
           decals:
-            2951: -22,-25
+            2946: -22,-25
         - node:
             color: '#FED83DB2'
             id: BrickCornerOverlayNE
           decals:
-            2944: -15,-25
+            2939: -15,-25
         - node:
             color: '#C74EBDB2'
             id: BrickCornerOverlayNW
           decals:
-            2939: -20,-25
+            2934: -20,-25
         - node:
             color: '#EFB34196'
             id: BrickCornerOverlayNW
           decals:
-            2490: 3,51
-            3102: -6,42
+            2485: 3,51
+            3097: -6,42
         - node:
             color: '#F9801DB2'
             id: BrickCornerOverlayNW
           decals:
-            2950: -23,-25
+            2945: -23,-25
         - node:
             color: '#FED83DB2'
             id: BrickCornerOverlayNW
           decals:
-            2945: -16,-25
+            2940: -16,-25
         - node:
             color: '#C74EBDB2'
             id: BrickCornerOverlaySE
           decals:
-            2941: -18,-26
+            2936: -18,-26
         - node:
             color: '#EFB34196'
             id: BrickCornerOverlaySE
           decals:
-            2491: 5,49
-            3100: -3,41
+            2486: 5,49
+            3095: -3,41
         - node:
             color: '#F9801DB2'
             id: BrickCornerOverlaySE
           decals:
-            2948: -22,-26
+            2943: -22,-26
         - node:
             color: '#FED83DB2'
             id: BrickCornerOverlaySE
           decals:
-            2946: -15,-26
+            2941: -15,-26
         - node:
             color: '#C74EBDB2'
             id: BrickCornerOverlaySW
           decals:
-            2940: -20,-26
+            2935: -20,-26
         - node:
             color: '#EFB34196'
             id: BrickCornerOverlaySW
           decals:
-            2443: 7,40
-            2492: 3,49
-            3101: -6,41
+            2438: 7,40
+            2487: 3,49
+            3096: -6,41
         - node:
             color: '#F9801DB2'
             id: BrickCornerOverlaySW
           decals:
-            2949: -23,-26
+            2944: -23,-26
         - node:
             color: '#FED83DB2'
             id: BrickCornerOverlaySW
           decals:
-            2947: -16,-26
+            2942: -16,-26
         - node:
             color: '#EFB34196'
             id: BrickLineOverlayE
           decals:
-            2454: 9,50
-            2455: 9,48
-            2456: 9,47
-            2464: 19,50
-            2475: 19,51
-            2476: 9,51
-            2495: 5,50
-            2497: 3,50
+            2449: 9,50
+            2450: 9,48
+            2451: 9,47
+            2459: 19,50
+            2470: 19,51
+            2471: 9,51
+            2490: 5,50
+            2492: 3,50
         - node:
             color: '#C74EBDB2'
             id: BrickLineOverlayN
           decals:
-            2942: -19,-25
-            2953: -20,-27
-            2954: -18,-27
-            2960: -19,-27
+            2937: -19,-25
+            2948: -20,-27
+            2949: -18,-27
+            2955: -19,-27
         - node:
             color: '#EFB34196'
             id: BrickLineOverlayN
           decals:
-            2457: 10,46
-            2458: 11,46
-            2459: 15,46
-            2460: 16,46
-            2494: 4,51
-            2500: 4,49
-            3104: -4,42
-            3105: -5,42
+            2452: 10,46
+            2453: 11,46
+            2454: 15,46
+            2455: 16,46
+            2489: 4,51
+            2495: 4,49
+            3099: -4,42
+            3100: -5,42
         - node:
             color: '#F9801DB2'
             id: BrickLineOverlayN
           decals:
-            2952: -23,-27
-            2961: -22,-27
+            2947: -23,-27
+            2956: -22,-27
         - node:
             color: '#FED83DB2'
             id: BrickLineOverlayN
           decals:
-            2955: -15,-27
-            2959: -16,-27
+            2950: -15,-27
+            2954: -16,-27
         - node:
             color: '#C74EBDB2'
             id: BrickLineOverlayS
           decals:
-            2943: -19,-26
+            2938: -19,-26
         - node:
             color: '#EFB34196'
             id: BrickLineOverlayS
           decals:
-            2496: 4,49
-            2498: 4,51
-            3106: -5,41
-            3107: -4,41
+            2491: 4,49
+            2493: 4,51
+            3101: -5,41
+            3102: -4,41
         - node:
             color: '#EFB34196'
             id: BrickLineOverlayW
           decals:
-            2444: 7,41
-            2445: 7,42
-            2446: 7,43
-            2447: 7,44
-            2448: 7,45
-            2449: 7,46
-            2450: 7,47
-            2451: 7,48
-            2452: 7,49
-            2453: 7,50
-            2461: 17,47
-            2462: 17,48
-            2463: 17,50
-            2474: 17,51
-            2477: 7,51
-            2493: 3,50
-            2499: 5,50
+            2439: 7,41
+            2440: 7,42
+            2441: 7,43
+            2442: 7,44
+            2443: 7,45
+            2444: 7,46
+            2445: 7,47
+            2446: 7,48
+            2447: 7,49
+            2448: 7,50
+            2456: 17,47
+            2457: 17,48
+            2458: 17,50
+            2469: 17,51
+            2472: 7,51
+            2488: 3,50
+            2494: 5,50
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkCornerNe
@@ -725,10 +725,10 @@ entities:
             618: 22,6
             619: 22,5
             887: -52,6
-            2524: 27,42
-            2525: 27,43
-            2526: 30,42
-            2527: 30,43
+            2519: 27,42
+            2520: 27,43
+            2521: 30,42
+            2522: 30,43
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineN
@@ -736,7 +736,7 @@ entities:
             873: -54,8
             884: -56,7
             1728: 41,-40
-            3514: -8,-24
+            3509: -8,-24
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineS
@@ -750,50 +750,50 @@ entities:
             id: BrickTileDarkLineW
           decals:
             883: -57,6
-            2528: 31,42
-            2529: 31,43
+            2523: 31,42
+            2524: 31,43
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelCornerNe
           decals:
             724: -1,-34
-            2330: -4,-50
-            2394: 32,-38
-            3086: -28,42
+            2325: -4,-50
+            2389: 32,-38
+            3081: -28,42
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelCornerNw
           decals:
-            2331: -8,-50
-            2393: 29,-38
-            3087: -33,42
-            3432: 19,-18
-            3433: 18,-19
+            2326: -8,-50
+            2388: 29,-38
+            3082: -33,42
+            3427: 19,-18
+            3428: 18,-19
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelCornerSe
           decals:
             723: -1,-39
-            2332: -4,-54
-            2402: 32,-40
-            3088: -28,40
+            2327: -4,-54
+            2397: 32,-40
+            3083: -28,40
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelCornerSw
           decals:
-            2333: -8,-54
-            2398: 29,-40
-            3089: -33,40
+            2328: -8,-54
+            2393: 29,-40
+            3084: -33,40
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelEndN
           decals:
-            2322: -8,-44
+            2317: -8,-44
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelEndS
           decals:
-            2323: -8,-48
+            2318: -8,-48
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelInnerNe
@@ -803,7 +803,7 @@ entities:
             color: '#FFFFFFFF'
             id: BrickTileSteelInnerNw
           decals:
-            3438: 19,-19
+            3433: 19,-19
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelInnerSe
@@ -820,64 +820,64 @@ entities:
             719: -1,-35
             722: -2,-33
             1815: 17,30
-            2324: -8,-47
-            2325: -8,-46
-            2326: -8,-45
-            2334: -4,-53
-            2335: -4,-52
-            2336: -4,-51
-            2401: 32,-39
-            3090: -28,41
+            2319: -8,-47
+            2320: -8,-46
+            2321: -8,-45
+            2329: -4,-53
+            2330: -4,-52
+            2331: -4,-51
+            2396: 32,-39
+            3085: -28,41
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelLineN
           decals:
-            2337: -5,-50
-            2338: -6,-50
-            2339: -7,-50
-            2395: 30,-38
-            2399: 31,-38
-            3096: -32,42
-            3097: -31,42
-            3098: -30,42
-            3099: -29,42
-            3436: 20,-18
-            3437: 21,-18
+            2332: -5,-50
+            2333: -6,-50
+            2334: -7,-50
+            2390: 30,-38
+            2394: 31,-38
+            3091: -32,42
+            3092: -31,42
+            3093: -30,42
+            3094: -29,42
+            3431: 20,-18
+            3432: 21,-18
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelLineS
           decals:
-            2340: -5,-54
-            2341: -6,-54
-            2342: -7,-54
-            2396: 30,-40
-            2397: 31,-40
-            3092: -32,40
-            3093: -31,40
-            3094: -30,40
-            3095: -29,40
+            2335: -5,-54
+            2336: -6,-54
+            2337: -7,-54
+            2391: 30,-40
+            2392: 31,-40
+            3087: -32,40
+            3088: -31,40
+            3089: -30,40
+            3090: -29,40
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelLineW
           decals:
             1816: 12,30
-            2327: -8,-47
-            2328: -8,-46
-            2329: -8,-45
-            2343: -8,-53
-            2344: -8,-52
-            2345: -8,-51
-            2400: 29,-39
-            3091: -33,41
-            3434: 18,-21
-            3435: 18,-20
+            2322: -8,-47
+            2323: -8,-46
+            2324: -8,-45
+            2338: -8,-53
+            2339: -8,-52
+            2340: -8,-51
+            2395: 29,-39
+            3086: -33,41
+            3429: 18,-21
+            3430: 18,-20
         - node:
             color: '#00BEBE7F'
             id: BrickTileWhiteCornerNe
           decals:
-            3174: -27,43
-            3184: -36,4
-            3186: -42,5
+            3169: -27,43
+            3179: -36,4
+            3181: -42,5
         - node:
             color: '#334E6DC8'
             id: BrickTileWhiteCornerNe
@@ -898,30 +898,30 @@ entities:
             494: -25,-26
             505: -29,-26
             557: -24,-39
-            2366: 28,-35
-            2388: 37,-37
+            2361: 28,-35
+            2383: 37,-37
         - node:
             color: '#765428FF'
             id: BrickTileWhiteCornerNe
           decals:
-            3338: -53,-17
+            3333: -53,-17
         - node:
             color: '#9FED58B3'
             id: BrickTileWhiteCornerNe
           decals:
-            2539: -46,-30
+            2534: -46,-30
         - node:
             color: '#BC863FFF'
             id: BrickTileWhiteCornerNe
           decals:
-            3227: -49,3
+            3222: -49,3
         - node:
             color: '#D381C996'
             id: BrickTileWhiteCornerNe
           decals:
             837: -11,-47
-            2194: 16,-35
-            2195: 12,-43
+            2189: 16,-35
+            2190: 12,-43
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteCornerNe
@@ -933,7 +933,7 @@ entities:
             color: '#EFB34196'
             id: BrickTileWhiteCornerNe
           decals:
-            3108: -2,43
+            3103: -2,43
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteCornerNe
@@ -943,8 +943,8 @@ entities:
             color: '#00BEBE7F'
             id: BrickTileWhiteCornerNw
           decals:
-            3175: -34,43
-            3185: -44,5
+            3170: -34,43
+            3180: -44,5
         - node:
             color: '#334E6DC8'
             id: BrickTileWhiteCornerNw
@@ -953,7 +953,7 @@ entities:
             604: 20,8
             610: 23,9
             611: 23,8
-            3216: -44,-9
+            3211: -44,-9
         - node:
             color: '#4B709CFF'
             id: BrickTileWhiteCornerNw
@@ -969,30 +969,30 @@ entities:
             504: -33,-26
             558: -28,-39
             727: -2,-39
-            2365: 27,-35
+            2360: 27,-35
         - node:
             color: '#765428FF'
             id: BrickTileWhiteCornerNw
           decals:
-            3337: -58,-17
+            3332: -58,-17
         - node:
             color: '#9FED58B3'
             id: BrickTileWhiteCornerNw
           decals:
-            2540: -48,-30
+            2535: -48,-30
         - node:
             color: '#BC863FFF'
             id: BrickTileWhiteCornerNw
           decals:
-            3226: -51,3
-            3363: -51,-2
+            3221: -51,3
+            3358: -51,-2
         - node:
             color: '#D381C996'
             id: BrickTileWhiteCornerNw
           decals:
             838: -14,-47
-            2188: 6,-43
-            2189: 14,-35
+            2183: 6,-43
+            2184: 14,-35
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteCornerNw
@@ -1003,7 +1003,7 @@ entities:
             color: '#EFB34196'
             id: BrickTileWhiteCornerNw
           decals:
-            3119: -7,43
+            3114: -7,43
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteCornerNw
@@ -1014,8 +1014,8 @@ entities:
             color: '#00BEBE7F'
             id: BrickTileWhiteCornerSe
           decals:
-            3176: -27,39
-            3188: -36,3
+            3171: -27,39
+            3183: -36,3
         - node:
             color: '#334E6DC8'
             id: BrickTileWhiteCornerSe
@@ -1037,30 +1037,30 @@ entities:
             491: -25,-30
             503: -29,-30
             555: -24,-42
-            2386: 34,-42
-            2387: 37,-38
+            2381: 34,-42
+            2382: 37,-38
         - node:
             color: '#765428FF'
             id: BrickTileWhiteCornerSe
           decals:
-            3340: -53,-24
+            3335: -53,-24
         - node:
             color: '#9FED58B3'
             id: BrickTileWhiteCornerSe
           decals:
-            2537: -46,-31
+            2532: -46,-31
         - node:
             color: '#BC863FFF'
             id: BrickTileWhiteCornerSe
           decals:
-            3235: -49,-5
+            3230: -49,-5
         - node:
             color: '#D381C996'
             id: BrickTileWhiteCornerSe
           decals:
             836: -11,-51
-            2190: 12,-45
-            2191: 16,-44
+            2185: 12,-45
+            2186: 16,-44
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteCornerSe
@@ -1070,9 +1070,9 @@ entities:
             color: '#EFB34196'
             id: BrickTileWhiteCornerSe
           decals:
-            3109: -2,40
-            3124: 10,40
-            3129: 19,39
+            3104: -2,40
+            3119: 10,40
+            3124: 19,39
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteCornerSe
@@ -1082,8 +1082,8 @@ entities:
             color: '#00BEBE7F'
             id: BrickTileWhiteCornerSw
           decals:
-            3177: -34,39
-            3187: -44,3
+            3172: -34,39
+            3182: -44,3
         - node:
             color: '#334E6DC8'
             id: BrickTileWhiteCornerSw
@@ -1092,7 +1092,7 @@ entities:
             603: 20,5
             607: 23,4
             615: 23,5
-            3215: -44,-11
+            3210: -44,-11
         - node:
             color: '#4B709CFF'
             id: BrickTileWhiteCornerSw
@@ -1108,30 +1108,30 @@ entities:
             506: -33,-30
             556: -28,-42
             726: -2,-34
-            2389: 27,-42
+            2384: 27,-42
         - node:
             color: '#765428FF'
             id: BrickTileWhiteCornerSw
           decals:
-            3339: -58,-24
+            3334: -58,-24
         - node:
             color: '#9FED58B3'
             id: BrickTileWhiteCornerSw
           decals:
-            2538: -48,-31
+            2533: -48,-31
         - node:
             color: '#BC863FFF'
             id: BrickTileWhiteCornerSw
           decals:
-            3236: -51,-5
-            3362: -51,1
+            3231: -51,-5
+            3357: -51,1
         - node:
             color: '#D381C996'
             id: BrickTileWhiteCornerSw
           decals:
             839: -14,-51
-            2192: 6,-45
-            2193: 14,-44
+            2187: 6,-45
+            2188: 14,-44
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteCornerSw
@@ -1141,8 +1141,8 @@ entities:
             color: '#EFB34196'
             id: BrickTileWhiteCornerSw
           decals:
-            3117: -7,40
-            3128: 17,39
+            3112: -7,40
+            3123: 17,39
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteCornerSw
@@ -1167,12 +1167,12 @@ entities:
             color: '#80C71F80'
             id: BrickTileWhiteEndS
           decals:
-            3456: 53,-20
+            3451: 53,-20
         - node:
             color: '#8932B87F'
             id: BrickTileWhiteEndS
           decals:
-            3453: 49,-20
+            3448: 49,-20
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteEndS
@@ -1182,7 +1182,7 @@ entities:
             color: '#F9801D7F'
             id: BrickTileWhiteEndS
           decals:
-            3452: 45,-20
+            3447: 45,-20
         - node:
             color: '#169C9CFF'
             id: BrickTileWhiteEndW
@@ -1207,8 +1207,8 @@ entities:
             color: '#00BEBE7F'
             id: BrickTileWhiteInnerNe
           decals:
-            3205: -44,1
-            3213: -42,4
+            3200: -44,1
+            3208: -42,4
         - node:
             color: '#334E6DC8'
             id: BrickTileWhiteInnerNe
@@ -1223,93 +1223,93 @@ entities:
             color: '#52B4E996'
             id: BrickTileWhiteInnerNe
           decals:
-            2392: 28,-37
+            2387: 28,-37
         - node:
             color: '#9FED58B3'
             id: BrickTileWhiteInnerNe
           decals:
-            2547: -48,-31
+            2542: -48,-31
         - node:
             color: '#BC863FFF'
             id: BrickTileWhiteInnerNe
           decals:
-            3244: -53,-2
-            3245: -53,3
-            3282: -53,1
-            3283: -53,2
-            3284: -53,3
-            3285: -53,-3
-            3286: -53,-4
-            3287: -53,-5
-            3288: -53,-6
-            3289: -53,-7
-            3290: -53,-8
-            3291: -53,-9
-            3292: -53,-10
-            3293: -53,-11
-            3294: -53,-12
-            3295: -53,-13
-            3296: -53,-15
-            3314: -58,3
-            3315: -57,3
-            3316: -56,3
-            3317: -55,3
+            3239: -53,-2
+            3240: -53,3
+            3277: -53,1
+            3278: -53,2
+            3279: -53,3
+            3280: -53,-3
+            3281: -53,-4
+            3282: -53,-5
+            3283: -53,-6
+            3284: -53,-7
+            3285: -53,-8
+            3286: -53,-9
+            3287: -53,-10
+            3288: -53,-11
+            3289: -53,-12
+            3290: -53,-13
+            3291: -53,-15
+            3309: -58,3
+            3310: -57,3
+            3311: -56,3
+            3312: -55,3
         - node:
             color: '#D381C996'
             id: BrickTileWhiteInnerNe
           decals:
-            2079: 3,-48
-            2082: 3,-45
-            2109: 17,-37
-            2110: 17,-36
-            2111: 17,-35
-            2112: 17,-34
-            2113: 15,-34
-            2114: 14,-34
-            2115: 13,-34
-            2123: 12,-42
-            2124: 11,-42
-            2125: 10,-42
-            2126: 9,-42
-            2127: 8,-42
-            2128: 7,-42
-            2129: 6,-42
-            2130: 5,-42
-            2138: 4,-34
-            2139: 8,-34
-            2140: 11,-40
-            2172: 8,-47
-            2173: 21,-44
-            2178: 13,-46
-            2187: 18,-45
-            2239: 5,-39
-            2292: -9,-42
-            2293: -8,-42
-            2294: -7,-42
-            2295: -7,-43
-            2301: -7,-46
-            2302: -7,-45
-            2305: -7,-49
-            2306: -6,-49
-            2307: -5,-49
-            2308: -5,-49
-            2309: -4,-49
-            2310: -3,-49
-            2311: -3,-50
-            2312: -3,-51
-            2313: -3,-52
-            2314: -3,-53
-            2315: -3,-54
-            2316: -3,-55
-            2866: 17,-42
-            2868: 17,-38
-            2869: 17,-39
-            2870: 17,-40
-            2871: 17,-43
-            2876: 20,-43
-            2877: 19,-43
-            2878: 18,-43
-            2968: 14,-42
+            2074: 3,-48
+            2077: 3,-45
+            2104: 17,-37
+            2105: 17,-36
+            2106: 17,-35
+            2107: 17,-34
+            2108: 15,-34
+            2109: 14,-34
+            2110: 13,-34
+            2118: 12,-42
+            2119: 11,-42
+            2120: 10,-42
+            2121: 9,-42
+            2122: 8,-42
+            2123: 7,-42
+            2124: 6,-42
+            2125: 5,-42
+            2133: 4,-34
+            2134: 8,-34
+            2135: 11,-40
+            2167: 8,-47
+            2168: 21,-44
+            2173: 13,-46
+            2182: 18,-45
+            2234: 5,-39
+            2287: -9,-42
+            2288: -8,-42
+            2289: -7,-42
+            2290: -7,-43
+            2296: -7,-46
+            2297: -7,-45
+            2300: -7,-49
+            2301: -6,-49
+            2302: -5,-49
+            2303: -5,-49
+            2304: -4,-49
+            2305: -3,-49
+            2306: -3,-50
+            2307: -3,-51
+            2308: -3,-52
+            2309: -3,-53
+            2310: -3,-54
+            2311: -3,-55
+            2861: 17,-42
+            2863: 17,-38
+            2864: 17,-39
+            2865: 17,-40
+            2866: 17,-43
+            2871: 20,-43
+            2872: 19,-43
+            2873: 18,-43
+            2963: 14,-42
         - node:
             color: '#D4D4D428'
             id: BrickTileWhiteInnerNe
@@ -1394,11 +1394,11 @@ entities:
             1721: 40,-39
             1724: 39,-39
             1732: 37,-42
-            2731: 54,-10
-            2847: 40,-25
-            2853: 42,-23
-            2855: 42,-22
-            3463: 54,-19
+            2726: 54,-10
+            2842: 40,-25
+            2848: 42,-23
+            2850: 42,-22
+            3458: 54,-19
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteInnerNe
@@ -1422,20 +1422,20 @@ entities:
             1851: 25,40
             1852: 23,40
             1866: 22,31
-            2501: 3,49
-            2505: 19,43
-            2518: 9,46
-            3067: 11,31
+            2496: 3,49
+            2500: 19,43
+            2513: 9,46
+            3062: 11,31
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteInnerNe
           decals:
-            3493: -6,-29
+            3488: -6,-29
         - node:
             color: '#00BEBE7F'
             id: BrickTileWhiteInnerNw
           decals:
-            3204: -35,1
+            3199: -35,1
         - node:
             color: '#4B709CFF'
             id: BrickTileWhiteInnerNw
@@ -1450,7 +1450,7 @@ entities:
             color: '#9FED58B3'
             id: BrickTileWhiteInnerNw
           decals:
-            2544: -46,-31
+            2539: -46,-31
         - node:
             color: '#A4610696'
             id: BrickTileWhiteInnerNw
@@ -1461,76 +1461,76 @@ entities:
             color: '#BC863FFF'
             id: BrickTileWhiteInnerNw
           decals:
-            3246: -53,3
-            3247: -55,3
-            3248: -56,3
-            3249: -57,3
-            3250: -58,3
-            3251: -58,2
-            3252: -58,1
-            3253: -58,0
-            3254: -58,-1
-            3255: -58,-8
-            3256: -58,-9
-            3257: -58,-10
-            3258: -58,-11
-            3259: -58,-12
-            3260: -58,-13
-            3261: -58,-14
-            3262: -58,-15
-            3350: -47,-5
-            3358: -47,-2
-            3367: -50,-2
+            3241: -53,3
+            3242: -55,3
+            3243: -56,3
+            3244: -57,3
+            3245: -58,3
+            3246: -58,2
+            3247: -58,1
+            3248: -58,0
+            3249: -58,-1
+            3250: -58,-8
+            3251: -58,-9
+            3252: -58,-10
+            3253: -58,-11
+            3254: -58,-12
+            3255: -58,-13
+            3256: -58,-14
+            3257: -58,-15
+            3345: -47,-5
+            3353: -47,-2
+            3362: -50,-2
         - node:
             color: '#D381C996'
             id: BrickTileWhiteInnerNw
           decals:
-            2085: 5,-45
-            2090: 5,-42
-            2091: 6,-42
-            2092: 7,-42
-            2093: 8,-42
-            2094: 9,-42
-            2095: 10,-42
-            2096: 11,-42
-            2097: 12,-42
-            2098: 13,-42
-            2099: 13,-41
-            2100: 13,-40
-            2101: 13,-38
-            2102: 13,-37
-            2103: 13,-36
-            2104: 13,-35
-            2105: 13,-34
-            2106: 14,-34
-            2107: 15,-34
-            2108: 17,-34
-            2142: 6,-34
-            2143: 10,-34
-            2240: 9,-39
-            2279: -9,-55
-            2280: -9,-53
-            2281: -9,-52
-            2282: -9,-51
-            2283: -9,-50
-            2284: -9,-48
-            2285: -9,-47
-            2286: -9,-46
-            2287: -9,-44
-            2288: -9,-43
-            2289: -9,-42
-            2290: -8,-42
-            2291: -7,-42
-            2317: -3,-49
-            2318: -4,-49
-            2319: -5,-49
-            2320: -6,-49
-            2358: -1,-48
-            2872: 18,-43
-            2873: 19,-43
-            2874: 20,-43
-            2875: 21,-43
-            2969: 16,-42
+            2080: 5,-45
+            2085: 5,-42
+            2086: 6,-42
+            2087: 7,-42
+            2088: 8,-42
+            2089: 9,-42
+            2090: 10,-42
+            2091: 11,-42
+            2092: 12,-42
+            2093: 13,-42
+            2094: 13,-41
+            2095: 13,-40
+            2096: 13,-38
+            2097: 13,-37
+            2098: 13,-36
+            2099: 13,-35
+            2100: 13,-34
+            2101: 14,-34
+            2102: 15,-34
+            2103: 17,-34
+            2137: 6,-34
+            2138: 10,-34
+            2235: 9,-39
+            2274: -9,-55
+            2275: -9,-53
+            2276: -9,-52
+            2277: -9,-51
+            2278: -9,-50
+            2279: -9,-48
+            2280: -9,-47
+            2281: -9,-46
+            2282: -9,-44
+            2283: -9,-43
+            2284: -9,-42
+            2285: -8,-42
+            2286: -7,-42
+            2312: -3,-49
+            2313: -4,-49
+            2314: -5,-49
+            2315: -6,-49
+            2353: -1,-48
+            2867: 18,-43
+            2868: 19,-43
+            2869: 20,-43
+            2870: 21,-43
+            2964: 16,-42
         - node:
             color: '#D4D4D428'
             id: BrickTileWhiteInnerNw
@@ -1615,10 +1615,10 @@ entities:
             1713: 43,-39
             1722: 40,-39
             1723: 39,-39
-            2846: 42,-25
-            2851: 40,-23
-            2861: 40,-19
-            2862: 40,-20
+            2841: 42,-25
+            2846: 40,-23
+            2856: 40,-19
+            2857: 40,-20
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteInnerNw
@@ -1639,10 +1639,10 @@ entities:
             1856: 25,28
             1857: 25,34
             1867: 28,31
-            2502: 5,49
-            2507: 20,43
-            2519: 17,46
-            3068: 18,31
+            2497: 5,49
+            2502: 20,43
+            2514: 17,46
+            3063: 18,31
         - node:
             color: '#334E6DC8'
             id: BrickTileWhiteInnerSe
@@ -1658,102 +1658,102 @@ entities:
             id: BrickTileWhiteInnerSe
           decals:
             416: -18,-29
-            2390: 34,-38
+            2385: 34,-38
         - node:
             color: '#80C71F80'
             id: BrickTileWhiteInnerSe
           decals:
-            3457: 53,-19
+            3452: 53,-19
         - node:
             color: '#8932B87F'
             id: BrickTileWhiteInnerSe
           decals:
-            3455: 49,-19
+            3450: 49,-19
         - node:
             color: '#9FED58B3'
             id: BrickTileWhiteInnerSe
           decals:
-            2545: -48,-30
+            2540: -48,-30
         - node:
             color: '#BC863FFF'
             id: BrickTileWhiteInnerSe
           decals:
-            3263: -58,-15
-            3264: -57,-15
-            3265: -54,-15
-            3266: -53,-15
-            3267: -53,-13
-            3268: -53,-12
-            3269: -53,-11
-            3270: -53,-10
-            3271: -53,-9
-            3272: -53,-8
-            3273: -53,-7
-            3274: -53,-6
-            3275: -53,-4
-            3276: -53,-5
-            3277: -53,-3
-            3278: -53,-2
-            3279: -53,1
-            3280: -53,2
-            3281: -53,3
-            3297: -53,-15
+            3258: -58,-15
+            3259: -57,-15
+            3260: -54,-15
+            3261: -53,-15
+            3262: -53,-13
+            3263: -53,-12
+            3264: -53,-11
+            3265: -53,-10
+            3266: -53,-9
+            3267: -53,-8
+            3268: -53,-7
+            3269: -53,-6
+            3270: -53,-4
+            3271: -53,-5
+            3272: -53,-3
+            3273: -53,-2
+            3274: -53,1
+            3275: -53,2
+            3276: -53,3
+            3292: -53,-15
         - node:
             color: '#D381C996'
             id: BrickTileWhiteInnerSe
           decals:
-            2080: 3,-45
-            2081: 3,-42
-            2141: 11,-38
-            2144: 21,-42
-            2145: 17,-36
-            2146: 17,-35
-            2147: 17,-34
-            2148: 21,-44
-            2149: 20,-44
-            2150: 19,-44
-            2151: 18,-44
-            2152: 18,-45
-            2153: 17,-45
-            2154: 16,-45
-            2155: 15,-45
-            2156: 14,-45
-            2157: 13,-45
-            2158: 13,-46
-            2159: 12,-46
-            2160: 11,-46
-            2161: 10,-46
-            2162: 9,-46
-            2163: 8,-46
-            2164: 8,-47
-            2165: 5,-47
-            2166: 6,-47
-            2167: 7,-47
-            2241: 5,-35
-            2266: -3,-55
-            2267: -3,-54
-            2268: -3,-53
-            2269: -3,-52
-            2270: -3,-51
-            2271: -3,-50
-            2272: -3,-49
-            2273: -4,-55
-            2274: -5,-55
-            2275: -6,-55
-            2276: -7,-55
-            2277: -8,-55
-            2278: -9,-55
-            2296: -7,-43
-            2297: -7,-42
-            2298: -7,-45
-            2299: -7,-46
-            2300: -7,-48
-            2867: 17,-40
-            2879: 17,-42
-            2880: 17,-39
-            2881: 17,-38
-            2882: 17,-37
-            2970: 14,-39
+            2075: 3,-45
+            2076: 3,-42
+            2136: 11,-38
+            2139: 21,-42
+            2140: 17,-36
+            2141: 17,-35
+            2142: 17,-34
+            2143: 21,-44
+            2144: 20,-44
+            2145: 19,-44
+            2146: 18,-44
+            2147: 18,-45
+            2148: 17,-45
+            2149: 16,-45
+            2150: 15,-45
+            2151: 14,-45
+            2152: 13,-45
+            2153: 13,-46
+            2154: 12,-46
+            2155: 11,-46
+            2156: 10,-46
+            2157: 9,-46
+            2158: 8,-46
+            2159: 8,-47
+            2160: 5,-47
+            2161: 6,-47
+            2162: 7,-47
+            2236: 5,-35
+            2261: -3,-55
+            2262: -3,-54
+            2263: -3,-53
+            2264: -3,-52
+            2265: -3,-51
+            2266: -3,-50
+            2267: -3,-49
+            2268: -4,-55
+            2269: -5,-55
+            2270: -6,-55
+            2271: -7,-55
+            2272: -8,-55
+            2273: -9,-55
+            2291: -7,-43
+            2292: -7,-42
+            2293: -7,-45
+            2294: -7,-46
+            2295: -7,-48
+            2862: 17,-40
+            2874: 17,-42
+            2875: 17,-39
+            2876: 17,-38
+            2877: 17,-37
+            2965: 14,-39
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteInnerSe
@@ -1827,13 +1827,13 @@ entities:
             1709: 43,-40
             1710: 43,-39
             1733: 37,-40
-            2732: 54,-12
-            2849: 40,-23
-            2852: 42,-23
-            2854: 42,-22
-            2860: 39,-18
-            3461: 52,-7
-            3462: 52,-6
+            2727: 54,-12
+            2844: 40,-23
+            2847: 42,-23
+            2849: 42,-22
+            2855: 39,-18
+            3456: 52,-7
+            3457: 52,-6
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteInnerSe
@@ -1856,23 +1856,23 @@ entities:
             1860: 25,36
             1861: 25,25
             1869: 22,33
-            2503: 3,51
-            2506: 19,42
-            2517: 10,45
-            2531: 32,42
-            2532: 25,42
-            2534: 23,42
-            3069: 11,33
+            2498: 3,51
+            2501: 19,42
+            2512: 10,45
+            2526: 32,42
+            2527: 25,42
+            2529: 23,42
+            3064: 11,33
         - node:
             color: '#F9801D7F'
             id: BrickTileWhiteInnerSe
           decals:
-            3460: 45,-19
+            3455: 45,-19
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteInnerSe
           decals:
-            3492: -6,-26
+            3487: -6,-26
         - node:
             color: '#4B709CFF'
             id: BrickTileWhiteInnerSw
@@ -1888,17 +1888,17 @@ entities:
             color: '#80C71F80'
             id: BrickTileWhiteInnerSw
           decals:
-            3458: 53,-19
+            3453: 53,-19
         - node:
             color: '#8932B87F'
             id: BrickTileWhiteInnerSw
           decals:
-            3454: 49,-19
+            3449: 49,-19
         - node:
             color: '#9FED58B3'
             id: BrickTileWhiteInnerSw
           decals:
-            2546: -46,-30
+            2541: -46,-30
         - node:
             color: '#A4610696'
             id: BrickTileWhiteInnerSw
@@ -1909,75 +1909,75 @@ entities:
             color: '#BC863FFF'
             id: BrickTileWhiteInnerSw
           decals:
-            3298: -53,-15
-            3299: -54,-15
-            3300: -57,-15
-            3301: -58,-15
-            3302: -58,-14
-            3303: -58,-13
-            3304: -58,-12
-            3305: -58,-11
-            3306: -58,-10
-            3307: -58,-9
-            3308: -58,-8
-            3309: -58,-7
-            3310: -58,0
-            3311: -58,1
-            3312: -58,2
-            3313: -58,3
-            3353: -47,2
-            3359: -47,-2
-            3366: -50,1
+            3293: -53,-15
+            3294: -54,-15
+            3295: -57,-15
+            3296: -58,-15
+            3297: -58,-14
+            3298: -58,-13
+            3299: -58,-12
+            3300: -58,-11
+            3301: -58,-10
+            3302: -58,-9
+            3303: -58,-8
+            3304: -58,-7
+            3305: -58,0
+            3306: -58,1
+            3307: -58,2
+            3308: -58,3
+            3348: -47,2
+            3354: -47,-2
+            3361: -50,1
         - node:
             color: '#D381C996'
             id: BrickTileWhiteInnerSw
           decals:
-            2083: 5,-42
-            2084: 5,-45
-            2116: 13,-34
-            2117: 13,-35
-            2118: 13,-36
-            2119: 13,-37
-            2120: 13,-38
-            2121: 13,-40
-            2122: 13,-41
-            2168: 6,-47
-            2169: 7,-47
-            2170: 8,-47
-            2171: 9,-46
-            2174: 10,-46
-            2175: 11,-46
-            2176: 12,-46
-            2177: 13,-46
-            2179: 14,-45
-            2180: 16,-45
-            2181: 15,-45
-            2182: 17,-45
-            2183: 18,-45
-            2184: 19,-44
-            2185: 20,-44
-            2186: 21,-44
-            2238: 9,-35
-            2247: -9,-48
-            2248: -5,-46
-            2249: -9,-47
-            2250: -9,-46
-            2251: -9,-44
-            2252: -9,-43
-            2253: -9,-42
-            2254: -9,-50
-            2255: -9,-51
-            2256: -9,-52
-            2257: -9,-53
-            2259: -9,-55
-            2260: -8,-55
-            2261: -7,-55
-            2262: -6,-55
-            2263: -5,-55
-            2264: -4,-55
-            2265: -3,-55
-            2354: -1,-42
-            2971: 16,-39
+            2078: 5,-42
+            2079: 5,-45
+            2111: 13,-34
+            2112: 13,-35
+            2113: 13,-36
+            2114: 13,-37
+            2115: 13,-38
+            2116: 13,-40
+            2117: 13,-41
+            2163: 6,-47
+            2164: 7,-47
+            2165: 8,-47
+            2166: 9,-46
+            2169: 10,-46
+            2170: 11,-46
+            2171: 12,-46
+            2172: 13,-46
+            2174: 14,-45
+            2175: 16,-45
+            2176: 15,-45
+            2177: 17,-45
+            2178: 18,-45
+            2179: 19,-44
+            2180: 20,-44
+            2181: 21,-44
+            2233: 9,-35
+            2242: -9,-48
+            2243: -5,-46
+            2244: -9,-47
+            2245: -9,-46
+            2246: -9,-44
+            2247: -9,-43
+            2248: -9,-42
+            2249: -9,-50
+            2250: -9,-51
+            2251: -9,-52
+            2252: -9,-53
+            2254: -9,-55
+            2255: -8,-55
+            2256: -7,-55
+            2257: -6,-55
+            2258: -5,-55
+            2259: -4,-55
+            2260: -3,-55
+            2349: -1,-42
+            2966: 16,-39
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteInnerSw
@@ -2053,11 +2053,11 @@ entities:
             1699: 39,-40
             1719: 42,-41
             1725: 39,-39
-            2848: 42,-23
-            2850: 40,-23
-            2857: 40,-20
-            2858: 40,-19
-            2859: 40,-18
+            2843: 42,-23
+            2845: 40,-23
+            2852: 40,-20
+            2853: 40,-19
+            2854: 40,-18
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteInnerSw
@@ -2080,23 +2080,23 @@ entities:
             1865: 27,42
             1868: 28,33
             1883: 35,42
-            2504: 5,51
-            2508: 20,42
-            2533: 25,42
-            3070: 18,33
-            3139: 17,45
+            2499: 5,51
+            2503: 20,42
+            2528: 25,42
+            3065: 18,33
+            3134: 17,45
         - node:
             color: '#F9801D7F'
             id: BrickTileWhiteInnerSw
           decals:
-            3459: 45,-19
+            3454: 45,-19
         - node:
             color: '#00BEBE7F'
             id: BrickTileWhiteLineE
           decals:
-            3162: -27,40
-            3163: -27,41
-            3164: -27,42
+            3157: -27,40
+            3158: -27,41
+            3159: -27,42
         - node:
             color: '#334E6DC8'
             id: BrickTileWhiteLineE
@@ -2126,40 +2126,40 @@ entities:
             509: -29,-27
             562: -24,-40
             563: -24,-41
-            2377: 34,-39
-            2378: 34,-40
-            2379: 34,-41
-            2391: 28,-36
+            2372: 34,-39
+            2373: 34,-40
+            2374: 34,-41
+            2386: 28,-36
         - node:
             color: '#765428FF'
             id: BrickTileWhiteLineE
           decals:
-            3324: -53,-18
-            3325: -53,-19
-            3326: -53,-20
-            3327: -53,-21
-            3328: -53,-22
-            3329: -53,-23
+            3319: -53,-18
+            3320: -53,-19
+            3321: -53,-20
+            3322: -53,-21
+            3323: -53,-22
+            3324: -53,-23
         - node:
             color: '#9FED58B3'
             id: BrickTileWhiteLineE
           decals:
-            2548: -45,-31
-            2549: -45,-30
+            2543: -45,-31
+            2544: -45,-30
         - node:
             color: '#BC863FFF'
             id: BrickTileWhiteLineE
           decals:
-            3221: -53,-14
-            3222: -53,-1
-            3223: -53,0
-            3229: -49,2
-            3230: -49,1
-            3231: -49,0
-            3232: -49,-1
-            3233: -49,-2
-            3234: -49,-4
-            3361: -49,-3
+            3216: -53,-14
+            3217: -53,-1
+            3218: -53,0
+            3224: -49,2
+            3225: -49,1
+            3226: -49,0
+            3227: -49,-1
+            3228: -49,-2
+            3229: -49,-4
+            3356: -49,-3
         - node:
             color: '#D381C996'
             id: BrickTileWhiteLineE
@@ -2167,32 +2167,32 @@ entities:
             843: -11,-50
             844: -11,-49
             845: -11,-48
-            2075: 3,-43
-            2076: 3,-44
-            2077: 3,-46
-            2078: 3,-47
-            2132: 17,-41
-            2133: 21,-43
-            2134: 11,-39
-            2202: 12,-44
-            2203: 16,-43
-            2204: 16,-42
-            2205: 16,-41
-            2206: 16,-40
-            2207: 16,-39
-            2208: 16,-38
-            2209: 16,-37
-            2210: 16,-36
-            2232: 5,-38
-            2233: 5,-37
-            2234: 5,-36
-            2242: -7,-47
-            2244: -7,-44
-            2304: -11,-45
-            2348: -3,-47
-            2349: -3,-46
-            2964: 14,-41
-            2965: 14,-40
+            2070: 3,-43
+            2071: 3,-44
+            2072: 3,-46
+            2073: 3,-47
+            2127: 17,-41
+            2128: 21,-43
+            2129: 11,-39
+            2197: 12,-44
+            2198: 16,-43
+            2199: 16,-42
+            2200: 16,-41
+            2201: 16,-40
+            2202: 16,-39
+            2203: 16,-38
+            2204: 16,-37
+            2205: 16,-36
+            2227: 5,-38
+            2228: 5,-37
+            2229: 5,-36
+            2237: -7,-47
+            2239: -7,-44
+            2299: -11,-45
+            2343: -3,-47
+            2344: -3,-46
+            2959: 14,-41
+            2960: 14,-40
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteLineE
@@ -2221,51 +2221,51 @@ entities:
             1826: 19,32
             1827: 19,33
             1880: 22,32
-            2514: 10,44
-            2515: 10,43
-            2516: 10,42
-            2520: 19,44
-            2521: 19,45
-            2522: 20,42
-            2523: 20,43
-            3058: 11,32
-            3085: 17,34
-            3110: -2,41
-            3111: -2,42
-            3125: 10,41
-            3130: 19,40
-            3131: 19,41
+            2509: 10,44
+            2510: 10,43
+            2511: 10,42
+            2515: 19,44
+            2516: 19,45
+            2517: 20,42
+            2518: 20,43
+            3053: 11,32
+            3080: 17,34
+            3105: -2,41
+            3106: -2,42
+            3120: 10,41
+            3125: 19,40
+            3126: 19,41
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteLineE
           decals:
             577: -30,-28
-            3494: -6,-28
-            3495: -6,-27
+            3489: -6,-28
+            3490: -6,-27
         - node:
             color: '#00BEBE7F'
             id: BrickTileWhiteLineN
           decals:
-            3165: -28,43
-            3166: -29,43
-            3167: -30,43
-            3168: -31,43
-            3169: -32,43
-            3170: -33,43
-            3196: -43,1
-            3197: -42,1
-            3198: -41,1
-            3199: -40,1
-            3200: -39,1
-            3201: -38,1
-            3202: -37,1
-            3203: -36,1
-            3207: -43,5
-            3208: -41,4
-            3209: -40,4
-            3210: -39,4
-            3211: -38,4
-            3212: -37,4
+            3160: -28,43
+            3161: -29,43
+            3162: -30,43
+            3163: -31,43
+            3164: -32,43
+            3165: -33,43
+            3191: -43,1
+            3192: -42,1
+            3193: -41,1
+            3194: -40,1
+            3195: -39,1
+            3196: -38,1
+            3197: -37,1
+            3198: -36,1
+            3202: -43,5
+            3203: -41,4
+            3204: -40,4
+            3205: -39,4
+            3206: -38,4
+            3207: -37,4
         - node:
             color: '#169C9CFF'
             id: BrickTileWhiteLineN
@@ -2301,52 +2301,52 @@ entities:
             559: -27,-39
             560: -26,-39
             561: -25,-39
-            2367: 29,-37
-            2368: 30,-37
-            2369: 31,-37
-            2370: 32,-37
-            2371: 33,-37
-            2372: 34,-37
-            2373: 35,-37
-            2374: 36,-37
+            2362: 29,-37
+            2363: 30,-37
+            2364: 31,-37
+            2365: 32,-37
+            2366: 33,-37
+            2367: 34,-37
+            2368: 35,-37
+            2369: 36,-37
         - node:
             color: '#765428FF'
             id: BrickTileWhiteLineN
           decals:
-            3318: -55,-17
-            3319: -56,-17
-            3320: -57,-17
-            3321: -54,-17
+            3313: -55,-17
+            3314: -56,-17
+            3315: -57,-17
+            3316: -54,-17
         - node:
             color: '#9FED58B3'
             id: BrickTileWhiteLineN
           decals:
-            2536: -47,-31
-            2542: -47,-30
+            2531: -47,-31
+            2537: -47,-30
         - node:
             color: '#BC863FFF'
             id: BrickTileWhiteLineN
           decals:
-            3218: -54,3
-            3228: -50,3
+            3213: -54,3
+            3223: -50,3
         - node:
             color: '#D381C996'
             id: BrickTileWhiteLineN
           decals:
             834: -13,-47
             835: -12,-47
-            2135: 16,-34
-            2136: 9,-34
-            2137: 5,-34
-            2196: 7,-43
-            2197: 8,-43
-            2198: 9,-43
-            2199: 10,-43
-            2200: 11,-43
-            2201: 15,-35
-            2229: 6,-39
-            2230: 7,-39
-            2231: 8,-39
+            2130: 16,-34
+            2131: 9,-34
+            2132: 5,-34
+            2191: 7,-43
+            2192: 8,-43
+            2193: 9,-43
+            2194: 10,-43
+            2195: 11,-43
+            2196: 15,-35
+            2224: 6,-39
+            2225: 7,-39
+            2226: 8,-39
         - node:
             color: '#D4D4D428'
             id: BrickTileWhiteLineN
@@ -2368,7 +2368,7 @@ entities:
             1717: 41,-41
             1720: 41,-39
             1731: 41,-40
-            2845: 41,-25
+            2840: 41,-25
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteLineN
@@ -2387,22 +2387,22 @@ entities:
             1872: 25,31
             1873: 26,31
             1874: 27,31
-            3046: 17,31
-            3047: 16,31
-            3048: 15,31
-            3049: 14,31
-            3050: 13,31
-            3051: 12,31
-            3061: 12,33
-            3062: 13,33
-            3063: 14,33
-            3064: 15,33
-            3065: 16,33
-            3066: 17,33
-            3120: -6,43
-            3121: -5,43
-            3122: -4,43
-            3123: -3,43
+            3041: 17,31
+            3042: 16,31
+            3043: 15,31
+            3044: 14,31
+            3045: 13,31
+            3046: 12,31
+            3056: 12,33
+            3057: 13,33
+            3058: 14,33
+            3059: 15,33
+            3060: 16,33
+            3061: 17,33
+            3115: -6,43
+            3116: -5,43
+            3117: -4,43
+            3118: -3,43
         - node:
             color: '#F38BAAFF'
             id: BrickTileWhiteLineN
@@ -2413,26 +2413,26 @@ entities:
             id: BrickTileWhiteLineN
           decals:
             576: -31,-27
-            3486: -5,-29
-            3487: -4,-29
-            3488: -3,-29
+            3481: -5,-29
+            3482: -4,-29
+            3483: -3,-29
         - node:
             color: '#00BEBE7F'
             id: BrickTileWhiteLineS
           decals:
-            3156: -33,39
-            3157: -32,39
-            3158: -31,39
-            3159: -30,39
-            3160: -29,39
-            3161: -28,39
-            3189: -37,3
-            3190: -38,3
-            3191: -39,3
-            3192: -40,3
-            3193: -41,3
-            3194: -42,3
-            3195: -43,3
+            3151: -33,39
+            3152: -32,39
+            3153: -31,39
+            3154: -30,39
+            3155: -29,39
+            3156: -28,39
+            3184: -37,3
+            3185: -38,3
+            3186: -39,3
+            3187: -40,3
+            3188: -41,3
+            3189: -42,3
+            3190: -43,3
         - node:
             color: '#169C9CFF'
             id: BrickTileWhiteLineS
@@ -2474,64 +2474,64 @@ entities:
             564: -25,-42
             565: -26,-42
             566: -27,-42
-            2375: 36,-38
-            2376: 35,-38
-            2380: 33,-42
-            2381: 32,-42
-            2382: 31,-42
-            2383: 30,-42
-            2384: 29,-42
-            2385: 28,-42
+            2370: 36,-38
+            2371: 35,-38
+            2375: 33,-42
+            2376: 32,-42
+            2377: 31,-42
+            2378: 30,-42
+            2379: 29,-42
+            2380: 28,-42
         - node:
             color: '#765428FF'
             id: BrickTileWhiteLineS
           decals:
-            3330: -54,-24
-            3331: -55,-24
-            3332: -56,-24
-            3333: -57,-24
+            3325: -54,-24
+            3326: -55,-24
+            3327: -56,-24
+            3328: -57,-24
         - node:
             color: '#80C71F7F'
             id: BrickTileWhiteLineS
           decals:
-            3443: 54,-19
-            3444: 52,-19
-            3445: 51,-19
+            3438: 54,-19
+            3439: 52,-19
+            3440: 51,-19
         - node:
             color: '#8932B87F'
             id: BrickTileWhiteLineS
           decals:
-            3446: 50,-19
-            3447: 48,-19
-            3448: 47,-19
+            3441: 50,-19
+            3442: 48,-19
+            3443: 47,-19
         - node:
             color: '#9FED58B3'
             id: BrickTileWhiteLineS
           decals:
-            2541: -47,-30
-            2543: -47,-31
+            2536: -47,-30
+            2538: -47,-31
         - node:
             color: '#BC863FFF'
             id: BrickTileWhiteLineS
           decals:
-            3219: -56,-15
-            3220: -55,-15
-            3237: -50,-5
+            3214: -56,-15
+            3215: -55,-15
+            3232: -50,-5
         - node:
             color: '#D381C996'
             id: BrickTileWhiteLineS
           decals:
             846: -12,-51
             847: -13,-51
-            2220: 7,-45
-            2221: 8,-45
-            2222: 9,-45
-            2223: 10,-45
-            2224: 11,-45
-            2225: 15,-44
-            2226: 6,-35
-            2227: 7,-35
-            2228: 8,-35
+            2215: 7,-45
+            2216: 8,-45
+            2217: 9,-45
+            2218: 10,-45
+            2219: 11,-45
+            2220: 15,-44
+            2221: 6,-35
+            2222: 7,-35
+            2223: 8,-35
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteLineS
@@ -2544,7 +2544,7 @@ entities:
             1569: 41,-30
             1606: 41,-37
             1718: 41,-41
-            2844: 41,-23
+            2839: 41,-23
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteLineS
@@ -2562,27 +2562,27 @@ entities:
             1878: 26,33
             1879: 27,33
             1882: 34,42
-            2509: 15,45
-            2510: 14,45
-            2511: 13,45
-            2512: 12,45
-            2513: 11,45
-            2530: 33,42
-            2535: 24,42
-            3052: 12,33
-            3053: 13,33
-            3054: 14,33
-            3055: 15,33
-            3056: 16,33
-            3057: 17,33
-            3112: -3,40
-            3113: -4,40
-            3114: -5,40
-            3118: -6,40
-            3126: 9,40
-            3127: 8,40
-            3132: 18,39
-            3138: 16,45
+            2504: 15,45
+            2505: 14,45
+            2506: 13,45
+            2507: 12,45
+            2508: 11,45
+            2525: 33,42
+            2530: 24,42
+            3047: 12,33
+            3048: 13,33
+            3049: 14,33
+            3050: 15,33
+            3051: 16,33
+            3052: 17,33
+            3107: -3,40
+            3108: -4,40
+            3109: -5,40
+            3113: -6,40
+            3121: 9,40
+            3122: 8,40
+            3127: 18,39
+            3133: 16,45
         - node:
             color: '#F38BAAFF'
             id: BrickTileWhiteLineS
@@ -2592,25 +2592,25 @@ entities:
             color: '#F9801D7F'
             id: BrickTileWhiteLineS
           decals:
-            3449: 46,-19
-            3450: 44,-19
-            3451: 43,-19
+            3444: 46,-19
+            3445: 44,-19
+            3446: 43,-19
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteLineS
           decals:
             578: -31,-29
-            3489: -5,-26
-            3490: -4,-26
-            3491: -3,-26
+            3484: -5,-26
+            3485: -4,-26
+            3486: -3,-26
         - node:
             color: '#00BEBE7F'
             id: BrickTileWhiteLineW
           decals:
-            3171: -34,42
-            3172: -34,41
-            3173: -34,40
-            3206: -44,4
+            3166: -34,42
+            3167: -34,41
+            3168: -34,40
+            3201: -44,4
         - node:
             color: '#334E6DC8'
             id: BrickTileWhiteLineW
@@ -2619,7 +2619,7 @@ entities:
             602: 21,7
             605: 20,6
             606: 20,7
-            3217: -44,-10
+            3212: -44,-10
         - node:
             color: '#4B709CFF'
             id: BrickTileWhiteLineW
@@ -2648,39 +2648,39 @@ entities:
             730: -1,-36
             731: -1,-37
             732: -1,-38
-            2359: 27,-41
-            2360: 27,-40
-            2361: 27,-39
-            2362: 27,-38
-            2363: 27,-37
-            2364: 27,-36
+            2354: 27,-41
+            2355: 27,-40
+            2356: 27,-39
+            2357: 27,-38
+            2358: 27,-37
+            2359: 27,-36
         - node:
             color: '#765428FF'
             id: BrickTileWhiteLineW
           decals:
-            3334: -58,-23
-            3335: -58,-22
-            3336: -58,-21
+            3329: -58,-23
+            3330: -58,-22
+            3331: -58,-21
         - node:
             color: '#9FED58B3'
             id: BrickTileWhiteLineW
           decals:
-            2550: -45,-31
-            2551: -45,-30
+            2545: -45,-31
+            2546: -45,-30
         - node:
             color: '#BC863FFF'
             id: BrickTileWhiteLineW
           decals:
-            3224: -51,-4
-            3225: -51,-3
-            3238: -47,-4
-            3239: -47,-3
-            3351: -47,0
-            3352: -47,1
-            3357: -47,-1
-            3360: -51,2
-            3364: -50,-1
-            3365: -50,0
+            3219: -51,-4
+            3220: -51,-3
+            3233: -47,-4
+            3234: -47,-3
+            3346: -47,0
+            3347: -47,1
+            3352: -47,-1
+            3355: -51,2
+            3359: -50,-1
+            3360: -50,0
         - node:
             color: '#D381C996'
             id: BrickTileWhiteLineW
@@ -2688,34 +2688,34 @@ entities:
             840: -14,-50
             841: -14,-49
             842: -14,-48
-            2086: 5,-43
-            2087: 5,-44
-            2088: 5,-46
-            2089: 5,-47
-            2131: 13,-39
-            2211: 6,-44
-            2212: 14,-43
-            2213: 14,-42
-            2214: 14,-41
-            2215: 14,-39
-            2216: 14,-40
-            2217: 14,-38
-            2218: 14,-37
-            2219: 14,-36
-            2235: 9,-38
-            2236: 9,-37
-            2237: 9,-36
-            2243: -5,-47
-            2246: -9,-49
-            2258: -9,-54
-            2303: -9,-45
-            2350: -1,-46
-            2351: -1,-45
-            2352: -1,-44
-            2353: -1,-43
-            2357: -1,-47
-            2966: 16,-41
-            2967: 16,-40
+            2081: 5,-43
+            2082: 5,-44
+            2083: 5,-46
+            2084: 5,-47
+            2126: 13,-39
+            2206: 6,-44
+            2207: 14,-43
+            2208: 14,-42
+            2209: 14,-41
+            2210: 14,-39
+            2211: 14,-40
+            2212: 14,-38
+            2213: 14,-37
+            2214: 14,-36
+            2230: 9,-38
+            2231: 9,-37
+            2232: 9,-36
+            2238: -5,-47
+            2241: -9,-49
+            2253: -9,-54
+            2298: -9,-45
+            2345: -1,-46
+            2346: -1,-45
+            2347: -1,-44
+            2348: -1,-43
+            2352: -1,-47
+            2961: 16,-41
+            2962: 16,-40
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteLineW
@@ -2726,8 +2726,8 @@ entities:
             1614: 40,-32
             1615: 30,-33
             1616: 30,-32
-            2863: 40,-22
-            2864: 40,-21
+            2858: 40,-22
+            2859: 40,-21
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteLineW
@@ -2747,15 +2747,15 @@ entities:
             1828: 21,32
             1829: 21,33
             1881: 28,32
-            3059: 18,32
-            3060: 12,34
-            3115: -7,41
-            3116: -7,42
-            3133: 17,40
-            3134: 17,41
-            3135: 17,42
-            3136: 17,43
-            3137: 17,44
+            3054: 18,32
+            3055: 12,34
+            3110: -7,41
+            3111: -7,42
+            3128: 17,40
+            3129: 17,41
+            3130: 17,42
+            3131: 17,43
+            3132: 17,44
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteLineW
@@ -2766,117 +2766,117 @@ entities:
             color: '#FFFFFFFF'
             id: BushAOne
           decals:
-            2652: -12.173578,-13.16537
+            2647: -12.173578,-13.16537
         - node:
             color: '#FFFFFFFF'
             id: BushAThree
           decals:
-            2609: 7.063609,-17.083809
-            2653: -12.954828,-13.13412
-            2985: -13.009358,7.995878
-            2990: -15.09027,11.031727
+            2604: 7.063609,-17.083809
+            2648: -12.954828,-13.13412
+            2980: -13.009358,7.995878
+            2985: -15.09027,11.031727
         - node:
             color: '#FFFFFFFF'
             id: BushATwo
           decals:
-            2654: -12.996495,-12.238287
-            2655: -6.0969057,-13.717453
+            2649: -12.996495,-12.238287
+            2650: -6.0969057,-13.717453
         - node:
             color: '#FFFFFFFF'
             id: BushCOne
           decals:
-            2978: -11.007082,13.412277
+            2973: -11.007082,13.412277
         - node:
             color: '#FFFFFFFF'
             id: BushCThree
           decals:
-            2603: 17.014423,-8.300894
-            2639: -4.785802,3.4705331
+            2598: 17.014423,-8.300894
+            2634: -4.785802,3.4705331
         - node:
             color: '#FFFFFFFF'
             id: BushCTwo
           decals:
-            2658: -5.148989,-12.144537
+            2653: -5.148989,-12.144537
         - node:
             color: '#FFFFFFFF'
             id: BushDTwo
           decals:
-            2595: 17.163681,15.561111
-            2596: 3.516313,17.119299
+            2590: 17.163681,15.561111
+            2591: 3.516313,17.119299
         - node:
             color: '#FFFFFFFF'
             id: Busha1
           decals:
-            2597: 4.90173,16.900549
-            2982: -13.092692,9.881294
+            2592: 4.90173,16.900549
+            2977: -13.092692,9.881294
         - node:
             color: '#FFFFFFFF'
             id: Busha2
           decals:
-            2987: -13.96527,9.885894
-            2989: -14.642353,10.979644
+            2982: -13.96527,9.885894
+            2984: -14.642353,10.979644
         - node:
             color: '#FFFFFFFF'
             id: Bushb1
           decals:
-            2979: -10.975832,14.18311
-            2983: -13.092692,9.006294
+            2974: -10.975832,14.18311
+            2978: -13.092692,9.006294
         - node:
             color: '#FFFFFFFF'
             id: Bushb2
           decals:
-            2651: -12.183994,-14.061203
-            2980: -10.996666,15.02686
+            2646: -12.183994,-14.061203
+            2975: -10.996666,15.02686
         - node:
             color: '#FFFFFFFF'
             id: Bushb3
           decals:
-            2984: -13.009358,8.402128
-            2988: -14.017353,10.354644
+            2979: -13.009358,8.402128
+            2983: -14.017353,10.354644
         - node:
             color: '#FFFFFFFF'
             id: Bushc1
           decals:
-            2656: -5.1698227,-12.957037
-            2986: -14.02777,11.062977
+            2651: -5.1698227,-12.957037
+            2981: -14.02777,11.062977
         - node:
             color: '#FFFFFFFF'
             id: Bushc3
           decals:
-            2594: 17.194931,12.9986105
-            2657: -8.055239,-11.332037
-            2981: -11.044625,12.930744
+            2589: 17.194931,12.9986105
+            2652: -8.055239,-11.332037
+            2976: -11.044625,12.930744
         - node:
             color: '#FFFFFFFF'
             id: Bushe1
           decals:
-            2585: 6.2998166,3.7755318
-            2600: 17.076923,-7.467561
-            2601: 16.566507,-7.988394
-            2607: 7.2406926,-16.500475
-            2622: 3.5204434,-9.447139
-            2623: 3.2912767,-9.686723
-            2659: -8.044823,-11.092453
+            2580: 6.2998166,3.7755318
+            2595: 17.076923,-7.467561
+            2596: 16.566507,-7.988394
+            2602: 7.2406926,-16.500475
+            2617: 3.5204434,-9.447139
+            2618: 3.2912767,-9.686723
+            2654: -8.044823,-11.092453
         - node:
             color: '#FFFFFFFF'
             id: Bushe2
           decals:
-            2586: 6.6984973,3.4174294
-            2602: 17.014423,-8.030061
-            2616: 7.441076,6.766222
-            2976: -17.569584,14.99561
-            2999: -4.0134697,4.9046235
-            3481: 63.771957,-1.9947927
-            3485: 64.23029,-2.0052094
+            2581: 6.6984973,3.4174294
+            2597: 17.014423,-8.030061
+            2611: 7.441076,6.766222
+            2971: -17.569584,14.99561
+            2994: -4.0134697,4.9046235
+            3476: 63.771957,-1.9947927
+            3480: 64.23029,-2.0052094
         - node:
             color: '#FFFFFFFF'
             id: Bushe3
           decals:
-            2608: 6.6990256,-16.510893
-            3380: 58.245747,-2.973395
-            3381: 57.818665,-3.0463119
-            3382: 58.308247,-2.1817284
-            3480: 64.15737,-0.19270933
+            2603: 6.6990256,-16.510893
+            3375: 58.245747,-2.973395
+            3376: 57.818665,-3.0463119
+            3377: 58.308247,-2.1817284
+            3475: 64.15737,-0.19270933
         - node:
             color: '#FFFFFFFF'
             id: Bushe4
@@ -2886,265 +2886,271 @@ entities:
             1306: 57.885906,-2.0552526
             1307: 58.15674,-1.5865024
             1308: 57.90674,0.18433094
-            2633: 6.6556993,14.650438
-            2640: -4.7441354,3.6892834
-            2665: -12.329075,-5.2076516
-            2666: -11.683241,-5.540985
-            3000: -4.2530527,4.29004
-            3479: 63.792793,0.09895742
+            2628: 6.6556993,14.650438
+            2635: -4.7441354,3.6892834
+            2660: -12.329075,-5.2076516
+            2661: -11.683241,-5.540985
+            2995: -4.2530527,4.29004
+            3474: 63.792793,0.09895742
         - node:
             color: '#FFFFFFFF'
             id: Bushf1
           decals:
             1311: 58.167156,-0.24275243
-            3013: -4.922404,-3.8768375
+            3008: -4.922404,-3.8768375
         - node:
             color: '#FFFFFFFF'
             id: Bushf2
           decals:
             1312: 57.833824,-0.37816906
-            3015: -4.4328203,-4.7726707
-            3016: -4.3255215,-5.3247385
+            3010: -4.4328203,-4.7726707
+            3011: -4.3255215,-5.3247385
         - node:
             color: '#FFFFFFFF'
             id: Bushf3
           decals:
-            2975: -17.132084,16.266443
-            3014: -4.3703203,-4.199754
-            3379: 57.943665,-2.723395
+            2970: -17.132084,16.266443
+            3009: -4.3703203,-4.199754
+            3374: 57.943665,-2.723395
         - node:
             color: '#FFFFFFFF'
             id: Bushg1
           decals:
-            2604: 17.14984,-5.092561
-            2610: 8.53236,-17.187975
-            2644: 3.404969,-4.7533755
-            2991: -9.359586,2.9312673
+            2599: 17.14984,-5.092561
+            2605: 8.53236,-17.187975
+            2639: 3.404969,-4.7533755
+            2986: -9.359586,2.9312673
         - node:
             color: '#FFFFFFFF'
             id: Bushg2
           decals:
-            2645: 4.175802,-4.0346255
-            2977: -16.8925,15.828943
+            2640: 4.175802,-4.0346255
+            2972: -16.8925,15.828943
         - node:
             color: '#FFFFFFFF'
             id: Bushg3
           decals:
-            2564: -2.1416075,5.8916445
-            2565: -2.162441,14.072103
-            2566: 17.866562,15.155413
-            2567: 18.231146,11.999163
-            2568: 3.059716,-17.07088
-            2569: -4.1298733,-14.029394
-            2570: -2.3702574,-5.9809127
-            2571: -8.961391,-10.053829
-            2572: -17.146135,-6.1901164
+            2559: -2.1416075,5.8916445
+            2560: -2.162441,14.072103
+            2561: 17.866562,15.155413
+            2562: 18.231146,11.999163
+            2563: 3.059716,-17.07088
+            2564: -4.1298733,-14.029394
+            2565: -2.3702574,-5.9809127
+            2566: -8.961391,-10.053829
+            2567: -17.146135,-6.1901164
         - node:
             color: '#FFFFFFFF'
             id: Bushg4
           decals:
-            2605: 17.160257,-5.6342273
-            2634: 7.2077823,13.712938
+            2600: 17.160257,-5.6342273
+            2629: 7.2077823,13.712938
         - node:
             color: '#FFFFFFFF'
             id: Bushh1
           decals:
-            2582: 5.9211392,3.1419072
-            2587: 8.507914,15.796663
-            2588: 9.528748,15.46333
-            2998: -3.4732609,5.2424126
+            2577: 5.9211392,3.1419072
+            2582: 8.507914,15.796663
+            2583: 9.528748,15.46333
+            2993: -3.4732609,5.2424126
         - node:
             color: '#FFFFFFFF'
             id: Bushh2
           decals:
-            2583: 5.087806,3.9127407
-            2589: 8.528747,14.473747
-            2667: -13.162408,-5.0826516
-            2668: -14.037408,-5.988902
+            2578: 5.087806,3.9127407
+            2584: 8.528747,14.473747
+            2662: -13.162408,-5.0826516
+            2663: -14.037408,-5.988902
         - node:
             color: '#FFFFFFFF'
             id: Bushh3
           decals:
-            2584: 7.181556,4.0273237
-            2593: 17.465765,12.071527
-            2669: -13.756159,-5.822237
-            2670: -13.901991,-8.228487
-            2995: -9.230458,4.9216795
+            2579: 7.181556,4.0273237
+            2588: 17.465765,12.071527
+            2664: -13.756159,-5.822237
+            2665: -13.901991,-8.228487
+            2990: -9.230458,4.9216795
         - node:
             color: '#FFFFFFFF'
             id: Bushi1
           decals:
-            2573: -17.677385,-15.149096
-            2574: -6.0205603,-17.117607
-            2575: -9.970078,-14.052947
-            2576: -9.887934,2.4137444
-            2577: -18.05108,15.0529785
-            2606: 6.2927756,-17.073393
-            2617: 15.850491,-4.61609
-            2619: 9.772904,-4.483665
-            2631: 13.70388,8.66825
-            2632: 7.1036158,14.358771
-            2635: -5.465275,9.849015
-            2636: -6.746525,10.213598
-            2649: 3.4466357,-5.461709
-            2684: -20.130556,-17.838984
-            2685: -16.849306,-19.984818
-            2686: -17.307638,-19.6619
-            2687: -19.265972,-20.13065
-            3003: -14.051299,-2.1793242
-            3006: -17.143507,-2.1316965
-            3007: -14.734559,-9.289597
-            3009: -14.390809,-9.633347
-            3010: -10.377625,-9.233512
-            3018: -3.5338547,-5.210155
-            3019: -4.8467765,-14.670914
-            3375: -2.6337829,9.646117
+            2568: -17.677385,-15.149096
+            2569: -6.0205603,-17.117607
+            2570: -9.970078,-14.052947
+            2571: -9.887934,2.4137444
+            2572: -18.05108,15.0529785
+            2601: 6.2927756,-17.073393
+            2612: 15.850491,-4.61609
+            2614: 9.772904,-4.483665
+            2626: 13.70388,8.66825
+            2627: 7.1036158,14.358771
+            2630: -5.465275,9.849015
+            2631: -6.746525,10.213598
+            2644: 3.4466357,-5.461709
+            2679: -20.130556,-17.838984
+            2680: -16.849306,-19.984818
+            2681: -17.307638,-19.6619
+            2682: -19.265972,-20.13065
+            2998: -14.051299,-2.1793242
+            3001: -17.143507,-2.1316965
+            3002: -14.734559,-9.289597
+            3004: -14.390809,-9.633347
+            3005: -10.377625,-9.233512
+            3013: -3.5338547,-5.210155
+            3014: -4.8467765,-14.670914
+            3370: -2.6337829,9.646117
         - node:
             color: '#FFFFFFFF'
             id: Bushi2
           decals:
-            2578: -17.025719,17.03245
-            2579: 18.117056,13.867498
-            2624: 3.580893,-8.535644
-            2625: 8.918044,-3.98356
-            2626: 15.266736,-5.8692675
-            2627: 16.209822,-5.8538113
-            2628: 7.318463,5.66825
-            2629: 6.4642963,5.85575
-            2630: 14.620547,8.230751
-            2641: 6.318049,2.225238
-            2660: -8.044823,-13.97787
-            2661: -8.878156,-13.144537
-            2662: -5.867739,-11.154953
-            2663: -13.026991,-9.009735
-            2664: -11.860325,-5.124318
-            2688: -16.859722,-18.94315
-            2992: -8.75542,2.9208503
-            2997: -13.95071,2.256745
-            3004: -14.165881,-2.439741
-            3008: -14.713725,-9.602097
-            3011: -9.76849,-14.395954
-            3020: -4.450943,-14.608414
-            3376: -2.8004496,9.333617
+            2573: -17.025719,17.03245
+            2574: 18.117056,13.867498
+            2619: 3.580893,-8.535644
+            2620: 8.918044,-3.98356
+            2621: 15.266736,-5.8692675
+            2622: 16.209822,-5.8538113
+            2623: 7.318463,5.66825
+            2624: 6.4642963,5.85575
+            2625: 14.620547,8.230751
+            2636: 6.318049,2.225238
+            2655: -8.044823,-13.97787
+            2656: -8.878156,-13.144537
+            2657: -5.867739,-11.154953
+            2658: -13.026991,-9.009735
+            2659: -11.860325,-5.124318
+            2683: -16.859722,-18.94315
+            2987: -8.75542,2.9208503
+            2992: -13.95071,2.256745
+            2999: -14.165881,-2.439741
+            3003: -14.713725,-9.602097
+            3006: -9.76849,-14.395954
+            3015: -4.450943,-14.608414
+            3371: -2.8004496,9.333617
         - node:
             color: '#FFFFFFFF'
             id: Bushi3
           decals:
-            2580: 17.117056,10.211248
-            2581: 9.26489,2.9960737
-            2611: 14.499886,6.958212
-            2612: 13.541552,7.447795
-            2613: 6.0254874,14.498462
-            2618: 16.579659,-3.9598398
-            2642: 7.224299,2.3710713
-            2643: 4.0082765,6.5204124
-            2650: 5.713353,-3.1926599
-            2974: -14.413333,18.172693
-            2994: -9.557503,5.8271008
-            2996: -14.0402975,2.506745
-            3377: -2.8212829,8.989867
+            2575: 17.117056,10.211248
+            2576: 9.26489,2.9960737
+            2606: 14.499886,6.958212
+            2607: 13.541552,7.447795
+            2608: 6.0254874,14.498462
+            2613: 16.579659,-3.9598398
+            2637: 7.224299,2.3710713
+            2638: 4.0082765,6.5204124
+            2645: 5.713353,-3.1926599
+            2969: -14.413333,18.172693
+            2989: -9.557503,5.8271008
+            2991: -14.0402975,2.506745
+            3372: -2.8212829,8.989867
         - node:
             color: '#FFFFFFFF'
             id: Bushi4
           decals:
-            2552: -15.13607,-18.199955
-            2553: -18.14605,-11.80234
-            2554: -13.963279,-4.177868
-            2555: -5.8667884,-5.4799514
-            2556: 8.061129,-4.427868
-            2557: 15.901968,-2.2820346
-            2558: 17.151968,2.9988291
-            2559: 9.610178,17.11985
-            2560: 4.0546904,17.078184
-            2561: 3.480264,5.210905
-            2562: -15.017622,18.057854
-            2563: -5.5270247,2.9853945
-            2598: 5.777904,17.049623
-            2599: 9.139725,14.0701685
-            2614: 6.567154,13.456795
-            2615: 6.441076,6.7870555
-            2620: 9.397904,-5.046165
-            2621: 4.3850265,-9.488806
-            2637: -6.2881913,9.494848
-            2638: -5.402775,10.869849
-            2646: 3.8528857,-4.5242085
-            2671: -11.037408,-8.100949
-            3001: -3.7009702,4.4983735
-            3002: -5.697132,-3.1168242
-            3012: -9.425084,-14.560988
-            3017: -3.5442712,-4.7830715
+            2547: -15.13607,-18.199955
+            2548: -18.14605,-11.80234
+            2549: -13.963279,-4.177868
+            2550: -5.8667884,-5.4799514
+            2551: 8.061129,-4.427868
+            2552: 15.901968,-2.2820346
+            2553: 17.151968,2.9988291
+            2554: 9.610178,17.11985
+            2555: 4.0546904,17.078184
+            2556: 3.480264,5.210905
+            2557: -15.017622,18.057854
+            2558: -5.5270247,2.9853945
+            2593: 5.777904,17.049623
+            2594: 9.139725,14.0701685
+            2609: 6.567154,13.456795
+            2610: 6.441076,6.7870555
+            2615: 9.397904,-5.046165
+            2616: 4.3850265,-9.488806
+            2632: -6.2881913,9.494848
+            2633: -5.402775,10.869849
+            2641: 3.8528857,-4.5242085
+            2666: -11.037408,-8.100949
+            2996: -3.7009702,4.4983735
+            2997: -5.697132,-3.1168242
+            3007: -9.425084,-14.560988
+            3012: -3.5442712,-4.7830715
         - node:
             color: '#FFFFFFFF'
             id: Bushj1
           decals:
-            2590: 8.789164,15.109163
-            2676: -19.824345,-10.10782
-            2677: -20.11601,-9.63907
-            2679: -20.011845,-8.243237
-            2680: -18.730595,-8.79532
-            2681: -18.873224,-10.013859
-            2682: -19.654474,-7.0659423
-            3393: -18.860361,-7.807997
+            2585: 8.789164,15.109163
+            2671: -19.824345,-10.10782
+            2672: -20.11601,-9.63907
+            2674: -20.011845,-8.243237
+            2675: -18.730595,-8.79532
+            2676: -18.873224,-10.013859
+            2677: -19.654474,-7.0659423
+            3388: -18.860361,-7.807997
         - node:
             color: '#FFFFFFFF'
             id: Bushj2
           decals:
-            2678: -18.793095,-6.868236
-            2683: -19.94614,-7.7117753
-            3391: -20.016611,-7.2975807
-            3392: -18.902029,-9.370498
-            3394: -19.318695,-8.485081
+            2673: -18.793095,-6.868236
+            2678: -19.94614,-7.7117753
+            3386: -20.016611,-7.2975807
+            3387: -18.902029,-9.370498
+            3389: -19.318695,-8.485081
         - node:
             color: '#FFFFFFFF'
             id: Bushj3
           decals:
-            3378: -4.6337833,10.114867
+            3373: -4.6337833,10.114867
         - node:
             color: '#FFFFFFFF'
             id: Bushk1
           decals:
-            2648: 3.0091357,-5.795042
-            2993: -10.00542,5.191684
+            2643: 3.0091357,-5.795042
+            2988: -10.00542,5.191684
         - node:
             color: '#FFFFFFFF'
             id: Bushk3
           decals:
-            2591: 15.903748,17.02583
-            2592: 18.067644,12.942497
-            2647: 4.8112187,-3.7846253
+            2586: 15.903748,17.02583
+            2587: 18.067644,12.942497
+            2642: 4.8112187,-3.7846253
         - node:
             color: '#FFFFFFFF'
             id: Bushm1
           decals:
-            3482: 63.81363,-0.83854264
+            3477: 63.81363,-0.83854264
         - node:
             color: '#FFFFFFFF'
             id: Bushm3
           decals:
-            3483: 64.29279,-0.73437595
+            3478: 64.29279,-0.73437595
         - node:
             color: '#FFFFFFFF'
             id: Bushm4
           decals:
-            2672: -10.9586735,-6.0094166
-            2673: -11.224603,-5.736016
-            2674: -13.307937,-8.381849
-            2675: -14.067469,-7.593817
-            3484: 64.12612,-1.2864593
+            2667: -10.9586735,-6.0094166
+            2668: -11.224603,-5.736016
+            2669: -13.307937,-8.381849
+            2670: -14.067469,-7.593817
+            3479: 64.12612,-1.2864593
         - node:
             color: '#FFFFFFFF'
             id: Bushn1
           decals:
             1309: 58.021324,0.5489143
             1310: 57.96924,-1.1594192
-            3383: 57.99387,-2.411529
+            3378: 57.99387,-2.411529
+        - node:
+            angle: 1.5707963267948966 rad
+            color: '#FFFFFFFF'
+            id: Caution
+          decals:
+            3546: 56.20735,16.017925
         - node:
             color: '#52B4E996'
             id: CheckerNWSE
           decals:
-            2956: -19,-27
-            2957: -16,-27
-            2958: -22,-27
+            2951: -19,-27
+            2952: -16,-27
+            2953: -22,-27
         - node:
             color: '#FFFFFFFF'
             id: ConcreteTrimCornerNe
@@ -3175,33 +3181,33 @@ entities:
           decals:
             30: -2,-2
             31: -2,-2
-            3418: 2,4
-            3419: 3,3
-            3420: 4,2
+            3413: 2,4
+            3414: 3,3
+            3415: 4,2
         - node:
             color: '#FFFFFFFF'
             id: ConcreteTrimInnerNw
           decals:
             33: 2,-2
-            3415: -4,2
-            3416: -3,3
-            3417: -2,4
+            3410: -4,2
+            3411: -3,3
+            3412: -2,4
         - node:
             color: '#FFFFFFFF'
             id: ConcreteTrimInnerSe
           decals:
             29: -2,2
-            3412: 2,-4
-            3413: 3,-3
-            3414: 4,-2
+            3407: 2,-4
+            3408: 3,-3
+            3409: 4,-2
         - node:
             color: '#FFFFFFFF'
             id: ConcreteTrimInnerSw
           decals:
             32: 2,2
-            3409: -2,-4
-            3410: -3,-3
-            3411: -4,-2
+            3404: -2,-4
+            3405: -3,-3
+            3406: -4,-2
         - node:
             color: '#FFFFFFFF'
             id: ConcreteTrimLineE
@@ -3265,7 +3271,7 @@ entities:
             95: -13,-2
             96: -16,-2
             97: -17,-2
-            3005: -14,-2
+            3000: -14,-2
         - node:
             color: '#FFFFFFFF'
             id: ConcreteTrimLineS
@@ -3296,8 +3302,8 @@ entities:
             105: -8,2
             106: -7,2
             107: -6,2
-            3401: 11,2
-            3402: 14,2
+            3396: 11,2
+            3397: 14,2
         - node:
             color: '#FFFFFFFF'
             id: ConcreteTrimLineW
@@ -3327,8 +3333,8 @@ entities:
             76: 2,-14
             77: 2,-16
             78: 2,-17
-            3407: 2,10
-            3408: 2,13
+            3402: 2,10
+            3403: 2,13
         - node:
             color: '#FFFFFFFF'
             id: Delivery
@@ -3341,52 +3347,52 @@ entities:
             color: '#3EB38896'
             id: DiagonalCheckerAOverlay
           decals:
-            3528: 12,23
-            3529: 13,22
-            3530: 13,23
-            3531: 14,23
-            3532: 15,23
-            3533: 15,22
-            3534: 14,22
-            3535: 14,21
-            3536: 13,21
-            3537: 12,20
-            3538: 13,20
-            3539: 14,20
-            3540: 15,20
-            3541: 15,21
-            3543: 12,21
-            3544: 12,22
+            3523: 12,23
+            3524: 13,22
+            3525: 13,23
+            3526: 14,23
+            3527: 15,23
+            3528: 15,22
+            3529: 14,22
+            3530: 14,21
+            3531: 13,21
+            3532: 12,20
+            3533: 13,20
+            3534: 14,20
+            3535: 15,20
+            3536: 15,21
+            3538: 12,21
+            3539: 12,22
         - node:
             color: '#639137FF'
             id: DiagonalCheckerBOverlay
           decals:
-            3515: 12,20
-            3516: 13,20
-            3517: 13,21
-            3518: 13,22
-            3519: 13,23
-            3520: 14,23
-            3521: 14,22
-            3522: 14,21
-            3523: 14,20
-            3524: 15,20
-            3525: 15,21
-            3526: 15,22
-            3527: 15,23
-            3542: 12,23
-            3545: 12,21
-            3546: 12,22
+            3510: 12,20
+            3511: 13,20
+            3512: 13,21
+            3513: 13,22
+            3514: 13,23
+            3515: 14,23
+            3516: 14,22
+            3517: 14,21
+            3518: 14,20
+            3519: 15,20
+            3520: 15,21
+            3521: 15,22
+            3522: 15,23
+            3537: 12,23
+            3540: 12,21
+            3541: 12,22
         - node:
             color: '#D381C996'
             id: DiagonalOverlay
           decals:
-            2245: -10,-49
-            2321: -10,-45
-            3386: 4,-47
-            3387: 4,-46
-            3388: -2,-47
-            3389: -6,-47
+            2240: -10,-49
+            2316: -10,-45
+            3381: 4,-47
+            3382: 4,-46
+            3383: -2,-47
+            3384: -6,-47
         - node:
             color: '#DE3A3A96'
             id: DiagonalOverlay
@@ -3403,7 +3409,7 @@ entities:
             1565: 44,-37
             1566: 41,-38
             1567: 38,-41
-            2856: 41,-24
+            2851: 41,-24
         - node:
             color: '#EFB34196'
             id: DiagonalOverlay
@@ -3416,156 +3422,156 @@ entities:
             color: '#FFFFFFFF'
             id: FlowersBROne
           decals:
-            2754: 16.070688,16.03927
-            2785: 9.361443,4.4135666
-            2786: 8.71561,5.3614836
+            2749: 16.070688,16.03927
+            2780: 9.361443,4.4135666
+            2781: 8.71561,5.3614836
         - node:
             color: '#FFFFFFFF'
             id: FlowersBRThree
           decals:
-            2755: 17.062426,11.239492
-            2756: 10.321154,17.060677
-            2789: 7.6635256,6.1948166
-            2790: 8.538526,6.2989836
-            2825: 9.51524,6.327868
+            2750: 17.062426,11.239492
+            2751: 10.321154,17.060677
+            2784: 7.6635256,6.1948166
+            2785: 8.538526,6.2989836
+            2820: 9.51524,6.327868
         - node:
             color: '#FFFFFFFF'
             id: FlowersBRTwo
           decals:
-            2782: 10.111443,4.4344
-            2783: 8.663526,4.5594
-            2784: 8.05936,5.5073166
-            2826: 9.79649,6.7862015
+            2777: 10.111443,4.4344
+            2778: 8.663526,4.5594
+            2779: 8.05936,5.5073166
+            2821: 9.79649,6.7862015
         - node:
             color: '#FFFFFFFF'
             id: Flowersbr1
           decals:
-            2751: 3.1090877,15.838451
-            2752: 15.10194,16.174686
+            2746: 3.1090877,15.838451
+            2747: 15.10194,16.174686
         - node:
             color: '#FFFFFFFF'
             id: Flowersbr2
           decals:
-            2753: 15.393607,16.737186
-            2787: 9.49686,5.1010666
-            2788: 9.080193,5.7260666
-            2791: 10.324566,5.2335067
-            2813: 16.988474,10.508276
-            2814: 16.363474,10.747859
-            2815: 11.000941,16.992361
-            2816: 11.6309395,17.170504
-            2832: 7.8013525,4.69695
-            2833: 9.145103,3.603201
-            2834: 9.15132,6.0905905
+            2748: 15.393607,16.737186
+            2782: 9.49686,5.1010666
+            2783: 9.080193,5.7260666
+            2786: 10.324566,5.2335067
+            2808: 16.988474,10.508276
+            2809: 16.363474,10.747859
+            2810: 11.000941,16.992361
+            2811: 11.6309395,17.170504
+            2827: 7.8013525,4.69695
+            2828: 9.145103,3.603201
+            2829: 9.15132,6.0905905
         - node:
             color: '#FFFFFFFF'
             id: Flowersbr3
           decals:
-            2824: 8.806907,6.8799515
+            2819: 8.806907,6.8799515
         - node:
             color: '#FFFFFFFF'
             id: Flowerspv1
           decals:
-            2792: 15.255633,6.9409747
-            2793: 14.661882,7.545141
+            2787: 15.255633,6.9409747
+            2788: 14.661882,7.545141
         - node:
             color: '#FFFFFFFF'
             id: Flowerspv2
           decals:
-            2794: 15.463966,7.690975
-            2796: 14.5844555,8.774308
-            2800: 14.978545,6.1768036
-            2801: 15.728544,6.3643036
-            2827: 14.814111,5.0989227
-            2828: 15.56411,4.4947557
-            2831: 12.9190645,9.799427
+            2789: 15.463966,7.690975
+            2791: 14.5844555,8.774308
+            2795: 14.978545,6.1768036
+            2796: 15.728544,6.3643036
+            2822: 14.814111,5.0989227
+            2823: 15.56411,4.4947557
+            2826: 12.9190645,9.799427
         - node:
             color: '#FFFFFFFF'
             id: Flowerspv3
           decals:
-            2745: 8.013186,3.1140726
-            2746: 10.378889,-5.012858
-            2747: 10.274722,-4.383773
-            2795: 15.219872,8.347224
-            2797: 13.9177885,8.774308
-            2798: 13.252036,8.115639
-            2799: 13.134795,8.926804
-            2802: 16.103544,7.1143036
-            2803: 16.42646,6.1143036
-            2804: 15.748611,5.544657
-            2829: 14.501611,4.234339
-            2830: 13.6690645,9.570259
+            2740: 8.013186,3.1140726
+            2741: 10.378889,-5.012858
+            2742: 10.274722,-4.383773
+            2790: 15.219872,8.347224
+            2792: 13.9177885,8.774308
+            2793: 13.252036,8.115639
+            2794: 13.134795,8.926804
+            2797: 16.103544,7.1143036
+            2798: 16.42646,6.1143036
+            2799: 15.748611,5.544657
+            2824: 14.501611,4.234339
+            2825: 13.6690645,9.570259
         - node:
             color: '#FFFFFFFF'
             id: Flowersy1
           decals:
-            2743: 7.160172,13.449887
-            2744: 5.483089,13.918637
-            2757: 12.341987,18.164845
-            2764: 4.084557,12.876521
-            2765: 6.313724,11.689021
-            2766: 9.0012245,11.564021
-            2772: 8.3553915,12.168188
-            2773: 6.730391,12.855688
-            2774: 5.105391,14.376521
-            2775: 2.9283073,14.741104
-            2777: 4.719974,13.105688
-            2778: 4.355391,14.585857
-            2779: 3.473161,14.394393
-            2780: 4.3585773,13.821476
-            2806: 2.299132,6.662748
-            2811: 4.7337813,6.6002483
-            2812: 4.5150313,6.0064983
+            2738: 7.160172,13.449887
+            2739: 5.483089,13.918637
+            2752: 12.341987,18.164845
+            2759: 4.084557,12.876521
+            2760: 6.313724,11.689021
+            2761: 9.0012245,11.564021
+            2767: 8.3553915,12.168188
+            2768: 6.730391,12.855688
+            2769: 5.105391,14.376521
+            2770: 2.9283073,14.741104
+            2772: 4.719974,13.105688
+            2773: 4.355391,14.585857
+            2774: 3.473161,14.394393
+            2775: 4.3585773,13.821476
+            2801: 2.299132,6.662748
+            2806: 4.7337813,6.6002483
+            2807: 4.5150313,6.0064983
         - node:
             color: '#FFFFFFFF'
             id: Flowersy2
           decals:
-            2758: 14.633654,18.154427
-            2767: 7.6991415,11.939021
-            2768: 7.0533075,11.282771
-            2769: 8.1783085,11.241104
-            2807: 3.0178826,5.8710814
+            2753: 14.633654,18.154427
+            2762: 7.6991415,11.939021
+            2763: 7.0533075,11.282771
+            2764: 8.1783085,11.241104
+            2802: 3.0178826,5.8710814
         - node:
             color: '#FFFFFFFF'
             id: Flowersy3
           decals:
-            2759: 13.227404,18.091927
-            2761: 11.914904,18.11276
-            2762: 11.914904,18.11276
-            2770: 6.938724,12.168188
-            2771: 7.6158075,12.918188
-            2781: 3.4939945,13.592309
-            2808: 3.1637156,6.5481644
-            2809: 3.7887158,5.704415
-            2810: 3.9108648,7.0273314
+            2754: 13.227404,18.091927
+            2756: 11.914904,18.11276
+            2757: 11.914904,18.11276
+            2765: 6.938724,12.168188
+            2766: 7.6158075,12.918188
+            2776: 3.4939945,13.592309
+            2803: 3.1637156,6.5481644
+            2804: 3.7887158,5.704415
+            2805: 3.9108648,7.0273314
         - node:
             color: '#FFFFFFFF'
             id: Flowersy4
           decals:
-            2748: 3.8501334,-9.470912
-            2749: 4.3709664,-9.908412
-            2750: 3.6209664,-9.960495
-            2760: 13.966987,18.133595
-            2763: 15.123237,18.071095
-            2776: 5.136641,13.511938
-            2805: 2.2574656,5.8294144
-            2817: 9.849766,11.338729
-            2818: 9.047683,10.619978
-            2819: 4.7809443,7.692894
-            2820: 5.676778,7.797061
-            2821: 5.4059443,8.505394
-            2822: 5.8902392,6.890369
-            2823: 6.223573,8.400785
+            2743: 3.8501334,-9.470912
+            2744: 4.3709664,-9.908412
+            2745: 3.6209664,-9.960495
+            2755: 13.966987,18.133595
+            2758: 15.123237,18.071095
+            2771: 5.136641,13.511938
+            2800: 2.2574656,5.8294144
+            2812: 9.849766,11.338729
+            2813: 9.047683,10.619978
+            2814: 4.7809443,7.692894
+            2815: 5.676778,7.797061
+            2816: 5.4059443,8.505394
+            2817: 5.8902392,6.890369
+            2818: 6.223573,8.400785
         - node:
             color: '#00BEBE7F'
             id: FullTileOverlayGreyscale
           decals:
-            3178: -26,40
-            3179: -26,42
-            3180: -43,2
-            3181: -42,2
-            3182: -37,2
-            3183: -36,2
+            3173: -26,40
+            3174: -26,42
+            3175: -43,2
+            3176: -42,2
+            3177: -37,2
+            3178: -36,2
         - node:
             color: '#334E6DC8'
             id: FullTileOverlayGreyscale
@@ -3575,62 +3581,62 @@ entities:
             708: 25,3
             808: -33,-9
             809: -29,-9
-            2865: -23,-36
+            2860: -23,-36
         - node:
             color: '#373737FF'
             id: FullTileOverlayGreyscale
           decals:
-            3421: 21,-19
-            3422: 20,-19
-            3423: 19,-19
-            3424: 19,-18
-            3425: 18,-19
-            3426: 18,-20
-            3427: 19,-20
-            3428: 19,-21
-            3429: 18,-21
-            3430: 21,-18
-            3431: 20,-18
-            3439: 17,-18
-            3440: 18,-17
-            3441: 21,-22
-            3442: 22,-21
+            3416: 21,-19
+            3417: 20,-19
+            3418: 19,-19
+            3419: 19,-18
+            3420: 18,-19
+            3421: 18,-20
+            3422: 19,-20
+            3423: 19,-21
+            3424: 18,-21
+            3425: 21,-18
+            3426: 20,-18
+            3434: 17,-18
+            3435: 18,-17
+            3436: 21,-22
+            3437: 22,-21
         - node:
             color: '#4A35194C'
             id: FullTileOverlayGreyscale
           decals:
-            2694: -22,3
-            2695: -21,3
-            2696: -20,3
-            2697: -19,3
-            2698: -19,4
-            2699: -19,5
-            2700: -19,6
-            2701: -19,7
-            2702: -19,8
-            2703: -19,9
-            2704: -19,10
-            2705: -20,10
-            2706: -20,9
-            2707: -20,8
-            2708: -20,7
-            2709: -20,6
-            2710: -20,5
-            2711: -20,4
-            2712: -21,4
-            2713: -22,4
-            2714: -22,5
-            2715: -21,5
-            2716: -21,6
-            2717: -22,6
-            2718: -22,7
-            2719: -21,7
-            2720: -21,8
-            2721: -22,8
-            2722: -22,9
-            2723: -21,9
-            2724: -21,10
-            2725: -22,10
+            2689: -22,3
+            2690: -21,3
+            2691: -20,3
+            2692: -19,3
+            2693: -19,4
+            2694: -19,5
+            2695: -19,6
+            2696: -19,7
+            2697: -19,8
+            2698: -19,9
+            2699: -19,10
+            2700: -20,10
+            2701: -20,9
+            2702: -20,8
+            2703: -20,7
+            2704: -20,6
+            2705: -20,5
+            2706: -20,4
+            2707: -21,4
+            2708: -22,4
+            2709: -22,5
+            2710: -21,5
+            2711: -21,6
+            2712: -22,6
+            2713: -22,7
+            2714: -21,7
+            2715: -21,8
+            2716: -22,8
+            2717: -22,9
+            2718: -21,9
+            2719: -21,10
+            2720: -22,10
         - node:
             color: '#52B4E996'
             id: FullTileOverlayGreyscale
@@ -3656,19 +3662,19 @@ entities:
             color: '#765428FF'
             id: FullTileOverlayGreyscale
           decals:
-            3322: -55,-16
-            3323: -56,-16
+            3317: -55,-16
+            3318: -56,-16
         - node:
             color: '#951710FF'
             id: FullTileOverlayGreyscale
           decals:
-            2403: 43,37
-            2404: 43,38
-            2405: 43,39
-            2406: 43,40
-            2407: 43,41
-            2408: 43,36
-            2409: 43,42
+            2398: 43,37
+            2399: 43,38
+            2400: 43,39
+            2401: 43,40
+            2402: 43,41
+            2403: 43,36
+            2404: 43,42
         - node:
             color: '#9FED5896'
             id: FullTileOverlayGreyscale
@@ -3693,23 +3699,23 @@ entities:
             color: '#BC863FFF'
             id: FullTileOverlayGreyscale
           decals:
-            3240: -48,-3
-            3241: -48,-4
-            3242: -52,-1
-            3243: -52,0
-            3354: -48,0
-            3355: -48,1
-            3356: -48,-1
-            3368: -51,-1
-            3369: -51,0
+            3235: -48,-3
+            3236: -48,-4
+            3237: -52,-1
+            3238: -52,0
+            3349: -48,0
+            3350: -48,1
+            3351: -48,-1
+            3363: -51,-1
+            3364: -51,0
         - node:
             color: '#C6FF91FF'
             id: FullTileOverlayGreyscale
           decals:
-            3023: -37,-35
-            3024: -37,-34
-            3025: -36,-34
-            3026: -35,-34
+            3018: -37,-35
+            3019: -37,-34
+            3020: -36,-34
+            3021: -35,-34
         - node:
             color: '#D381C996'
             id: FullTileOverlayGreyscale
@@ -3728,44 +3734,44 @@ entities:
           decals:
             820: -29,-5
             821: -33,-5
-            2740: 56,-10
-            2741: 56,-11
-            2742: 56,-12
-            3395: 32,-10
-            3396: 38,-10
-            3397: 40,-10
+            2735: 56,-10
+            2736: 56,-11
+            2737: 56,-12
+            3390: 32,-10
+            3391: 38,-10
+            3392: 40,-10
         - node:
             color: '#EFB34196'
             id: FullTileOverlayGreyscale
           decals:
             810: -29,-8
             811: -33,-8
-            2891: -11,-39
-            2892: -19,-40
-            2937: -16,-38
+            2886: -11,-39
+            2887: -19,-40
+            2932: -16,-38
         - node:
             color: '#FFFFFFFF'
             id: GrayConcreteTrimLineE
           decals:
-            3398: 11,2
+            3393: 11,2
         - node:
             color: '#FFFFFFFF'
             id: GrayConcreteTrimLineN
           decals:
-            3405: 2,10
+            3400: 2,10
         - node:
             color: '#FFFFFFFF'
             id: GrayConcreteTrimLineS
           decals:
-            3400: 12.501469,3.9993005
-            3403: 2,13
-            3404: 2,13
+            3395: 12.501469,3.9993005
+            3398: 2,13
+            3399: 2,13
         - node:
             color: '#FFFFFFFF'
             id: GrayConcreteTrimLineW
           decals:
-            3399: 14,2
-            3406: 4.001555,11.500919
+            3394: 14,2
+            3401: 4.001555,11.500919
         - node:
             color: '#334E6DC8'
             id: HalfTileOverlayGreyscale
@@ -3819,16 +3825,16 @@ entities:
             color: '#C6FF91FF'
             id: HalfTileOverlayGreyscale
           decals:
-            3027: -36,-31
-            3028: -37,-31
-            3029: -38,-31
+            3022: -36,-31
+            3023: -37,-31
+            3024: -38,-31
         - node:
             color: '#D381C996'
             id: HalfTileOverlayGreyscale
           decals:
             830: -13,-50
             831: -12,-50
-            2962: 15,-42
+            2957: 15,-42
         - node:
             color: '#DE3A3A96'
             id: HalfTileOverlayGreyscale
@@ -3895,25 +3901,25 @@ entities:
             color: '#C6FF91FF'
             id: HalfTileOverlayGreyscale180
           decals:
-            3022: -38,-35
+            3017: -38,-35
         - node:
             color: '#D381C996'
             id: HalfTileOverlayGreyscale180
           decals:
             824: -13,-48
             825: -12,-48
-            2963: 15,-39
+            2958: 15,-39
         - node:
             color: '#1E5026FF'
             id: HalfTileOverlayGreyscale270
           decals:
-            2417: 42,36
-            2418: 42,37
-            2419: 42,38
-            2420: 42,39
-            2421: 42,40
-            2422: 42,41
-            2423: 42,42
+            2412: 42,36
+            2413: 42,37
+            2414: 42,38
+            2415: 42,39
+            2416: 42,40
+            2417: 42,41
+            2418: 42,42
         - node:
             color: '#334E6DC8'
             id: HalfTileOverlayGreyscale270
@@ -3957,13 +3963,13 @@ entities:
             color: '#951710FF'
             id: HalfTileOverlayGreyscale270
           decals:
-            2431: 44,36
-            2432: 44,37
-            2433: 44,38
-            2434: 44,39
-            2435: 44,40
-            2436: 44,41
-            2437: 44,42
+            2426: 44,36
+            2427: 44,37
+            2428: 44,38
+            2429: 44,39
+            2430: 44,40
+            2431: 44,41
+            2432: 44,42
         - node:
             color: '#9FED5896'
             id: HalfTileOverlayGreyscale270
@@ -3979,9 +3985,9 @@ entities:
             color: '#C6FF91FF'
             id: HalfTileOverlayGreyscale270
           decals:
-            3031: -39,-32
-            3032: -39,-33
-            3033: -39,-34
+            3026: -39,-32
+            3027: -39,-33
+            3028: -39,-34
         - node:
             color: '#D381C996'
             id: HalfTileOverlayGreyscale270
@@ -3991,20 +3997,20 @@ entities:
             color: '#DE3A3A96'
             id: HalfTileOverlayGreyscale270
           decals:
-            2735: 57,-12
-            2736: 57,-11
-            2737: 57,-10
+            2730: 57,-12
+            2731: 57,-11
+            2732: 57,-10
         - node:
             color: '#1E5026FF'
             id: HalfTileOverlayGreyscale90
           decals:
-            2410: 44,36
-            2411: 44,37
-            2412: 44,38
-            2413: 44,39
-            2414: 44,40
-            2415: 44,41
-            2416: 44,42
+            2405: 44,36
+            2406: 44,37
+            2407: 44,38
+            2408: 44,39
+            2409: 44,40
+            2410: 44,41
+            2411: 44,42
         - node:
             color: '#52B4E996'
             id: HalfTileOverlayGreyscale90
@@ -4033,13 +4039,13 @@ entities:
             color: '#951710FF'
             id: HalfTileOverlayGreyscale90
           decals:
-            2424: 42,36
-            2425: 42,37
-            2426: 42,38
-            2427: 42,39
-            2428: 42,40
-            2429: 42,41
-            2430: 42,42
+            2419: 42,36
+            2420: 42,37
+            2421: 42,38
+            2422: 42,39
+            2423: 42,40
+            2424: 42,41
+            2425: 42,42
         - node:
             color: '#9FED5896'
             id: HalfTileOverlayGreyscale90
@@ -4058,57 +4064,57 @@ entities:
             color: '#EFB34196'
             id: MiniTileCornerOverlayNE
           decals:
-            2886: -14,-40
+            2881: -14,-40
         - node:
             color: '#EFB34196'
             id: MiniTileCornerOverlayNW
           decals:
-            2883: -16,-40
+            2878: -16,-40
         - node:
             color: '#EFB34196'
             id: MiniTileCornerOverlaySE
           decals:
-            2884: -14,-42
+            2879: -14,-42
         - node:
             color: '#EFB34196'
             id: MiniTileCornerOverlaySW
           decals:
-            2885: -16,-42
+            2880: -16,-42
         - node:
             color: '#DE3A3A96'
             id: MiniTileInnerOverlaySE
           decals:
-            2835: 36,-13
+            2830: 36,-13
         - node:
             color: '#EFB34196'
             id: MiniTileLineOverlayE
           decals:
-            2888: -14,-41
+            2883: -14,-41
         - node:
             color: '#DE3A3A96'
             id: MiniTileLineOverlayN
           decals:
-            2734: 55,-10
+            2729: 55,-10
         - node:
             color: '#EFB34196'
             id: MiniTileLineOverlayN
           decals:
-            2887: -15,-40
+            2882: -15,-40
         - node:
             color: '#DE3A3A96'
             id: MiniTileLineOverlayS
           decals:
-            2733: 55,-12
+            2728: 55,-12
         - node:
             color: '#EFB34196'
             id: MiniTileLineOverlayS
           decals:
-            2890: -15,-42
+            2885: -15,-42
         - node:
             color: '#EFB34196'
             id: MiniTileLineOverlayW
           decals:
-            2889: -16,-41
+            2884: -16,-41
         - node:
             color: '#D4D4D496'
             id: MiniTileOverlay
@@ -4179,15 +4185,15 @@ entities:
             color: '#EFB34196'
             id: MiniTileWhiteCornerNe
           decals:
-            2928: -11,-42
-            2929: -12,-39
+            2923: -11,-42
+            2924: -12,-39
         - node:
             color: '#FFFFFFFF'
             id: MiniTileWhiteCornerNe
           decals:
             441: -15,-34
-            2896: -12,-39
-            2897: -11,-42
+            2891: -12,-39
+            2892: -11,-42
         - node:
             color: '#A4610696'
             id: MiniTileWhiteCornerNw
@@ -4203,13 +4209,13 @@ entities:
             color: '#EFB34196'
             id: MiniTileWhiteCornerNw
           decals:
-            2930: -18,-39
+            2925: -18,-39
         - node:
             color: '#FFFFFFFF'
             id: MiniTileWhiteCornerNw
           decals:
             440: -20,-34
-            2895: -18,-39
+            2890: -18,-39
         - node:
             color: '#334E6DC8'
             id: MiniTileWhiteCornerSe
@@ -4230,13 +4236,13 @@ entities:
             color: '#EFB34196'
             id: MiniTileWhiteCornerSe
           decals:
-            2927: -11,-43
+            2922: -11,-43
         - node:
             color: '#FFFFFFFF'
             id: MiniTileWhiteCornerSe
           decals:
             438: -15,-35
-            2893: -11,-43
+            2888: -11,-43
         - node:
             color: '#A4610696'
             id: MiniTileWhiteCornerSw
@@ -4252,39 +4258,39 @@ entities:
             color: '#EFB34196'
             id: MiniTileWhiteCornerSw
           decals:
-            2926: -18,-43
+            2921: -18,-43
         - node:
             color: '#FFFFFFFF'
             id: MiniTileWhiteCornerSw
           decals:
             439: -20,-35
-            2894: -18,-43
+            2889: -18,-43
         - node:
             color: '#D381C996'
             id: MiniTileWhiteInnerNe
           decals:
-            3390: -7,-48
+            3385: -7,-48
         - node:
             color: '#DE3A3A96'
             id: MiniTileWhiteInnerNe
           decals:
-            3385: 42,-39
+            3380: 42,-39
         - node:
             color: '#EFB34196'
             id: MiniTileWhiteInnerNe
           decals:
-            2936: -12,-42
+            2931: -12,-42
         - node:
             color: '#FFFFFFFF'
             id: MiniTileWhiteInnerNe
           decals:
             434: -21,-36
-            2914: -12,-42
+            2909: -12,-42
         - node:
             color: '#DE3A3A96'
             id: MiniTileWhiteInnerNw
           decals:
-            3384: 42,-39
+            3379: 42,-39
         - node:
             color: '#FFFFFFFF'
             id: MiniTileWhiteInnerNw
@@ -4321,8 +4327,8 @@ entities:
             color: '#EFB34196'
             id: MiniTileWhiteLineE
           decals:
-            2934: -12,-41
-            2935: -12,-40
+            2929: -12,-41
+            2930: -12,-40
         - node:
             color: '#FFFFFFFF'
             id: MiniTileWhiteLineE
@@ -4330,17 +4336,17 @@ entities:
             425: -21,-34
             426: -21,-34
             427: -21,-35
-            2903: -12,-40
-            2904: -12,-41
+            2898: -12,-40
+            2899: -12,-41
         - node:
             color: '#EFB34196'
             id: MiniTileWhiteLineN
           decals:
-            2915: -17,-39
-            2916: -16,-39
-            2917: -15,-39
-            2918: -14,-39
-            2919: -13,-39
+            2910: -17,-39
+            2911: -16,-39
+            2912: -15,-39
+            2913: -14,-39
+            2914: -13,-39
         - node:
             color: '#FFFFFFFF'
             id: MiniTileWhiteLineN
@@ -4355,21 +4361,21 @@ entities:
             443: -18,-34
             444: -17,-34
             445: -16,-34
-            2898: -17,-39
-            2899: -16,-39
-            2900: -15,-39
-            2901: -14,-39
-            2902: -13,-39
+            2893: -17,-39
+            2894: -16,-39
+            2895: -15,-39
+            2896: -14,-39
+            2897: -13,-39
         - node:
             color: '#EFB34196'
             id: MiniTileWhiteLineS
           decals:
-            2920: -12,-43
-            2921: -13,-43
-            2922: -14,-43
-            2923: -15,-43
-            2924: -16,-43
-            2925: -17,-43
+            2915: -12,-43
+            2916: -13,-43
+            2917: -14,-43
+            2918: -15,-43
+            2919: -16,-43
+            2920: -17,-43
         - node:
             color: '#FFFFFFFF'
             id: MiniTileWhiteLineS
@@ -4384,12 +4390,12 @@ entities:
             447: -17,-35
             448: -18,-35
             449: -19,-35
-            2905: -12,-43
-            2906: -13,-43
-            2907: -14,-43
-            2908: -15,-43
-            2909: -16,-43
-            2910: -17,-43
+            2900: -12,-43
+            2901: -13,-43
+            2902: -14,-43
+            2903: -15,-43
+            2904: -16,-43
+            2905: -17,-43
         - node:
             color: '#A4610696'
             id: MiniTileWhiteLineW
@@ -4405,18 +4411,18 @@ entities:
             color: '#EFB34196'
             id: MiniTileWhiteLineW
           decals:
-            2931: -18,-40
-            2932: -18,-41
-            2933: -18,-42
+            2926: -18,-40
+            2927: -18,-41
+            2928: -18,-42
         - node:
             color: '#FFFFFFFF'
             id: MiniTileWhiteLineW
           decals:
             417: -14,-35
             418: -14,-34
-            2911: -18,-42
-            2912: -18,-41
-            2913: -18,-40
+            2906: -18,-42
+            2907: -18,-41
+            2908: -18,-40
         - node:
             color: '#FFFFFFFF'
             id: OldConcreteTrimInnerNe
@@ -4498,27 +4504,27 @@ entities:
             1381: 54,-22
             1382: 53,-22
             1383: 52,-22
-            3464: 42,-12
-            3465: 44,-12
-            3466: 44,-13
-            3467: 43,-13
-            3468: 41,-12
-            3469: 41,-14
-            3470: 42,-13
-            3471: 41,-13
-            3472: 42,-14
-            3473: 43,-14
-            3474: 44,-14
-            3475: 45,-14
-            3476: 45,-13
-            3477: 45,-12
-            3478: 43,-12
+            3459: 42,-12
+            3460: 44,-12
+            3461: 44,-13
+            3462: 43,-13
+            3463: 41,-12
+            3464: 41,-14
+            3465: 42,-13
+            3466: 41,-13
+            3467: 42,-14
+            3468: 43,-14
+            3469: 44,-14
+            3470: 45,-14
+            3471: 45,-13
+            3472: 45,-12
+            3473: 43,-12
         - node:
             color: '#1D1D21FF'
             id: QuarterTileOverlayGreyscale
           decals:
-            2438: 43,37
-            2441: 44,41
+            2433: 43,37
+            2436: 44,41
         - node:
             color: '#334E6DC8'
             id: QuarterTileOverlayGreyscale
@@ -4589,10 +4595,10 @@ entities:
             554: -25,-42
             570: -12,-31
             737: -2,-37
-            3034: -36,-33
-            3038: -37,-33
-            3042: -35,-33
-            3044: -34,-33
+            3029: -36,-33
+            3033: -37,-33
+            3037: -35,-33
+            3039: -34,-33
         - node:
             color: '#9FED5896'
             id: QuarterTileOverlayGreyscale
@@ -4665,101 +4671,99 @@ entities:
             1332: 60,5
             1333: 61,5
             1339: 62,0
-            1936: 3,-83
-            1937: 3,-82
-            1938: 3,-81
-            1939: 3,-80
-            1940: 3,-79
-            1941: 3,-78
-            1942: 3,-77
-            1943: 3,-76
-            1944: 3,-75
-            1945: 3,-74
-            1946: 3,-73
-            1947: 3,-72
-            1948: 3,-71
-            1949: 3,-70
-            1950: 3,-69
-            1951: 3,-68
-            1952: 3,-67
-            1953: 3,-66
-            1954: 3,-65
-            1955: 3,-64
-            1990: -11,-82
-            1991: -11,-81
-            1992: -10,-81
-            1993: -10,-80
-            1994: -10,-79
-            1995: -10,-78
-            1996: -11,-77
-            1997: -11,-76
-            1998: -11,-75
-            1999: -11,-75
-            2000: -10,-75
-            2001: -10,-74
-            2002: -10,-73
-            2003: -10,-72
-            2004: -10,-71
-            2005: -11,-70
-            2006: -11,-69
-            2007: -11,-68
-            2008: -10,-68
-            2009: -10,-67
-            2010: -10,-66
-            2011: -10,-65
-            2012: -10,-64
-            2013: -10,-63
-            2014: -10,-62
-            2015: -10,-61
-            2016: -10,-60
-            2017: -10,-59
-            2018: -10,-58
-            2019: -10,-57
-            2020: -9,-57
-            2021: -1,-57
-            2022: -1,-56
-            2023: -1,-55
-            2024: -1,-54
-            2025: -1,-53
-            2026: -1,-52
-            2027: -1,-51
-            2028: -1,-50
-            2029: -1,-49
-            2030: -1,-46
-            2031: -1,-45
-            2032: -1,-44
-            2033: -1,-43
-            2034: -1,-42
-            2035: -1,-41
-            2355: -1,-47
-            2356: -1,-48
+            1933: 3,-83
+            1934: 3,-82
+            1935: 3,-81
+            1936: 3,-80
+            1937: 3,-79
+            1938: 3,-78
+            1939: 3,-77
+            1940: 3,-76
+            1941: 3,-75
+            1942: 3,-74
+            1943: 3,-73
+            1944: 3,-72
+            1945: 3,-71
+            1946: 3,-70
+            1947: 3,-69
+            1948: 3,-68
+            1949: 3,-67
+            1950: 3,-66
+            1951: 3,-65
+            1952: 3,-64
+            1987: -10,-81
+            1988: -10,-80
+            1989: -10,-79
+            1990: -10,-78
+            1991: -11,-77
+            1992: -11,-76
+            1993: -11,-75
+            1994: -11,-75
+            1995: -10,-75
+            1996: -10,-74
+            1997: -10,-73
+            1998: -10,-72
+            1999: -10,-71
+            2000: -11,-70
+            2001: -11,-69
+            2002: -11,-68
+            2003: -10,-68
+            2004: -10,-67
+            2005: -10,-66
+            2006: -10,-65
+            2007: -10,-64
+            2008: -10,-63
+            2009: -10,-62
+            2010: -10,-61
+            2011: -10,-60
+            2012: -10,-59
+            2013: -10,-58
+            2014: -10,-57
+            2015: -9,-57
+            2016: -1,-57
+            2017: -1,-56
+            2018: -1,-55
+            2019: -1,-54
+            2020: -1,-53
+            2021: -1,-52
+            2022: -1,-51
+            2023: -1,-50
+            2024: -1,-49
+            2025: -1,-46
+            2026: -1,-45
+            2027: -1,-44
+            2028: -1,-43
+            2029: -1,-42
+            2030: -1,-41
+            2350: -1,-47
+            2351: -1,-48
         - node:
             color: '#D4D4D433'
             id: QuarterTileOverlayGreyscale
           decals:
-            3144: 0,48
-            3145: 0,47
-            3146: 0,46
-            3147: 0,45
-            3148: 0,44
-            3149: 0,43
-            3150: 0,42
-            3151: 0,41
-            3152: 0,40
-            3153: 0,38
-            3154: 0,39
-            3155: -1,38
+            3139: 0,48
+            3140: 0,47
+            3141: 0,46
+            3142: 0,45
+            3143: 0,44
+            3144: 0,43
+            3145: 0,42
+            3146: 0,41
+            3147: 0,40
+            3148: 0,38
+            3149: 0,39
+            3150: -1,38
         - node:
             color: '#DE3A3A96'
             id: QuarterTileOverlayGreyscale
           decals:
-            2739: 57,-13
+            2734: 57,-13
         - node:
             color: '#1D1D21FF'
             id: QuarterTileOverlayGreyscale180
           decals:
-            2439: 43,39
-            2442: 43,36
+            2434: 43,39
+            2437: 43,36
         - node:
             color: '#334E6DC8'
             id: QuarterTileOverlayGreyscale180
@@ -4825,11 +4829,11 @@ entities:
             551: -27,-40
             569: -12,-31
             581: -12,-33
-            3035: -36,-32
-            3036: -37,-32
-            3037: -38,-32
-            3043: -35,-32
-            3045: -34,-32
+            3030: -36,-32
+            3031: -37,-32
+            3032: -38,-32
+            3038: -35,-32
+            3040: -34,-32
         - node:
             color: '#639137FF'
             id: QuarterTileOverlayGreyscale180
@@ -4954,23 +4958,23 @@ entities:
             1893: 1,-30
             1894: 1,-31
             1895: 1,-32
-            1934: 4,-83
-            1935: 3,-83
-            1956: 2,-63
-            1957: 1,-63
-            1958: 0,-63
-            1959: -1,-63
-            1960: -2,-63
-            1967: -3,-63
-            2047: 1,-33
-            2048: 1,-34
-            2049: 1,-35
-            2050: 1,-36
-            2051: 1,-37
-            2052: 1,-38
-            2053: 1,-39
-            2054: 1,-40
-            2074: 1,-25
+            1931: 4,-83
+            1932: 3,-83
+            1953: 2,-63
+            1954: 1,-63
+            1955: 0,-63
+            1956: -1,-63
+            1957: -2,-63
+            1964: -3,-63
+            2042: 1,-33
+            2043: 1,-34
+            2044: 1,-35
+            2045: 1,-36
+            2046: 1,-37
+            2047: 1,-38
+            2048: 1,-39
+            2049: 1,-40
+            2069: 1,-25
         - node:
             color: '#334E6DC8'
             id: QuarterTileOverlayGreyscale270
@@ -4986,7 +4990,7 @@ entities:
             249: -7,-38
             553: -25,-40
             738: -2,-36
-            3040: -37,-32
+            3035: -37,-32
         - node:
             color: '#639137FF'
             id: QuarterTileOverlayGreyscale270
@@ -5059,49 +5063,49 @@ entities:
             1322: 59,1
             1323: 61,-6
             1340: 62,-1
-            1961: -8,-63
-            1962: -7,-63
-            1963: -6,-63
-            1964: -5,-63
-            1965: -4,-63
-            1966: -3,-63
-            1988: -9,-83
-            1989: -10,-83
-            2036: -1,-32
-            2037: -1,-31
-            2038: -1,-29
-            2039: -1,-30
-            2040: -1,-26
-            2041: -2,-23
-            2042: -2,-22
-            2043: -1,-21
-            2044: -1,-20
-            2045: -1,-19
-            2046: -1,-18
-            2067: 4,-51
-            2068: 3,-51
-            2069: 2,-51
-            2070: -1,-24
-            2071: -1,-25
-            2072: -1,-27
-            2073: -1,-28
+            1958: -8,-63
+            1959: -7,-63
+            1960: -6,-63
+            1961: -5,-63
+            1962: -4,-63
+            1963: -3,-63
+            1985: -9,-83
+            1986: -10,-83
+            2031: -1,-32
+            2032: -1,-31
+            2033: -1,-29
+            2034: -1,-30
+            2035: -1,-26
+            2036: -2,-23
+            2037: -2,-22
+            2038: -1,-21
+            2039: -1,-20
+            2040: -1,-19
+            2041: -1,-18
+            2062: 4,-51
+            2063: 3,-51
+            2064: 2,-51
+            2065: -1,-24
+            2066: -1,-25
+            2067: -1,-27
+            2068: -1,-28
         - node:
             color: '#D4D4D433'
             id: QuarterTileOverlayGreyscale270
           decals:
-            3140: -3,49
-            3141: -2,49
-            3142: -1,49
+            3135: -3,49
+            3136: -2,49
+            3137: -1,49
         - node:
             color: '#DE3A3A96'
             id: QuarterTileOverlayGreyscale270
           decals:
-            2738: 57,-9
+            2733: 57,-9
         - node:
             color: '#1D1D21FF'
             id: QuarterTileOverlayGreyscale90
           decals:
-            2440: 42,40
+            2435: 42,40
         - node:
             color: '#334E6DC8'
             id: QuarterTileOverlayGreyscale90
@@ -5114,7 +5118,7 @@ entities:
           decals:
             247: -8,-40
             552: -27,-42
-            3039: -38,-33
+            3034: -38,-33
         - node:
             color: '#9FED5896'
             id: QuarterTileOverlayGreyscale90
@@ -5267,60 +5271,57 @@ entities:
             1928: 4,-79
             1929: 4,-80
             1930: 4,-81
-            1931: 5,-81
-            1932: 5,-82
-            1933: 5,-83
-            1968: -9,-64
-            1969: -9,-65
-            1970: -9,-66
-            1971: -9,-67
-            1972: -9,-68
-            1973: -9,-69
-            1974: -9,-70
-            1975: -9,-71
-            1976: -9,-72
-            1977: -9,-73
-            1978: -9,-74
-            1979: -9,-75
-            1980: -9,-76
-            1981: -9,-77
-            1982: -9,-78
-            1983: -9,-79
-            1984: -9,-80
-            1985: -9,-81
-            1986: -9,-82
-            1987: -9,-83
-            2055: 1,-41
-            2056: 2,-42
-            2057: 3,-42
-            2058: 3,-43
-            2059: 3,-44
-            2060: 3,-45
-            2061: 3,-46
-            2062: 3,-47
-            2063: 3,-48
-            2064: 4,-49
-            2065: 4,-50
-            2066: 4,-51
+            1965: -9,-64
+            1966: -9,-65
+            1967: -9,-66
+            1968: -9,-67
+            1969: -9,-68
+            1970: -9,-69
+            1971: -9,-70
+            1972: -9,-71
+            1973: -9,-72
+            1974: -9,-73
+            1975: -9,-74
+            1976: -9,-75
+            1977: -9,-76
+            1978: -9,-77
+            1979: -9,-78
+            1980: -9,-79
+            1981: -9,-80
+            1982: -9,-81
+            1983: -9,-82
+            1984: -9,-83
+            2050: 1,-41
+            2051: 2,-42
+            2052: 3,-42
+            2053: 3,-43
+            2054: 3,-44
+            2055: 3,-45
+            2056: 3,-46
+            2057: 3,-47
+            2058: 3,-48
+            2059: 4,-49
+            2060: 4,-50
+            2061: 4,-51
         - node:
             color: '#D4D4D433'
             id: QuarterTileOverlayGreyscale90
           decals:
-            3143: 1,49
-            3214: -35,1
+            3138: 1,49
+            3209: -35,1
         - node:
             color: '#FFFFFFFF'
             id: Rock06
           decals:
-            2689: -6.549043,-18.995234
+            2684: -6.549043,-18.995234
         - node:
             color: '#FFFFFFFF'
             id: Rock07
           decals:
-            2690: -10.21571,-19.245234
-            2691: -19.922543,-12.716649
-            2692: -18.60001,-10.259648
-            2693: -18.846893,-8.106161
+            2685: -10.21571,-19.245234
+            2686: -19.922543,-12.716649
+            2687: -18.60001,-10.259648
+            2688: -18.846893,-8.106161
         - node:
             color: '#FFFFFFFF'
             id: SpaceStationSign1
@@ -5361,7 +5362,7 @@ entities:
             color: '#FFFFFFFF'
             id: StandClearGreyscale
           decals:
-            3374: -56,-4
+            3369: -56,-4
         - node:
             color: '#334E6DC8'
             id: ThreeQuarterTileOverlayGreyscale
@@ -5391,7 +5392,7 @@ entities:
             color: '#C6FF91FF'
             id: ThreeQuarterTileOverlayGreyscale
           decals:
-            3030: -39,-31
+            3025: -39,-31
         - node:
             color: '#334E6DC8'
             id: ThreeQuarterTileOverlayGreyscale180
@@ -5451,7 +5452,7 @@ entities:
             color: '#C6FF91FF'
             id: ThreeQuarterTileOverlayGreyscale270
           decals:
-            3021: -39,-35
+            3016: -39,-35
         - node:
             color: '#334E6DC8'
             id: ThreeQuarterTileOverlayGreyscale90
@@ -5477,22 +5478,41 @@ entities:
             174: -29,-11
             175: -32,-11
             483: -29,-23
-            3041: -35,-31
+            3036: -35,-31
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnBox
+          decals:
+            3559: -24,36
+            3560: -25,37
+            3561: -26,37
+            3562: -27,37
+            3563: -28,37
+            3564: -29,37
+            3565: -30,37
+            3566: -31,36
+            3567: -25,35
+            3568: -26,35
+            3569: -28,35
+            3570: -29,35
+            3571: -30,35
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerGreyscaleNW
           decals:
-            3497: -6,-26
+            3492: -6,-26
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerSmallGreyscaleNW
           decals:
-            3513: -6,-29
+            3508: -6,-29
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerSmallNE
           decals:
-            3347: -58,-13
+            3342: -58,-13
+            3558: -22,42
+            3574: -31,35
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerSmallNW
@@ -5500,11 +5520,15 @@ entities:
             981: -56,-7
             985: -56,-3
             1001: -54,-13
+            3557: -18,42
+            3575: -24,35
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerSmallSE
           decals:
-            3346: -58,-8
+            3341: -58,-8
+            3555: -22,44
+            3573: -31,37
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerSmallSW
@@ -5513,55 +5537,58 @@ entities:
             980: -56,-1
             986: -56,-5
             1000: -54,-8
+            3556: -18,44
+            3572: -24,37
         - node:
             color: '#FFFFFFFF'
             id: WarnFull
           decals:
-            2486: 12,53
-            2487: 13,53
-            2488: 14,53
+            2481: 12,53
+            2482: 13,53
+            2483: 14,53
         - node:
             color: '#BC863FFF'
             id: WarnFullGreyscale
           decals:
-            3370: -51,-1
-            3371: -51,0
-            3372: -52,-1
-            3373: -52,0
+            3365: -51,-1
+            3366: -51,0
+            3367: -52,-1
+            3368: -52,0
         - node:
             color: '#FFFFFFFF'
             id: WarnLineE
           decals:
-            2468: 9,49
-            2470: 19,49
-            2471: 19,48
-            2472: 19,47
-            2473: 19,46
-            3341: -58,-12
-            3342: -58,-11
-            3343: -58,-10
-            3344: -58,-9
+            2463: 9,49
+            2465: 19,49
+            2466: 19,48
+            2467: 19,47
+            2468: 19,46
+            3336: -58,-12
+            3337: -58,-11
+            3338: -58,-10
+            3339: -58,-9
+            3551: -22,43
         - node:
             color: '#FFFFFFFF'
             id: WarnLineGreyscaleN
           decals:
-            3498: -5,-26
-            3499: -4,-26
-            3500: -3,-26
-            3510: -9,-29
-            3511: -8,-29
-            3512: -7,-29
+            3493: -5,-26
+            3494: -4,-26
+            3495: -3,-26
+            3505: -9,-29
+            3506: -8,-29
+            3507: -7,-29
         - node:
             color: '#FFFFFFFF'
             id: WarnLineGreyscaleS
           decals:
-            3503: -9,-30
-            3504: -8,-30
-            3505: -7,-30
-            3506: -6,-30
-            3507: -5,-30
-            3508: -4,-30
-            3509: -3,-30
+            3498: -9,-30
+            3499: -8,-30
+            3500: -7,-30
+            3501: -6,-30
+            3502: -5,-30
+            3503: -4,-30
+            3504: -3,-30
         - node:
             color: '#FFFFFFFF'
             id: WarnLineGreyscaleW
@@ -5569,8 +5596,8 @@ entities:
             982: -56,-5
             983: -56,-4
             984: -56,-3
-            3501: -6,-27
-            3502: -6,-28
+            3496: -6,-27
+            3497: -6,-28
         - node:
             color: '#FFFFFFFF'
             id: WarnLineN
@@ -5580,7 +5607,10 @@ entities:
             991: -56,-8
             992: -56,-8
             993: -55,-8
-            3348: -58,-1
+            3343: -58,-1
+            3548: -19,44
+            3549: -20,44
+            3550: -21,44
         - node:
             color: '#FFFFFFFF'
             id: WarnLineS
@@ -5590,12 +5620,13 @@ entities:
             994: -54,-10
             995: -54,-11
             996: -54,-12
-            2469: 17,49
-            3345: -54,-9
-            3547: 21,46
-            3548: 21,47
-            3549: 21,48
-            3550: 21,49
+            2464: 17,49
+            3340: -54,-9
+            3542: 21,46
+            3543: 21,47
+            3544: 21,48
+            3545: 21,49
+            3547: -18,43
         - node:
             color: '#FFFFFFFF'
             id: WarnLineW
@@ -5604,18 +5635,21 @@ entities:
             997: -55,-13
             998: -56,-13
             999: -57,-13
-            2465: 12,46
-            2466: 13,46
-            2467: 14,46
-            2478: 7,51
-            2479: 8,51
-            2480: 9,51
-            2481: 17,51
-            2482: 18,51
-            2483: 19,51
-            2484: 15,53
-            2485: 11,53
-            3349: -58,-7
+            2460: 12,46
+            2461: 13,46
+            2462: 14,46
+            2473: 7,51
+            2474: 8,51
+            2475: 9,51
+            2476: 17,51
+            2477: 18,51
+            2478: 19,51
+            2479: 15,53
+            2480: 11,53
+            3344: -58,-7
+            3552: -21,42
+            3553: -20,42
+            3554: -19,42
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinCornerNe
@@ -5636,8 +5670,8 @@ entities:
             924: 44,-9
             931: 17,-30
             932: 20,-30
-            2836: 41,23
-            3071: 19,37
+            2831: 41,23
+            3066: 19,37
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinCornerNw
@@ -5661,8 +5695,8 @@ entities:
             921: 42,-9
             933: 13,-30
             934: 19,-30
-            2837: 39,23
-            3072: 12,37
+            2832: 39,23
+            3067: 12,37
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinCornerSe
@@ -5683,7 +5717,7 @@ entities:
             922: 44,-10
             935: 17,-32
             936: 20,-32
-            3082: 19,36
+            3077: 19,36
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinCornerSw
@@ -5740,7 +5774,7 @@ entities:
             id: WoodTrimThinInnerSe
           decals:
             690: 37,-3
-            3084: 17,36
+            3079: 17,36
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinInnerSw
@@ -5789,8 +5823,8 @@ entities:
             910: 40,13
             939: 20,-31
             940: 17,-31
-            2838: 41,22
-            3073: 17,35
+            2833: 41,22
+            3068: 17,35
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinLineN
@@ -5833,13 +5867,13 @@ entities:
             947: 15,-30
             948: 15,-30
             949: 16,-30
-            2840: 40,23
-            3076: 13,37
-            3077: 14,37
-            3078: 15,37
-            3079: 16,37
-            3080: 17,37
-            3081: 18,37
+            2835: 40,23
+            3071: 13,37
+            3072: 14,37
+            3073: 15,37
+            3074: 16,37
+            3075: 17,37
+            3076: 18,37
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinLineS
@@ -5883,7 +5917,7 @@ entities:
             943: 14,-32
             944: 15,-32
             945: 16,-32
-            3083: 18,36
+            3078: 18,36
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinLineW
@@ -5913,2091 +5947,2113 @@ entities:
             912: 35,14
             941: 19,-31
             942: 13,-31
-            2839: 39,22
-            3074: 12,35
-            3075: 12,36
+            2834: 39,22
+            3069: 12,35
+            3070: 12,36
     - type: GridAtmosphere
       version: 2
       data:
         tiles:
           0,0:
             0: 65535
+          0,-1:
+            0: 65527
+          -1,0:
+            0: 61439
           0,1:
-            0: 65535
+            0: 65463
+          -1,1:
+            0: 65469
           0,2:
-            0: 65535
+            0: 65471
+          -1,2:
+            0: 65471
           0,3:
-            0: 65535
+            0: 49151
+          -1,3:
+            0: 49151
+          0,4:
+            0: 62463
           1,0:
-            0: 65535
+            0: 60927
           1,1:
             0: 65535
           1,2:
             0: 65535
           1,3:
             0: 65535
+          1,-1:
+            0: 65007
+          1,4:
+            0: 61695
           2,0:
-            0: 65535
+            0: 65023
           2,1:
             0: 65535
           2,2:
             0: 65535
           2,3:
             0: 65535
+          2,-1:
+            0: 65023
+          2,4:
+            0: 28927
           3,0:
-            0: 65535
+            0: 63487
           3,1:
             0: 65535
           3,2:
             0: 65535
           3,3:
             0: 65535
+          3,-1:
+            0: 63487
+          3,4:
+            0: 4095
+          4,0:
+            0: 13311
+          4,1:
+            0: 48059
+          4,2:
+            0: 13243
+          4,3:
+            0: 30583
           -4,0:
-            0: 65535
+            0: 65023
+          -4,-1:
+            0: 65023
+          -5,0:
+            0: 47615
           -4,1:
             0: 65535
+          -5,1:
+            0: 65535
           -4,2:
             0: 65535
+          -5,2:
+            0: 35839
           -4,3:
             0: 65535
+          -5,3:
+            0: 56797
+          -4,4:
+            0: 3839
           -3,0:
-            0: 65535
+            0: 63487
           -3,1:
             0: 65535
           -3,2:
             0: 65535
           -3,3:
             0: 65535
+          -3,-1:
+            0: 63487
+          -3,4:
+            0: 51711
           -2,0:
-            0: 65535
+            0: 63487
           -2,1:
             0: 65535
           -2,2:
             0: 65535
           -2,3:
             0: 65535
-          -1,0:
-            0: 65535
-          -1,1:
-            0: 65535
-          -1,2:
-            0: 65535
-          -1,3:
+          -2,-1:
+            0: 63487
+          -2,4:
             0: 65535
+          -1,-1:
+            0: 65517
+          -1,4:
+            0: 47615
           0,-4:
-            0: 65535
+            0: 65471
+          0,-5:
+            0: 62395
+          -1,-4:
+            0: 65471
           0,-3:
-            0: 65535
+            0: 49151
+          -1,-3:
+            0: 49151
           0,-2:
-            0: 65535
-          0,-1:
-            0: 65535
+            0: 49151
+          -1,-2:
+            0: 49151
           1,-4:
             0: 65535
           1,-3:
             0: 65535
           1,-2:
-            0: 65535
-          1,-1:
-            0: 65535
+            0: 65407
+          1,-5:
+            0: 61627
           2,-4:
             0: 65535
           2,-3:
             0: 65535
           2,-2:
             0: 65535
-          2,-1:
-            0: 65535
+          2,-5:
+            0: 61559
           3,-4:
             0: 65535
           3,-3:
             0: 65535
           3,-2:
             0: 65535
-          3,-1:
-            0: 65535
+          3,-5:
+            0: 65295
+          4,-4:
+            0: 30579
+          4,-3:
+            0: 45879
+          4,-2:
+            0: 46011
+          4,-1:
+            0: 62395
           -4,-4:
-            0: 65535
+            0: 65503
+          -4,-5:
+            0: 65038
+          -5,-4:
+            0: 56792
           -4,-3:
-            0: 65535
+            0: 49149
+          -5,-3:
+            0: 48013
           -4,-2:
-            0: 65535
-          -4,-1:
-            0: 65535
+            0: 49151
+          -5,-2:
+            0: 47291
+          -5,-1:
+            0: 63931
           -3,-4:
-            0: 65535
+            0: 63471
           -3,-3:
-            0: 65535
+            0: 57214
           -3,-2:
-            0: 65535
-          -3,-1:
-            0: 65535
+            0: 57343
+          -3,-5:
+            0: 61901
           -2,-4:
-            0: 65535
+            0: 63487
           -2,-3:
-            0: 65535
+            0: 65407
           -2,-2:
             0: 65535
-          -2,-1:
-            0: 65535
-          -1,-4:
-            0: 65535
-          -1,-3:
-            0: 65535
-          -1,-2:
-            0: 65535
-          -1,-1:
-            0: 65535
-          -4,4:
-            0: 65535
+          -2,-5:
+            0: 61627
+          -1,-5:
+            0: 63675
+          -5,4:
+            0: 62392
           -4,5:
-            0: 61441
             1: 4094
+          -5,5:
+            1: 2176
+            0: 883
           -4,6:
-            0: 65535
+            0: 6398
+          -5,6:
+            0: 57583
           -4,7:
-            0: 65331
-          -3,4:
-            0: 65535
+            0: 53521
+          -5,7:
+            0: 61422
+          -4,8:
+            0: 55759
           -3,5:
             1: 273
-            0: 65262
+            0: 3308
           -3,6:
-            0: 65535
+            0: 4095
           -3,7:
-            0: 65280
-          -2,4:
-            0: 65535
+            0: 53248
+          -3,8:
+            0: 64733
           -2,5:
-            0: 65535
+            0: 4095
           -2,6:
-            0: 65535
+            0: 4094
           -2,7:
-            0: 65280
-          -1,4:
+            0: 61440
+          -2,8:
             0: 65535
           -1,5:
-            0: 65535
+            0: 35835
           -1,6:
-            0: 65535
+            0: 52639
           -1,7:
-            0: 65518
+            0: 55436
+          -1,8:
+            0: 56797
+          0,5:
+            0: 64511
+          0,6:
+            0: 30523
+          0,7:
+            0: 29503
           -8,-4:
+            0: 54527
+          -8,-5:
             0: 65535
+          -9,-4:
+            0: 48059
           -8,-3:
-            0: 65535
+            0: 61661
+          -9,-3:
+            0: 41147
           -8,-2:
             0: 65535
+          -9,-2:
+            0: 43176
           -8,-1:
-            0: 65535
-          -7,-4:
-            0: 65535
-          -7,-3:
-            0: 65535
-          -7,-2:
-            0: 65535
-          -7,-1:
-            0: 65535
-          -6,-4:
-            0: 65535
-          -6,-3:
-            0: 65535
-          -6,-2:
-            0: 65535
-          -6,-1:
-            0: 65535
-          -5,-4:
-            0: 65535
-          -5,-3:
-            0: 65535
-          -5,-2:
-            0: 65535
-          -5,-1:
-            0: 65535
+            0: 65295
+          -9,-1:
+            0: 63528
           -8,0:
-            0: 65535
+            0: 62719
+          -7,-4:
+            0: 58487
+          -7,-1:
+            0: 64526
+          -7,-5:
+            0: 29934
+          -7,-3:
+            0: 57582
+          -7,-2:
+            0: 58018
+          -7,0:
+            0: 3327
+          -6,-4:
+            0: 58999
+          -6,-3:
+            0: 63078
+          -6,-2:
+            0: 54612
+          -6,-1:
+            0: 61917
+          -6,-5:
+            0: 30439
+          -6,0:
+            0: 53759
+          -5,-5:
+            0: 46079
+          -9,0:
+            0: 55807
           -8,1:
-            0: 65535
+            0: 4095
+          -9,1:
+            0: 7645
           -8,2:
-            0: 65535
+            0: 4095
+          -9,2:
+            0: 7645
           -8,3:
             0: 65535
-          -7,0:
-            0: 65535
-          -7,1:
-            0: 65535
-          -7,2:
-            0: 65535
-          -7,3:
-            0: 65535
-          -6,0:
-            0: 65535
-          -6,1:
-            0: 65535
-          -6,2:
-            0: 65535
-          -6,3:
-            0: 65535
-          -5,0:
-            0: 65535
-          -5,1:
-            0: 65535
-          -5,2:
-            0: 65535
-          -5,3:
+          -9,3:
             0: 65535
           -8,4:
             0: 65535
+          -7,2:
+            0: 52701
+          -7,3:
+            0: 48029
+          -7,1:
+            0: 52362
+          -7,4:
+            0: 48059
+          -6,1:
+            0: 56797
+          -6,2:
+            0: 40413
+          -6,3:
+            0: 56797
+          -6,4:
+            0: 65529
+          -9,4:
+            0: 65535
           -8,5:
             0: 65535
+          -9,5:
+            0: 65535
           -8,6:
+            0: 65531
+          -9,6:
             0: 65535
           -8,7:
             0: 65535
-          -7,4:
+          -9,7:
             0: 65535
+          -8,8:
+            0: 57599
           -7,5:
-            0: 65535
+            0: 63347
           -7,6:
             0: 65535
           -7,7:
             0: 65535
-          -6,4:
-            0: 65535
+          -7,8:
+            0: 62207
           -6,5:
-            0: 65535
+            0: 56542
           -6,6:
-            0: 65535
+            0: 57309
           -6,7:
-            0: 65535
-          -5,4:
-            0: 65535
-          -5,5:
-            0: 63359
-            1: 2176
-          -5,6:
-            0: 65535
-          -5,7:
-            0: 65535
-          0,4:
-            0: 65535
-          0,5:
-            0: 65535
-          0,6:
-            0: 65535
-          0,7:
-            0: 65535
-          1,4:
-            0: 65535
+            0: 56797
+          -6,8:
+            0: 56541
+          -5,8:
+            0: 65358
+          0,8:
+            0: 63487
           1,5:
             0: 65535
           1,6:
-            0: 65535
+            0: 65295
           1,7:
-            0: 65535
-          2,4:
+            0: 65295
+          1,8:
             0: 65535
           2,5:
-            0: 65535
+            0: 32759
           2,6:
-            0: 65535
+            0: 65287
           2,7:
-            0: 65535
-          3,4:
-            0: 65535
+            0: 54735
+          2,8:
+            0: 24063
           3,5:
             0: 65535
           3,6:
-            0: 65535
+            0: 65520
           3,7:
+            0: 61695
+          3,8:
             0: 65535
           4,4:
-            0: 65535
+            0: 60083
           4,5:
-            0: 65535
+            0: 61182
           4,6:
-            0: 65535
+            0: 65534
           4,7:
-            0: 65535
-          5,4:
-            0: 65535
-          5,5:
-            0: 65535
+            0: 63743
+          4,8:
+            0: 49151
           5,6:
-            0: 65535
+            0: 61408
+          5,4:
+            0: 3822
+          5,5:
+            0: 61166
           5,7:
-            0: 65535
+            0: 61070
+          5,8:
+            0: 3839
+          5,3:
+            0: 61166
           6,4:
-            0: 65535
+            0: 1911
           6,5:
-            0: 65535
+            0: 30583
           6,6:
-            0: 65535
+            0: 30708
           6,7:
-            0: 65535
+            0: 65311
+          6,3:
+            0: 32759
+          6,8:
+            0: 24575
           7,4:
-            0: 65535
+            0: 65486
           7,5:
-            0: 65535
+            0: 4095
           7,6:
-            0: 63351
+            0: 819
           7,7:
+            0: 47887
+          7,3:
             0: 65535
-          4,0:
-            0: 65535
-          4,1:
-            0: 65535
-          4,2:
-            0: 65535
-          4,3:
-            0: 65535
+          7,8:
+            0: 33723
+          8,4:
+            0: 16257
+          8,5:
+            0: 3003
+          8,7:
+            0: 65295
           5,0:
-            0: 65535
+            0: 255
           5,1:
             0: 65535
           5,2:
-            0: 65535
-          5,3:
-            0: 65535
+            0: 49407
+          5,-1:
+            0: 63743
           6,0:
-            0: 65535
+            0: 255
           6,1:
             0: 65535
           6,2:
-            0: 65535
-          6,3:
-            0: 65535
-          7,0:
-            0: 65535
-          7,1:
-            0: 65535
-          7,2:
-            0: 65535
-          7,3:
-            0: 65535
-          4,-4:
-            0: 65535
-          4,-3:
-            0: 65535
-          4,-2:
-            0: 65535
-          4,-1:
-            0: 65535
-          5,-4:
-            0: 65535
-          5,-3:
-            0: 65535
-          5,-2:
-            0: 65535
-          5,-1:
-            0: 65535
-          6,-4:
-            0: 65535
-          6,-3:
-            0: 65535
-          6,-2:
-            0: 65535
+            0: 12543
           6,-1:
-            0: 65535
-          7,-4:
-            0: 65535
-          7,-3:
-            0: 65535
-          7,-2:
-            0: 65535
+            0: 64543
+          7,0:
+            0: 52479
+          7,1:
+            0: 65500
+          7,2:
+            0: 60621
           7,-1:
-            0: 65535
-          4,-8:
-            0: 65535
-          4,-7:
-            0: 65535
-          4,-6:
-            0: 65535
+            0: 63965
+          8,0:
+            0: 3327
+          8,2:
+            0: 5196
+          8,3:
+            0: 49147
           4,-5:
-            0: 65535
-          5,-8:
-            0: 65535
-          5,-7:
-            0: 65535
-          5,-6:
-            0: 65535
+            0: 64238
+          5,-4:
+            0: 65520
+          5,-3:
+            0: 61695
+          5,-2:
+            0: 61695
           5,-5:
-            0: 65535
-          6,-8:
-            0: 65535
-          6,-7:
-            0: 65535
-          6,-6:
-            0: 65535
+            0: 32767
+          6,-4:
+            0: 64989
+          6,-3:
+            0: 56541
+          6,-2:
+            0: 56541
           6,-5:
-            0: 65535
-          7,-8:
-            0: 65535
-          7,-7:
-            0: 65535
-          7,-6:
-            0: 65535
+            0: 56797
+          7,-4:
+            0: 55517
+          7,-3:
+            0: 49357
+          7,-2:
+            0: 56796
           7,-5:
-            0: 65535
-          0,-8:
-            0: 63351
-          0,-7:
-            0: 65535
-          0,-6:
-            0: 65535
-          0,-5:
-            0: 65535
-          1,-8:
-            0: 4095
-          1,-7:
-            0: 65535
-          1,-6:
-            0: 65535
-          1,-5:
-            0: 65535
-          2,-8:
-            0: 34679
-          2,-7:
-            0: 65535
-          2,-6:
-            0: 65535
-          2,-5:
-            0: 65535
+            0: 53717
+          8,-4:
+            0: 63709
+          8,-3:
+            0: 45567
+          8,-2:
+            0: 64507
+          8,-1:
+            0: 61883
+          4,-8:
+            0: 3067
+          4,-9:
+            0: 37683
+            1: 2184
           3,-8:
-            0: 65535
+            0: 3822
+          4,-7:
+            0: 2047
           3,-7:
-            0: 65535
+            0: 3071
+          4,-6:
+            0: 61135
           3,-6:
             0: 65535
-          3,-5:
-            0: 65535
+          5,-8:
+            0: 51677
+          5,-7:
+            0: 2047
+          5,-6:
+            0: 65527
+          5,-9:
+            0: 49152
+            1: 307
+          6,-8:
+            0: 43195
+          6,-7:
+            0: 65466
+          6,-6:
+            0: 56782
+          6,-9:
+            0: 45499
+          7,-8:
+            0: 53727
+          7,-7:
+            0: 21845
+          7,-6:
+            0: 21845
+          7,-9:
+            0: 64721
+          8,-8:
+            0: 61695
+          8,-7:
+            0: 65520
+          8,-6:
+            0: 65407
+          8,-5:
+            0: 53360
+          0,-8:
+            0: 13107
+          0,-9:
+            0: 15291
+          -1,-8:
+            0: 49080
+          0,-7:
+            0: 14327
+          -1,-7:
+            0: 48059
+          0,-6:
+            0: 48123
+          -1,-6:
+            0: 36824
+          1,-7:
+            0: 4080
+          1,-6:
+            0: 46075
+          1,-8:
+            0: 102
+          1,-9:
+            0: 12287
+          2,-8:
+            0: 51
+          2,-7:
+            0: 4080
+          2,-6:
+            0: 28927
+          2,-9:
+            0: 12287
           -4,-8:
+            0: 64271
+          -4,-9:
             0: 65535
+          -5,-8:
+            0: 65407
           -4,-7:
-            0: 65535
+            0: 15295
+          -5,-7:
+            0: 30719
           -4,-6:
-            0: 65535
-          -4,-5:
-            0: 65535
+            0: 36856
+          -5,-6:
+            0: 4080
           -3,-8:
-            0: 65535
+            0: 64401
           -3,-7:
-            0: 65535
+            0: 35771
           -3,-6:
-            0: 65535
-          -3,-5:
-            0: 65535
+            0: 36851
+          -3,-9:
+            0: 64991
           -2,-8:
-            0: 65535
+            0: 65520
           -2,-7:
             0: 65535
           -2,-6:
-            0: 65535
-          -2,-5:
-            0: 65535
-          -1,-8:
-            0: 65535
-          -1,-7:
-            0: 65535
-          -1,-6:
-            0: 65535
-          -1,-5:
-            0: 65535
-          -8,-8:
-            0: 65535
-          -8,-7:
-            0: 65535
-          -8,-6:
-            0: 65535
-          -8,-5:
-            0: 65535
-          -7,-8:
-            0: 65535
-          -7,-7:
-            0: 65535
-          -7,-6:
-            0: 65535
-          -7,-5:
-            0: 65535
-          -6,-8:
-            0: 65535
-          -6,-7:
-            0: 65535
-          -6,-6:
-            0: 65535
-          -6,-5:
-            0: 65535
-          -5,-8:
-            0: 65535
-          -5,-7:
-            0: 65535
-          -5,-6:
-            0: 65535
-          -5,-5:
-            0: 65535
-          -4,-12:
-            0: 65535
-          -4,-11:
-            0: 65535
-          -4,-10:
-            0: 65535
-          -4,-9:
-            0: 65535
-          -3,-12:
-            0: 65535
-          -3,-11:
-            0: 65535
-          -3,-10:
-            0: 65535
-          -3,-9:
-            0: 65535
-          -2,-12:
-            0: 65535
-          -2,-11:
-            0: 65535
-          -2,-10:
-            0: 65535
+            0: 36849
           -2,-9:
             0: 65535
-          -1,-12:
-            0: 65535
-          -1,-11:
-            0: 65535
-          -1,-10:
-            0: 65535
           -1,-9:
-            0: 65535
-          0,-12:
-            0: 65535
-          0,-11:
-            0: 65535
-          0,-10:
-            0: 65535
-          0,-9:
-            0: 65535
-          1,-12:
-            0: 65535
-          1,-11:
-            0: 65535
-          1,-10:
-            0: 65535
-          1,-9:
-            0: 65535
-          2,-12:
-            0: 65535
-          2,-11:
-            0: 65535
-          2,-10:
-            0: 65535
-          2,-9:
-            0: 65535
-          3,-12:
-            0: 65535
-          3,-11:
-            0: 65535
-          3,-10:
-            0: 65535
-          3,-9:
-            0: 65535
-          -8,-12:
-            0: 65535
-          -8,-11:
-            0: 65439
-            2: 96
-          -8,-10:
-            0: 65535
+            0: 61167
+          -8,-8:
+            0: 65327
           -8,-9:
-            0: 65535
-          -7,-12:
-            0: 65535
-          -7,-11:
-            0: 65535
-          -7,-10:
-            0: 65535
+            0: 62207
+          -9,-8:
+            0: 43071
+          -8,-7:
+            0: 8191
+          -9,-7:
+            0: 15290
+          -8,-6:
+            0: 62719
+          -9,-6:
+            0: 46015
+          -9,-5:
+            0: 48059
+          -7,-8:
+            0: 65039
+          -7,-7:
+            0: 3823
+          -7,-6:
+            0: 57583
           -7,-9:
-            0: 65535
-          -6,-12:
-            0: 65535
-          -6,-11:
-            0: 65535
-          -6,-10:
-            0: 65535
+            0: 61679
+          -6,-8:
+            0: 65039
+          -6,-7:
+            0: 26351
+          -6,-6:
+            0: 28400
           -6,-9:
-            0: 65535
-          -5,-12:
-            0: 65535
-          -5,-11:
-            0: 65535
-          -5,-10:
-            0: 65535
+            0: 64735
           -5,-9:
             0: 65535
-          4,-12:
-            0: 65535
-          4,-11:
-            0: 65535
-          4,-10:
-            0: 65535
-          4,-9:
-            0: 63351
-            1: 2184
-          5,-12:
-            0: 65535
-          5,-11:
-            0: 65535
-          5,-10:
-            0: 65535
-          5,-9:
-            1: 307
-            0: 65228
-          6,-12:
-            0: 65459
-          6,-11:
-            0: 65535
-          6,-10:
-            0: 65535
-          6,-9:
-            0: 65535
-          7,-12:
-            0: 65528
-          7,-11:
-            0: 65535
-          7,-10:
-            0: 65535
-          7,-9:
-            0: 65535
-          8,-8:
-            0: 65535
-          8,-7:
-            0: 65535
-          8,-6:
-            0: 65535
-          8,-5:
-            0: 65535
-          9,-8:
-            0: 65535
-          9,-7:
-            0: 65535
-          9,-6:
-            0: 65535
-          9,-5:
-            0: 65535
-          10,-8:
-            0: 65535
-          10,-7:
-            0: 65535
-          10,-6:
-            0: 65535
-          10,-5:
-            0: 65535
-          11,-8:
-            0: 255
-          11,-6:
-            0: 65520
-          11,-5:
-            0: 65535
-          8,-12:
-            0: 65535
-          8,-11:
-            0: 65535
-          8,-10:
-            0: 65535
-          8,-9:
-            0: 65535
-          9,-12:
-            0: 65527
-          9,-11:
-            0: 65535
-          9,-10:
-            0: 65535
-          9,-9:
-            0: 65535
-          10,-12:
-            0: 65535
-          10,-11:
-            0: 65535
-          10,-10:
-            0: 65535
-          10,-9:
-            0: 65535
-          11,-12:
-            0: 65399
-          11,-11:
-            0: 65535
-          11,-10:
-            0: 65535
-          11,-9:
-            0: 65535
-          8,-4:
-            0: 65535
-          8,-3:
-            0: 65535
-          8,-2:
-            0: 65535
-          8,-1:
-            0: 65535
-          9,-4:
-            0: 65535
-          9,-3:
-            0: 65535
-          9,-2:
-            0: 65535
-          9,-1:
-            0: 65535
-          10,-4:
-            0: 65535
-          10,-3:
-            0: 65535
-          10,-2:
-            0: 65535
-          10,-1:
-            0: 65535
-          11,-4:
-            0: 65535
-          11,-3:
-            0: 65535
-          11,-2:
-            0: 65535
-          11,-1:
-            0: 65535
-          8,0:
-            0: 65535
-          8,1:
-            0: 65535
-          8,2:
-            0: 65535
-          8,3:
-            0: 32767
-            3: 32768
-          9,0:
-            0: 65535
-          9,1:
-            0: 65535
-          9,2:
-            0: 65535
-          9,3:
-            0: 65535
-          10,0:
-            0: 65535
-          10,1:
-            0: 65535
-          10,2:
-            0: 65535
-          10,3:
-            0: 65535
-          11,0:
-            0: 65535
-          11,1:
-            0: 65535
-          11,2:
-            0: 65535
-          11,3:
-            0: 65535
-          8,4:
-            0: 65535
-          8,5:
-            0: 65535
-          8,6:
-            0: 64716
-          8,7:
-            0: 65535
-          9,4:
-            0: 65535
-          9,5:
-            0: 65535
-          9,6:
-            0: 65535
-          9,7:
-            0: 65535
-          10,4:
-            0: 65535
-          10,5:
-            0: 65535
-          10,6:
-            0: 65535
-          10,7:
-            0: 65535
-          11,4:
-            0: 65535
-          11,5:
-            0: 65535
-          11,6:
-            0: 65535
-          11,7:
-            0: 65535
-          -12,-12:
-            0: 30719
-          -12,-11:
-            0: 65527
-          -12,-10:
-            0: 65535
-          -12,-9:
-            0: 65535
-          -11,-12:
-            0: 65535
-          -11,-11:
-            0: 65535
-          -11,-10:
-            0: 65535
-          -11,-9:
-            0: 65535
-          -10,-12:
-            0: 65535
-          -10,-11:
-            0: 65535
-          -10,-10:
-            0: 65535
-          -10,-9:
-            0: 65535
-          -9,-12:
-            0: 65535
-          -9,-11:
-            0: 65535
-          -9,-10:
-            0: 65535
-          -9,-9:
-            0: 65535
-          -12,-8:
-            0: 65535
-          -12,-7:
-            0: 65535
-          -12,-6:
-            0: 65527
-          -12,-5:
-            0: 65407
-          -11,-8:
-            0: 65535
-          -11,-7:
-            0: 65535
-          -11,-6:
-            0: 65535
-          -11,-5:
-            0: 65535
-          -10,-8:
-            0: 65535
-          -10,-7:
-            0: 65535
-          -10,-6:
-            0: 65535
-          -10,-5:
-            0: 65535
-          -9,-8:
-            0: 65535
-          -9,-7:
-            0: 65535
-          -9,-6:
-            0: 65535
-          -9,-5:
-            0: 65535
-          -12,-4:
-            0: 65535
-          -12,-3:
-            0: 65535
-          -12,-2:
-            0: 65535
-          -12,-1:
-            0: 65535
-          -11,-4:
-            0: 65535
-          -11,-3:
-            0: 65535
-          -11,-2:
-            0: 65535
-          -11,-1:
-            0: 65535
-          -10,-4:
-            0: 65535
-          -10,-3:
-            0: 65535
-          -10,-2:
-            0: 65535
-          -10,-1:
-            0: 65535
-          -9,-4:
-            0: 65535
-          -9,-3:
-            0: 65535
-          -9,-2:
-            0: 65535
-          -9,-1:
-            0: 65535
-          -12,0:
-            0: 65535
-          -12,1:
-            0: 40863
-          -11,0:
-            0: 65535
-          -11,1:
-            0: 65535
-          -10,0:
-            0: 65535
-          -10,1:
-            0: 65535
-          -10,2:
-            0: 65535
-          -10,3:
-            0: 65535
-          -9,0:
-            0: 65535
-          -9,1:
-            0: 65535
-          -9,2:
-            0: 65535
-          -9,3:
-            0: 65535
-          -10,4:
-            0: 65535
-          -10,5:
-            0: 65535
-          -10,6:
-            0: 65535
-          -10,7:
-            0: 65535
-          -9,4:
-            0: 65535
-          -9,5:
-            0: 65535
-          -9,6:
-            0: 65535
-          -9,7:
-            0: 65535
-          0,-13:
-            0: 65535
-          1,-13:
-            0: 65531
+          -4,-12:
+            0: 61661
           -4,-13:
-            0: 65535
+            0: 56784
+          -5,-12:
+            0: 61917
+          -4,-11:
+            0: 65522
+          -5,-11:
+            0: 56529
+          -4,-10:
+            0: 62463
+          -5,-10:
+            0: 61919
+          -3,-12:
+            0: 63675
+          -3,-11:
+            0: 7096
+          -3,-10:
+            0: 64765
           -3,-13:
+            0: 64440
+          -2,-12:
+            0: 48115
+          -2,-11:
+            0: 3007
+          -2,-10:
             0: 65535
           -2,-13:
             0: 65535
-          -1,-13:
-            0: 65535
-          -8,-14:
-            0: 65535
-          -8,-13:
-            0: 65535
-          -7,-14:
-            0: 65535
-          -7,-13:
-            0: 65535
-          -6,-13:
-            0: 65535
-          -5,-13:
-            0: 65535
-          -12,-14:
-            0: 65535
-          -12,-13:
-            0: 65535
-          -11,-14:
-            0: 65535
-          -11,-13:
-            0: 63487
-          -10,-14:
-            0: 65535
-          -10,-13:
-            0: 64767
-          -9,-14:
-            0: 65535
-          -9,-13:
-            0: 65535
-          -13,-8:
-            0: 65535
-          -13,-11:
-            0: 65535
-          -13,-10:
-            0: 65535
-          -13,-9:
-            0: 65535
-          8,8:
-            0: 65535
-          8,9:
-            0: 65535
-          8,10:
-            0: 65535
-          8,11:
-            0: 65535
-          9,8:
-            0: 65535
-          9,9:
-            0: 65535
-          9,10:
-            0: 65535
-          9,11:
-            0: 65535
-          10,8:
-            0: 65535
-          10,9:
-            0: 65535
-          10,10:
-            0: 65535
-          10,11:
-            0: 12908
-            4: 275
-          11,8:
-            0: 65535
-          11,9:
-            0: 65535
-          11,10:
-            0: 65535
-          11,11:
-            0: 61166
-          4,8:
-            0: 65535
-          4,9:
-            0: 65535
-          4,10:
-            0: 65535
-          4,11:
-            0: 65535
-          5,8:
-            0: 65535
-          5,9:
-            0: 65535
-          5,10:
-            0: 65535
-          5,11:
-            0: 65535
-          6,8:
-            0: 65535
-          6,9:
-            0: 65535
-          6,10:
-            0: 65535
-          6,11:
-            0: 65535
-          7,8:
-            0: 65535
-          7,9:
-            0: 65535
-          7,10:
-            0: 65535
-          7,11:
-            0: 65535
-          0,8:
-            0: 65535
-          0,9:
-            0: 65535
-          0,10:
-            0: 65535
-          0,11:
-            0: 65535
-          1,8:
-            0: 65535
-          1,9:
-            0: 65535
-          1,10:
-            0: 65535
-          1,11:
-            0: 65535
-          2,8:
-            0: 65535
-          2,9:
-            0: 65535
-          2,10:
-            0: 65535
-          2,11:
-            0: 65535
-          3,8:
-            0: 65535
-          3,9:
-            0: 65535
-          3,10:
-            0: 65535
-          3,11:
-            0: 65535
-          12,0:
-            0: 65535
-          12,1:
-            0: 65535
-          12,2:
-            0: 65535
-          13,0:
-            0: 65535
-          13,1:
-            0: 65535
-          13,2:
-            0: 65535
-          14,0:
-            0: 65535
-          12,-4:
-            0: 65535
-          12,-3:
-            0: 65535
-          12,-2:
-            0: 65535
-          12,-1:
-            0: 65535
-          13,-4:
-            0: 65535
-          13,-3:
-            0: 65535
-          13,-2:
-            0: 65535
-          13,-1:
-            0: 65535
-          14,-4:
-            0: 65535
-          14,-3:
-            0: 65535
-          14,-2:
-            0: 65535
-          14,-1:
-            0: 65535
-          15,-4:
-            0: 48059
-          15,-3:
-            0: 48059
-          12,-8:
-            0: 255
-          12,-6:
-            0: 65520
-          12,-5:
-            0: 65535
-          13,-8:
-            0: 255
-          13,-6:
-            0: 65520
-          13,-5:
-            0: 65535
-          14,-8:
-            0: 255
-          14,-6:
-            0: 65520
-          14,-5:
-            0: 65535
-          15,-8:
-            0: 119
-          15,-6:
-            0: 63344
-          15,-5:
-            0: 49151
-          12,-11:
-            0: 65535
-          12,-10:
-            0: 65535
-          12,-9:
-            0: 65535
-          13,-10:
-            0: 65535
-          13,-9:
-            0: 65535
-          14,-10:
-            0: 65535
-          14,-9:
-            0: 65535
-          15,-10:
-            0: 65535
-          15,-9:
-            0: 30583
-          -4,8:
-            0: 65535
-          -4,9:
-            0: 65535
-          -4,10:
-            0: 65535
-          -4,11:
-            0: 65535
-          -3,8:
-            0: 65535
-          -3,9:
-            0: 65535
-          -3,10:
-            0: 65535
-          -3,11:
-            0: 65535
-          -2,8:
-            0: 65535
-          -2,9:
-            0: 65535
-          -2,10:
-            0: 65535
-          -2,11:
-            0: 65535
-          -1,8:
-            0: 65535
-          -1,9:
-            0: 65535
-          -1,10:
-            0: 65535
-          -1,11:
-            0: 65535
-          -8,8:
-            0: 65535
-          -8,9:
-            0: 65535
-          -8,10:
-            0: 65535
-          -8,11:
-            0: 43823
-          -7,8:
-            0: 65535
-          -7,9:
-            0: 65535
-          -7,10:
-            0: 65535
-          -7,11:
-            0: 53199
-          -6,8:
-            0: 65535
-          -6,9:
-            0: 65535
-          -6,10:
-            0: 65535
-          -6,11:
-            0: 65535
-          -5,8:
-            0: 65535
-          -5,9:
-            0: 65535
-          -5,10:
-            0: 65535
-          -5,11:
-            0: 65535
-          -10,8:
-            0: 65535
-          -9,8:
-            0: 65535
-          -9,9:
-            0: 65535
-          -9,10:
-            0: 61166
-          -9,11:
-            0: 20238
-          8,-16:
-            0: 65024
-          8,-15:
-            0: 65535
-          8,-14:
-            0: 65535
-          8,-13:
-            0: 65535
-          9,-16:
-            0: 28928
-          9,-15:
-            0: 65527
-          9,-14:
-            0: 14207
-          9,-13:
-            0: 13107
-          7,-15:
-            0: 52424
-          7,-14:
-            0: 2188
-          7,-16:
-            0: 32768
-          -7,12:
-            0: 64750
-          -7,13:
-            0: 36092
-          -6,12:
-            0: 65535
-          -6,13:
-            0: 65535
-          -5,12:
-            0: 65535
-          -5,13:
-            0: 65535
-          -4,12:
-            0: 65535
-          -4,13:
-            0: 65535
-          -3,12:
-            0: 65535
-          -3,13:
-            0: 4095
-          -2,12:
-            0: 65535
-          -2,13:
-            0: 65535
-          -1,12:
-            0: 65535
-          -1,13:
-            0: 8191
-          0,12:
-            0: 65535
-          0,13:
-            0: 53247
-          1,12:
-            0: 65535
-          1,13:
-            0: 32767
-          1,14:
-            0: 61183
-          1,15:
-            0: 61166
-          2,12:
-            0: 65535
-          2,13:
-            0: 4095
-          2,14:
-            0: 49023
-          2,15:
-            0: 44974
-          3,12:
-            0: 65535
-          3,13:
-            0: 4095
-          3,14:
-            0: 44847
-          3,15:
-            0: 44975
-          4,12:
-            0: 65535
-          4,13:
-            0: 4095
-          4,14:
-            0: 61439
-          4,15:
-            0: 44971
-          5,12:
-            0: 65503
-            5: 32
-          5,13:
-            0: 15359
-          5,14:
-            0: 29491
-          5,15:
-            0: 14335
-          6,12:
-            0: 65535
-          6,13:
-            0: 8191
-          6,15:
-            0: 255
-          7,12:
-            0: 65535
-          7,13:
-            0: 4095
-          7,15:
-            0: 255
-          8,12:
-            0: 65535
-          8,13:
-            0: 4991
-          8,15:
-            0: 255
-          9,12:
-            0: 65535
-          9,15:
-            0: 255
-          10,12:
-            0: 16383
-          10,14:
-            0: 65224
-          10,15:
-            0: 55
-          11,12:
-            0: 53247
-          11,13:
-            0: 65228
-          11,14:
-            0: 311
-          12,8:
-            0: 13107
-          12,9:
-            0: 13107
-          12,10:
-            0: 63923
-          12,11:
-            0: 61443
-          12,6:
-            0: 65535
-          12,7:
-            0: 16383
-          12,12:
-            0: 65535
-          13,12:
-            0: 4095
-          14,12:
-            0: 4095
-          15,12:
-            0: 4095
-          16,12:
-            0: 883
-          1,16:
-            0: 61166
-          1,17:
-            0: 28670
-          2,16:
-            0: 32702
-          2,17:
-            0: 61439
-          3,16:
-            0: 12207
-          3,17:
-            0: 65535
-          4,16:
-            0: 65515
-          4,17:
-            0: 16383
-          5,16:
-            0: 13107
-          5,17:
-            0: 49011
-          -12,2:
-            0: 34953
-          -12,3:
-            0: 34956
-          -11,2:
-            0: 8191
-            6: 57344
-          -11,3:
-            0: 65311
-            7: 224
-          -12,4:
-            0: 53192
-          -12,7:
-            0: 36092
-          -12,5:
-            0: 34952
-          -12,6:
-            0: 34952
-          -11,4:
-            0: 7967
-            8: 224
-            4: 57344
-          -11,5:
-            0: 7967
-            4: 57568
-          -11,6:
-            0: 65311
-            4: 224
-          -11,7:
-            0: 7967
-            4: 57568
-          -12,9:
-            0: 65433
-          -12,10:
-            0: 52428
-          -12,8:
-            0: 34952
-          -11,8:
-            0: 65535
-          -11,9:
-            0: 65535
-          -10,9:
-            0: 65535
-          -10,10:
+          -1,-12:
+            0: 48120
+          -1,-11:
             0: 35771
-          -10,11:
-            0: 2296
-          -8,13:
-            0: 29666
-          -8,12:
-            0: 43690
-          -13,2:
-            0: 30719
-          -13,3:
-            0: 12851
-          -13,4:
-            0: 32630
-          -13,7:
-            0: 26615
-          -13,5:
-            0: 8742
-          -13,6:
-            0: 25122
-          -13,8:
-            0: 50722
-          -13,9:
-            0: 8
-          -9,12:
-            0: 17476
-          -9,13:
-            0: 3140
-          0,-16:
+          -1,-10:
+            0: 65262
+          -1,-13:
+            0: 48059
+          0,-12:
             0: 65535
-          0,-15:
-            0: 65535
-          0,-14:
-            0: 65535
-          1,-16:
-            0: 13107
-          1,-15:
-            0: 13107
-          1,-14:
-            0: 48063
-          2,-15:
-            0: 39315
-          2,-14:
-            0: 63631
+          0,-11:
+            0: 16383
+          0,-10:
+            0: 15291
+          0,-13:
+            0: 65531
+          1,-12:
+            0: 61424
+          1,-11:
+            0: 3839
+          1,-10:
+            0: 16383
+          1,-13:
+            0: 57104
+            2: 8
+          2,-12:
+            0: 65308
+          2,-11:
+            0: 4095
+          2,-10:
+            0: 28671
           2,-13:
-            0: 65528
-          2,-16:
-            0: 27776
-          3,-16:
-            0: 57375
-          3,-15:
-            0: 12443
-          3,-14:
-            0: 61488
+            0: 7936
+            2: 8
+          3,-12:
+            0: 62349
+          3,-11:
+            0: 61439
+          3,-10:
+            0: 61182
           3,-13:
-            0: 65524
-          -4,-15:
-            0: 65521
-          -4,-14:
+            0: 55040
+            2: 4
+          3,-9:
+            0: 3822
+          4,-12:
+            0: 28913
+          4,-11:
             0: 65535
-          -3,-15:
+          4,-10:
+            0: 16383
+          -8,-12:
+            0: 30591
+          -9,-12:
+            0: 2039
+          -8,-11:
+            0: 28791
+          -8,-10:
+            0: 61559
+          -9,-11:
+            0: 61559
+          -9,-10:
+            0: 46079
+          -9,-9:
+            0: 62393
+          -7,-12:
+            0: 65295
+          -7,-11:
+            0: 65295
+          -7,-10:
+            0: 57599
+          -7,-13:
+            0: 65287
+          -6,-12:
+            0: 57293
+          -6,-11:
+            0: 55757
+          -6,-10:
+            0: 56543
+          -6,-13:
+            0: 64911
+          -5,-13:
+            0: 64961
+          5,-12:
+            0: 36856
+          5,-11:
+            0: 48123
+          5,-10:
+            0: 3003
+          5,-13:
+            0: 49083
+          6,-12:
+            0: 61712
+          6,-11:
+            0: 39739
+          6,-10:
+            0: 49147
+          6,-13:
+            0: 4369
+          7,-12:
+            0: 65280
+          7,-11:
+            0: 65295
+          7,-10:
             0: 65535
-          -3,-14:
+          8,-12:
+            0: 65534
+          8,-11:
+            0: 30479
+          8,-10:
+            0: 65399
+          8,-9:
+            0: 65520
+          9,-8:
+            0: 45183
+          9,-6:
+            0: 65376
+          9,-5:
+            0: 61031
+          9,-9:
+            0: 32624
+          9,-7:
+            0: 43690
+          9,-4:
+            0: 65262
+          10,-8:
+            0: 30511
+          10,-7:
+            0: 30711
+          10,-6:
+            0: 30578
+          10,-5:
+            0: 65527
+          10,-9:
             0: 65535
-          -3,-16:
+          10,-4:
+            0: 65535
+          11,-8:
+            0: 13
+          11,-6:
+            0: 30464
+          11,-5:
+            0: 65522
+          11,-9:
+            0: 56654
+          11,-4:
+            0: 65535
+          12,-8:
+            0: 15
+          12,-6:
+            0: 30464
+          12,-5:
+            0: 65522
+          8,-13:
             0: 61166
-          -2,-16:
+          9,-12:
+            0: 65329
+          9,-11:
+            0: 64271
+          9,-10:
+            0: 45963
+          9,-13:
+            0: 4369
+          10,-12:
+            0: 14560
+          10,-11:
+            0: 65295
+          10,-10:
+            0: 62207
+          10,-13:
+            2: 9902
+          11,-12:
+            0: 4913
+          11,-11:
+            0: 20199
+          11,-10:
+            0: 65262
+          11,-13:
+            0: 4352
+            2: 127
+          12,-10:
+            0: 65488
+          12,-9:
+            0: 65293
+          9,-3:
+            0: 62719
+          9,-2:
             0: 65535
-          -2,-15:
+          9,-1:
+            0: 61559
+          9,0:
+            0: 53759
+          10,-3:
+            0: 56607
+          10,-2:
+            0: 65529
+          10,-1:
+            0: 65521
+          10,0:
+            0: 29183
+          11,-3:
+            0: 56783
+          11,-2:
+            0: 22300
+          11,-1:
+            0: 65252
+          11,0:
+            0: 62207
+          12,-4:
+            0: 61007
+          12,-3:
+            0: 62702
+          12,-2:
+            0: 45055
+          12,-1:
+            0: 64238
+          8,1:
+            0: 52428
+          9,1:
+            0: 7645
+          9,2:
+            0: 49183
+          9,3:
             0: 65535
-          -2,-14:
+          9,4:
+            0: 39197
+          10,1:
+            0: 10103
+          10,2:
+            0: 39119
+          10,3:
+            0: 39321
+          10,4:
+            0: 48009
+          11,1:
+            0: 4095
+          11,2:
+            0: 49407
+          11,3:
+            0: 21845
+          11,4:
+            0: 21845
+          12,0:
+            0: 29439
+          12,1:
+            0: 1911
+          12,2:
+            0: 61567
+          12,3:
+            0: 32752
+          8,8:
+            0: 61695
+          8,6:
+            0: 34952
+          9,5:
+            0: 35225
+          9,6:
+            0: 8179
+          9,7:
+            0: 24013
+          9,8:
+            0: 54357
+          10,5:
+            0: 48063
+          10,6:
+            0: 36856
+          10,7:
+            0: 52701
+          10,8:
+            0: 8191
+          11,5:
+            0: 21845
+          11,6:
+            0: 36636
+          11,7:
+            0: 22387
+          11,8:
+            0: 17989
+          12,4:
+            0: 65407
+          12,5:
+            0: 4095
+          12,6:
+            0: 64271
+          12,7:
+            2: 16368
+          -12,-12:
+            0: 13119
+          -12,-13:
+            0: 65427
+          -13,-12:
+            0: 56524
+            3: 17
+          -12,-11:
+            0: 60931
+          -13,-11:
+            0: 64735
+          -12,-10:
+            0: 3823
+          -13,-10:
+            0: 32767
+          -12,-9:
+            0: 30583
+          -12,-8:
+            0: 4087
+          -11,-12:
+            0: 61166
+          -11,-11:
+            0: 61166
+          -11,-10:
+            0: 3808
+          -11,-9:
+            0: 1636
+          -10,-12:
+            0: 32767
+          -10,-11:
+            0: 30583
+          -10,-10:
+            0: 26222
+          -10,-9:
+            0: 61158
+          -10,-8:
+            0: 59630
+          -13,-8:
+            0: 32631
+          -12,-7:
+            0: 4095
+          -12,-6:
+            0: 65331
+          -12,-5:
+            0: 28723
+          -12,-4:
+            0: 119
+          -13,-5:
+            0: 58982
+          -11,-8:
+            0: 61424
+          -11,-7:
+            0: 61422
+          -11,-5:
+            0: 65262
+          -11,-6:
+            0: 61166
+          -11,-4:
+            0: 61183
+          -10,-7:
+            0: 28926
+          -10,-5:
+            0: 24679
+          -10,-6:
+            0: 26118
+          -10,-4:
+            0: 1654
+          -13,-4:
+            0: 992
+          -12,-3:
+            0: 30583
+          -13,-3:
+            0: 52428
+          -12,-2:
+            0: 57351
+          -13,-2:
+            0: 57356
+          -12,-1:
+            0: 61183
+          -13,-1:
+            0: 65262
+          -12,0:
+            0: 26367
+          -11,-3:
+            0: 65534
+          -11,-2:
+            0: 65262
+          -11,-1:
             0: 65535
+          -11,0:
+            0: 63231
+          -10,-3:
+            0: 59645
+          -10,-1:
+            0: 61694
+          -10,-2:
+            0: 61166
+          -10,0:
+            0: 64511
+          -13,0:
+            0: 61167
+          -13,1:
+            0: 57296
+          -12,1:
+            2: 36352
+          -12,3:
+            2: 34956
+          -11,1:
+            0: 127
+            2: 30464
+          -12,2:
+            2: 34952
+          -11,2:
+            2: 255
+            4: 57344
+          -12,4:
+            2: 53192
+          -11,3:
+            2: 61440
+            5: 224
+          -10,1:
+            0: 40847
+          -10,2:
+            2: 8755
+            0: 34952
+          -10,3:
+            2: 12834
+            0: 34952
+          -10,4:
+            2: 8738
+            0: 34952
+          -13,4:
+            2: 32630
+          -12,7:
+            2: 52476
+          -13,7:
+            2: 26615
+          -12,6:
+            2: 51336
+          -12,5:
+            2: 34952
+          -11,6:
+            2: 61440
+            3: 224
+          -12,8:
+            2: 34952
+          -11,4:
+            6: 224
+            3: 57344
+          -11,5:
+            3: 57568
+          -11,7:
+            3: 57568
+          -10,6:
+            2: 12834
+            0: 34952
+          -10,5:
+            2: 8738
+            0: 34952
+          -10,7:
+            2: 8738
+            0: 34952
+          -10,8:
+            2: 62258
+            0: 136
+          -9,8:
+            0: 52479
+            2: 4096
+          0,-16:
+            0: 65528
           -1,-16:
-            0: 65535
+            0: 65520
+          0,-15:
+            0: 16191
           -1,-15:
             0: 65535
+          0,-14:
+            0: 48059
           -1,-14:
-            0: 65535
-          -6,-14:
-            0: 65535
-          -6,-15:
-            0: 65280
+            0: 48056
+          0,-17:
+            0: 34952
+          1,-16:
+            0: 4369
+          1,-15:
+            0: 257
+          1,-14:
+            0: 4369
+            2: 34956
+          1,-17:
+            0: 4371
+          2,-14:
+            2: 63631
+          2,-15:
+            2: 39315
+          2,-16:
+            2: 27776
+          3,-16:
+            2: 57375
+          3,-15:
+            2: 12443
+          3,-14:
+            2: 61488
+          4,-16:
+            2: 4883
+          -4,-15:
+            0: 65088
+          -4,-14:
+            0: 65303
           -5,-15:
-            0: 65280
+            0: 61440
           -5,-14:
             0: 65535
+          -3,-15:
+            0: 57292
+          -3,-14:
+            0: 49072
+          -3,-16:
+            0: 52428
+          -3,-17:
+            0: 52430
+          -2,-16:
+            0: 65520
+          -2,-15:
+            0: 65527
+          -2,-14:
+            0: 65520
+          -9,-15:
+            3: 2048
+          -8,-14:
+            0: 4080
+          -9,-14:
+            0: 4080
+          -8,-13:
+            0: 1911
+          -9,-13:
+            0: 4095
+          -7,-15:
+            3: 61184
+          -7,-14:
+            0: 32752
+          -6,-15:
+            3: 256
+            0: 32768
+          -6,-14:
+            0: 65528
+          -12,-16:
+            2: 4880
+          -13,-16:
+            2: 65520
+          -12,-15:
+            3: 53128
+          -12,-14:
+            0: 30483
+            3: 4
+          -13,-14:
+            0: 52232
+            2: 23
+          -11,-16:
+            3: 4352
+          -11,-15:
+            3: 65425
+          -11,-14:
+            0: 65520
+          -11,-13:
+            0: 831
+          -10,-15:
+            3: 14327
+          -10,-14:
+            0: 16304
+          -10,-13:
+            0: 2187
+          -10,-16:
+            3: 8704
+          -10,-17:
+            3: 49152
           -16,-7:
-            0: 52416
+            2: 52416
           -16,-6:
-            0: 52428
+            2: 3276
+            0: 32768
           -16,-5:
-            0: 52428
+            0: 3080
+          -16,-4:
+            2: 140
           -15,-7:
-            0: 65534
+            2: 4368
+            0: 3276
           -15,-6:
-            0: 65535
+            2: 273
+            0: 52428
           -15,-5:
-            0: 65535
+            0: 53199
+          -15,-4:
+            2: 4369
+            0: 52416
           -15,-8:
-            0: 61439
+            0: 52416
+          -15,-9:
+            0: 34952
+            3: 256
           -14,-8:
-            0: 65535
+            0: 49080
           -14,-7:
-            0: 65535
+            0: 3003
           -14,-6:
             0: 65535
           -14,-5:
             0: 65535
-          -13,-7:
-            0: 65535
-          -13,-6:
-            0: 65535
-          -13,-5:
-            0: 65535
-          -15,-11:
-            0: 65535
-          -15,-10:
-            0: 65535
-          -15,-9:
-            0: 65535
-          -14,-11:
-            0: 65535
-          -14,-10:
-            0: 65535
           -14,-9:
             0: 65535
+          -14,-4:
+            0: 65523
+          -13,-6:
+            0: 26470
+          -13,-9:
+            0: 30583
+          -13,-7:
+            0: 26214
+          -16,-12:
+            3: 32
+          -16,-11:
+            3: 32768
+          -16,-10:
+            3: 8
+          -15,-11:
+            3: 13036
+            0: 32768
+          -15,-10:
+            3: 307
+            0: 34952
+          -15,-12:
+            3: 51336
           -14,-12:
+            3: 4607
+            0: 49152
+          -14,-11:
+            3: 17
+            0: 61644
+          -14,-10:
             0: 65535
-          -13,-12:
+          -14,-13:
+            3: 59392
+          -13,-13:
+            3: 4352
+            0: 1604
+          8,9:
             0: 65535
-          12,3:
+          7,9:
+            0: 48059
+          8,10:
+            0: 65391
+          7,10:
+            0: 65291
+          8,11:
+            0: 53244
+          7,11:
+            0: 65520
+          8,12:
+            0: 3822
+          9,9:
+            0: 56793
+          9,10:
+            0: 28621
+          9,11:
+            0: 1906
+          9,12:
+            0: 3581
+          10,9:
+            0: 56797
+          10,10:
+            0: 3549
+          10,11:
+            3: 275
+          10,12:
+            0: 305
+            2: 3276
+          11,9:
+            0: 4469
+            2: 49152
+          11,10:
+            0: 273
+            2: 52428
+          11,11:
+            2: 61166
+          11,12:
+            2: 53247
+          12,8:
+            2: 13107
+          12,9:
+            2: 13107
+          12,10:
+            2: 63923
+          12,11:
+            2: 61443
+          4,9:
+            0: 57599
+          3,9:
+            0: 61695
+          4,10:
+            0: 61167
+          3,10:
             0: 65535
+          4,11:
+            0: 61438
+          3,11:
+            0: 4080
+          4,12:
+            0: 61166
+          5,10:
+            0: 65294
+          5,9:
+            0: 61166
+          5,11:
+            0: 60928
+          5,12:
+            0: 238
+            2: 49152
+          6,9:
+            0: 65535
+          6,10:
+            0: 65375
+          6,11:
+            0: 13056
+          6,12:
+            0: 51
+          7,12:
+            0: 28671
+          0,9:
+            0: 14207
+          -1,9:
+            0: 4093
+          0,10:
+            0: 48059
+          -1,10:
+            0: 32759
+          0,11:
+            0: 47931
+          0,12:
+            0: 48051
+          1,9:
+            0: 36863
+          1,10:
+            0: 49083
+          1,11:
+            0: 48043
+          2,9:
+            0: 341
+          2,10:
+            0: 30583
+          2,11:
+            0: 16375
+          1,12:
+            0: 49080
+          2,12:
+            0: 48059
+          3,12:
+            0: 65535
+          13,0:
+            0: 52991
+          13,1:
+            0: 63289
+          13,2:
+            0: 61447
           13,3:
+            0: 59248
+          13,-1:
+            0: 65262
+          13,4:
+            0: 30694
+          14,0:
             0: 65535
           14,1:
-            0: 65535
+            0: 29439
           14,2:
-            0: 65535
+            0: 53488
           14,3:
+            0: 56541
+          14,-1:
             0: 65535
-          15,0:
-            0: 65535
-          15,1:
-            0: 32767
-          15,2:
-            0: 63351
-          15,3:
-            0: 32767
-          15,-2:
-            0: 65535
-          15,-1:
-            0: 65535
-          -12,11:
-            0: 136
-          -11,10:
-            0: 36863
-          -11,11:
-            0: 248
-          4,-16:
-            0: 57311
-          4,-13:
-            0: 47496
-          4,-15:
-            0: 8
-          4,-14:
-            0: 34816
-          5,-16:
-            0: 65535
-          5,-15:
-            0: 207
-          5,-14:
-            0: 62464
-          5,-13:
-            0: 65535
-          6,-16:
-            0: 30719
-          6,-15:
-            0: 19
-          6,-14:
-            0: 12800
-          6,-13:
-            0: 13107
-          12,4:
-            0: 65535
-          12,5:
-            0: 65535
-          13,4:
-            0: 65535
-          13,5:
-            0: 65535
-          13,6:
-            0: 65535
-          13,7:
-            0: 20479
           14,4:
-            0: 65535
-          14,5:
+            0: 56541
+          15,0:
+            0: 16183
+          15,1:
             0: 13119
-          14,6:
+            2: 18432
+          15,2:
             0: 13107
-          14,7:
-            0: 51711
+            2: 32836
+          15,3:
+            0: 13107
+            2: 2184
+          15,-1:
+            0: 30527
           15,4:
-            0: 63351
-          15,5:
+            0: 13107
+            2: 32768
+          16,0:
+            0: 1793
+            2: 4
+          16,1:
             0: 7
-          15,6:
-            0: 14024
-          15,7:
-            0: 55539
-          2,18:
-            0: 4238
-          3,18:
+            2: 1024
+          16,3:
+            2: 4368
+          13,-4:
+            0: 26215
+          13,-3:
+            0: 32494
+          13,-2:
+            0: 51479
+          13,-5:
+            0: 30578
+          14,-3:
+            0: 61439
+          14,-2:
+            0: 65534
+          14,-4:
+            0: 59630
+          14,-5:
+            0: 61098
+          15,-4:
+            0: 4113
+            2: 34952
+          15,-3:
+            0: 4369
+            2: 34952
+          15,-2:
+            0: 16177
+            2: 8
+          15,-5:
+            0: 4353
+            2: 34952
+          16,-2:
+            0: 1792
+            2: 4
+          16,-1:
+            0: 4359
+            2: 17408
+          13,-8:
+            0: 15
+          13,-6:
+            0: 30464
+          13,-9:
+            0: 32527
+          14,-8:
+            0: 35
+          14,-6:
+            0: 41504
+          14,-9:
+            0: 36623
+          15,-8:
+            3: 16
+          15,-6:
+            3: 16
+            0: 4096
+            2: 32768
+          15,-9:
+            0: 4353
+          16,-5:
+            2: 304
+          12,-11:
+            3: 49156
+          12,-12:
+            2: 12
+          12,-13:
+            2: 52303
+          13,-12:
+            2: 15
+            3: 16384
+          13,-11:
+            3: 65228
+          13,-10:
+            0: 65520
+          13,-13:
+            2: 65295
+          14,-12:
+            2: 15
+          14,-11:
+            3: 65521
+          14,-10:
+            0: 65392
+          14,-13:
+            2: 65295
+          15,-12:
+            2: 1
+          15,-11:
+            3: 4112
+          15,-10:
+            3: 52451
+            0: 4096
+          15,-13:
+            2: 4511
+          16,-10:
+            3: 19
+          -4,9:
+            0: 7421
+          -5,9:
+            0: 62719
+          -4,10:
+            0: 65533
+            7: 2
+          -5,10:
+            0: 65535
+          -4,11:
+            0: 7999
+          -5,11:
+            0: 32767
+          -4,12:
+            0: 34945
+            3: 13072
+          -3,9:
+            0: 4095
+          -3,10:
+            0: 65535
+          -3,11:
+            3: 61408
+          -2,9:
+            0: 4095
+          -2,10:
+            0: 61438
+          -2,11:
+            0: 61152
+          -1,11:
+            0: 30580
+          -8,9:
+            0: 61678
+          -9,9:
+            0: 52428
+            2: 4369
+          -8,10:
+            0: 65535
+          -9,10:
+            0: 52428
+          -8,11:
+            2: 43808
+          -9,11:
+            2: 20224
+          -8,12:
+            2: 43690
+          -7,9:
+            0: 45311
+          -7,10:
+            0: 49087
+          -7,11:
+            2: 768
+            0: 34952
+          -6,9:
+            0: 61661
+          -6,10:
+            0: 65535
+          -6,11:
+            0: 64255
+            8: 256
+            7: 1024
+          -7,12:
+            0: 34952
+            2: 12322
+          -6,12:
+            0: 65535
+          -5,12:
+            0: 13111
+            3: 34816
+          -12,9:
+            2: 65433
+          -13,9:
+            2: 8
+          -12,10:
+            2: 52428
+          -11,8:
+            2: 65520
+          -11,9:
+            2: 4607
+            3: 49152
+          -11,10:
+            2: 33041
+            3: 204
+          -12,11:
+            2: 136
+          -11,11:
+            2: 248
+          -10,9:
+            2: 52479
+            3: 4096
+          -10,10:
+            3: 17
+            2: 34952
+          -10,11:
+            2: 2296
+          -9,12:
+            2: 17476
+          8,-15:
+            0: 65535
+          7,-15:
+            0: 34816
+          8,-14:
+            0: 61183
+          8,-16:
+            0: 49152
+          9,-15:
+            0: 30515
+          9,-14:
+            0: 4403
+          10,-16:
+            2: 3584
+          11,-16:
+            2: 7936
+          10,-14:
+            2: 34816
+          11,-14:
+            2: 29489
+          11,-15:
+            2: 4369
+          12,-16:
+            2: 3840
+          4,-17:
+            2: 4096
+          4,-14:
+            2: 2048
+          5,-14:
+            2: 1024
+          6,-14:
+            2: 512
+          -8,13:
+            2: 29666
+          -9,13:
+            2: 3140
+          -8,14:
+            2: 15
+          -7,13:
+            2: 32816
+            0: 1032
+          -7,14:
+            2: 15
+          -6,13:
             0: 255
+          -6,14:
+            2: 49
+          -5,13:
+            0: 51
+            3: 51208
+          -5,14:
+            3: 264
+          -4,13:
+            3: 29443
+            0: 136
+          -4,14:
+            3: 3
+          -3,12:
+            0: 65520
+          -3,13:
+            0: 255
+          -2,12:
+            0: 45040
+          -2,13:
+            0: 43690
+          -1,12:
+            0: 61424
+          -1,13:
+            0: 238
+          0,13:
+            0: 35003
+          1,13:
+            0: 8866
+          1,14:
+            0: 8710
+            2: 34952
+          1,15:
+            0: 8226
+            2: 34952
+          1,16:
+            0: 8738
+            2: 34952
+          2,13:
+            0: 184
+          2,14:
+            2: 49023
+          2,15:
+            2: 44974
+          2,16:
+            2: 32702
+          3,13:
+            0: 255
+          3,14:
+            2: 44847
+          3,15:
+            2: 44975
+          3,16:
+            2: 12207
+          4,14:
+            2: 61439
+          4,15:
+            2: 44971
+          4,13:
+            0: 224
+          4,16:
+            2: 65515
+          5,15:
+            2: 1279
+            0: 8192
+          5,13:
+            0: 8738
+            3: 136
+          5,14:
+            0: 546
+            2: 16384
+          5,16:
+            0: 8738
+          6,15:
+            2: 255
+          6,13:
+            0: 1262
+          7,13:
+            0: 1279
+          7,15:
+            2: 255
+          8,15:
+            2: 255
+          9,15:
+            2: 255
+          10,15:
+            2: 55
+          10,14:
+            2: 65224
+          11,14:
+            2: 311
+          11,13:
+            2: 65228
+          12,12:
+            2: 65535
+          13,10:
+            2: 17
+          13,9:
+            2: 13028
+          13,8:
+            2: 19652
+          13,7:
+            2: 20478
+          14,9:
+            2: 248
+          14,8:
+            2: 52428
+          14,7:
+            2: 51711
+          15,8:
+            2: 56797
+          15,9:
+            2: 248
+          15,7:
+            2: 55539
+          16,8:
+            2: 56797
+          16,9:
+            2: 248
+          13,5:
+            0: 1911
+          13,6:
+            0: 4111
+            2: 60928
+          14,5:
+            0: 4369
+          14,6:
+            0: 1
+            2: 13056
+          15,6:
+            2: 14024
+          16,4:
+            2: 29233
+          16,6:
+            2: 34947
+          16,7:
+            2: 55544
+          13,12:
+            2: 4095
+          14,12:
+            2: 4095
+          15,12:
+            2: 4095
+          16,12:
+            2: 883
+          0,18:
+            2: 49160
+          0,17:
+            2: 34816
+          1,17:
+            2: 24856
+            0: 3106
+          1,18:
+            2: 61987
+          2,17:
+            2: 57359
+            0: 1792
+          2,18:
+            2: 4238
+          3,17:
+            2: 61455
+            0: 1792
+          3,18:
+            2: 255
+          4,17:
+            2: 12303
+            0: 3840
           4,18:
-            0: 49155
+            2: 49155
+          5,17:
+            0: 290
+            2: 48192
+          5,18:
+            2: 61998
+          6,17:
+            2: 18244
+          6,18:
+            2: 4164
+          6,16:
+            2: 16384
           -15,0:
-            0: 61167
+            2: 1
+            0: 52428
           -15,1:
-            0: 56831
+            2: 4401
+            0: 34944
           -15,2:
-            0: 56797
+            2: 4369
+            0: 2176
           -15,3:
-            0: 34959
+            2: 34959
+          -15,-1:
+            0: 52732
           -14,0:
             0: 65535
           -14,1:
-            0: 65535
+            0: 65524
           -14,2:
-            0: 65535
-          -14,3:
-            0: 61695
-          -13,0:
-            0: 65535
-          -13,1:
-            0: 65535
-          -13,-13:
-            0: 65535
-          4,-17:
-            0: 55296
-          5,-17:
-            0: 65504
-          6,-17:
-            0: 29456
-          0,-20:
-            0: 52428
-          0,-19:
-            0: 52428
-          0,-18:
-            0: 52428
-          0,-17:
-            0: 52428
-          1,-20:
-            0: 30519
-          1,-19:
-            0: 14199
-          1,-18:
-            0: 30579
-          1,-17:
-            0: 13175
-          -3,-20:
-            0: 65519
-          -3,-19:
             0: 61439
-          -3,-18:
-            0: 65534
-          -3,-17:
-            0: 61183
-          -2,-20:
-            0: 4369
-          -2,-19:
-            0: 4369
-          -2,-18:
-            0: 4369
-          -2,-17:
-            0: 4369
-          -3,-21:
+          -14,3:
+            2: 61440
+            0: 14
+          -14,-1:
             0: 65535
-          -2,-21:
-            0: 4369
+          -13,2:
+            0: 817
+            2: 128
+          -13,3:
+            2: 12834
+          -13,5:
+            2: 8742
+          -13,6:
+            2: 25122
+          -13,8:
+            2: 50722
+          -16,-16:
+            2: 30583
+          -16,-17:
+            2: 29187
+          -16,-15:
+            2: 29426
+          -17,-15:
+            2: 29426
+          -16,-14:
+            2: 30583
+          -16,-13:
+            2: 2
+          -15,-15:
+            2: 240
+          -15,-16:
+            2: 65520
+          -15,-13:
+            3: 64
+          -14,-16:
+            2: 24404
+          -14,-15:
+            2: 52980
+          -14,-17:
+            2: 24404
+          -13,-15:
+            2: 29456
+          -14,-14:
+            2: 8
+          0,-20:
+            0: 34952
+          0,-19:
+            0: 34956
+          0,-18:
+            0: 51336
           0,-21:
-            0: 52428
+            0: 34944
+          1,-20:
+            0: 12561
+          1,-19:
+            0: 4403
+          1,-18:
+            0: 13073
           1,-21:
-            0: 30583
-          -16,-4:
-            0: 140
+            0: 61936
+          2,-21:
+            0: 4112
+          -4,-21:
+            0: 49344
+          -3,-21:
+            0: 64752
+          -3,-20:
+            0: 60620
+          -3,-19:
+            0: 52462
+          -3,-18:
+            0: 61132
+          -2,-19:
+            0: 1
+          -2,-18:
+            0: 4096
           -16,-2:
-            0: 52428
+            2: 12
+            0: 51200
           -16,-1:
-            0: 52428
+            0: 2240
           -16,-3:
-            0: 32768
-          -15,-4:
-            0: 65535
+            2: 32768
           -15,-3:
-            0: 65535
+            2: 4369
+            0: 52428
           -15,-2:
-            0: 65535
-          -15,-1:
-            0: 65535
-          -14,-4:
-            0: 65535
+            2: 1
+            0: 64972
           -14,-3:
             0: 65535
           -14,-2:
             0: 65535
-          -14,-1:
-            0: 65535
-          -13,-4:
-            0: 65535
-          -13,-3:
-            0: 65535
-          -13,-2:
-            0: 65535
-          -13,-1:
-            0: 65535
-          16,4:
-            0: 29233
           16,5:
-            0: 62242
-          16,6:
-            0: 34947
-          16,0:
-            0: 30583
-          16,1:
-            0: 1143
-          16,3:
-            0: 4368
-          16,-2:
-            0: 30580
-          16,-1:
-            0: 30583
-          16,-5:
-            0: 304
-          -8,-16:
-            0: 4352
-          -8,-15:
-            0: 65527
-          -7,-15:
-            0: 65280
-          -12,-16:
-            0: 65496
-          -12,-15:
-            0: 65534
-          -11,-16:
-            0: 47547
-          -11,-15:
-            0: 65535
-          -10,-16:
-            0: 65535
-          -10,-15:
-            0: 65535
-          -9,-16:
-            0: 65523
-          -9,-15:
-            0: 65535
-          -16,-12:
-            0: 61439
-          -16,-11:
-            0: 35022
-          -16,-10:
-            0: 34952
-          -16,-9:
-            0: 34952
-          -15,-12:
-            0: 65535
-          12,-12:
-            0: 65292
-          13,-12:
-            0: 28943
-          13,-11:
-            0: 65535
-          14,-12:
-            0: 15
-          14,-11:
-            0: 65521
-          15,-12:
-            0: 1
-          15,-11:
-            0: 65328
-          10,-16:
-            0: 3584
-          10,-14:
-            0: 34816
-          10,-13:
-            0: 34952
-          11,-16:
-            0: 7936
-          11,-15:
-            0: 4369
-          11,-14:
-            0: 29489
-          11,-13:
-            0: 13183
-          -8,14:
-            0: 15
-          -7,14:
-            0: 15
-          -6,14:
-            0: 35071
-          -6,15:
-            0: 136
-          -5,14:
-            0: 30719
-          -5,15:
-            0: 4403
-          -4,14:
-            0: 3
-          9,13:
-            0: 3
-          13,9:
-            0: 13028
-          13,10:
-            0: 17
-          13,8:
-            0: 19652
-          14,9:
-            0: 248
-          14,8:
-            0: 52428
-          15,8:
-            0: 56797
-          15,9:
-            0: 248
-          0,18:
-            0: 49160
-          0,17:
-            0: 34816
-          1,18:
-            0: 61987
-          5,18:
-            0: 61998
-          6,17:
-            0: 18244
-          6,18:
-            0: 4164
-          6,16:
-            0: 16384
-          -16,-16:
-            0: 30583
-          -16,-15:
-            0: 29426
-          -16,-14:
-            0: 30583
-          -16,-13:
-            0: 12290
-          -15,-16:
-            0: 65520
-          -15,-15:
-            0: 240
-          -15,-13:
-            0: 65535
-          -15,-14:
-            0: 26144
-          -14,-16:
-            0: 24404
-          -14,-15:
-            0: 52980
-          -14,-13:
-            0: 65528
-          -14,-14:
-            0: 8
-          -13,-16:
-            0: 65520
-          -13,-15:
-            0: 62224
-          -13,-14:
-            0: 61183
-          16,7:
-            0: 55544
+            2: 62242
           17,5:
-            0: 61440
+            2: 61440
           17,6:
-            0: 65520
+            2: 65520
           17,7:
-            0: 55536
-          18,5:
-            0: 61440
-          18,6:
-            0: 65520
-          18,7:
-            0: 55536
-          19,5:
-            0: 61440
-          19,6:
-            0: 48056
-          19,7:
-            0: 39162
-          -12,-19:
-            0: 61440
-          -12,-18:
-            0: 4880
-          -12,-17:
-            0: 37648
-          -11,-19:
-            0: 61440
-          -11,-17:
-            0: 47360
-          -10,-19:
-            0: 65088
-          -10,-18:
-            0: 65262
-          -10,-17:
-            0: 65535
-          -9,-18:
-            0: 4096
-          -9,-17:
-            0: 13073
-          -18,-12:
-            0: 196
-          -17,-12:
-            0: 3327
-          -18,-15:
-            0: 17636
-          -18,-16:
-            0: 17476
-          -18,-14:
-            0: 17476
-          -18,-13:
-            0: 17476
-          -17,-16:
-            0: 30583
-          -17,-15:
-            0: 29426
-          -17,-14:
-            0: 30583
-          -17,-13:
-            0: 32770
-          16,-11:
-            0: 4096
-          16,-10:
-            0: 19
-          16,-12:
-            0: 546
-          -16,-17:
-            0: 29187
-          -16,-19:
-            0: 57344
-          -16,-18:
-            0: 10786
-          -15,-19:
-            0: 61440
-          -15,-18:
-            0: 65520
-          -15,-17:
-            0: 65520
-          -14,-19:
-            0: 62464
-          -14,-18:
-            0: 24404
-          -14,-17:
-            0: 24404
-          -13,-19:
-            0: 61440
-          -13,-18:
-            0: 65520
-          -13,-17:
-            0: 65520
-          -18,-17:
-            0: 17484
-          -17,-17:
-            0: 29199
-          12,-16:
-            0: 3840
-          12,-15:
-            0: 30496
-          12,-14:
-            0: 10103
-          12,-13:
-            0: 52303
-          13,-16:
-            0: 3840
-          13,-15:
-            0: 30496
-          13,-14:
-            0: 10103
-          13,-13:
-            0: 65295
-          14,-16:
-            0: 3840
-          14,-15:
-            0: 30496
-          14,-14:
-            0: 10103
-          14,-13:
-            0: 65295
-          15,-16:
-            0: 3840
-          15,-15:
-            0: 30496
-          15,-14:
-            0: 10103
-          15,-13:
-            0: 4511
-          16,-16:
-            0: 8960
-          16,-13:
-            0: 8743
-          16,-15:
-            0: 8738
-          16,-14:
-            0: 8738
-          16,8:
-            0: 56797
-          16,9:
-            0: 248
+            2: 55536
           17,8:
-            0: 56797
-          17,9:
-            0: 248
+            2: 56797
+          18,5:
+            2: 61440
+          18,6:
+            2: 65520
+          18,7:
+            2: 55536
           18,8:
-            0: 56797
-          18,9:
-            0: 248
+            2: 56797
+          19,5:
+            2: 61440
+          19,6:
+            2: 48056
+          19,7:
+            2: 39162
           19,8:
-            0: 39321
-          19,9:
-            0: 248
+            2: 39321
           20,7:
-            0: 16
+            2: 16
+          -12,-19:
+            2: 61440
+          -13,-19:
+            2: 61440
+          -12,-18:
+            2: 4880
+          -13,-18:
+            2: 65520
+          -12,-17:
+            2: 4880
+          -13,-17:
+            2: 65520
+          -11,-19:
+            2: 61440
+          -10,-19:
+            2: 4096
+          -10,-18:
+            0: 4
+          -18,-12:
+            2: 68
+          -18,-13:
+            2: 17476
+          -18,-15:
+            2: 17636
+          -18,-16:
+            2: 17476
+          -18,-17:
+            2: 17484
+          -18,-14:
+            2: 17476
+          -17,-16:
+            2: 30583
+          -17,-17:
+            2: 29199
+          -17,-14:
+            2: 30583
+          -17,-13:
+            2: 2
+          16,-12:
+            2: 546
+          16,-13:
+            2: 8743
+          -16,-19:
+            2: 57344
+          -16,-18:
+            2: 10786
+          -15,-19:
+            2: 61440
+          -15,-18:
+            2: 65520
+          -15,-17:
+            2: 65520
+          -14,-19:
+            2: 62464
+          -14,-18:
+            2: 24404
+          12,-15:
+            2: 30496
+          12,-14:
+            2: 10103
+          13,-16:
+            2: 3840
+          13,-15:
+            2: 30496
+          13,-14:
+            2: 10103
+          14,-16:
+            2: 3840
+          14,-15:
+            2: 30496
+          14,-14:
+            2: 10103
+          15,-16:
+            2: 3840
+          15,-15:
+            2: 30496
+          15,-14:
+            2: 10103
+          16,-16:
+            2: 8960
+          16,-15:
+            2: 8738
+          16,-14:
+            2: 8738
+          17,9:
+            2: 248
+          18,9:
+            2: 248
+          19,9:
+            2: 248
         uniqueMixes:
         - volume: 2500
           temperature: 293.15
@@ -8030,10 +8086,10 @@ entities:
           - 0
           - 0
         - volume: 2500
-          temperature: 293.15
+          immutable: True
           moles:
-          - 21.6852
-          - 81.57766
+          - 0
+          - 0
           - 0
           - 0
           - 0
@@ -8045,7 +8101,67 @@ entities:
           - 0
           - 0
         - volume: 2500
-          temperature: 293.14975
+          temperature: 293.15
+          moles:
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 0
+          - 6666.982
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 6666.982
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 0
+          - 0
+          - 0
+          - 6666.982
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        - volume: 2500
+          temperature: 293.14993
           moles:
           - 21.824879
           - 82.10312
@@ -8060,8 +8176,10 @@ entities:
           - 0
           - 0
         - volume: 2500
-          temperature: 293.15
+          temperature: 293.14987
           moles:
+          - 21.824879
+          - 82.10312
           - 0
           - 0
           - 0
@@ -8072,68 +8190,6 @@ entities:
           - 0
           - 0
           - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 293.14975
-          moles:
-          - 20.078888
-          - 75.53487
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 293.15
-          moles:
-          - 0
-          - 6666.982
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 293.15
-          moles:
-          - 6666.982
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 293.15
-          moles:
-          - 0
-          - 0
-          - 0
-          - 6666.982
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
         chunkSize: 4
     - type: GasTileOverlay
     - type: RadiationGridResistance
@@ -8406,6 +8462,43 @@ entities:
             id: Basalt9
           decals:
             56: 11.336716,9.096708
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileWhiteInnerNe
+          decals:
+            85: 4,-3
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileWhiteInnerSe
+          decals:
+            84: 4,1
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileWhiteLineE
+          decals:
+            77: 7,-2
+            78: 7,0
+            81: 4,-2
+            82: 4,0
+            83: 4,-1
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileWhiteLineN
+          decals:
+            88: -2,1
+            89: -1,1
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileWhiteLineS
+          decals:
+            86: -1,-3
+            87: -2,-3
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileWhiteLineW
+          decals:
+            79: 6,0
+            80: 6,-2
         - node:
             color: '#FFFFFFFF'
             id: BushAThree
@@ -8570,6 +8663,14 @@ entities:
           decals:
             18: 19.09259,-9.995552
             46: 25.186539,-9.033943
+        - node:
+            color: '#DE3A3A96'
+            id: DiagonalOverlay
+          decals:
+            73: 5,-2
+            74: 5,0
+            75: 8,0
+            76: 8,-2
     - type: GridAtmosphere
       version: 2
       data:
@@ -9135,7 +9236,8 @@ entities:
           4,-12:
             0: 65534
           4,-11:
-            0: 3839
+            0: 3775
+            1: 64
           4,-9:
             0: 61412
           5,-12:
@@ -9688,6 +9790,50 @@ entities:
     - type: Transform
       pos: 19.476593,-4.469906
       parent: 21002
+- proto: ActionToggleInternals
+  entities:
+  - uid: 8791
+    components:
+    - type: Transform
+      parent: 23838
+    - type: InstantAction
+      container: 23838
+  - uid: 8792
+    components:
+    - type: Transform
+      parent: 23832
+    - type: InstantAction
+      container: 23832
+  - uid: 8794
+    components:
+    - type: Transform
+      parent: 23836
+    - type: InstantAction
+      container: 23836
+  - uid: 8795
+    components:
+    - type: Transform
+      parent: 23834
+    - type: InstantAction
+      container: 23834
+  - uid: 8796
+    components:
+    - type: Transform
+      parent: 23830
+    - type: InstantAction
+      container: 23830
+  - uid: 8807
+    components:
+    - type: Transform
+      parent: 8806
+    - type: InstantAction
+      container: 8806
+  - uid: 8992
+    components:
+    - type: Transform
+      parent: 8991
+    - type: InstantAction
+      container: 8991
 - proto: AirAlarm
   entities:
   - uid: 5583
@@ -9712,11 +9858,27 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -17.5,49.5
       parent: 2
+    - type: DeviceList
+      devices:
+      - 8129
+      - 28592
   - uid: 8131
     components:
     - type: Transform
       pos: -11.5,44.5
       parent: 2
+    - type: DeviceList
+      devices:
+      - 28591
+      - 8128
+  - uid: 9177
+    components:
+    - type: Transform
+      pos: -38.5,38.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 9168
   - uid: 9410
     components:
     - type: Transform
@@ -9784,7 +9946,6 @@ entities:
       - 15934
       - 16030
       - 16033
-      - 16032
       - 16533
       - 14793
       - 14782
@@ -10243,7 +10404,6 @@ entities:
       - 24087
       - 18325
       - 18324
-      - 16513
       - 18292
       - 16511
       - 15356
@@ -10331,7 +10491,6 @@ entities:
       - 18368
       - 18370
       - 18371
-      - 18407
       - 18439
       - 18408
   - uid: 18443
@@ -10542,6 +10701,7 @@ entities:
       - 13585
       - 13595
       - 18563
+      - 28561
   - uid: 18567
     components:
     - type: Transform
@@ -10557,7 +10717,7 @@ entities:
       - 18568
       - 18569
       - 18574
-      - 13583
+      - 16794
       - 13584
       - 18573
   - uid: 18570
@@ -11229,6 +11389,16 @@ entities:
       devices:
       - 25359
       - 28277
+  - uid: 28611
+    components:
+    - type: Transform
+      pos: -28.5,34.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 3136
+      - 9112
+      - 28612
 - proto: AirCanister
   entities:
   - uid: 4223
@@ -11241,6 +11411,70 @@ entities:
     - type: Transform
       pos: -21.5,35.5
       parent: 2
+  - uid: 8140
+    components:
+    - type: Transform
+      anchored: True
+      pos: -24.5,35.5
+      parent: 2
+    - type: Physics
+      bodyType: Static
+  - uid: 8141
+    components:
+    - type: Transform
+      anchored: True
+      pos: -24.5,37.5
+      parent: 2
+    - type: Physics
+      bodyType: Static
+  - uid: 8145
+    components:
+    - type: Transform
+      anchored: True
+      pos: -26.5,37.5
+      parent: 2
+    - type: Physics
+      bodyType: Static
+  - uid: 8168
+    components:
+    - type: Transform
+      anchored: True
+      pos: -30.5,36.5
+      parent: 2
+    - type: Physics
+      bodyType: Static
+  - uid: 8169
+    components:
+    - type: Transform
+      anchored: True
+      pos: -29.5,35.5
+      parent: 2
+    - type: Physics
+      bodyType: Static
+  - uid: 8177
+    components:
+    - type: Transform
+      anchored: True
+      pos: -27.5,35.5
+      parent: 2
+    - type: Physics
+      bodyType: Static
+  - uid: 8685
+    components:
+    - type: Transform
+      anchored: True
+      pos: -28.5,35.5
+      parent: 2
+    - type: Physics
+      bodyType: Static
+  - uid: 8686
+    components:
+    - type: Transform
+      anchored: True
+      pos: -23.5,36.5
+      parent: 2
+    - type: Physics
+      bodyType: Static
   - uid: 9470
     components:
     - type: Transform
@@ -11251,6 +11485,22 @@ entities:
     - type: Transform
       pos: 6.5,-35.5
       parent: 2
+  - uid: 10187
+    components:
+    - type: Transform
+      anchored: True
+      pos: -25.5,35.5
+      parent: 2
+    - type: Physics
+      bodyType: Static
+  - uid: 10844
+    components:
+    - type: Transform
+      anchored: True
+      pos: -25.5,37.5
+      parent: 2
+    - type: Physics
+      bodyType: Static
   - uid: 18930
     components:
     - type: Transform
@@ -11340,6 +11590,22 @@ entities:
       parent: 21002
     - type: Physics
       bodyType: Static
+  - uid: 24127
+    components:
+    - type: Transform
+      anchored: True
+      pos: -28.5,37.5
+      parent: 2
+    - type: Physics
+      bodyType: Static
+  - uid: 24160
+    components:
+    - type: Transform
+      anchored: True
+      pos: -27.5,37.5
+      parent: 2
+    - type: Physics
+      bodyType: Static
   - uid: 24294
     components:
     - type: Transform
@@ -11395,6 +11661,14 @@ entities:
       parent: 21002
     - type: Physics
       bodyType: Static
+  - uid: 28427
+    components:
+    - type: Transform
+      anchored: True
+      pos: -29.5,37.5
+      parent: 2
+    - type: Physics
+      bodyType: Static
 - proto: Airlock
   entities:
   - uid: 769
@@ -11414,27 +11688,18 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -39.5,-14.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 28358
   - uid: 12132
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -39.5,-19.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 28357
   - uid: 12133
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -39.5,-24.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 28356
   - uid: 19155
     components:
     - type: Transform
@@ -11544,6 +11809,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: -36.5,5.5
       parent: 2
+  - uid: 28554
+    components:
+    - type: Transform
+      pos: -26.5,34.5
+      parent: 2
 - proto: AirlockBarLocked
   entities:
   - uid: 466
@@ -12024,18 +12294,18 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -47.5,-50.5
       parent: 2
-  - uid: 19965
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 42.5,-46.5
-      parent: 2
   - uid: 20486
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 45.5,26.5
       parent: 2
+  - uid: 21027
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 42.5,-46.5
+      parent: 2
   - uid: 23669
     components:
     - type: Transform
@@ -12058,17 +12328,11 @@ entities:
     - type: Transform
       pos: 49.5,2.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 6115
   - uid: 6114
     components:
     - type: Transform
       pos: 45.5,2.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 6115
 - proto: AirlockExternalEngineeringLocked
   entities:
   - uid: 19542
@@ -12076,9 +12340,6 @@ entities:
     - type: Transform
       pos: -50.5,-49.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 19543
     - type: DeviceLinkSource
       linkedPorts:
         19543:
@@ -12088,9 +12349,6 @@ entities:
     - type: Transform
       pos: -49.5,-51.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 19542
     - type: DeviceLinkSource
       linkedPorts:
         19542:
@@ -12100,10 +12358,6 @@ entities:
     - type: Transform
       pos: -47.5,-54.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 19546
-      - 19545
     - type: DeviceLinkSource
       linkedPorts:
         19545:
@@ -12115,9 +12369,6 @@ entities:
     - type: Transform
       pos: -48.5,-55.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 19544
     - type: DeviceLinkSource
       linkedPorts:
         19544:
@@ -12127,9 +12378,6 @@ entities:
     - type: Transform
       pos: -46.5,-55.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 19544
     - type: DeviceLinkSource
       linkedPorts:
         19544:
@@ -12168,8 +12416,6 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       invokeCounter: 1
-      links:
-      - 8431
     - type: DeviceLinkSource
       linkedPorts:
         8431:
@@ -12182,32 +12428,16 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       invokeCounter: 1
-      links:
-      - 8424
     - type: DeviceLinkSource
       linkedPorts:
         8424:
         - DoorStatus: DoorBolt
 - proto: AirlockExternalGlassCargoLocked
   entities:
-  - uid: 10846
+  - uid: 826
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -58.5,-17.5
-      parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 11363
-    - type: DeviceLinkSource
-      linkedPorts:
-        11363:
-        - DoorStatus: DoorBolt
-  - uid: 10848
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -58.5,-19.5
+      pos: -60.5,-20.5
       parent: 2
   - uid: 11331
     components:
@@ -12219,19 +12449,16 @@ entities:
     - type: Transform
       pos: -58.5,-4.5
       parent: 2
-  - uid: 11363
+  - uid: 28494
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -61.5,-17.5
+      pos: -58.5,-19.5
+      parent: 2
+  - uid: 28495
+    components:
+    - type: Transform
+      pos: -58.5,-17.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 10846
-    - type: DeviceLinkSource
-      linkedPorts:
-        10846:
-        - DoorStatus: DoorBolt
 - proto: AirlockExternalGlassEngineeringLocked
   entities:
   - uid: 6828
@@ -12239,9 +12466,6 @@ entities:
     - type: Transform
       pos: 41.5,49.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 6829
     - type: DeviceLinkSource
       linkedPorts:
         6829:
@@ -12251,9 +12475,6 @@ entities:
     - type: Transform
       pos: 37.5,49.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 6828
     - type: DeviceLinkSource
       linkedPorts:
         6828:
@@ -12264,9 +12485,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 6.5,56.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 7623
     - type: DeviceLinkSource
       linkedPorts:
         7623:
@@ -12277,9 +12495,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 3.5,55.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 7622
     - type: DeviceLinkSource
       linkedPorts:
         7622:
@@ -12290,9 +12505,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 3.5,52.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 7621
     - type: DeviceLinkSource
       linkedPorts:
         7621:
@@ -12303,9 +12515,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 5.5,52.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 7615
     - type: DeviceLinkSource
       linkedPorts:
         7615:
@@ -12318,8 +12527,6 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       invokeCounter: 1
-      links:
-      - 8048
     - type: DeviceLinkSource
       linkedPorts:
         8048:
@@ -12332,8 +12539,6 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       invokeCounter: 1
-      links:
-      - 7830
     - type: DeviceLinkSource
       linkedPorts:
         7830:
@@ -12346,8 +12551,6 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       invokeCounter: 1
-      links:
-      - 8053
     - type: DeviceLinkSource
       linkedPorts:
         8053:
@@ -12360,8 +12563,6 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       invokeCounter: 1
-      links:
-      - 8052
     - type: DeviceLinkSource
       linkedPorts:
         8052:
@@ -12374,8 +12575,6 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       invokeCounter: 1
-      links:
-      - 19974
     - type: DeviceLinkSource
       linkedPorts:
         19974:
@@ -12388,8 +12587,6 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       invokeCounter: 1
-      links:
-      - 19973
     - type: DeviceLinkSource
       linkedPorts:
         19973:
@@ -12400,9 +12597,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 52.5,27.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 20254
     - type: DeviceLinkSource
       linkedPorts:
         20254:
@@ -12413,9 +12607,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 50.5,27.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 20253
     - type: DeviceLinkSource
       linkedPorts:
         20253:
@@ -12428,9 +12619,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 57.5,-19.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 3783
   - uid: 3781
     components:
     - type: Transform
@@ -12457,9 +12645,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 55.5,-31.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 3781
   - uid: 7763
     components:
     - type: Transform
@@ -12470,15 +12655,36 @@ entities:
     - type: Transform
       pos: -4.5,51.5
       parent: 2
+  - uid: 11161
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-80.5
+      parent: 2
+  - uid: 12847
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -10.5,-82.5
+      parent: 2
+  - uid: 18430
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -10.5,-80.5
+      parent: 2
+  - uid: 20084
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-82.5
+      parent: 2
   - uid: 22784
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 4.5,-14.5
       parent: 21002
-    - type: DeviceLinkSink
-      links:
-      - 22785
     - type: DeviceLinkSource
       linkedPorts:
         22785:
@@ -12489,9 +12695,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 4.5,-12.5
       parent: 21002
-    - type: DeviceLinkSink
-      links:
-      - 22784
     - type: DeviceLinkSource
       linkedPorts:
         22784:
@@ -12503,8 +12706,6 @@ entities:
       parent: 21002
     - type: DeviceLinkSink
       invokeCounter: 1
-      links:
-      - 24609
     - type: DeviceLinkSource
       linkedPorts:
         24609:
@@ -12517,9 +12718,6 @@ entities:
       parent: 21002
     - type: DeviceLinkSink
       invokeCounter: 2
-      links:
-      - 24601
-      - 24606
     - type: DeviceLinkSource
       linkedPorts:
         24601:
@@ -12534,9 +12732,6 @@ entities:
       parent: 21002
     - type: DeviceLinkSink
       invokeCounter: 2
-      links:
-      - 24601
-      - 24600
     - type: DeviceLinkSource
       linkedPorts:
         24601:
@@ -12550,8 +12745,6 @@ entities:
       parent: 21002
     - type: DeviceLinkSink
       invokeCounter: 1
-      links:
-      - 24599
     - type: DeviceLinkSource
       linkedPorts:
         24599:
@@ -12604,12 +12797,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -61.5,-4.5
       parent: 2
-  - uid: 11364
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -61.5,-19.5
-      parent: 2
 - proto: AirlockExternalGlassShuttleEmergencyLocked
   entities:
   - uid: 13106
@@ -12656,9 +12843,6 @@ entities:
       linkedPorts:
         6863:
         - DoorStatus: DoorBolt
-    - type: DeviceLinkSink
-      links:
-      - 6864
   - uid: 6991
     components:
     - type: Transform
@@ -12672,6 +12856,30 @@ entities:
       parent: 2
 - proto: AirlockExternalGlassShuttleLocked
   entities:
+  - uid: 277
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -61.5,-17.5
+      parent: 2
+  - uid: 353
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -13.5,-80.5
+      parent: 2
+  - uid: 555
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -13.5,-82.5
+      parent: 2
+  - uid: 3806
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-82.5
+      parent: 2
   - uid: 9992
     components:
     - type: Transform
@@ -12684,6 +12892,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: -4.5,55.5
       parent: 2
+  - uid: 20082
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-80.5
+      parent: 2
   - uid: 21015
     components:
     - type: Transform
@@ -12705,9 +12919,6 @@ entities:
       parent: 21002
     - type: DeviceLinkSink
       invokeCounter: 2
-      links:
-      - 24600
-      - 24606
     - type: DeviceLinkSource
       linkedPorts:
         24600:
@@ -12721,9 +12932,6 @@ entities:
       parent: 21002
     - type: DeviceLinkSink
       invokeCounter: 2
-      links:
-      - 24622
-      - 24623
     - type: DeviceLinkSource
       linkedPorts:
         24622:
@@ -12737,9 +12945,6 @@ entities:
       parent: 21002
     - type: DeviceLinkSink
       invokeCounter: 2
-      links:
-      - 24616
-      - 24615
     - type: DeviceLinkSource
       linkedPorts:
         24615:
@@ -12753,9 +12958,6 @@ entities:
       parent: 21002
     - type: DeviceLinkSink
       invokeCounter: 2
-      links:
-      - 24614
-      - 24616
     - type: DeviceLinkSource
       linkedPorts:
         24614:
@@ -12769,9 +12971,6 @@ entities:
       parent: 21002
     - type: DeviceLinkSink
       invokeCounter: 2
-      links:
-      - 24614
-      - 24615
     - type: DeviceLinkSource
       linkedPorts:
         24614:
@@ -12785,9 +12984,6 @@ entities:
       parent: 21002
     - type: DeviceLinkSink
       invokeCounter: 2
-      links:
-      - 24619
-      - 24618
     - type: DeviceLinkSource
       linkedPorts:
         24618:
@@ -12801,9 +12997,6 @@ entities:
       parent: 21002
     - type: DeviceLinkSink
       invokeCounter: 2
-      links:
-      - 24619
-      - 24617
     - type: DeviceLinkSource
       linkedPorts:
         24619:
@@ -12817,9 +13010,6 @@ entities:
       parent: 21002
     - type: DeviceLinkSink
       invokeCounter: 2
-      links:
-      - 24618
-      - 24617
     - type: DeviceLinkSource
       linkedPorts:
         24618:
@@ -12833,8 +13023,6 @@ entities:
       parent: 21002
     - type: DeviceLinkSink
       invokeCounter: 1
-      links:
-      - 24621
     - type: DeviceLinkSource
       linkedPorts:
         24621:
@@ -12846,8 +13034,6 @@ entities:
       parent: 21002
     - type: DeviceLinkSink
       invokeCounter: 1
-      links:
-      - 24620
     - type: DeviceLinkSource
       linkedPorts:
         24620:
@@ -12859,9 +13045,6 @@ entities:
       parent: 21002
     - type: DeviceLinkSink
       invokeCounter: 2
-      links:
-      - 24613
-      - 24623
     - type: DeviceLinkSource
       linkedPorts:
         24623:
@@ -12875,9 +13058,6 @@ entities:
       parent: 21002
     - type: DeviceLinkSink
       invokeCounter: 2
-      links:
-      - 24622
-      - 24613
     - type: DeviceLinkSource
       linkedPorts:
         24622:
@@ -12933,9 +13113,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 30.5,51.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 6820
   - uid: 6864
     components:
     - type: Transform
@@ -13091,258 +13268,6 @@ entities:
     - type: Transform
       pos: 41.5,7.5
       parent: 2
-- proto: AirlockMaint
-  entities:
-  - uid: 353
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 59.5,-13.5
-      parent: 2
-  - uid: 555
-    components:
-    - type: Transform
-      pos: -2.5,-21.5
-      parent: 2
-  - uid: 730
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -27.5,-23.5
-      parent: 2
-  - uid: 813
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 25.5,-12.5
-      parent: 2
-  - uid: 1143
-    components:
-    - type: Transform
-      pos: -23.5,3.5
-      parent: 2
-  - uid: 1330
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -23.5,-2.5
-      parent: 2
-  - uid: 1434
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -33.5,-23.5
-      parent: 2
-  - uid: 1551
-    components:
-    - type: Transform
-      pos: -36.5,-29.5
-      parent: 2
-  - uid: 1861
-    components:
-    - type: Transform
-      pos: -53.5,-29.5
-      parent: 2
-  - uid: 1945
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -22.5,-45.5
-      parent: 2
-  - uid: 3162
-    components:
-    - type: Transform
-      pos: 28.5,-2.5
-      parent: 2
-  - uid: 3163
-    components:
-    - type: Transform
-      pos: 36.5,3.5
-      parent: 2
-  - uid: 3977
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 46.5,-40.5
-      parent: 2
-    - type: Door
-      secondsUntilStateChange: -424809.1
-      state: Opening
-  - uid: 4137
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 46.5,-34.5
-      parent: 2
-  - uid: 5192
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 26.5,-37.5
-      parent: 2
-  - uid: 5193
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 26.5,-38.5
-      parent: 2
-  - uid: 5302
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 27.5,25.5
-      parent: 2
-  - uid: 5392
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,24.5
-      parent: 2
-  - uid: 5393
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,28.5
-      parent: 2
-  - uid: 5397
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 20.5,26.5
-      parent: 2
-  - uid: 5398
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 27.5,28.5
-      parent: 2
-  - uid: 5462
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 19.5,30.5
-      parent: 2
-  - uid: 5543
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 10.5,30.5
-      parent: 2
-  - uid: 6580
-    components:
-    - type: Transform
-      pos: 37.5,44.5
-      parent: 2
-  - uid: 7798
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 17.5,18.5
-      parent: 2
-  - uid: 7941
-    components:
-    - type: Transform
-      pos: -14.5,37.5
-      parent: 2
-  - uid: 7970
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -17.5,33.5
-      parent: 2
-  - uid: 7971
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -19.5,30.5
-      parent: 2
-  - uid: 8502
-    components:
-    - type: Transform
-      pos: 23.5,-29.5
-      parent: 2
-  - uid: 9935
-    components:
-    - type: Transform
-      pos: 3.5,-26.5
-      parent: 2
-  - uid: 10217
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -36.5,-9.5
-      parent: 2
-  - uid: 10260
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -18.5,-48.5
-      parent: 2
-  - uid: 10285
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -20.5,-50.5
-      parent: 2
-  - uid: 10292
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -22.5,-48.5
-      parent: 2
-  - uid: 10596
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,-49.5
-      parent: 2
-  - uid: 10656
-    components:
-    - type: Transform
-      pos: -10.5,-57.5
-      parent: 2
-  - uid: 10956
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 57.5,6.5
-      parent: 2
-  - uid: 11565
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -48.5,-16.5
-      parent: 2
-  - uid: 12126
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -48.5,-29.5
-      parent: 2
-  - uid: 12127
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -39.5,-26.5
-      parent: 2
-  - uid: 12130
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -38.5,-10.5
-      parent: 2
-  - uid: 12475
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -50.5,-43.5
-      parent: 2
-  - uid: 12476
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -47.5,-39.5
-      parent: 2
 - proto: AirlockMaintAtmoLocked
   entities:
   - uid: 8847
@@ -13425,17 +13350,232 @@ entities:
     - type: Transform
       pos: 26.5,-44.5
       parent: 2
+  - uid: 11965
+    components:
+    - type: Transform
+      pos: -36.5,-29.5
+      parent: 2
+  - uid: 11973
+    components:
+    - type: Transform
+      pos: 25.5,-12.5
+      parent: 2
+  - uid: 12127
+    components:
+    - type: Transform
+      pos: -33.5,-23.5
+      parent: 2
+  - uid: 12130
+    components:
+    - type: Transform
+      pos: -23.5,3.5
+      parent: 2
+  - uid: 12786
+    components:
+    - type: Transform
+      pos: -2.5,-21.5
+      parent: 2
+  - uid: 12822
+    components:
+    - type: Transform
+      pos: 59.5,-13.5
+      parent: 2
+  - uid: 12842
+    components:
+    - type: Transform
+      pos: -27.5,-23.5
+      parent: 2
+  - uid: 12843
+    components:
+    - type: Transform
+      pos: -23.5,-2.5
+      parent: 2
   - uid: 16554
     components:
     - type: Transform
       pos: -19.5,24.5
       parent: 2
+  - uid: 23273
+    components:
+    - type: Transform
+      pos: -53.5,-29.5
+      parent: 2
+  - uid: 23537
+    components:
+    - type: Transform
+      pos: -22.5,-45.5
+      parent: 2
+  - uid: 23758
+    components:
+    - type: Transform
+      pos: 28.5,-2.5
+      parent: 2
+  - uid: 23803
+    components:
+    - type: Transform
+      pos: 36.5,3.5
+      parent: 2
+  - uid: 23831
+    components:
+    - type: Transform
+      pos: 46.5,-40.5
+      parent: 2
+  - uid: 23833
+    components:
+    - type: Transform
+      pos: 46.5,-34.5
+      parent: 2
+  - uid: 23835
+    components:
+    - type: Transform
+      pos: 26.5,-37.5
+      parent: 2
+  - uid: 23837
+    components:
+    - type: Transform
+      pos: 26.5,-38.5
+      parent: 2
+  - uid: 23839
+    components:
+    - type: Transform
+      pos: 27.5,25.5
+      parent: 2
   - uid: 23841
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -37.5,-53.5
       parent: 2
+  - uid: 24219
+    components:
+    - type: Transform
+      pos: -1.5,24.5
+      parent: 2
+  - uid: 25233
+    components:
+    - type: Transform
+      pos: 3.5,28.5
+      parent: 2
+  - uid: 28274
+    components:
+    - type: Transform
+      pos: 20.5,26.5
+      parent: 2
+  - uid: 28278
+    components:
+    - type: Transform
+      pos: 27.5,28.5
+      parent: 2
+  - uid: 28282
+    components:
+    - type: Transform
+      pos: 19.5,30.5
+      parent: 2
+  - uid: 28284
+    components:
+    - type: Transform
+      pos: 10.5,30.5
+      parent: 2
+  - uid: 28448
+    components:
+    - type: Transform
+      pos: 37.5,44.5
+      parent: 2
+  - uid: 28449
+    components:
+    - type: Transform
+      pos: 17.5,18.5
+      parent: 2
+  - uid: 28450
+    components:
+    - type: Transform
+      pos: -14.5,37.5
+      parent: 2
+  - uid: 28451
+    components:
+    - type: Transform
+      pos: -17.5,33.5
+      parent: 2
+  - uid: 28452
+    components:
+    - type: Transform
+      pos: -19.5,30.5
+      parent: 2
+  - uid: 28453
+    components:
+    - type: Transform
+      pos: 23.5,-29.5
+      parent: 2
+  - uid: 28454
+    components:
+    - type: Transform
+      pos: 3.5,-26.5
+      parent: 2
+  - uid: 28455
+    components:
+    - type: Transform
+      pos: -36.5,-9.5
+      parent: 2
+  - uid: 28456
+    components:
+    - type: Transform
+      pos: -18.5,-48.5
+      parent: 2
+  - uid: 28457
+    components:
+    - type: Transform
+      pos: -20.5,-50.5
+      parent: 2
+  - uid: 28458
+    components:
+    - type: Transform
+      pos: -22.5,-48.5
+      parent: 2
+  - uid: 28459
+    components:
+    - type: Transform
+      pos: 5.5,-49.5
+      parent: 2
+  - uid: 28460
+    components:
+    - type: Transform
+      pos: -10.5,-57.5
+      parent: 2
+  - uid: 28461
+    components:
+    - type: Transform
+      pos: 57.5,6.5
+      parent: 2
+  - uid: 28462
+    components:
+    - type: Transform
+      pos: -48.5,-16.5
+      parent: 2
+  - uid: 28463
+    components:
+    - type: Transform
+      pos: -48.5,-29.5
+      parent: 2
+  - uid: 28464
+    components:
+    - type: Transform
+      pos: -39.5,-26.5
+      parent: 2
+  - uid: 28465
+    components:
+    - type: Transform
+      pos: -38.5,-10.5
+      parent: 2
+  - uid: 28466
+    components:
+    - type: Transform
+      pos: -50.5,-43.5
+      parent: 2
+  - uid: 28467
+    components:
+    - type: Transform
+      pos: -47.5,-39.5
+      parent: 2
 - proto: AirlockMaintMedLocked
   entities:
   - uid: 1155
@@ -13512,9 +13652,6 @@ entities:
       parent: 2
     - type: DoorBolt
       boltsDown: True
-    - type: DeviceLinkSink
-      links:
-      - 23551
   - uid: 680
     components:
     - type: Transform
@@ -13523,9 +13660,6 @@ entities:
       parent: 2
     - type: DoorBolt
       boltsDown: True
-    - type: DeviceLinkSink
-      links:
-      - 23559
   - uid: 681
     components:
     - type: Transform
@@ -13534,9 +13668,6 @@ entities:
       parent: 2
     - type: DoorBolt
       boltsDown: True
-    - type: DeviceLinkSink
-      links:
-      - 23558
   - uid: 682
     components:
     - type: Transform
@@ -13544,9 +13675,6 @@ entities:
       parent: 2
     - type: DoorBolt
       boltsDown: True
-    - type: DeviceLinkSink
-      links:
-      - 23557
   - uid: 683
     components:
     - type: Transform
@@ -13555,9 +13683,6 @@ entities:
       parent: 2
     - type: DoorBolt
       boltsDown: True
-    - type: DeviceLinkSink
-      links:
-      - 4166
   - uid: 684
     components:
     - type: Transform
@@ -13566,9 +13691,6 @@ entities:
       parent: 2
     - type: DoorBolt
       boltsDown: True
-    - type: DeviceLinkSink
-      links:
-      - 23556
   - uid: 685
     components:
     - type: Transform
@@ -13620,7 +13742,7 @@ entities:
       pos: -3.5,-35.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -540976.5
+      secondsUntilStateChange: -583970.1
       state: Opening
   - uid: 1496
     components:
@@ -13882,24 +14004,17 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 0.5,0.5
       parent: 21002
-  - uid: 21067
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 8.5,-1.5
-      parent: 21002
-    - type: DeviceLinkSink
-      links:
-      - 21063
   - uid: 21068
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 8.5,0.5
       parent: 21002
-    - type: DeviceLinkSink
-      links:
-      - 21064
+  - uid: 28504
+    components:
+    - type: Transform
+      pos: 8.5,-1.5
+      parent: 21002
 - proto: AirlockSecurityLawyerLocked
   entities:
   - uid: 3747
@@ -14078,6 +14193,14 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 10169
+  - uid: 9168
+    components:
+    - type: Transform
+      pos: -40.5,40.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9177
   - uid: 18245
     components:
     - type: Transform
@@ -15034,6 +15157,32 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 28262
+  - uid: 28591
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -9.5,46.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 8131
+  - uid: 28592
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -15.5,51.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 8130
+  - uid: 28612
+    components:
+    - type: Transform
+      pos: -26.5,36.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 28611
 - proto: AirTank
   entities:
   - uid: 18893
@@ -15046,6 +15195,34 @@ entities:
     - type: Transform
       pos: -2.5264995,40.54678
       parent: 2
+- proto: AirTankFilled
+  entities:
+  - uid: 8806
+    components:
+    - type: Transform
+      pos: -23.668444,37.633034
+      parent: 2
+    - type: GasTank
+      toggleActionEntity: 8807
+    - type: ActionsContainer
+    - type: ContainerContainer
+      containers:
+        actions: !type:Container
+          ents:
+          - 8807
+  - uid: 8991
+    components:
+    - type: Transform
+      pos: -30.637194,35.58095
+      parent: 2
+    - type: GasTank
+      toggleActionEntity: 8992
+    - type: ActionsContainer
+    - type: ContainerContainer
+      containers:
+        actions: !type:Container
+          ents:
+          - 8992
 - proto: AlertsComputerCircuitboard
   entities:
   - uid: 4080
@@ -15113,6 +15290,8 @@ entities:
       rot: 3.141592653589793 rad
       pos: -20.5,-30.5
       parent: 2
+    - type: Apc
+      hasAccess: True
   - uid: 1691
     components:
     - type: Transform
@@ -15338,6 +15517,8 @@ entities:
       parent: 2
   - uid: 2023
     components:
+    - type: MetaData
+      name: Park APC
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -23.5,-7.5
@@ -34440,11 +34621,11 @@ entities:
     - type: Transform
       pos: 2.5,-68.5
       parent: 2
-  - uid: 10844
+  - uid: 10848
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -61.5,-19.5
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-82.5
       parent: 2
   - uid: 11333
     components:
@@ -34456,11 +34637,34 @@ entities:
     - type: Transform
       pos: -61.5,-2.5
       parent: 2
+  - uid: 12849
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-80.5
+      parent: 2
+  - uid: 16803
+    components:
+    - type: Transform
+      pos: -61.5,-17.5
+      parent: 2
   - uid: 18705
     components:
     - type: Transform
       pos: -13.5,-58.5
       parent: 2
+  - uid: 19960
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -13.5,-82.5
+      parent: 2
+  - uid: 19965
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -13.5,-80.5
+      parent: 2
   - uid: 21017
     components:
     - type: Transform
@@ -34595,6 +34799,921 @@ entities:
     - type: Transform
       pos: 41.5,44.5
       parent: 2
+  - uid: 28526
+    components:
+    - type: Transform
+      pos: -47.5,-57.5
+      parent: 2
+  - uid: 28645
+    components:
+    - type: Transform
+      pos: -16.5,52.5
+      parent: 2
+  - uid: 28646
+    components:
+    - type: Transform
+      pos: -16.5,51.5
+      parent: 2
+  - uid: 28647
+    components:
+    - type: Transform
+      pos: -16.5,50.5
+      parent: 2
+  - uid: 28648
+    components:
+    - type: Transform
+      pos: -15.5,52.5
+      parent: 2
+  - uid: 28649
+    components:
+    - type: Transform
+      pos: -15.5,51.5
+      parent: 2
+  - uid: 28650
+    components:
+    - type: Transform
+      pos: -15.5,50.5
+      parent: 2
+  - uid: 28651
+    components:
+    - type: Transform
+      pos: -14.5,52.5
+      parent: 2
+  - uid: 28652
+    components:
+    - type: Transform
+      pos: -14.5,51.5
+      parent: 2
+  - uid: 28653
+    components:
+    - type: Transform
+      pos: -14.5,50.5
+      parent: 2
+  - uid: 28654
+    components:
+    - type: Transform
+      pos: -10.5,47.5
+      parent: 2
+  - uid: 28655
+    components:
+    - type: Transform
+      pos: -10.5,46.5
+      parent: 2
+  - uid: 28656
+    components:
+    - type: Transform
+      pos: -10.5,45.5
+      parent: 2
+  - uid: 28657
+    components:
+    - type: Transform
+      pos: -9.5,47.5
+      parent: 2
+  - uid: 28658
+    components:
+    - type: Transform
+      pos: -9.5,46.5
+      parent: 2
+  - uid: 28659
+    components:
+    - type: Transform
+      pos: -9.5,45.5
+      parent: 2
+  - uid: 28660
+    components:
+    - type: Transform
+      pos: -8.5,47.5
+      parent: 2
+  - uid: 28661
+    components:
+    - type: Transform
+      pos: -8.5,46.5
+      parent: 2
+  - uid: 28662
+    components:
+    - type: Transform
+      pos: -8.5,45.5
+      parent: 2
+  - uid: 28663
+    components:
+    - type: Transform
+      pos: -15.5,53.5
+      parent: 2
+  - uid: 28664
+    components:
+    - type: Transform
+      pos: -16.5,54.5
+      parent: 2
+  - uid: 28665
+    components:
+    - type: Transform
+      pos: -15.5,54.5
+      parent: 2
+  - uid: 28666
+    components:
+    - type: Transform
+      pos: -14.5,54.5
+      parent: 2
+  - uid: 28667
+    components:
+    - type: Transform
+      pos: -17.5,55.5
+      parent: 2
+  - uid: 28668
+    components:
+    - type: Transform
+      pos: -16.5,55.5
+      parent: 2
+  - uid: 28669
+    components:
+    - type: Transform
+      pos: -15.5,55.5
+      parent: 2
+  - uid: 28670
+    components:
+    - type: Transform
+      pos: -14.5,55.5
+      parent: 2
+  - uid: 28671
+    components:
+    - type: Transform
+      pos: -13.5,55.5
+      parent: 2
+  - uid: 28672
+    components:
+    - type: Transform
+      pos: -14.5,56.5
+      parent: 2
+  - uid: 28673
+    components:
+    - type: Transform
+      pos: -15.5,56.5
+      parent: 2
+  - uid: 28674
+    components:
+    - type: Transform
+      pos: -16.5,56.5
+      parent: 2
+  - uid: 28675
+    components:
+    - type: Transform
+      pos: -15.5,49.5
+      parent: 2
+  - uid: 28676
+    components:
+    - type: Transform
+      pos: -11.5,46.5
+      parent: 2
+  - uid: 28677
+    components:
+    - type: Transform
+      pos: -19.5,58.5
+      parent: 2
+  - uid: 28678
+    components:
+    - type: Transform
+      pos: -39.5,39.5
+      parent: 2
+  - uid: 28679
+    components:
+    - type: Transform
+      pos: -39.5,40.5
+      parent: 2
+  - uid: 28680
+    components:
+    - type: Transform
+      pos: -39.5,41.5
+      parent: 2
+  - uid: 28681
+    components:
+    - type: Transform
+      pos: -40.5,39.5
+      parent: 2
+  - uid: 28682
+    components:
+    - type: Transform
+      pos: -40.5,40.5
+      parent: 2
+  - uid: 28683
+    components:
+    - type: Transform
+      pos: -40.5,41.5
+      parent: 2
+  - uid: 28684
+    components:
+    - type: Transform
+      pos: -41.5,39.5
+      parent: 2
+  - uid: 28685
+    components:
+    - type: Transform
+      pos: -41.5,40.5
+      parent: 2
+  - uid: 28686
+    components:
+    - type: Transform
+      pos: -41.5,41.5
+      parent: 2
+  - uid: 28687
+    components:
+    - type: Transform
+      pos: -42.5,39.5
+      parent: 2
+  - uid: 28688
+    components:
+    - type: Transform
+      pos: -42.5,40.5
+      parent: 2
+  - uid: 28689
+    components:
+    - type: Transform
+      pos: -42.5,41.5
+      parent: 2
+  - uid: 28690
+    components:
+    - type: Transform
+      pos: -59.5,-33.5
+      parent: 2
+  - uid: 28691
+    components:
+    - type: Transform
+      pos: -59.5,-37.5
+      parent: 2
+  - uid: 28692
+    components:
+    - type: Transform
+      pos: -59.5,-38.5
+      parent: 2
+  - uid: 28693
+    components:
+    - type: Transform
+      pos: -58.5,-38.5
+      parent: 2
+  - uid: 28694
+    components:
+    - type: Transform
+      pos: -58.5,-39.5
+      parent: 2
+  - uid: 28695
+    components:
+    - type: Transform
+      pos: -59.5,-39.5
+      parent: 2
+  - uid: 28696
+    components:
+    - type: Transform
+      pos: -60.5,-39.5
+      parent: 2
+  - uid: 28697
+    components:
+    - type: Transform
+      pos: -60.5,-40.5
+      parent: 2
+  - uid: 28698
+    components:
+    - type: Transform
+      pos: -59.5,-40.5
+      parent: 2
+  - uid: 28699
+    components:
+    - type: Transform
+      pos: -58.5,-40.5
+      parent: 2
+  - uid: 28700
+    components:
+    - type: Transform
+      pos: -58.5,-41.5
+      parent: 2
+  - uid: 28701
+    components:
+    - type: Transform
+      pos: -58.5,-42.5
+      parent: 2
+  - uid: 28702
+    components:
+    - type: Transform
+      pos: -57.5,-42.5
+      parent: 2
+  - uid: 28703
+    components:
+    - type: Transform
+      pos: -57.5,-43.5
+      parent: 2
+  - uid: 28704
+    components:
+    - type: Transform
+      pos: -57.5,-44.5
+      parent: 2
+  - uid: 28705
+    components:
+    - type: Transform
+      pos: -56.5,-42.5
+      parent: 2
+  - uid: 28706
+    components:
+    - type: Transform
+      pos: -56.5,-43.5
+      parent: 2
+  - uid: 28707
+    components:
+    - type: Transform
+      pos: -56.5,-44.5
+      parent: 2
+  - uid: 28708
+    components:
+    - type: Transform
+      pos: -55.5,-42.5
+      parent: 2
+  - uid: 28709
+    components:
+    - type: Transform
+      pos: -55.5,-43.5
+      parent: 2
+  - uid: 28710
+    components:
+    - type: Transform
+      pos: -55.5,-44.5
+      parent: 2
+  - uid: 28711
+    components:
+    - type: Transform
+      pos: -62.5,-46.5
+      parent: 2
+  - uid: 28712
+    components:
+    - type: Transform
+      pos: -57.5,-50.5
+      parent: 2
+  - uid: 28713
+    components:
+    - type: Transform
+      pos: -56.5,-45.5
+      parent: 2
+  - uid: 28714
+    components:
+    - type: Transform
+      pos: -56.5,-46.5
+      parent: 2
+  - uid: 28715
+    components:
+    - type: Transform
+      pos: -56.5,-47.5
+      parent: 2
+  - uid: 28716
+    components:
+    - type: Transform
+      pos: -55.5,-45.5
+      parent: 2
+  - uid: 28717
+    components:
+    - type: Transform
+      pos: -55.5,-46.5
+      parent: 2
+  - uid: 28718
+    components:
+    - type: Transform
+      pos: -55.5,-47.5
+      parent: 2
+  - uid: 28719
+    components:
+    - type: Transform
+      pos: -54.5,-46.5
+      parent: 2
+  - uid: 28720
+    components:
+    - type: Transform
+      pos: -54.5,-47.5
+      parent: 2
+  - uid: 28721
+    components:
+    - type: Transform
+      pos: -54.5,-48.5
+      parent: 2
+  - uid: 28722
+    components:
+    - type: Transform
+      pos: -53.5,-46.5
+      parent: 2
+  - uid: 28723
+    components:
+    - type: Transform
+      pos: -53.5,-47.5
+      parent: 2
+  - uid: 28724
+    components:
+    - type: Transform
+      pos: -53.5,-48.5
+      parent: 2
+  - uid: 28725
+    components:
+    - type: Transform
+      pos: -52.5,-46.5
+      parent: 2
+  - uid: 28726
+    components:
+    - type: Transform
+      pos: -52.5,-47.5
+      parent: 2
+  - uid: 28727
+    components:
+    - type: Transform
+      pos: -52.5,-48.5
+      parent: 2
+  - uid: 28728
+    components:
+    - type: Transform
+      pos: -51.5,-46.5
+      parent: 2
+  - uid: 28729
+    components:
+    - type: Transform
+      pos: -51.5,-47.5
+      parent: 2
+  - uid: 28730
+    components:
+    - type: Transform
+      pos: -51.5,-48.5
+      parent: 2
+  - uid: 28731
+    components:
+    - type: Transform
+      pos: -51.5,-49.5
+      parent: 2
+  - uid: 28732
+    components:
+    - type: Transform
+      pos: -52.5,-49.5
+      parent: 2
+  - uid: 28733
+    components:
+    - type: Transform
+      pos: -46.5,-57.5
+      parent: 2
+  - uid: 28734
+    components:
+    - type: Transform
+      pos: -45.5,-57.5
+      parent: 2
+  - uid: 28735
+    components:
+    - type: Transform
+      pos: -45.5,-55.5
+      parent: 2
+  - uid: 28736
+    components:
+    - type: Transform
+      pos: -45.5,-56.5
+      parent: 2
+  - uid: 28737
+    components:
+    - type: Transform
+      pos: 60.5,-22.5
+      parent: 2
+  - uid: 28738
+    components:
+    - type: Transform
+      pos: -43.5,-61.5
+      parent: 2
+  - uid: 28739
+    components:
+    - type: Transform
+      pos: -43.5,-60.5
+      parent: 2
+  - uid: 28740
+    components:
+    - type: Transform
+      pos: -43.5,-59.5
+      parent: 2
+  - uid: 28741
+    components:
+    - type: Transform
+      pos: -43.5,-58.5
+      parent: 2
+  - uid: 28742
+    components:
+    - type: Transform
+      pos: -43.5,-57.5
+      parent: 2
+  - uid: 28743
+    components:
+    - type: Transform
+      pos: -43.5,-56.5
+      parent: 2
+  - uid: 28744
+    components:
+    - type: Transform
+      pos: -44.5,-56.5
+      parent: 2
+  - uid: 28745
+    components:
+    - type: Transform
+      pos: -44.5,-57.5
+      parent: 2
+  - uid: 28746
+    components:
+    - type: Transform
+      pos: -44.5,-58.5
+      parent: 2
+  - uid: 28747
+    components:
+    - type: Transform
+      pos: -44.5,-59.5
+      parent: 2
+  - uid: 28748
+    components:
+    - type: Transform
+      pos: -42.5,-56.5
+      parent: 2
+  - uid: 28749
+    components:
+    - type: Transform
+      pos: -42.5,-57.5
+      parent: 2
+  - uid: 28750
+    components:
+    - type: Transform
+      pos: -41.5,-56.5
+      parent: 2
+  - uid: 28751
+    components:
+    - type: Transform
+      pos: -41.5,-57.5
+      parent: 2
+  - uid: 28752
+    components:
+    - type: Transform
+      pos: -40.5,-56.5
+      parent: 2
+  - uid: 28753
+    components:
+    - type: Transform
+      pos: -40.5,-57.5
+      parent: 2
+  - uid: 28754
+    components:
+    - type: Transform
+      pos: -39.5,-56.5
+      parent: 2
+  - uid: 28755
+    components:
+    - type: Transform
+      pos: -39.5,-57.5
+      parent: 2
+  - uid: 28756
+    components:
+    - type: Transform
+      pos: -38.5,-56.5
+      parent: 2
+  - uid: 28757
+    components:
+    - type: Transform
+      pos: -38.5,-57.5
+      parent: 2
+  - uid: 28758
+    components:
+    - type: Transform
+      pos: -37.5,-57.5
+      parent: 2
+  - uid: 28759
+    components:
+    - type: Transform
+      pos: -37.5,-58.5
+      parent: 2
+  - uid: 28760
+    components:
+    - type: Transform
+      pos: -37.5,-59.5
+      parent: 2
+  - uid: 28761
+    components:
+    - type: Transform
+      pos: -38.5,-59.5
+      parent: 2
+  - uid: 28762
+    components:
+    - type: Transform
+      pos: -39.5,-59.5
+      parent: 2
+  - uid: 28763
+    components:
+    - type: Transform
+      pos: -39.5,-58.5
+      parent: 2
+  - uid: 28764
+    components:
+    - type: Transform
+      pos: -40.5,-58.5
+      parent: 2
+  - uid: 28765
+    components:
+    - type: Transform
+      pos: -38.5,-58.5
+      parent: 2
+  - uid: 28766
+    components:
+    - type: Transform
+      pos: -36.5,-58.5
+      parent: 2
+  - uid: 28767
+    components:
+    - type: Transform
+      pos: -38.5,-60.5
+      parent: 2
+  - uid: 28768
+    components:
+    - type: Transform
+      pos: -38.5,-61.5
+      parent: 2
+  - uid: 28769
+    components:
+    - type: Transform
+      pos: -37.5,-64.5
+      parent: 2
+  - uid: 28770
+    components:
+    - type: Transform
+      pos: -36.5,-64.5
+      parent: 2
+  - uid: 28771
+    components:
+    - type: Transform
+      pos: -36.5,-64.5
+      parent: 2
+  - uid: 28772
+    components:
+    - type: Transform
+      pos: -32.5,-57.5
+      parent: 2
+  - uid: 28773
+    components:
+    - type: Transform
+      pos: -26.5,-56.5
+      parent: 2
+  - uid: 28774
+    components:
+    - type: Transform
+      pos: -25.5,-56.5
+      parent: 2
+  - uid: 28775
+    components:
+    - type: Transform
+      pos: -24.5,-56.5
+      parent: 2
+  - uid: 28776
+    components:
+    - type: Transform
+      pos: -23.5,-57.5
+      parent: 2
+  - uid: 28777
+    components:
+    - type: Transform
+      pos: -24.5,-57.5
+      parent: 2
+  - uid: 28778
+    components:
+    - type: Transform
+      pos: -25.5,-57.5
+      parent: 2
+  - uid: 28779
+    components:
+    - type: Transform
+      pos: -26.5,-57.5
+      parent: 2
+  - uid: 28780
+    components:
+    - type: Transform
+      pos: -27.5,-57.5
+      parent: 2
+  - uid: 28781
+    components:
+    - type: Transform
+      pos: 50.5,-43.5
+      parent: 2
+  - uid: 28782
+    components:
+    - type: Transform
+      pos: 50.5,-43.5
+      parent: 2
+  - uid: 28783
+    components:
+    - type: Transform
+      pos: 50.5,-40.5
+      parent: 2
+  - uid: 28784
+    components:
+    - type: Transform
+      pos: 51.5,-40.5
+      parent: 2
+  - uid: 28785
+    components:
+    - type: Transform
+      pos: 52.5,-40.5
+      parent: 2
+  - uid: 28786
+    components:
+    - type: Transform
+      pos: 53.5,-40.5
+      parent: 2
+  - uid: 28787
+    components:
+    - type: Transform
+      pos: 54.5,-40.5
+      parent: 2
+  - uid: 28788
+    components:
+    - type: Transform
+      pos: 55.5,-40.5
+      parent: 2
+  - uid: 28789
+    components:
+    - type: Transform
+      pos: 56.5,-40.5
+      parent: 2
+  - uid: 28790
+    components:
+    - type: Transform
+      pos: 57.5,-40.5
+      parent: 2
+  - uid: 28791
+    components:
+    - type: Transform
+      pos: 58.5,-40.5
+      parent: 2
+  - uid: 28792
+    components:
+    - type: Transform
+      pos: 59.5,-40.5
+      parent: 2
+  - uid: 28793
+    components:
+    - type: Transform
+      pos: 60.5,-40.5
+      parent: 2
+  - uid: 28794
+    components:
+    - type: Transform
+      pos: 60.5,-42.5
+      parent: 2
+  - uid: 28795
+    components:
+    - type: Transform
+      pos: 59.5,-42.5
+      parent: 2
+  - uid: 28796
+    components:
+    - type: Transform
+      pos: 58.5,-42.5
+      parent: 2
+  - uid: 28797
+    components:
+    - type: Transform
+      pos: 57.5,-42.5
+      parent: 2
+  - uid: 28798
+    components:
+    - type: Transform
+      pos: 56.5,-42.5
+      parent: 2
+  - uid: 28799
+    components:
+    - type: Transform
+      pos: 55.5,-42.5
+      parent: 2
+  - uid: 28800
+    components:
+    - type: Transform
+      pos: 54.5,-42.5
+      parent: 2
+  - uid: 28801
+    components:
+    - type: Transform
+      pos: 53.5,-41.5
+      parent: 2
+  - uid: 28802
+    components:
+    - type: Transform
+      pos: 54.5,-41.5
+      parent: 2
+  - uid: 28803
+    components:
+    - type: Transform
+      pos: 55.5,-41.5
+      parent: 2
+  - uid: 28804
+    components:
+    - type: Transform
+      pos: 56.5,-41.5
+      parent: 2
+  - uid: 28805
+    components:
+    - type: Transform
+      pos: 57.5,-41.5
+      parent: 2
+  - uid: 28806
+    components:
+    - type: Transform
+      pos: 58.5,-41.5
+      parent: 2
+  - uid: 28807
+    components:
+    - type: Transform
+      pos: 59.5,-41.5
+      parent: 2
+  - uid: 28808
+    components:
+    - type: Transform
+      pos: 56.5,-43.5
+      parent: 2
+  - uid: 28809
+    components:
+    - type: Transform
+      pos: 55.5,-43.5
+      parent: 2
+  - uid: 28810
+    components:
+    - type: Transform
+      pos: 54.5,-43.5
+      parent: 2
+  - uid: 28811
+    components:
+    - type: Transform
+      pos: 54.5,-44.5
+      parent: 2
+  - uid: 28812
+    components:
+    - type: Transform
+      pos: 60.5,-39.5
+      parent: 2
+  - uid: 28813
+    components:
+    - type: Transform
+      pos: 61.5,-39.5
+      parent: 2
+  - uid: 28814
+    components:
+    - type: Transform
+      pos: 61.5,-38.5
+      parent: 2
+  - uid: 28815
+    components:
+    - type: Transform
+      pos: 62.5,-38.5
+      parent: 2
+  - uid: 28816
+    components:
+    - type: Transform
+      pos: 63.5,-38.5
+      parent: 2
+  - uid: 28817
+    components:
+    - type: Transform
+      pos: 64.5,-38.5
+      parent: 2
+  - uid: 28818
+    components:
+    - type: Transform
+      pos: 64.5,-39.5
+      parent: 2
+  - uid: 28819
+    components:
+    - type: Transform
+      pos: 65.5,-39.5
+      parent: 2
+  - uid: 28820
+    components:
+    - type: Transform
+      pos: 63.5,-37.5
+      parent: 2
+  - uid: 28821
+    components:
+    - type: Transform
+      pos: 62.5,-37.5
+      parent: 2
+  - uid: 28822
+    components:
+    - type: Transform
+      pos: 62.5,-36.5
+      parent: 2
+  - uid: 28823
+    components:
+    - type: Transform
+      pos: 63.5,-36.5
+      parent: 2
+  - uid: 28824
+    components:
+    - type: Transform
+      pos: 60.5,-30.5
+      parent: 2
+  - uid: 28825
+    components:
+    - type: Transform
+      pos: 23.5,53.5
+      parent: 2
+  - uid: 28826
+    components:
+    - type: Transform
+      pos: 23.5,52.5
+      parent: 2
 - proto: AtmosFixFreezerMarker
   entities:
   - uid: 9264
@@ -34949,11 +36068,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: -16.5,-42.5
       parent: 2
-  - uid: 8910
+  - uid: 28433
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -30.5,37.5
+      rot: 3.141592653589793 rad
+      pos: -26.5,14.5
       parent: 2
 - proto: BassGuitarInstrument
   entities:
@@ -35419,225 +36538,146 @@ entities:
     - type: Transform
       pos: 7.5,52.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 7697
   - uid: 7188
     components:
     - type: Transform
       pos: 8.5,52.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 7697
   - uid: 7189
     components:
     - type: Transform
       pos: 9.5,52.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 7697
   - uid: 7190
     components:
     - type: Transform
       pos: 17.5,52.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 7696
   - uid: 7191
     components:
     - type: Transform
       pos: 18.5,52.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 7696
   - uid: 7192
     components:
     - type: Transform
       pos: 19.5,52.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 7696
   - uid: 7334
     components:
     - type: Transform
       pos: 20.5,47.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 7706
   - uid: 7335
     components:
     - type: Transform
       pos: 20.5,46.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 7706
   - uid: 7336
     components:
     - type: Transform
       pos: 20.5,49.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 7706
   - uid: 7337
     components:
     - type: Transform
       pos: 20.5,48.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 7706
   - uid: 7338
     components:
     - type: Transform
       pos: 14.5,47.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 7698
   - uid: 7339
     components:
     - type: Transform
       pos: 13.5,47.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 7698
   - uid: 7340
     components:
     - type: Transform
       pos: 12.5,47.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 7698
   - uid: 8458
     components:
     - type: Transform
       pos: -29.5,11.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 15291
   - uid: 8459
     components:
     - type: Transform
       pos: -30.5,11.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 15291
   - uid: 8460
     components:
     - type: Transform
       pos: -31.5,11.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 15291
   - uid: 9638
     components:
     - type: Transform
       pos: -42.5,41.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 9642
   - uid: 9639
     components:
     - type: Transform
       pos: -42.5,40.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 9642
   - uid: 9640
     components:
     - type: Transform
       pos: -42.5,39.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 9642
   - uid: 9715
     components:
     - type: Transform
       pos: 8.5,-29.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 10078
   - uid: 9718
     components:
     - type: Transform
       pos: 6.5,-29.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 9781
   - uid: 9965
     components:
     - type: Transform
       pos: 20.5,-52.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 10393
   - uid: 10312
     components:
     - type: Transform
       pos: 21.5,-52.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 10393
   - uid: 11337
     components:
     - type: Transform
       pos: -61.5,-1.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 11339
   - uid: 11338
     components:
     - type: Transform
       pos: -61.5,-5.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 11339
   - uid: 12955
     components:
     - type: Transform
       pos: 62.5,9.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 13038
   - uid: 12956
     components:
     - type: Transform
       pos: 62.5,8.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 13038
   - uid: 12957
     components:
     - type: Transform
       pos: 62.5,7.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 13038
+  - uid: 16797
+    components:
+    - type: Transform
+      pos: -15.5,53.5
+      parent: 2
 - proto: BlastDoorOpen
   entities:
   - uid: 12801
@@ -35645,25 +36685,16 @@ entities:
     - type: Transform
       pos: 56.5,17.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 12804
   - uid: 12802
     components:
     - type: Transform
       pos: 56.5,16.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 12804
   - uid: 12803
     components:
     - type: Transform
       pos: 56.5,15.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 12804
 - proto: BlockGameArcade
   entities:
   - uid: 19106
@@ -35914,6 +36945,35 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -34.5,-6.5
       parent: 2
+  - uid: 7941
+    components:
+    - type: Transform
+      pos: 51.5,16.5
+      parent: 2
+    - type: EntityStorage
+      open: True
+      removedMasks: 20
+    - type: Fixtures
+      fixtures:
+        fix1:
+          shape: !type:PolygonShape
+            radius: 0.01
+            vertices:
+            - -0.45,-0.45
+            - 0.45,-0.45
+            - 0.45,0.45
+            - -0.45,0.45
+          mask:
+          - Impassable
+          - TableLayer
+          - LowImpassable
+          layer:
+          - BulletImpassable
+          - Opaque
+          density: 190
+          hard: True
+          restitution: 0
+          friction: 0.4
   - uid: 10179
     components:
     - type: Transform
@@ -35925,16 +36985,6 @@ entities:
     - type: Transform
       pos: -7.5,-54.5
       parent: 2
-  - uid: 13018
-    components:
-    - type: Transform
-      pos: 50.5,17.5
-      parent: 2
-  - uid: 13019
-    components:
-    - type: Transform
-      pos: 50.5,15.5
-      parent: 2
 - proto: BoxBeaker
   entities:
   - uid: 10428
@@ -36157,6 +37207,11 @@ entities:
         23243:
           position: 4,0
           _rotation: South
+  - uid: 28644
+    components:
+    - type: Transform
+      pos: -15.971759,39.567432
+      parent: 2
 - proto: BoxFolderGreen
   entities:
   - uid: 9375
@@ -36286,6 +37341,11 @@ entities:
     - type: Transform
       pos: -55.493286,3.568643
       parent: 2
+  - uid: 28641
+    components:
+    - type: Transform
+      pos: -16.430094,39.650764
+      parent: 2
 - proto: BoxHandcuff
   entities:
   - uid: 4814
@@ -36563,6 +37623,11 @@ entities:
       parent: 2
 - proto: CableApcExtension
   entities:
+  - uid: 813
+    components:
+    - type: Transform
+      pos: 5.5,-80.5
+      parent: 2
   - uid: 861
     components:
     - type: Transform
@@ -36588,6 +37653,11 @@ entities:
     - type: Transform
       pos: 21.5,-13.5
       parent: 2
+  - uid: 1143
+    components:
+    - type: Transform
+      pos: -12.5,-80.5
+      parent: 2
   - uid: 1170
     components:
     - type: Transform
@@ -36608,6 +37678,31 @@ entities:
     - type: Transform
       pos: -21.5,-10.5
       parent: 2
+  - uid: 1330
+    components:
+    - type: Transform
+      pos: -11.5,-80.5
+      parent: 2
+  - uid: 1434
+    components:
+    - type: Transform
+      pos: -10.5,-80.5
+      parent: 2
+  - uid: 1551
+    components:
+    - type: Transform
+      pos: -9.5,-80.5
+      parent: 2
+  - uid: 1666
+    components:
+    - type: Transform
+      pos: -12.5,-82.5
+      parent: 2
+  - uid: 1667
+    components:
+    - type: Transform
+      pos: -11.5,-82.5
+      parent: 2
   - uid: 1692
     components:
     - type: Transform
@@ -36983,6 +38078,11 @@ entities:
     - type: Transform
       pos: -23.5,-27.5
       parent: 2
+  - uid: 1767
+    components:
+    - type: Transform
+      pos: -10.5,-82.5
+      parent: 2
   - uid: 1768
     components:
     - type: Transform
@@ -37388,6 +38488,11 @@ entities:
     - type: Transform
       pos: -27.5,-20.5
       parent: 2
+  - uid: 1861
+    components:
+    - type: Transform
+      pos: -9.5,-82.5
+      parent: 2
   - uid: 1929
     components:
     - type: Transform
@@ -43348,6 +44453,16 @@ entities:
     - type: Transform
       pos: -5.5,32.5
       parent: 2
+  - uid: 7970
+    components:
+    - type: Transform
+      pos: -8.5,-82.5
+      parent: 2
+  - uid: 7971
+    components:
+    - type: Transform
+      pos: 4.5,-80.5
+      parent: 2
   - uid: 7989
     components:
     - type: Transform
@@ -43423,6 +44538,131 @@ entities:
     - type: Transform
       pos: -16.5,28.5
       parent: 2
+  - uid: 8091
+    components:
+    - type: Transform
+      pos: -23.5,46.5
+      parent: 2
+  - uid: 8104
+    components:
+    - type: Transform
+      pos: -23.5,45.5
+      parent: 2
+  - uid: 8105
+    components:
+    - type: Transform
+      pos: -22.5,44.5
+      parent: 2
+  - uid: 8108
+    components:
+    - type: Transform
+      pos: -17.5,48.5
+      parent: 2
+  - uid: 8109
+    components:
+    - type: Transform
+      pos: -17.5,47.5
+      parent: 2
+  - uid: 8110
+    components:
+    - type: Transform
+      pos: -17.5,46.5
+      parent: 2
+  - uid: 8111
+    components:
+    - type: Transform
+      pos: -16.5,46.5
+      parent: 2
+  - uid: 8112
+    components:
+    - type: Transform
+      pos: -23.5,48.5
+      parent: 2
+  - uid: 8113
+    components:
+    - type: Transform
+      pos: -23.5,47.5
+      parent: 2
+  - uid: 8148
+    components:
+    - type: Transform
+      pos: -23.5,43.5
+      parent: 2
+  - uid: 8149
+    components:
+    - type: Transform
+      pos: -23.5,42.5
+      parent: 2
+  - uid: 8150
+    components:
+    - type: Transform
+      pos: -23.5,41.5
+      parent: 2
+  - uid: 8690
+    components:
+    - type: Transform
+      pos: -29.5,9.5
+      parent: 2
+  - uid: 8803
+    components:
+    - type: Transform
+      pos: -36.5,39.5
+      parent: 2
+  - uid: 8810
+    components:
+    - type: Transform
+      pos: -40.5,39.5
+      parent: 2
+  - uid: 8812
+    components:
+    - type: Transform
+      pos: -37.5,39.5
+      parent: 2
+  - uid: 8813
+    components:
+    - type: Transform
+      pos: -23.5,50.5
+      parent: 2
+  - uid: 8814
+    components:
+    - type: Transform
+      pos: -23.5,51.5
+      parent: 2
+  - uid: 8819
+    components:
+    - type: Transform
+      pos: -33.5,35.5
+      parent: 2
+  - uid: 8917
+    components:
+    - type: Transform
+      pos: -35.5,38.5
+      parent: 2
+  - uid: 8999
+    components:
+    - type: Transform
+      pos: -23.5,49.5
+      parent: 2
+  - uid: 9000
+    components:
+    - type: Transform
+      pos: -15.5,46.5
+      parent: 2
+  - uid: 9009
+    components:
+    - type: Transform
+      pos: -38.5,39.5
+      parent: 2
+  - uid: 9010
+    components:
+    - type: Transform
+      pos: -39.5,39.5
+      parent: 2
+  - uid: 9022
+    components:
+    - type: Transform
+      pos: -35.5,39.5
+      parent: 2
   - uid: 9042
     components:
     - type: Transform
@@ -43768,46 +45008,6 @@ entities:
     - type: Transform
       pos: -31.5,31.5
       parent: 2
-  - uid: 9111
-    components:
-    - type: Transform
-      pos: -27.5,31.5
-      parent: 2
-  - uid: 9112
-    components:
-    - type: Transform
-      pos: -27.5,32.5
-      parent: 2
-  - uid: 9113
-    components:
-    - type: Transform
-      pos: -27.5,33.5
-      parent: 2
-  - uid: 9114
-    components:
-    - type: Transform
-      pos: -27.5,34.5
-      parent: 2
-  - uid: 9115
-    components:
-    - type: Transform
-      pos: -27.5,35.5
-      parent: 2
-  - uid: 9116
-    components:
-    - type: Transform
-      pos: -27.5,36.5
-      parent: 2
-  - uid: 9117
-    components:
-    - type: Transform
-      pos: -28.5,36.5
-      parent: 2
-  - uid: 9118
-    components:
-    - type: Transform
-      pos: -26.5,36.5
-      parent: 2
   - uid: 9119
     components:
     - type: Transform
@@ -43823,60 +45023,10 @@ entities:
     - type: Transform
       pos: -25.5,25.5
       parent: 2
-  - uid: 9122
-    components:
-    - type: Transform
-      pos: -25.5,26.5
-      parent: 2
-  - uid: 9123
-    components:
-    - type: Transform
-      pos: -25.5,27.5
-      parent: 2
-  - uid: 9124
-    components:
-    - type: Transform
-      pos: -25.5,28.5
-      parent: 2
-  - uid: 9125
-    components:
-    - type: Transform
-      pos: -25.5,29.5
-      parent: 2
-  - uid: 9126
-    components:
-    - type: Transform
-      pos: -25.5,30.5
-      parent: 2
-  - uid: 9127
-    components:
-    - type: Transform
-      pos: -25.5,31.5
-      parent: 2
-  - uid: 9128
-    components:
-    - type: Transform
-      pos: -25.5,32.5
-      parent: 2
-  - uid: 9129
-    components:
-    - type: Transform
-      pos: -25.5,33.5
-      parent: 2
-  - uid: 9130
-    components:
-    - type: Transform
-      pos: -25.5,34.5
-      parent: 2
-  - uid: 9131
-    components:
-    - type: Transform
-      pos: -25.5,35.5
-      parent: 2
   - uid: 9132
     components:
     - type: Transform
-      pos: -25.5,36.5
+      pos: -34.5,37.5
       parent: 2
   - uid: 9134
     components:
@@ -43978,6 +45128,11 @@ entities:
     - type: Transform
       pos: -38.5,6.5
       parent: 2
+  - uid: 9167
+    components:
+    - type: Transform
+      pos: -33.5,37.5
+      parent: 2
   - uid: 9191
     components:
     - type: Transform
@@ -43996,7 +45151,7 @@ entities:
   - uid: 9194
     components:
     - type: Transform
-      pos: -22.5,44.5
+      pos: -36.5,34.5
       parent: 2
   - uid: 9195
     components:
@@ -44018,36 +45173,6 @@ entities:
     - type: Transform
       pos: -19.5,43.5
       parent: 2
-  - uid: 9199
-    components:
-    - type: Transform
-      pos: -22.5,45.5
-      parent: 2
-  - uid: 9200
-    components:
-    - type: Transform
-      pos: -22.5,46.5
-      parent: 2
-  - uid: 9201
-    components:
-    - type: Transform
-      pos: -22.5,47.5
-      parent: 2
-  - uid: 9202
-    components:
-    - type: Transform
-      pos: -22.5,48.5
-      parent: 2
-  - uid: 9203
-    components:
-    - type: Transform
-      pos: -22.5,49.5
-      parent: 2
-  - uid: 9204
-    components:
-    - type: Transform
-      pos: -22.5,50.5
-      parent: 2
   - uid: 9205
     components:
     - type: Transform
@@ -44078,16 +45203,6 @@ entities:
     - type: Transform
       pos: -17.5,51.5
       parent: 2
-  - uid: 9211
-    components:
-    - type: Transform
-      pos: -22.5,43.5
-      parent: 2
-  - uid: 9212
-    components:
-    - type: Transform
-      pos: -22.5,42.5
-      parent: 2
   - uid: 9213
     components:
     - type: Transform
@@ -44193,11 +45308,6 @@ entities:
     - type: Transform
       pos: -15.5,45.5
       parent: 2
-  - uid: 9234
-    components:
-    - type: Transform
-      pos: -15.5,46.5
-      parent: 2
   - uid: 9235
     components:
     - type: Transform
@@ -44223,6 +45333,11 @@ entities:
     - type: Transform
       pos: -12.5,46.5
       parent: 2
+  - uid: 9258
+    components:
+    - type: Transform
+      pos: -35.5,34.5
+      parent: 2
   - uid: 9340
     components:
     - type: Transform
@@ -44383,6 +45498,16 @@ entities:
     - type: Transform
       pos: -29.5,-2.5
       parent: 2
+  - uid: 9606
+    components:
+    - type: Transform
+      pos: -35.5,32.5
+      parent: 2
+  - uid: 9607
+    components:
+    - type: Transform
+      pos: -35.5,33.5
+      parent: 2
   - uid: 10079
     components:
     - type: Transform
@@ -46133,16 +47258,6 @@ entities:
     - type: Transform
       pos: -8.5,-81.5
       parent: 2
-  - uid: 11160
-    components:
-    - type: Transform
-      pos: -9.5,-81.5
-      parent: 2
-  - uid: 11161
-    components:
-    - type: Transform
-      pos: 4.5,-81.5
-      parent: 2
   - uid: 11162
     components:
     - type: Transform
@@ -48018,6 +49133,11 @@ entities:
     - type: Transform
       pos: 0.5,43.5
       parent: 2
+  - uid: 13589
+    components:
+    - type: Transform
+      pos: -40.5,40.5
+      parent: 2
   - uid: 14189
     components:
     - type: Transform
@@ -49738,6 +50858,26 @@ entities:
     - type: Transform
       pos: 43.5,29.5
       parent: 2
+  - uid: 21052
+    components:
+    - type: Transform
+      pos: 4.5,46.5
+      parent: 2
+  - uid: 21053
+    components:
+    - type: Transform
+      pos: 3.5,46.5
+      parent: 2
+  - uid: 21067
+    components:
+    - type: Transform
+      pos: 4.5,44.5
+      parent: 2
+  - uid: 21135
+    components:
+    - type: Transform
+      pos: 3.5,44.5
+      parent: 2
   - uid: 21232
     components:
     - type: Transform
@@ -50998,6 +52138,11 @@ entities:
     - type: Transform
       pos: 10.5,36.5
       parent: 2
+  - uid: 23663
+    components:
+    - type: Transform
+      pos: -34.5,35.5
+      parent: 2
   - uid: 23708
     components:
     - type: Transform
@@ -53638,19 +54783,157 @@ entities:
     - type: Transform
       pos: -59.5,-17.5
       parent: 2
+  - uid: 28435
+    components:
+    - type: Transform
+      pos: -35.5,37.5
+      parent: 2
+  - uid: 28468
+    components:
+    - type: Transform
+      pos: 6.5,-80.5
+      parent: 2
+  - uid: 28469
+    components:
+    - type: Transform
+      pos: 7.5,-80.5
+      parent: 2
+  - uid: 28470
+    components:
+    - type: Transform
+      pos: 3.5,-82.5
+      parent: 2
+  - uid: 28471
+    components:
+    - type: Transform
+      pos: 4.5,-82.5
+      parent: 2
+  - uid: 28472
+    components:
+    - type: Transform
+      pos: 5.5,-82.5
+      parent: 2
+  - uid: 28473
+    components:
+    - type: Transform
+      pos: 6.5,-82.5
+      parent: 2
+  - uid: 28474
+    components:
+    - type: Transform
+      pos: 7.5,-82.5
+      parent: 2
+  - uid: 28570
+    components:
+    - type: Transform
+      pos: -26.5,32.5
+      parent: 2
+  - uid: 28571
+    components:
+    - type: Transform
+      pos: -27.5,32.5
+      parent: 2
+  - uid: 28572
+    components:
+    - type: Transform
+      pos: -28.5,32.5
+      parent: 2
+  - uid: 28573
+    components:
+    - type: Transform
+      pos: -26.5,33.5
+      parent: 2
+  - uid: 28574
+    components:
+    - type: Transform
+      pos: -26.5,34.5
+      parent: 2
+  - uid: 28575
+    components:
+    - type: Transform
+      pos: -26.5,35.5
+      parent: 2
+  - uid: 28576
+    components:
+    - type: Transform
+      pos: -26.5,36.5
+      parent: 2
+  - uid: 28577
+    components:
+    - type: Transform
+      pos: -27.5,36.5
+      parent: 2
+  - uid: 28578
+    components:
+    - type: Transform
+      pos: -28.5,36.5
+      parent: 2
+  - uid: 28579
+    components:
+    - type: Transform
+      pos: -29.5,36.5
+      parent: 2
+  - uid: 28580
+    components:
+    - type: Transform
+      pos: -25.5,36.5
+      parent: 2
+  - uid: 28581
+    components:
+    - type: Transform
+      pos: -24.5,36.5
+      parent: 2
+  - uid: 28582
+    components:
+    - type: Transform
+      pos: -24.5,25.5
+      parent: 2
+  - uid: 28583
+    components:
+    - type: Transform
+      pos: -24.5,26.5
+      parent: 2
+  - uid: 28584
+    components:
+    - type: Transform
+      pos: -24.5,27.5
+      parent: 2
+  - uid: 28585
+    components:
+    - type: Transform
+      pos: -24.5,28.5
+      parent: 2
+  - uid: 28586
+    components:
+    - type: Transform
+      pos: -25.5,28.5
+      parent: 2
+  - uid: 28587
+    components:
+    - type: Transform
+      pos: -26.5,28.5
+      parent: 2
+  - uid: 28588
+    components:
+    - type: Transform
+      pos: -27.5,28.5
+      parent: 2
+  - uid: 28606
+    components:
+    - type: Transform
+      pos: -31.5,9.5
+      parent: 2
 - proto: CableApcStack1
   entities:
   - uid: 23589
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -24.973267,-49.100296
+      pos: -26.27221,-48.773342
       parent: 2
   - uid: 23590
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -26.65035,-47.42321
+      pos: -26.80346,-48.627506
       parent: 2
 - proto: Cablecuffs
   entities:
@@ -53661,6 +54944,11 @@ entities:
       parent: 2
 - proto: CableHV
   entities:
+  - uid: 231
+    components:
+    - type: Transform
+      pos: 44.5,-46.5
+      parent: 2
   - uid: 1409
     components:
     - type: Transform
@@ -56836,6 +58124,16 @@ entities:
     - type: Transform
       pos: 10.5,-47.5
       parent: 2
+  - uid: 10292
+    components:
+    - type: Transform
+      pos: 41.5,-48.5
+      parent: 2
+  - uid: 10596
+    components:
+    - type: Transform
+      pos: 41.5,-47.5
+      parent: 2
   - uid: 10602
     components:
     - type: Transform
@@ -56896,6 +58194,41 @@ entities:
     - type: Transform
       pos: 4.5,-57.5
       parent: 2
+  - uid: 10656
+    components:
+    - type: Transform
+      pos: 41.5,-46.5
+      parent: 2
+  - uid: 10691
+    components:
+    - type: Transform
+      pos: 42.5,-46.5
+      parent: 2
+  - uid: 10716
+    components:
+    - type: Transform
+      pos: 41.5,-49.5
+      parent: 2
+  - uid: 10725
+    components:
+    - type: Transform
+      pos: 42.5,-51.5
+      parent: 2
+  - uid: 10726
+    components:
+    - type: Transform
+      pos: 41.5,-51.5
+      parent: 2
+  - uid: 10727
+    components:
+    - type: Transform
+      pos: 43.5,-51.5
+      parent: 2
+  - uid: 10744
+    components:
+    - type: Transform
+      pos: 41.5,-50.5
+      parent: 2
   - uid: 10891
     components:
     - type: Transform
@@ -57336,11 +58669,6 @@ entities:
     - type: Transform
       pos: 43.5,10.5
       parent: 2
-  - uid: 12822
-    components:
-    - type: Transform
-      pos: 50.5,20.5
-      parent: 2
   - uid: 12823
     components:
     - type: Transform
@@ -57356,31 +58684,6 @@ entities:
     - type: Transform
       pos: 52.5,19.5
       parent: 2
-  - uid: 12826
-    components:
-    - type: Transform
-      pos: 52.5,20.5
-      parent: 2
-  - uid: 12849
-    components:
-    - type: Transform
-      pos: 53.5,21.5
-      parent: 2
-  - uid: 12850
-    components:
-    - type: Transform
-      pos: 52.5,21.5
-      parent: 2
-  - uid: 12851
-    components:
-    - type: Transform
-      pos: 50.5,21.5
-      parent: 2
-  - uid: 12852
-    components:
-    - type: Transform
-      pos: 49.5,21.5
-      parent: 2
   - uid: 12888
     components:
     - type: Transform
@@ -57751,6 +59054,11 @@ entities:
     - type: Transform
       pos: 56.5,9.5
       parent: 2
+  - uid: 15404
+    components:
+    - type: Transform
+      pos: 44.5,-44.5
+      parent: 2
   - uid: 15616
     components:
     - type: Transform
@@ -57796,6 +59104,11 @@ entities:
     - type: Transform
       pos: -54.5,-61.5
       parent: 2
+  - uid: 19073
+    components:
+    - type: Transform
+      pos: 44.5,-45.5
+      parent: 2
   - uid: 19164
     components:
     - type: Transform
@@ -59061,6 +60374,11 @@ entities:
     - type: Transform
       pos: 41.5,-44.5
       parent: 2
+  - uid: 19959
+    components:
+    - type: Transform
+      pos: 43.5,-46.5
+      parent: 2
   - uid: 19983
     components:
     - type: Transform
@@ -59081,36 +60399,6 @@ entities:
     - type: Transform
       pos: 44.5,-43.5
       parent: 2
-  - uid: 19987
-    components:
-    - type: Transform
-      pos: 44.5,-44.5
-      parent: 2
-  - uid: 19988
-    components:
-    - type: Transform
-      pos: 44.5,-45.5
-      parent: 2
-  - uid: 19989
-    components:
-    - type: Transform
-      pos: 44.5,-46.5
-      parent: 2
-  - uid: 19990
-    components:
-    - type: Transform
-      pos: 43.5,-46.5
-      parent: 2
-  - uid: 19991
-    components:
-    - type: Transform
-      pos: 42.5,-46.5
-      parent: 2
-  - uid: 19992
-    components:
-    - type: Transform
-      pos: 41.5,-46.5
-      parent: 2
   - uid: 20054
     components:
     - type: Transform
@@ -59246,26 +60534,6 @@ entities:
     - type: Transform
       pos: 46.5,-51.5
       parent: 2
-  - uid: 20081
-    components:
-    - type: Transform
-      pos: 44.5,-50.5
-      parent: 2
-  - uid: 20082
-    components:
-    - type: Transform
-      pos: 44.5,-49.5
-      parent: 2
-  - uid: 20083
-    components:
-    - type: Transform
-      pos: 44.5,-48.5
-      parent: 2
-  - uid: 20084
-    components:
-    - type: Transform
-      pos: 44.5,-47.5
-      parent: 2
   - uid: 20085
     components:
     - type: Transform
@@ -64063,55 +65331,70 @@ entities:
     - type: Transform
       pos: 10.5,49.5
       parent: 2
-  - uid: 9018
+  - uid: 8114
     components:
     - type: Transform
-      pos: -21.5,33.5
+      pos: -21.5,26.5
       parent: 2
-  - uid: 9019
+  - uid: 8115
     components:
     - type: Transform
-      pos: -22.5,33.5
+      pos: -23.5,26.5
       parent: 2
-  - uid: 9020
+  - uid: 8116
     components:
     - type: Transform
-      pos: -23.5,33.5
+      pos: -22.5,23.5
       parent: 2
-  - uid: 9021
+  - uid: 8117
     components:
     - type: Transform
-      pos: -24.5,33.5
+      pos: -22.5,24.5
       parent: 2
-  - uid: 9022
+  - uid: 8119
     components:
     - type: Transform
-      pos: -25.5,33.5
+      pos: -21.5,24.5
       parent: 2
-  - uid: 9023
+  - uid: 8171
     components:
     - type: Transform
-      pos: -26.5,33.5
+      pos: -31.5,32.5
       parent: 2
-  - uid: 9024
+  - uid: 8222
     components:
     - type: Transform
-      pos: -27.5,33.5
+      pos: -21.5,28.5
       parent: 2
-  - uid: 9025
+  - uid: 8223
     components:
     - type: Transform
-      pos: -28.5,33.5
+      pos: -25.5,26.5
       parent: 2
-  - uid: 9026
+  - uid: 8224
     components:
     - type: Transform
-      pos: -29.5,33.5
+      pos: -24.5,26.5
       parent: 2
-  - uid: 9027
+  - uid: 8798
     components:
     - type: Transform
-      pos: -30.5,33.5
+      pos: -23.5,42.5
+      parent: 2
+  - uid: 8805
+    components:
+    - type: Transform
+      pos: -23.5,41.5
+      parent: 2
+  - uid: 8840
+    components:
+    - type: Transform
+      pos: -22.5,29.5
+      parent: 2
+  - uid: 8945
+    components:
+    - type: Transform
+      pos: -23.5,43.5
       parent: 2
   - uid: 9028
     components:
@@ -64263,21 +65546,6 @@ entities:
     - type: Transform
       pos: -22.5,41.5
       parent: 2
-  - uid: 9256
-    components:
-    - type: Transform
-      pos: -22.5,42.5
-      parent: 2
-  - uid: 9257
-    components:
-    - type: Transform
-      pos: -22.5,43.5
-      parent: 2
-  - uid: 9258
-    components:
-    - type: Transform
-      pos: -22.5,44.5
-      parent: 2
   - uid: 9259
     components:
     - type: Transform
@@ -64308,6 +65576,21 @@ entities:
     - type: Transform
       pos: -26.5,0.5
       parent: 2
+  - uid: 9608
+    components:
+    - type: Transform
+      pos: -22.5,28.5
+      parent: 2
+  - uid: 9610
+    components:
+    - type: Transform
+      pos: -22.5,26.5
+      parent: 2
+  - uid: 9619
+    components:
+    - type: Transform
+      pos: -23.5,26.5
+      parent: 2
   - uid: 10039
     components:
     - type: Transform
@@ -66598,6 +67881,61 @@ entities:
     - type: Transform
       pos: 29.5,-35.5
       parent: 21002
+  - uid: 28562
+    components:
+    - type: Transform
+      pos: -26.5,26.5
+      parent: 2
+  - uid: 28563
+    components:
+    - type: Transform
+      pos: -27.5,26.5
+      parent: 2
+  - uid: 28564
+    components:
+    - type: Transform
+      pos: -28.5,26.5
+      parent: 2
+  - uid: 28565
+    components:
+    - type: Transform
+      pos: -28.5,27.5
+      parent: 2
+  - uid: 28566
+    components:
+    - type: Transform
+      pos: -28.5,28.5
+      parent: 2
+  - uid: 28567
+    components:
+    - type: Transform
+      pos: -28.5,29.5
+      parent: 2
+  - uid: 28568
+    components:
+    - type: Transform
+      pos: -28.5,30.5
+      parent: 2
+  - uid: 28569
+    components:
+    - type: Transform
+      pos: -28.5,31.5
+      parent: 2
+  - uid: 28608
+    components:
+    - type: Transform
+      pos: -29.5,31.5
+      parent: 2
+  - uid: 28609
+    components:
+    - type: Transform
+      pos: -30.5,31.5
+      parent: 2
+  - uid: 28610
+    components:
+    - type: Transform
+      pos: -31.5,31.5
+      parent: 2
 - proto: CableTerminal
   entities:
   - uid: 6405
@@ -66639,15 +67977,21 @@ entities:
     - type: Transform
       pos: 14.5,43.5
       parent: 2
-  - uid: 12845
+  - uid: 8502
     components:
     - type: Transform
-      pos: 50.5,21.5
+      pos: 50.5,20.5
       parent: 2
-  - uid: 12846
+  - uid: 8670
     components:
     - type: Transform
-      pos: 52.5,21.5
+      pos: 52.5,20.5
+      parent: 2
+  - uid: 10285
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 41.5,-47.5
       parent: 2
   - uid: 16678
     components:
@@ -66892,6 +68236,11 @@ entities:
     - type: Transform
       pos: 28.5,-35.5
       parent: 21002
+  - uid: 28625
+    components:
+    - type: Transform
+      pos: -21.5,39.5
+      parent: 2
 - proto: CargoBountyComputerCircuitboard
   entities:
   - uid: 23275
@@ -68710,6 +70059,24 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 9.5,28.5
       parent: 2
+  - uid: 4137
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 44.5,-45.5
+      parent: 2
+  - uid: 4151
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 44.5,-46.5
+      parent: 2
+  - uid: 4431
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 44.5,-48.5
+      parent: 2
   - uid: 5175
     components:
     - type: Transform
@@ -68722,6 +70089,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 8.5,28.5
       parent: 2
+  - uid: 5397
+    components:
+    - type: Transform
+      pos: -52.5,-26.5
+      parent: 2
   - uid: 5434
     components:
     - type: Transform
@@ -68824,6 +70196,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 31.5,37.5
       parent: 2
+  - uid: 6764
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 60.5,-30.5
+      parent: 2
   - uid: 7200
     components:
     - type: Transform
@@ -68925,6 +70303,58 @@ entities:
     - type: Transform
       pos: -5.5,46.5
       parent: 2
+  - uid: 7798
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 60.5,-22.5
+      parent: 2
+  - uid: 8151
+    components:
+    - type: Transform
+      pos: -27.5,16.5
+      parent: 2
+  - uid: 8152
+    components:
+    - type: Transform
+      pos: -26.5,16.5
+      parent: 2
+  - uid: 8158
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -26.5,26.5
+      parent: 2
+  - uid: 8173
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -26.5,27.5
+      parent: 2
+  - uid: 8245
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -27.5,24.5
+      parent: 2
+  - uid: 8255
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -27.5,23.5
+      parent: 2
+  - uid: 8358
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -26.5,24.5
+      parent: 2
+  - uid: 8369
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -26.5,35.5
+      parent: 2
   - uid: 8400
     components:
     - type: Transform
@@ -69063,83 +70493,27 @@ entities:
       rot: 3.141592653589793 rad
       pos: -38.5,10.5
       parent: 2
-  - uid: 8772
+  - uid: 8654
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -27.5,12.5
+      rot: 1.5707963267948966 rad
+      pos: -26.5,36.5
       parent: 2
-  - uid: 8773
+  - uid: 8655
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -27.5,13.5
+      rot: -1.5707963267948966 rad
+      pos: -26.5,23.5
       parent: 2
-  - uid: 8774
+  - uid: 8656
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -27.5,14.5
+      pos: -27.5,22.5
       parent: 2
-  - uid: 8775
+  - uid: 8754
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -27.5,33.5
-      parent: 2
-  - uid: 8776
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -27.5,34.5
-      parent: 2
-  - uid: 8777
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -26.5,34.5
-      parent: 2
-  - uid: 8778
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -26.5,33.5
-      parent: 2
-  - uid: 8779
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -26.5,31.5
-      parent: 2
-  - uid: 8780
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -26.5,30.5
-      parent: 2
-  - uid: 8781
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -26.5,29.5
-      parent: 2
-  - uid: 8782
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -26.5,28.5
-      parent: 2
-  - uid: 8783
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -26.5,27.5
-      parent: 2
-  - uid: 8784
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -26.5,26.5
+      pos: 52.5,20.5
       parent: 2
   - uid: 8785
     components:
@@ -69147,234 +70521,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -26.5,25.5
       parent: 2
-  - uid: 8786
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -26.5,24.5
-      parent: 2
-  - uid: 8787
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -26.5,23.5
-      parent: 2
-  - uid: 8788
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -25.5,34.5
-      parent: 2
-  - uid: 8789
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -25.5,33.5
-      parent: 2
-  - uid: 8790
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -25.5,32.5
-      parent: 2
-  - uid: 8791
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -25.5,31.5
-      parent: 2
-  - uid: 8792
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -25.5,30.5
-      parent: 2
-  - uid: 8793
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -25.5,29.5
-      parent: 2
-  - uid: 8794
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -25.5,28.5
-      parent: 2
-  - uid: 8795
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -25.5,27.5
-      parent: 2
-  - uid: 8796
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -25.5,26.5
-      parent: 2
-  - uid: 8797
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -25.5,25.5
-      parent: 2
-  - uid: 8798
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -25.5,24.5
-      parent: 2
-  - uid: 8799
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -25.5,23.5
-      parent: 2
-  - uid: 8800
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -24.5,34.5
-      parent: 2
-  - uid: 8801
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -24.5,33.5
-      parent: 2
-  - uid: 8802
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -24.5,32.5
-      parent: 2
-  - uid: 8803
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -24.5,31.5
-      parent: 2
-  - uid: 8804
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -24.5,30.5
-      parent: 2
-  - uid: 8805
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -24.5,29.5
-      parent: 2
-  - uid: 8806
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -24.5,28.5
-      parent: 2
-  - uid: 8807
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -24.5,27.5
-      parent: 2
-  - uid: 8808
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -24.5,26.5
-      parent: 2
-  - uid: 8809
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -24.5,25.5
-      parent: 2
-  - uid: 8810
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -24.5,24.5
-      parent: 2
-  - uid: 8811
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -24.5,23.5
-      parent: 2
-  - uid: 8812
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -23.5,34.5
-      parent: 2
-  - uid: 8813
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -27.5,35.5
-      parent: 2
-  - uid: 8814
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -27.5,35.5
-      parent: 2
-  - uid: 8815
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -23.5,31.5
-      parent: 2
-  - uid: 8816
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -23.5,30.5
-      parent: 2
-  - uid: 8817
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -23.5,29.5
-      parent: 2
-  - uid: 8818
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -23.5,28.5
-      parent: 2
-  - uid: 8819
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -23.5,27.5
-      parent: 2
-  - uid: 8820
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -23.5,26.5
-      parent: 2
-  - uid: 8821
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -23.5,25.5
-      parent: 2
-  - uid: 8822
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -23.5,24.5
-      parent: 2
-  - uid: 8823
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -23.5,23.5
-      parent: 2
   - uid: 8824
     components:
     - type: Transform
@@ -69423,131 +70569,38 @@ entities:
       rot: 3.141592653589793 rad
       pos: -26.5,17.5
       parent: 2
-  - uid: 8832
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -26.5,16.5
-      parent: 2
-  - uid: 8833
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -26.5,15.5
-      parent: 2
-  - uid: 8834
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -26.5,14.5
-      parent: 2
-  - uid: 8835
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -27.5,36.5
-      parent: 2
   - uid: 8836
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -27.5,37.5
+      pos: -27.5,19.5
       parent: 2
   - uid: 8837
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -26.5,35.5
+      pos: -27.5,20.5
       parent: 2
   - uid: 8838
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -26.5,36.5
-      parent: 2
-  - uid: 8839
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -26.5,37.5
-      parent: 2
-  - uid: 8840
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -25.5,35.5
-      parent: 2
-  - uid: 8841
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -25.5,36.5
-      parent: 2
-  - uid: 8842
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -25.5,37.5
-      parent: 2
-  - uid: 8992
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -27.5,15.5
-      parent: 2
-  - uid: 8993
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -27.5,16.5
-      parent: 2
-  - uid: 8994
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -27.5,17.5
+      pos: -27.5,21.5
       parent: 2
   - uid: 8995
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -27.5,18.5
+      pos: -24.5,36.5
       parent: 2
   - uid: 8996
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -27.5,19.5
-      parent: 2
-  - uid: 8997
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -27.5,20.5
+      pos: -25.5,36.5
       parent: 2
   - uid: 8998
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -27.5,21.5
-      parent: 2
-  - uid: 8999
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -27.5,22.5
-      parent: 2
-  - uid: 9000
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -27.5,23.5
-      parent: 2
-  - uid: 9001
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -27.5,24.5
+      pos: -29.5,36.5
       parent: 2
   - uid: 9002
     components:
@@ -69573,47 +70626,62 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -27.5,28.5
       parent: 2
-  - uid: 9006
+  - uid: 9018
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -27.5,29.5
+      pos: -28.5,36.5
       parent: 2
-  - uid: 9007
+  - uid: 9019
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -27.5,30.5
-      parent: 2
-  - uid: 9008
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -27.5,31.5
-      parent: 2
-  - uid: 9009
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -27.5,32.5
-      parent: 2
-  - uid: 9010
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -26.5,32.5
+      pos: -27.5,36.5
       parent: 2
   - uid: 9384
     components:
     - type: Transform
       pos: -4.5,46.5
       parent: 2
+  - uid: 9634
+    components:
+    - type: Transform
+      pos: -27.5,17.5
+      parent: 2
+  - uid: 9635
+    components:
+    - type: Transform
+      pos: -27.5,18.5
+      parent: 2
+  - uid: 9935
+    components:
+    - type: Transform
+      pos: 50.5,20.5
+      parent: 2
+  - uid: 9945
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 12.5,-47.5
+      parent: 2
+  - uid: 11974
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-57.5
+      parent: 2
   - uid: 11991
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 6.5,-49.5
       parent: 2
+  - uid: 12476
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 57.5,9.5
+      parent: 2
   - uid: 12481
     components:
     - type: Transform
@@ -70766,12 +71834,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -23.5,5.5
       parent: 2
-  - uid: 12684
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -20.5,24.5
-      parent: 2
   - uid: 12685
     components:
     - type: Transform
@@ -70802,27 +71864,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -20.5,29.5
       parent: 2
-  - uid: 12690
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -20.5,30.5
-      parent: 2
-  - uid: 12842
-    components:
-    - type: Transform
-      pos: 50.5,19.5
-      parent: 2
-  - uid: 12843
-    components:
-    - type: Transform
-      pos: 52.5,19.5
-      parent: 2
-  - uid: 12844
-    components:
-    - type: Transform
-      pos: 51.5,20.5
-      parent: 2
   - uid: 13135
     components:
     - type: Transform
@@ -70841,6 +71882,23 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 66.5,6.5
       parent: 2
+  - uid: 13571
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -26.5,28.5
+      parent: 2
+  - uid: 13938
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 58.5,9.5
+      parent: 2
+  - uid: 15443
+    components:
+    - type: Transform
+      pos: 51.5,20.5
+      parent: 2
   - uid: 15563
     components:
     - type: Transform
@@ -72092,11 +73150,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -47.5,-55.5
       parent: 2
-  - uid: 19975
+  - uid: 21050
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 44.5,-48.5
+      pos: 11.5,-47.5
       parent: 2
   - uid: 23469
     components:
@@ -72324,6 +73382,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -5.5,26.5
       parent: 21002
+  - uid: 28441
+    components:
+    - type: Transform
+      pos: -24.5,25.5
+      parent: 2
   - uid: 28442
     components:
     - type: Transform
@@ -72354,6 +73417,116 @@ entities:
     - type: Transform
       pos: 19.5,53.5
       parent: 2
+  - uid: 28475
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-82.5
+      parent: 2
+  - uid: 28476
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-82.5
+      parent: 2
+  - uid: 28477
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-80.5
+      parent: 2
+  - uid: 28478
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-80.5
+      parent: 2
+  - uid: 28479
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -11.5,-82.5
+      parent: 2
+  - uid: 28480
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -12.5,-82.5
+      parent: 2
+  - uid: 28481
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -12.5,-80.5
+      parent: 2
+  - uid: 28482
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -11.5,-80.5
+      parent: 2
+  - uid: 28527
+    components:
+    - type: Transform
+      pos: -25.5,28.5
+      parent: 2
+  - uid: 28528
+    components:
+    - type: Transform
+      pos: -24.5,28.5
+      parent: 2
+  - uid: 28529
+    components:
+    - type: Transform
+      pos: -23.5,28.5
+      parent: 2
+  - uid: 28530
+    components:
+    - type: Transform
+      pos: -24.5,27.5
+      parent: 2
+  - uid: 28531
+    components:
+    - type: Transform
+      pos: -25.5,27.5
+      parent: 2
+  - uid: 28532
+    components:
+    - type: Transform
+      pos: -25.5,26.5
+      parent: 2
+  - uid: 28533
+    components:
+    - type: Transform
+      pos: -24.5,26.5
+      parent: 2
+  - uid: 28534
+    components:
+    - type: Transform
+      pos: -23.5,26.5
+      parent: 2
+  - uid: 28535
+    components:
+    - type: Transform
+      pos: -23.5,25.5
+      parent: 2
+  - uid: 28537
+    components:
+    - type: Transform
+      pos: -25.5,25.5
+      parent: 2
+  - uid: 28589
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -25.5,24.5
+      parent: 2
+  - uid: 28590
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -25.5,23.5
+      parent: 2
 - proto: Chair
   entities:
   - uid: 495
@@ -72895,6 +74068,17 @@ entities:
       rot: 3.141592653589793 rad
       pos: 20.5,-39.5
       parent: 2
+  - uid: 5398
+    components:
+    - type: Transform
+      pos: -27.477377,-48.432636
+      parent: 2
+  - uid: 5462
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -23.466612,-47.338886
+      parent: 2
   - uid: 5838
     components:
     - type: Transform
@@ -73407,17 +74591,17 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 41.19866,-40.377396
       parent: 2
-  - uid: 11972
+  - uid: 20083
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 5.6389174,-82.314095
+      pos: 5.6858897,-74.35811
       parent: 2
-  - uid: 11973
+  - uid: 21024
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 5.4930844,-82.376595
+      pos: 5.5921397,-74.49352
       parent: 2
   - uid: 23248
     components:
@@ -73906,6 +75090,11 @@ entities:
     - type: Transform
       pos: -25.5,8.5
       parent: 2
+  - uid: 13936
+    components:
+    - type: Transform
+      pos: 37.5,-37.5
+      parent: 2
   - uid: 18255
     components:
     - type: Transform
@@ -74320,11 +75509,11 @@ entities:
       parent: 2
 - proto: ClothingEyesGlassesJensen
   entities:
-  - uid: 11964
+  - uid: 12848
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -10.287879,-82.42868
+      pos: -10.243727,-76.532394
       parent: 2
 - proto: ClothingEyesGlassesSunglasses
   entities:
@@ -74422,6 +75611,43 @@ entities:
     - type: Transform
       pos: -23.570253,21.892609
       parent: 2
+- proto: ClothingHeadHatCone
+  entities:
+  - uid: 5543
+    components:
+    - type: Transform
+      pos: 33.20417,30.844486
+      parent: 2
+  - uid: 6580
+    components:
+    - type: Transform
+      pos: 33.20417,30.844486
+      parent: 2
+  - uid: 6624
+    components:
+    - type: Transform
+      pos: 36.218544,31.813236
+      parent: 2
+  - uid: 11966
+    components:
+    - type: Transform
+      pos: 18.719696,31.344906
+      parent: 2
+  - uid: 11967
+    components:
+    - type: Transform
+      pos: 11.232897,31.344906
+      parent: 2
+  - uid: 12475
+    components:
+    - type: Transform
+      pos: 10.227567,26.35734
+      parent: 2
+  - uid: 21051
+    components:
+    - type: Transform
+      pos: 35.71459,33.323654
+      parent: 2
 - proto: ClothingHeadHatCowboyBountyHunter
   entities:
   - uid: 4019
@@ -74543,6 +75769,13 @@ entities:
     - type: Transform
       pos: -23.582691,21.820213
       parent: 2
+- proto: ClothingHeadHatSecsoft
+  entities:
+  - uid: 28509
+    components:
+    - type: Transform
+      pos: 19.506287,-46.321068
+      parent: 21002
 - proto: ClothingHeadHatWatermelon
   entities:
   - uid: 19136
@@ -74685,6 +75918,18 @@ entities:
     - type: Transform
       pos: 46.451965,-16.390926
       parent: 21002
+- proto: ClothingMaskGasAtmos
+  entities:
+  - uid: 8993
+    components:
+    - type: Transform
+      pos: -23.293444,37.59137
+      parent: 2
+  - uid: 13587
+    components:
+    - type: Transform
+      pos: -30.30386,35.46637
+      parent: 2
 - proto: ClothingMaskSadMime
   entities:
   - uid: 24197
@@ -74772,6 +76017,13 @@ entities:
     - type: Transform
       pos: 32.51363,-25.606247
       parent: 2
+- proto: ClothingOuterCoatDetectiveLoadout
+  entities:
+  - uid: 19186
+    components:
+    - type: Transform
+      pos: -33.359306,-49.4063
+      parent: 2
 - proto: ClothingOuterCoatExpensive
   entities:
   - uid: 24200
@@ -74781,13 +76033,6 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-- proto: ClothingOuterCoatInspector
-  entities:
-  - uid: 19186
-    components:
-    - type: Transform
-      pos: -33.359306,-49.4063
-      parent: 2
 - proto: ClothingOuterCoatTrench
   entities:
   - uid: 28309
@@ -75152,6 +76397,12 @@ entities:
     - type: InsideEntityStorage
 - proto: Cobweb1
   entities:
+  - uid: 10956
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 39.5,18.5
+      parent: 2
   - uid: 12436
     components:
     - type: Transform
@@ -75171,10 +76422,10 @@ entities:
       parent: 2
 - proto: Cobweb2
   entities:
-  - uid: 3806
+  - uid: 12826
     components:
     - type: Transform
-      pos: 41.5,22.5
+      pos: 41.5,23.5
       parent: 2
 - proto: ComfyChair
   entities:
@@ -75328,6 +76579,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 40.5,15.5
       parent: 2
+  - uid: 3652
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-75.5
+      parent: 2
   - uid: 3791
     components:
     - type: Transform
@@ -75430,17 +76687,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -0.5,-61.5
       parent: 2
-  - uid: 11966
+  - uid: 16070
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -10.5,-81.5
-      parent: 2
-  - uid: 11967
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,-81.5
+      pos: -10.5,-75.5
       parent: 2
   - uid: 23373
     components:
@@ -76013,261 +77264,174 @@ entities:
       parent: 2
 - proto: ConveyorBelt
   entities:
-  - uid: 1666
-    components:
-    - type: Transform
-      pos: -57.5,-30.5
-      parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 3226
-  - uid: 1667
-    components:
-    - type: Transform
-      pos: -57.5,-29.5
-      parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 3226
-  - uid: 1767
-    components:
-    - type: Transform
-      pos: -57.5,-25.5
-      parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 3226
-  - uid: 2120
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -55.5,-25.5
-      parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 3226
-  - uid: 3225
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -54.5,-25.5
-      parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 3226
-  - uid: 3236
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -56.5,-25.5
-      parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 3226
-  - uid: 3247
-    components:
-    - type: Transform
-      pos: -57.5,-28.5
-      parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 3226
-  - uid: 3327
-    components:
-    - type: Transform
-      pos: -57.5,-27.5
-      parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 3226
-  - uid: 3652
-    components:
-    - type: Transform
-      pos: -57.5,-26.5
-      parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 3226
   - uid: 11344
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -57.5,-5.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 11355
   - uid: 11345
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -57.5,-1.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 11354
   - uid: 11346
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -58.5,-1.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 11354
   - uid: 11347
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -60.5,-5.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 11355
   - uid: 11348
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -59.5,-1.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 11354
   - uid: 11349
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -60.5,-1.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 11354
   - uid: 11350
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -59.5,-5.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 11355
   - uid: 11352
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -61.5,-1.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 11354
   - uid: 11353
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -58.5,-5.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 11355
   - uid: 11356
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -61.5,-5.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 11355
   - uid: 11357
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -56.5,-5.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 11355
   - uid: 11358
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -56.5,-1.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 11354
+  - uid: 11363
+    components:
+    - type: Transform
+      pos: -57.5,-30.5
+      parent: 2
+  - uid: 11364
+    components:
+    - type: Transform
+      pos: -57.5,-29.5
+      parent: 2
+  - uid: 11565
+    components:
+    - type: Transform
+      pos: -57.5,-25.5
+      parent: 2
+  - uid: 11571
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -55.5,-25.5
+      parent: 2
+  - uid: 11596
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -54.5,-25.5
+      parent: 2
   - uid: 11659
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -45.5,-14.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 12098
   - uid: 11660
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -46.5,-14.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 12098
+  - uid: 11828
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -56.5,-25.5
+      parent: 2
+  - uid: 11941
+    components:
+    - type: Transform
+      pos: -57.5,-28.5
+      parent: 2
+  - uid: 11942
+    components:
+    - type: Transform
+      pos: -57.5,-27.5
+      parent: 2
+  - uid: 11948
+    components:
+    - type: Transform
+      pos: -57.5,-26.5
+      parent: 2
   - uid: 12092
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -48.5,-14.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 12098
   - uid: 12093
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -47.5,-14.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 12098
   - uid: 12094
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -49.5,-14.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 12098
   - uid: 12095
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -50.5,-14.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 12098
   - uid: 12096
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -51.5,-14.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 12098
   - uid: 12097
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -52.5,-14.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 12098
 - proto: CottonSeeds
   entities:
   - uid: 22761
@@ -76453,6 +77617,24 @@ entities:
     - type: Transform
       pos: -46.5,-52.5
       parent: 2
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.14673
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
 - proto: CrateEmergencyFire
   entities:
   - uid: 23791
@@ -77144,7 +78326,7 @@ entities:
           ent: null
 - proto: CrateInternals
   entities:
-  - uid: 19636
+  - uid: 11961
     components:
     - type: Transform
       pos: -45.5,-52.5
@@ -77198,13 +78380,6 @@ entities:
     - type: Transform
       pos: 31.5,-41.5
       parent: 2
-- proto: CrateMindShieldImplants
-  entities:
-  - uid: 24219
-    components:
-    - type: Transform
-      pos: 38.5,-19.5
-      parent: 2
 - proto: CrateNPCGoose
   entities:
   - uid: 3950
@@ -77226,6 +78401,13 @@ entities:
     - type: Transform
       pos: -45.5,-15.5
       parent: 2
+- proto: CrateSecurityTrackingMindshieldImplants
+  entities:
+  - uid: 2263
+    components:
+    - type: Transform
+      pos: 38.5,-19.5
+      parent: 2
 - proto: CrateServicePersonnel
   entities:
   - uid: 3510
@@ -77379,7 +78561,7 @@ entities:
   - uid: 9263
     components:
     - type: Transform
-      pos: -23.455753,23.489971
+      pos: -25.627705,22.52101
       parent: 2
   - uid: 9447
     components:
@@ -77393,6 +78575,11 @@ entities:
     - type: Transform
       pos: 23.425058,34.59862
       parent: 2
+  - uid: 8687
+    components:
+    - type: Transform
+      pos: -23.33511,35.40387
+      parent: 2
   - uid: 9791
     components:
     - type: Transform
@@ -78137,6 +79324,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -15.5,-42.5
       parent: 2
+  - uid: 5636
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -32.5,33.5
+      parent: 2
   - uid: 6912
     components:
     - type: Transform
@@ -78154,6 +79347,29 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -0.5,38.5
       parent: 2
+  - uid: 8166
+    components:
+    - type: Transform
+      pos: -25.5,33.5
+      parent: 2
+  - uid: 8774
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -25.5,26.5
+      parent: 2
+  - uid: 8789
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -32.5,41.5
+      parent: 2
+  - uid: 8790
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -26.5,41.5
+      parent: 2
   - uid: 9381
     components:
     - type: Transform
@@ -78275,12 +79491,6 @@ entities:
     - type: Transform
       pos: -21.5,26.5
       parent: 2
-  - uid: 16807
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -26.5,26.5
-      parent: 2
   - uid: 16808
     components:
     - type: Transform
@@ -79008,11 +80218,32 @@ entities:
       rot: 3.141592653589793 rad
       pos: -15.5,-37.5
       parent: 2
+  - uid: 3097
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -29.5,33.5
+      parent: 2
+  - uid: 3286
+    components:
+    - type: Transform
+      pos: -32.5,38.5
+      parent: 2
+  - uid: 3287
+    components:
+    - type: Transform
+      pos: -32.5,34.5
+      parent: 2
   - uid: 5632
     components:
     - type: Transform
       pos: -23.5,9.5
       parent: 2
+  - uid: 5637
+    components:
+    - type: Transform
+      pos: -32.5,35.5
+      parent: 2
   - uid: 7692
     components:
     - type: Transform
@@ -79073,12 +80304,100 @@ entities:
       rot: 3.141592653589793 rad
       pos: 0.5,47.5
       parent: 2
+  - uid: 8032
+    components:
+    - type: Transform
+      pos: -32.5,37.5
+      parent: 2
+  - uid: 8054
+    components:
+    - type: Transform
+      pos: -32.5,36.5
+      parent: 2
+  - uid: 8164
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -30.5,41.5
+      parent: 2
+  - uid: 8165
+    components:
+    - type: Transform
+      pos: -32.5,39.5
+      parent: 2
+  - uid: 8174
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -29.5,41.5
+      parent: 2
+  - uid: 8175
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -31.5,41.5
+      parent: 2
+  - uid: 8176
+    components:
+    - type: Transform
+      pos: -32.5,40.5
+      parent: 2
+  - uid: 8178
+    components:
+    - type: Transform
+      pos: -25.5,31.5
+      parent: 2
+  - uid: 8196
+    components:
+    - type: Transform
+      pos: -25.5,27.5
+      parent: 2
+  - uid: 8197
+    components:
+    - type: Transform
+      pos: -25.5,29.5
+      parent: 2
+  - uid: 8691
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -27.5,33.5
+      parent: 2
+  - uid: 8787
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -28.5,41.5
+      parent: 2
+  - uid: 8788
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -27.5,41.5
+      parent: 2
+  - uid: 8834
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -28.5,33.5
+      parent: 2
+  - uid: 8835
+    components:
+    - type: Transform
+      pos: -25.5,30.5
+      parent: 2
   - uid: 8908
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 0.5,48.5
       parent: 2
+  - uid: 9125
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -30.5,33.5
+      parent: 2
   - uid: 9328
     components:
     - type: Transform
@@ -79267,6 +80586,28 @@ entities:
     - type: Transform
       pos: -45.5,-15.5
       parent: 2
+  - uid: 12690
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -26.5,33.5
+      parent: 2
+  - uid: 12820
+    components:
+    - type: Transform
+      pos: -25.5,32.5
+      parent: 2
+  - uid: 13245
+    components:
+    - type: Transform
+      pos: -25.5,28.5
+      parent: 2
+  - uid: 13593
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -31.5,33.5
+      parent: 2
   - uid: 13601
     components:
     - type: Transform
@@ -80169,12 +81510,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 18.5,44.5
       parent: 2
-  - uid: 16779
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -25.5,26.5
-      parent: 2
   - uid: 16780
     components:
     - type: Transform
@@ -80217,81 +81552,6 @@ entities:
     - type: Transform
       pos: -21.5,20.5
       parent: 2
-  - uid: 16790
-    components:
-    - type: Transform
-      pos: -26.5,27.5
-      parent: 2
-  - uid: 16791
-    components:
-    - type: Transform
-      pos: -26.5,28.5
-      parent: 2
-  - uid: 16792
-    components:
-    - type: Transform
-      pos: -26.5,29.5
-      parent: 2
-  - uid: 16793
-    components:
-    - type: Transform
-      pos: -26.5,30.5
-      parent: 2
-  - uid: 16794
-    components:
-    - type: Transform
-      pos: -26.5,31.5
-      parent: 2
-  - uid: 16795
-    components:
-    - type: Transform
-      pos: -26.5,32.5
-      parent: 2
-  - uid: 16796
-    components:
-    - type: Transform
-      pos: -26.5,33.5
-      parent: 2
-  - uid: 16797
-    components:
-    - type: Transform
-      pos: -26.5,34.5
-      parent: 2
-  - uid: 16798
-    components:
-    - type: Transform
-      pos: -26.5,35.5
-      parent: 2
-  - uid: 16799
-    components:
-    - type: Transform
-      pos: -26.5,36.5
-      parent: 2
-  - uid: 16800
-    components:
-    - type: Transform
-      pos: -26.5,37.5
-      parent: 2
-  - uid: 16801
-    components:
-    - type: Transform
-      pos: -26.5,38.5
-      parent: 2
-  - uid: 16802
-    components:
-    - type: Transform
-      pos: -26.5,39.5
-      parent: 2
-  - uid: 16803
-    components:
-    - type: Transform
-      pos: -26.5,40.5
-      parent: 2
-  - uid: 16804
-    components:
-    - type: Transform
-      pos: -26.5,41.5
-      parent: 2
   - uid: 16805
     components:
     - type: Transform
@@ -86006,15 +87266,31 @@ entities:
   - uid: 23838
     components:
     - type: Transform
-      pos: -26.335854,15.494169
+      pos: -23.365643,29.375084
       parent: 2
+    - type: GasTank
+      toggleActionEntity: 8791
+    - type: ActionsContainer
+    - type: ContainerContainer
+      containers:
+        actions: !type:Container
+          ents:
+          - 8791
 - proto: DoubleEmergencyOxygenTankFilled
   entities:
   - uid: 23832
     components:
     - type: Transform
-      pos: -26.606686,15.712919
+      pos: -23.646893,29.614668
       parent: 2
+    - type: GasTank
+      toggleActionEntity: 8792
+    - type: ActionsContainer
+    - type: ContainerContainer
+      containers:
+        actions: !type:Container
+          ents:
+          - 8792
 - proto: Dresser
   entities:
   - uid: 22340
@@ -86743,6 +88019,16 @@ entities:
     - type: Transform
       pos: -56.229656,1.6717383
       parent: 2
+  - uid: 28518
+    components:
+    - type: Transform
+      pos: 28.797165,-32.378082
+      parent: 21002
+  - uid: 28519
+    components:
+    - type: Transform
+      pos: 28.443008,-32.284332
+      parent: 21002
 - proto: DrinkSodaWaterBottleFull
   entities:
   - uid: 18
@@ -86930,10 +88216,10 @@ entities:
     - type: Transform
       pos: 40.466858,21.550955
       parent: 2
-  - uid: 11974
+  - uid: 16069
     components:
     - type: Transform
-      pos: 5.3368344,-82.39743
+      pos: 5.3317227,-74.51436
       parent: 2
 - proto: DrinkWineGlass
   entities:
@@ -86977,7 +88263,7 @@ entities:
   - uid: 19088
     components:
     - type: Transform
-      pos: 37.326473,-37.33899
+      pos: 36.382908,-36.606503
       parent: 2
 - proto: ElectricGrillMachineCircuitboard
   entities:
@@ -87004,6 +88290,23 @@ entities:
       parent: 2
 - proto: EmergencyLight
   entities:
+  - uid: 8200
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -24.5,23.5
+      parent: 2
+  - uid: 8201
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -26.5,16.5
+      parent: 2
+  - uid: 9007
+    components:
+    - type: Transform
+      pos: -25.5,33.5
+      parent: 2
   - uid: 11282
     components:
     - type: Transform
@@ -87567,12 +88870,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -28.5,24.5
       parent: 2
-  - uid: 24118
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -30.5,34.5
-      parent: 2
   - uid: 24119
     components:
     - type: Transform
@@ -87616,13 +88913,26 @@ entities:
     - type: Transform
       pos: -47.5,-7.5
       parent: 2
+  - uid: 28858
+    components:
+    - type: Transform
+      pos: -29.5,33.5
+      parent: 2
 - proto: EmergencyNitrogenTankFilled
   entities:
   - uid: 23836
     components:
     - type: Transform
-      pos: -26.28377,14.921253
+      pos: -27.349743,13.441146
       parent: 2
+    - type: GasTank
+      toggleActionEntity: 8794
+    - type: ActionsContainer
+    - type: ContainerContainer
+      containers:
+        actions: !type:Container
+          ents:
+          - 8794
   - uid: 28423
     components:
     - type: Transform
@@ -87643,8 +88953,16 @@ entities:
   - uid: 23834
     components:
     - type: Transform
-      pos: -26.481686,14.431669
+      pos: -27.683077,13.784896
       parent: 2
+    - type: GasTank
+      toggleActionEntity: 8795
+    - type: ActionsContainer
+    - type: ContainerContainer
+      containers:
+        actions: !type:Container
+          ents:
+          - 8795
   - uid: 28281
     components:
     - type: Transform
@@ -87694,9 +89012,6 @@ entities:
     - type: Transform
       pos: 60.5,-20.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 4246
   - uid: 7214
     components:
     - type: Transform
@@ -87823,11 +89138,6 @@ entities:
       parent: 9543
     - type: Physics
       canCollide: False
-  - uid: 28274
-    components:
-    - type: Transform
-      pos: 28.595581,-32.32901
-      parent: 21002
 - proto: EncryptionKeyService
   entities:
   - uid: 9489
@@ -87841,8 +89151,7 @@ entities:
   - uid: 3151
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -59.503017,-33.53635
+      pos: -59.512844,-33.467316
       parent: 2
 - proto: ExosuitFabricator
   entities:
@@ -87861,8 +89170,16 @@ entities:
   - uid: 23830
     components:
     - type: Transform
-      pos: -26.606686,14.921253
+      pos: -27.422659,13.732813
       parent: 2
+    - type: GasTank
+      toggleActionEntity: 8796
+    - type: ActionsContainer
+    - type: ContainerContainer
+      containers:
+        actions: !type:Container
+          ents:
+          - 8796
 - proto: ExtinguisherCabinetFilled
   entities:
   - uid: 5804
@@ -87948,6 +89265,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -58.5,-0.5
       parent: 2
+  - uid: 28859
+    components:
+    - type: Transform
+      pos: -29.5,34.5
+      parent: 2
 - proto: FaxMachineBase
   entities:
   - uid: 1043
@@ -88027,7 +89349,7 @@ entities:
     - type: MetaData
       name: atmos fax machine
     - type: Transform
-      pos: -28.5,30.5
+      pos: -23.5,28.5
       parent: 2
     - type: FaxMachine
       name: atmos
@@ -89633,6 +90955,11 @@ entities:
     - type: Transform
       pos: 6.713035,38.652546
       parent: 2
+  - uid: 28862
+    components:
+    - type: Transform
+      pos: -30.738241,37.63888
+      parent: 2
 - proto: Firelock
   entities:
   - uid: 21389
@@ -93832,6 +95159,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -33.452118,6.067984
       parent: 2
+  - uid: 8997
+    components:
+    - type: Transform
+      pos: -30.324694,37.6122
+      parent: 2
   - uid: 9444
     components:
     - type: Transform
@@ -93845,7 +95177,7 @@ entities:
   - uid: 9449
     components:
     - type: Transform
-      pos: -24.321604,23.554502
+      pos: -28.646633,25.494314
       parent: 2
   - uid: 9790
     components:
@@ -93859,41 +95191,57 @@ entities:
     - type: Transform
       pos: -36.5,10.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 8631
     components:
     - type: Transform
       pos: -36.5,12.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 8632
     components:
     - type: Transform
       pos: -36.5,16.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 8633
     components:
     - type: Transform
       pos: -36.5,18.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 8634
     components:
     - type: Transform
       pos: -36.5,20.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 8635
     components:
     - type: Transform
       pos: -36.5,22.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 8636
     components:
     - type: Transform
       pos: -36.5,24.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 8637
     components:
     - type: Transform
       pos: -36.5,28.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 8638
     components:
     - type: Transform
@@ -93959,7 +95307,7 @@ entities:
       parent: 2
 - proto: GasMixer
   entities:
-  - uid: 8670
+  - uid: 11963
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
@@ -94056,6 +95404,47 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 6.5,-30.5
       parent: 2
+- proto: GasPassiveGate
+  entities:
+  - uid: 6667
+    components:
+    - type: Transform
+      pos: -24.5,31.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 8994
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -24.5,46.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 16790
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -26.5,31.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 28607
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -27.5,33.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 28635
+    components:
+    - type: Transform
+      rot: -4.71238898038469 rad
+      pos: -13.5,40.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
 - proto: GasPassiveVent
   entities:
   - uid: 5579
@@ -94069,12 +95458,16 @@ entities:
     - type: Transform
       pos: -10.5,46.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 8127
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -15.5,50.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 8523
     components:
     - type: Transform
@@ -94129,6 +95522,16 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -40.5,9.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 8844
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -26.5,48.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#333333FF'
   - uid: 9280
     components:
     - type: Transform
@@ -94161,6 +95564,14 @@ entities:
       rot: 3.141592653589793 rad
       pos: 20.5,-34.5
       parent: 2
+  - uid: 13583
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -26.5,49.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#333333FF'
   - uid: 21136
     components:
     - type: Transform
@@ -94251,6 +95662,17 @@ entities:
     - type: Transform
       pos: 52.5,16.5
       parent: 21002
+  - uid: 28594
+    components:
+    - type: Transform
+      pos: -41.5,29.5
+      parent: 2
+  - uid: 28595
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -41.5,31.5
+      parent: 2
 - proto: GasPipeBend
   entities:
   - uid: 51
@@ -94338,134 +95760,48 @@ entities:
       rot: 3.141592653589793 rad
       pos: -18.5,42.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#947507FF'
   - uid: 8107
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -20.5,42.5
       parent: 2
-  - uid: 8109
-    components:
-    - type: Transform
-      pos: -20.5,46.5
-      parent: 2
-  - uid: 8110
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 8187
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -21.5,46.5
-      parent: 2
-  - uid: 8111
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -18.5,46.5
-      parent: 2
-  - uid: 8112
-    components:
-    - type: Transform
-      pos: -17.5,46.5
-      parent: 2
-  - uid: 8119
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -17.5,42.5
-      parent: 2
-  - uid: 8151
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -23.5,40.5
-      parent: 2
-  - uid: 8156
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -24.5,52.5
-      parent: 2
-  - uid: 8158
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -21.5,42.5
-      parent: 2
-  - uid: 8169
-    components:
-    - type: Transform
-      pos: -16.5,44.5
-      parent: 2
-  - uid: 8174
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -8.5,40.5
-      parent: 2
-  - uid: 8181
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -24.5,41.5
-      parent: 2
-  - uid: 8183
-    components:
-    - type: Transform
-      pos: -22.5,46.5
-      parent: 2
-  - uid: 8186
-    components:
-    - type: Transform
-      anchored: False
-      rot: 1.5707963267948966 rad
-      pos: -24.5,52.5
-      parent: 2
-    - type: Physics
-      canCollide: True
-      bodyType: Dynamic
-  - uid: 8188
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -22.5,41.5
-      parent: 2
-  - uid: 8197
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -24.5,50.5
+      pos: -32.5,41.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#B3A234FF'
   - uid: 8217
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -28.5,51.5
       parent: 2
-  - uid: 8218
-    components:
-    - type: Transform
-      anchored: False
-      rot: 1.5707963267948966 rad
-      pos: -28.5,51.5
-      parent: 2
-    - type: Physics
-      canCollide: True
-      bodyType: Dynamic
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 8219
     components:
     - type: Transform
-      anchored: False
-      rot: 1.5707963267948966 rad
-      pos: -28.5,51.5
+      rot: 3.141592653589793 rad
+      pos: -27.5,23.5
       parent: 2
-    - type: Physics
-      canCollide: True
-      bodyType: Dynamic
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 8220
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -28.5,46.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 8561
     components:
     - type: Transform
@@ -94484,6 +95820,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -36.5,9.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 8572
     components:
     - type: Transform
@@ -94560,13 +95898,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 8695
-    components:
-    - type: Transform
-      pos: -20.5,32.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 8713
     components:
     - type: Transform
@@ -94590,34 +95921,145 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 8754
+  - uid: 8800
     components:
     - type: Transform
-      anchored: False
-      rot: 1.5707963267948966 rad
-      pos: -24.5,19.5
+      rot: 3.141592653589793 rad
+      pos: -15.5,40.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#947507FF'
+  - uid: 8801
+    components:
+    - type: Transform
+      pos: -12.5,43.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-    - type: Physics
-      canCollide: True
-      bodyType: Dynamic
-  - uid: 8990
+  - uid: 8816
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -26.5,14.5
+      pos: -26.5,16.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 8991
+  - uid: 8823
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -27.5,14.5
+      pos: -21.5,36.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 8842
+    components:
+    - type: Transform
+      pos: -16.5,45.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#947507FF'
+  - uid: 8843
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -8.5,42.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 8916
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -31.5,40.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 8943
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -22.5,42.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 8988
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -19.5,52.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 9027
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -29.5,32.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 9111
+    components:
+    - type: Transform
+      pos: -27.5,32.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 9114
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -23.5,30.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 9115
+    components:
+    - type: Transform
+      pos: -25.5,32.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 9116
+    components:
+    - type: Transform
+      pos: -23.5,32.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 9126
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -27.5,16.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 9201
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -44.5,34.5
+      parent: 2
+  - uid: 9204
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -41.5,27.5
+      parent: 2
+  - uid: 9212
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -40.5,36.5
+      parent: 2
+  - uid: 9234
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -44.5,27.5
+      parent: 2
   - uid: 9390
     components:
     - type: Transform
@@ -94640,28 +96082,22 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 9615
+  - uid: 9622
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -39.5,37.5
+      pos: -26.5,38.5
       parent: 2
-  - uid: 9616
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 9626
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -41.5,35.5
-      parent: 2
-  - uid: 9617
-    components:
-    - type: Transform
-      pos: -33.5,35.5
-      parent: 2
-  - uid: 9618
-    components:
-    - type: Transform
-      pos: -32.5,37.5
+      rot: -1.5707963267948966 rad
+      pos: -25.5,30.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 11525
     components:
     - type: Transform
@@ -94724,29 +96160,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 13577
-    components:
-    - type: Transform
-      pos: -27.5,40.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 13587
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -20.5,33.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 13588
+  - uid: 13563
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -20.5,35.5
+      pos: -33.5,43.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#3AB334FF'
   - uid: 13614
     components:
     - type: Transform
@@ -96027,14 +97448,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 16173
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -11.5,37.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 16235
     components:
     - type: Transform
@@ -96218,6 +97631,13 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 16791
+    components:
+    - type: Transform
+      pos: -24.5,33.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
   - uid: 17111
     components:
     - type: Transform
@@ -96414,6 +97834,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 23672
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -24.5,29.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 23702
     components:
     - type: Transform
@@ -96588,36 +98016,93 @@ entities:
       parent: 21002
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 28417
+  - uid: 28599
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -27.5,24.5
+      pos: -41.5,33.5
       parent: 2
-  - uid: 28426
+  - uid: 28600
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -24.5,24.5
+      pos: -39.5,33.5
       parent: 2
-  - uid: 28438
+  - uid: 28613
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -28.5,14.5
+      rot: 3.141592653589793 rad
+      pos: -40.5,34.5
       parent: 2
-  - uid: 28439
+  - uid: 28614
+    components:
+    - type: Transform
+      anchored: False
+      rot: 3.141592653589793 rad
+      pos: -40.5,34.5
+      parent: 2
+    - type: Physics
+      canCollide: True
+      bodyType: Dynamic
+  - uid: 28615
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -28.5,15.5
+      pos: -42.5,36.5
       parent: 2
-  - uid: 28440
+  - uid: 28616
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -27.5,15.5
+      pos: -41.5,34.5
       parent: 2
+  - uid: 28634
+    components:
+    - type: Transform
+      pos: -18.5,49.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#947507FF'
+  - uid: 28839
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -19.5,47.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 28844
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -18.5,44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#947507FF'
+  - uid: 28846
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -18.5,45.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#947507FF'
+  - uid: 28853
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -9.5,40.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 28855
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -14.5,42.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#947507FF'
 - proto: GasPipeFourway
   entities:
   - uid: 666
@@ -96655,6 +98140,55 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 8154
+    components:
+    - type: Transform
+      pos: -28.5,36.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 8161
+    components:
+    - type: Transform
+      pos: -26.5,33.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 8172
+    components:
+    - type: Transform
+      pos: -24.5,36.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 8199
+    components:
+    - type: Transform
+      pos: -29.5,36.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 8205
+    components:
+    - type: Transform
+      pos: -27.5,36.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 8206
+    components:
+    - type: Transform
+      pos: -25.5,36.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 8244
+    components:
+    - type: Transform
+      pos: -26.5,36.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
   - uid: 13152
     components:
     - type: Transform
@@ -96739,6 +98273,20 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 13570
+    components:
+    - type: Transform
+      pos: -31.5,33.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 13577
+    components:
+    - type: Transform
+      pos: -20.5,24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 13854
     components:
     - type: Transform
@@ -97086,18 +98634,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 3097
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -24.5,30.5
-      parent: 2
-  - uid: 3098
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -32.5,14.5
-      parent: 2
   - uid: 3202
     components:
     - type: Transform
@@ -97142,18 +98678,8 @@ entities:
     - type: Transform
       pos: -8.5,44.5
       parent: 2
-  - uid: 6764
-    components:
-    - type: Transform
-      anchored: False
-      rot: -1.5707963267948966 rad
-      pos: 0.5,49.5
-      parent: 2
     - type: AtmosPipeColor
-      color: '#0335FCFF'
-    - type: Physics
-      canCollide: True
-      bodyType: Dynamic
+      color: '#FF1212FF'
   - uid: 7355
     components:
     - type: Transform
@@ -97175,99 +98701,63 @@ entities:
     - type: Transform
       pos: -20.5,44.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
   - uid: 7774
     components:
     - type: Transform
       pos: -10.5,44.5
       parent: 2
-  - uid: 8028
-    components:
-    - type: Transform
-      pos: -24.5,40.5
-      parent: 2
-  - uid: 8031
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -22.5,40.5
-      parent: 2
-  - uid: 8032
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -21.5,40.5
-      parent: 2
-  - uid: 8091
-    components:
-    - type: Transform
-      anchored: False
-      pos: -20.5,44.5
-      parent: 2
-    - type: Physics
-      canCollide: True
-      bodyType: Dynamic
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 8094
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -17.5,50.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 8095
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -17.5,52.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 8096
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -16.5,50.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 8097
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -16.5,52.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 8098
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -10.5,45.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 8099
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -8.5,45.5
       parent: 2
-  - uid: 8108
-    components:
-    - type: Transform
-      pos: -21.5,43.5
-      parent: 2
-  - uid: 8113
-    components:
-    - type: Transform
-      pos: -17.5,45.5
-      parent: 2
-  - uid: 8115
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -16.5,43.5
-      parent: 2
-  - uid: 8116
-    components:
-    - type: Transform
-      pos: -21.5,45.5
-      parent: 2
-  - uid: 8117
-    components:
-    - type: Transform
-      pos: -17.5,43.5
-      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 8122
     components:
     - type: Transform
@@ -97279,260 +98769,139 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -17.5,51.5
       parent: 2
-  - uid: 8145
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -23.5,38.5
-      parent: 2
-  - uid: 8147
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -23.5,39.5
-      parent: 2
-  - uid: 8148
-    components:
-    - type: Transform
-      pos: -24.5,38.5
-      parent: 2
-  - uid: 8150
-    components:
-    - type: Transform
-      pos: -24.5,39.5
-      parent: 2
-  - uid: 8153
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -23.5,46.5
-      parent: 2
-  - uid: 8154
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -24.5,46.5
-      parent: 2
-  - uid: 8155
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -22.5,42.5
-      parent: 2
-  - uid: 8157
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -22.5,43.5
-      parent: 2
-  - uid: 8161
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -17.5,40.5
-      parent: 2
   - uid: 8162
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -16.5,41.5
-      parent: 2
-  - uid: 8163
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -20.5,40.5
-      parent: 2
-  - uid: 8164
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -15.5,40.5
-      parent: 2
-  - uid: 8165
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -19.5,40.5
-      parent: 2
-  - uid: 8166
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -14.5,40.5
+      pos: -25.5,33.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
   - uid: 8167
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -13.5,40.5
-      parent: 2
-  - uid: 8168
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -18.5,40.5
-      parent: 2
-  - uid: 8170
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -11.5,40.5
-      parent: 2
-  - uid: 8172
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -9.5,40.5
-      parent: 2
-  - uid: 8175
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -12.5,40.5
-      parent: 2
-  - uid: 8176
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -8.5,41.5
-      parent: 2
-  - uid: 8177
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -8.5,42.5
-      parent: 2
-  - uid: 8178
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -10.5,41.5
+      rot: -1.5707963267948966 rad
+      pos: -22.5,23.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 8179
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -10.5,42.5
+      rot: -1.5707963267948966 rad
+      pos: -24.5,23.5
       parent: 2
-  - uid: 8180
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 8181
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -16.5,42.5
+      rot: -1.5707963267948966 rad
+      pos: -25.5,43.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#3AB334FF'
   - uid: 8182
     components:
     - type: Transform
-      pos: -18.5,44.5
+      rot: -1.5707963267948966 rad
+      pos: -28.5,43.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#3AB334FF'
+  - uid: 8183
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -30.5,43.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#3AB334FF'
   - uid: 8184
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -23.5,41.5
+      rot: -1.5707963267948966 rad
+      pos: -32.5,43.5
       parent: 2
-  - uid: 8187
+    - type: AtmosPipeColor
+      color: '#3AB334FF'
+  - uid: 8185
     components:
     - type: Transform
-      pos: -22.5,45.5
+      pos: -33.5,41.5
       parent: 2
-  - uid: 8196
+    - type: AtmosPipeColor
+      color: '#3AB334FF'
+  - uid: 8186
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -20.5,50.5
+      pos: -32.5,40.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#B3A234FF'
+  - uid: 8188
+    components:
+    - type: Transform
+      pos: -32.5,39.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#B3A234FF'
   - uid: 8198
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -21.5,50.5
-      parent: 2
-  - uid: 8199
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -23.5,50.5
-      parent: 2
-  - uid: 8200
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -22.5,50.5
-      parent: 2
-  - uid: 8201
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -19.5,50.5
-      parent: 2
-  - uid: 8202
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -19.5,52.5
-      parent: 2
-  - uid: 8203
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -20.5,52.5
-      parent: 2
-  - uid: 8204
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -21.5,52.5
-      parent: 2
-  - uid: 8205
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -22.5,52.5
-      parent: 2
-  - uid: 8206
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -23.5,52.5
+      pos: -15.5,37.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 8211
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -25.5,46.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 8212
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -26.5,46.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 8213
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -27.5,46.5
+      rot: -1.5707963267948966 rad
+      pos: -25.5,29.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 8214
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -25.5,51.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 8215
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -26.5,51.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 8216
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -27.5,51.5
+      rot: -1.5707963267948966 rad
+      pos: -25.5,24.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 8534
     components:
     - type: Transform
@@ -97970,61 +99339,85 @@ entities:
     - type: Transform
       pos: -36.5,11.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 8640
     components:
     - type: Transform
       pos: -36.5,13.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 8641
     components:
     - type: Transform
       pos: -36.5,14.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 8642
     components:
     - type: Transform
       pos: -36.5,15.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 8643
     components:
     - type: Transform
       pos: -36.5,17.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 8644
     components:
     - type: Transform
       pos: -36.5,19.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 8645
     components:
     - type: Transform
       pos: -36.5,21.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 8646
     components:
     - type: Transform
       pos: -36.5,23.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 8647
     components:
     - type: Transform
       pos: -36.5,25.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 8648
     components:
     - type: Transform
       pos: -36.5,26.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 8649
     components:
     - type: Transform
       pos: -36.5,27.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 8650
     components:
     - type: Transform
       pos: -36.5,29.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 8651
     components:
     - type: Transform
@@ -98039,17 +99432,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 8655
-    components:
-    - type: Transform
-      anchored: False
-      pos: -36.5,32.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-    - type: Physics
-      canCollide: True
-      bodyType: Dynamic
   - uid: 8664
     components:
     - type: Transform
@@ -98132,74 +99514,17 @@ entities:
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -29.5,33.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 8683
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -28.5,33.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 8685
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -26.5,33.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 8686
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -25.5,33.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 8687
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -24.5,33.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 8689
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -25.5,32.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 8690
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -24.5,32.5
+      pos: -13.5,37.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 8692
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -22.5,32.5
+      pos: -26.5,35.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 8693
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -22.5,33.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#03FCD3FF'
   - uid: 8694
     components:
     - type: Transform
@@ -98208,22 +99533,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 8696
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -21.5,32.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 8699
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -20.5,31.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 8701
     components:
     - type: Transform
@@ -98579,11 +99888,11 @@ entities:
   - uid: 8759
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -21.5,23.5
+      rot: -1.5707963267948966 rad
+      pos: -17.5,37.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#0335FCFF'
   - uid: 8760
     components:
     - type: Transform
@@ -98640,35 +99949,208 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 8772
+    components:
+    - type: Transform
+      pos: -17.5,37.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 8773
+    components:
+    - type: Transform
+      pos: -33.5,38.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#3AB334FF'
+  - uid: 8775
+    components:
+    - type: Transform
+      pos: -33.5,37.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#3AB334FF'
+  - uid: 8776
+    components:
+    - type: Transform
+      pos: -32.5,37.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#B3A234FF'
+  - uid: 8777
+    components:
+    - type: Transform
+      pos: -32.5,36.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#B3A234FF'
+  - uid: 8778
+    components:
+    - type: Transform
+      pos: -33.5,36.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#3AB334FF'
+  - uid: 8779
+    components:
+    - type: Transform
+      pos: -33.5,35.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#3AB334FF'
+  - uid: 8780
+    components:
+    - type: Transform
+      pos: -32.5,35.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#B3A234FF'
+  - uid: 8781
+    components:
+    - type: Transform
+      pos: -32.5,34.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#B3A234FF'
+  - uid: 8782
+    components:
+    - type: Transform
+      pos: -33.5,34.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#3AB334FF'
+  - uid: 8783
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -32.5,33.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#B3A234FF'
+  - uid: 8784
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -33.5,33.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#3AB334FF'
+  - uid: 8815
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -18.5,37.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 8817
+    components:
+    - type: Transform
+      pos: -27.5,14.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 8818
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -43.5,34.5
+      parent: 2
+  - uid: 8821
+    components:
+    - type: Transform
+      pos: -44.5,32.5
+      parent: 2
+  - uid: 8822
+    components:
+    - type: Transform
+      pos: -31.5,38.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 8832
+    components:
+    - type: Transform
+      pos: -21.5,34.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 8839
+    components:
+    - type: Transform
+      pos: -33.5,42.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#3AB334FF'
+  - uid: 8841
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -23.5,49.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#947507FF'
+  - uid: 8845
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -16.5,44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#947507FF'
+  - uid: 8849
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -22.5,44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 8850
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -22.5,49.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#947507FF'
   - uid: 8854
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -38.5,9.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 8856
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -37.5,9.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 8909
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -29.5,41.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#B3A234FF'
   - uid: 8911
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -29.5,37.5
+      rot: -1.5707963267948966 rad
+      pos: -30.5,41.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#B3A234FF'
   - uid: 8972
     components:
     - type: Transform
-      pos: -26.5,15.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 8973
-    components:
-    - type: Transform
-      pos: -26.5,16.5
+      rot: 1.5707963267948966 rad
+      pos: -21.5,51.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
@@ -98714,13 +100196,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 8981
-    components:
-    - type: Transform
-      pos: -26.5,24.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 8982
     components:
     - type: Transform
@@ -98742,27 +100217,101 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 8986
-    components:
-    - type: Transform
-      pos: -26.5,29.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 8987
     components:
     - type: Transform
-      pos: -26.5,30.5
+      rot: 1.5707963267948966 rad
+      pos: -23.5,51.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 8988
+  - uid: 8990
     components:
     - type: Transform
-      pos: -26.5,31.5
+      rot: 1.5707963267948966 rad
+      pos: -22.5,51.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 9001
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -16.5,44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#947507FF'
+  - uid: 9008
+    components:
+    - type: Transform
+      pos: -25.5,31.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 9021
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -24.5,51.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 9025
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -28.5,48.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 9117
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -19.5,36.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 9122
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -20.5,36.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 9123
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -19.5,37.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 9127
+    components:
+    - type: Transform
+      pos: -27.5,15.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 9130
+    components:
+    - type: Transform
+      pos: -26.5,34.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 9199
+    components:
+    - type: Transform
+      pos: -44.5,29.5
+      parent: 2
+  - uid: 9200
+    components:
+    - type: Transform
+      pos: -44.5,28.5
+      parent: 2
   - uid: 9386
     components:
     - type: Transform
@@ -98859,72 +100408,33 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 9603
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -40.5,35.5
-      parent: 2
   - uid: 9604
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -39.5,35.5
+      pos: -43.5,27.5
       parent: 2
-  - uid: 9605
+  - uid: 9611
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -38.5,35.5
-      parent: 2
-  - uid: 9606
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -37.5,35.5
-      parent: 2
-  - uid: 9607
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -36.5,35.5
-      parent: 2
-  - uid: 9609
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -34.5,35.5
-      parent: 2
-  - uid: 9610
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -34.5,37.5
-      parent: 2
-  - uid: 9612
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -36.5,37.5
+      pos: -31.5,34.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 9613
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -37.5,37.5
+      pos: -31.5,36.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 9614
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -38.5,37.5
-      parent: 2
-  - uid: 9619
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -33.5,37.5
+      pos: -31.5,37.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 9620
     components:
     - type: Transform
@@ -98937,18 +100447,14 @@ entities:
       rot: 3.141592653589793 rad
       pos: -39.5,39.5
       parent: 2
-  - uid: 9622
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -41.5,36.5
-      parent: 2
   - uid: 9623
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -41.5,37.5
+      pos: -31.5,39.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 9624
     components:
     - type: Transform
@@ -98961,66 +100467,37 @@ entities:
       rot: 3.141592653589793 rad
       pos: -41.5,39.5
       parent: 2
-  - uid: 9626
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -33.5,34.5
-      parent: 2
   - uid: 9627
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -33.5,33.5
+      pos: -21.5,35.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 9628
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -33.5,32.5
+      pos: -20.5,31.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 9629
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -33.5,31.5
-      parent: 2
-  - uid: 9630
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -32.5,36.5
+      rot: -1.5707963267948966 rad
+      pos: -18.5,36.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 9631
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -32.5,35.5
-      parent: 2
-  - uid: 9632
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -32.5,34.5
-      parent: 2
-  - uid: 9633
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -32.5,33.5
-      parent: 2
-  - uid: 9634
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -32.5,32.5
-      parent: 2
-  - uid: 9635
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -32.5,31.5
+      pos: -20.5,34.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 9753
     components:
     - type: Transform
@@ -99049,6 +100526,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 10183
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -12.5,37.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 10194
     components:
     - type: Transform
@@ -99179,6 +100664,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 12787
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 61.5,7.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 13144
     components:
     - type: Transform
@@ -99768,12 +101261,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 13245
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -31.5,14.5
-      parent: 2
   - uid: 13248
     components:
     - type: Transform
@@ -101530,87 +103017,64 @@ entities:
   - uid: 13561
     components:
     - type: Transform
-      pos: -27.5,34.5
+      pos: -32.5,38.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#B3A234FF'
   - uid: 13562
     components:
     - type: Transform
-      pos: -27.5,35.5
+      pos: -33.5,39.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 13563
-    components:
-    - type: Transform
-      pos: -27.5,36.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#3AB334FF'
   - uid: 13564
     components:
     - type: Transform
-      pos: -27.5,37.5
+      pos: -33.5,40.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#3AB334FF'
   - uid: 13565
     components:
     - type: Transform
-      pos: -27.5,38.5
+      rot: -1.5707963267948966 rad
+      pos: -26.5,43.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#3AB334FF'
   - uid: 13566
     components:
     - type: Transform
-      pos: -27.5,39.5
+      rot: -1.5707963267948966 rad
+      pos: -31.5,41.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#B3A234FF'
   - uid: 13567
     components:
     - type: Transform
-      pos: -26.5,33.5
+      rot: -1.5707963267948966 rad
+      pos: -29.5,43.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0335FCFF'
+      color: '#3AB334FF'
   - uid: 13568
     components:
     - type: Transform
-      pos: -26.5,34.5
+      rot: -1.5707963267948966 rad
+      pos: -31.5,43.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0335FCFF'
+      color: '#3AB334FF'
   - uid: 13569
     components:
     - type: Transform
-      pos: -26.5,35.5
+      rot: -1.5707963267948966 rad
+      pos: -27.5,43.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 13570
-    components:
-    - type: Transform
-      pos: -26.5,36.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 13571
-    components:
-    - type: Transform
-      pos: -26.5,37.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 13572
-    components:
-    - type: Transform
-      pos: -26.5,38.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
+      color: '#3AB334FF'
   - uid: 13573
     components:
     - type: Transform
@@ -101659,55 +103123,47 @@ entities:
   - uid: 13581
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -28.5,40.5
+      rot: 1.5707963267948966 rad
+      pos: -21.5,24.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#0335FCFF'
   - uid: 13582
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -29.5,40.5
+      rot: 1.5707963267948966 rad
+      pos: -25.5,49.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 13589
+      color: '#333333FF'
+  - uid: 13586
     components:
     - type: Transform
-      pos: -20.5,34.5
+      rot: 1.5707963267948966 rad
+      pos: -25.5,48.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#333333FF'
   - uid: 13590
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -19.5,35.5
+      rot: 1.5707963267948966 rad
+      pos: -25.5,23.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 13591
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -18.5,35.5
+      rot: 3.141592653589793 rad
+      pos: -21.5,33.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 13592
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -17.5,36.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 13593
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -17.5,37.5
+      pos: -17.5,35.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
@@ -101719,6 +103175,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 13596
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -28.5,13.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 13603
     components:
     - type: Transform
@@ -103381,18 +104845,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 13936
-    components:
-    - type: Transform
-      anchored: False
-      rot: 3.141592653589793 rad
-      pos: 11.5,-7.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-    - type: Physics
-      canCollide: True
-      bodyType: Dynamic
   - uid: 13937
     components:
     - type: Transform
@@ -103401,18 +104853,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 13938
-    components:
-    - type: Transform
-      anchored: False
-      rot: 3.141592653589793 rad
-      pos: 12.5,-8.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-    - type: Physics
-      canCollide: True
-      bodyType: Dynamic
   - uid: 13940
     components:
     - type: Transform
@@ -104775,13 +106215,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 14233
-    components:
-    - type: Transform
-      pos: 43.5,-6.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 14234
     components:
     - type: Transform
@@ -110273,17 +111706,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 15252
-    components:
-    - type: Transform
-      anchored: False
-      pos: -42.5,-35.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-    - type: Physics
-      canCollide: True
-      bodyType: Dynamic
   - uid: 15253
     components:
     - type: Transform
@@ -111273,17 +112695,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 15443
-    components:
-    - type: Transform
-      anchored: False
-      pos: 33.5,-22.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-    - type: Physics
-      canCollide: True
-      bodyType: Dynamic
   - uid: 15447
     components:
     - type: Transform
@@ -111955,17 +113366,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 15663
-    components:
-    - type: Transform
-      anchored: False
-      pos: -13.5,-37.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-    - type: Physics
-      canCollide: True
-      bodyType: Dynamic
   - uid: 15664
     components:
     - type: Transform
@@ -114351,6 +115751,13 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 16173
+    components:
+    - type: Transform
+      pos: -23.5,31.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
   - uid: 16176
     components:
     - type: Transform
@@ -115996,17 +117403,64 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 16518
+  - uid: 16792
     components:
     - type: Transform
-      anchored: False
-      pos: -42.5,-12.5
+      pos: -44.5,33.5
+      parent: 2
+  - uid: 16793
+    components:
+    - type: Transform
+      pos: -44.5,31.5
+      parent: 2
+  - uid: 16796
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -17.5,44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#947507FF'
+  - uid: 16798
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -26.5,41.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#B3A234FF'
+  - uid: 16799
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -28.5,41.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#B3A234FF'
+  - uid: 16801
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -20.5,36.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 16802
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -20.5,33.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 16804
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -28.5,49.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-    - type: Physics
-      canCollide: True
-      bodyType: Dynamic
   - uid: 16913
     components:
     - type: Transform
@@ -116420,17 +117874,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 18430
-    components:
-    - type: Transform
-      anchored: False
-      pos: 60.5,12.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-    - type: Physics
-      canCollide: True
-      bodyType: Dynamic
   - uid: 18908
     components:
     - type: Transform
@@ -117536,18 +118979,6 @@ entities:
     - type: Transform
       pos: -32.5,25.5
       parent: 2
-  - uid: 23537
-    components:
-    - type: Transform
-      anchored: False
-      rot: -1.5707963267948966 rad
-      pos: -39.5,4.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-    - type: Physics
-      canCollide: True
-      bodyType: Dynamic
   - uid: 23538
     components:
     - type: Transform
@@ -117564,28 +118995,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 23639
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -30.5,14.5
-      parent: 2
-  - uid: 23640
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -29.5,14.5
-      parent: 2
-  - uid: 23663
-    components:
-    - type: Transform
-      pos: -27.5,16.5
-      parent: 2
-  - uid: 23672
-    components:
-    - type: Transform
-      pos: -27.5,17.5
-      parent: 2
   - uid: 23696
     components:
     - type: Transform
@@ -117634,11 +119043,22 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 23843
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -20.5,32.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 23847
     components:
     - type: Transform
-      pos: -27.5,18.5
+      rot: 3.141592653589793 rad
+      pos: -20.5,35.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 23865
     components:
     - type: Transform
@@ -117879,15 +119299,10 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 24126
+  - uid: 24118
     components:
     - type: Transform
-      pos: -27.5,19.5
-      parent: 2
-  - uid: 24127
-    components:
-    - type: Transform
-      pos: -27.5,20.5
+      pos: -44.5,30.5
       parent: 2
   - uid: 25219
     components:
@@ -118274,90 +119689,346 @@ entities:
   - uid: 28355
     components:
     - type: Transform
-      pos: -27.5,21.5
+      rot: -1.5707963267948966 rad
+      pos: -22.5,24.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 28415
     components:
     - type: Transform
-      pos: -27.5,22.5
-      parent: 2
-  - uid: 28416
-    components:
-    - type: Transform
-      pos: -27.5,23.5
-      parent: 2
-  - uid: 28427
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -26.5,24.5
-      parent: 2
-  - uid: 28428
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -25.5,24.5
+      rot: 1.5707963267948966 rad
+      pos: -25.5,38.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 28429
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -24.5,25.5
+      rot: -1.5707963267948966 rad
+      pos: -14.5,37.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 28430
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -24.5,26.5
+      rot: -1.5707963267948966 rad
+      pos: -16.5,37.5
       parent: 2
-  - uid: 28431
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 28438
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -24.5,24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 28524
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -25.5,41.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#B3A234FF'
+  - uid: 28525
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -27.5,41.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#B3A234FF'
+  - uid: 28538
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -26.5,23.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 28539
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -24.5,27.5
+      pos: -27.5,24.5
       parent: 2
-  - uid: 28432
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 28541
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -24.5,28.5
+      pos: -27.5,25.5
       parent: 2
-  - uid: 28433
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 28542
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -24.5,29.5
+      pos: -27.5,26.5
       parent: 2
-  - uid: 28434
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 28543
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -24.5,38.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 28545
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -24.5,33.5
+      pos: -27.5,27.5
       parent: 2
-  - uid: 28435
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 28546
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -24.5,35.5
+      pos: -27.5,28.5
       parent: 2
-  - uid: 28436
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 28547
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -24.5,32.5
+      pos: -27.5,29.5
       parent: 2
-  - uid: 28437
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 28548
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -24.5,31.5
+      pos: -27.5,30.5
       parent: 2
-  - uid: 28441
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 28549
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -24.5,34.5
+      pos: -27.5,31.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 28551
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -28.5,32.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 28558
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -22.5,38.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 28559
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -21.5,38.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 28593
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -41.5,28.5
+      parent: 2
+  - uid: 28597
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -41.5,32.5
+      parent: 2
+  - uid: 28598
+    components:
+    - type: Transform
+      anchored: False
+      rot: 3.141592653589793 rad
+      pos: -41.5,32.5
+      parent: 2
+    - type: Physics
+      canCollide: True
+      bodyType: Dynamic
+  - uid: 28620
+    components:
+    - type: Transform
+      pos: -21.5,41.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 28626
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -23.5,48.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 28627
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -22.5,48.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 28628
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -21.5,48.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 28631
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -21.5,49.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#947507FF'
+  - uid: 28632
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -20.5,49.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#947507FF'
+  - uid: 28633
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -19.5,49.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#947507FF'
+  - uid: 28636
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -17.5,45.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#947507FF'
+  - uid: 28637
+    components:
+    - type: Transform
+      pos: -18.5,47.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#947507FF'
+  - uid: 28638
+    components:
+    - type: Transform
+      pos: -18.5,46.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#947507FF'
+  - uid: 28828
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -22.5,45.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 28836
+    components:
+    - type: Transform
+      pos: -20.5,49.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 28837
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -21.5,46.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 28838
+    components:
+    - type: Transform
+      pos: -19.5,49.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 28841
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -11.5,42.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 28845
+    components:
+    - type: Transform
+      pos: -18.5,48.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#947507FF'
+  - uid: 28848
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -15.5,41.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#947507FF'
+  - uid: 28850
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -12.5,40.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 28851
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -11.5,40.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 28852
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -10.5,40.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 28854
+    components:
+    - type: Transform
+      pos: -9.5,41.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
 - proto: GasPipeTJunction
   entities:
   - uid: 17
@@ -118455,29 +120126,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 5636
-    components:
-    - type: Transform
-      pos: -31.5,33.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 5637
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -27.5,33.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 5638
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -20.5,30.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 5639
     components:
     - type: Transform
@@ -118509,26 +120157,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 7228
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -20.5,24.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 7333
-    components:
-    - type: Transform
-      anchored: False
-      rot: 1.5707963267948966 rad
-      pos: -20.5,24.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-    - type: Physics
-      canCollide: True
-      bodyType: Dynamic
   - uid: 7343
     components:
     - type: Transform
@@ -118569,42 +120197,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 8029
+  - uid: 8683
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -22.5,44.5
-      parent: 2
-  - uid: 8114
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -17.5,44.5
-      parent: 2
-  - uid: 8152
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -21.5,44.5
-      parent: 2
-  - uid: 8171
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -10.5,40.5
-      parent: 2
-  - uid: 8173
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -16.5,40.5
-      parent: 2
-  - uid: 8185
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -24.5,51.5
+      pos: -24.5,32.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
   - uid: 8738
     components:
     - type: Transform
@@ -118636,6 +120236,72 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 8797
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -20.5,46.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 8802
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -14.5,43.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#947507FF'
+  - uid: 8804
+    components:
+    - type: Transform
+      pos: -9.5,42.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 8808
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -16.5,42.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#947507FF'
+  - uid: 8811
+    components:
+    - type: Transform
+      pos: -15.5,44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#947507FF'
+  - uid: 8833
+    components:
+    - type: Transform
+      pos: -11.5,37.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 8846
+    components:
+    - type: Transform
+      pos: -14.5,44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#947507FF'
+  - uid: 8848
+    components:
+    - type: Transform
+      pos: -21.5,42.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 8973
+    components:
+    - type: Transform
+      pos: -22.5,46.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
   - uid: 8977
     components:
     - type: Transform
@@ -118644,6 +120310,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 8981
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -10.5,42.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 8984
     components:
     - type: Transform
@@ -118652,11 +120326,51 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 8989
+  - uid: 8986
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -26.5,32.5
+      pos: -19.5,50.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 8989
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -19.5,51.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 9118
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -20.5,30.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 9124
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -21.5,23.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 9128
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -26.5,24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 9129
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -26.5,30.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
@@ -118683,11 +120397,35 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 9612
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -31.5,35.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 9630
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -17.5,36.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 9730
     components:
     - type: Transform
       pos: 7.5,-30.5
       parent: 2
+  - uid: 10184
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -26.5,29.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 10391
     components:
     - type: Transform
@@ -118782,18 +120520,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 11596
-    components:
-    - type: Transform
-      anchored: False
-      rot: -1.5707963267948966 rad
-      pos: 0.5,42.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-    - type: Physics
-      canCollide: True
-      bodyType: Dynamic
   - uid: 11908
     components:
     - type: Transform
@@ -118802,6 +120528,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 11968
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 43.5,-6.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 12297
     components:
     - type: Transform
@@ -119310,18 +121044,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 13522
-    components:
-    - type: Transform
-      anchored: False
-      rot: 1.5707963267948966 rad
-      pos: -42.5,-11.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-    - type: Physics
-      canCollide: True
-      bodyType: Dynamic
   - uid: 13544
     components:
     - type: Transform
@@ -119342,6 +121064,14 @@ entities:
     - type: Physics
       canCollide: True
       bodyType: Dynamic
+  - uid: 13572
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -20.5,37.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 13576
     components:
     - type: Transform
@@ -119349,21 +121079,13 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 13586
+  - uid: 13588
     components:
     - type: Transform
-      pos: -21.5,33.5
+      pos: -20.5,51.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 13596
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -17.5,35.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#0335FCFF'
   - uid: 13662
     components:
     - type: Transform
@@ -119380,18 +121102,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 13664
-    components:
-    - type: Transform
-      anchored: False
-      rot: 1.5707963267948966 rad
-      pos: -10.5,10.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-    - type: Physics
-      canCollide: True
-      bodyType: Dynamic
   - uid: 13707
     components:
     - type: Transform
@@ -120356,18 +122066,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 15320
-    components:
-    - type: Transform
-      anchored: False
-      rot: 3.141592653589793 rad
-      pos: -2.5,-43.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-    - type: Physics
-      canCollide: True
-      bodyType: Dynamic
   - uid: 15321
     components:
     - type: Transform
@@ -120451,17 +122149,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 15404
-    components:
-    - type: Transform
-      anchored: False
-      pos: -21.5,-47.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-    - type: Physics
-      canCollide: True
-      bodyType: Dynamic
   - uid: 15455
     components:
     - type: Transform
@@ -121035,14 +122722,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 18406
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 61.5,7.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 18431
     components:
     - type: Transform
@@ -121210,6 +122889,84 @@ entities:
       parent: 21002
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 28550
+    components:
+    - type: Transform
+      pos: -29.5,33.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 28557
+    components:
+    - type: Transform
+      pos: -23.5,38.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 28560
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -20.5,38.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 28602
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -39.5,34.5
+      parent: 2
+  - uid: 28604
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -39.5,36.5
+      parent: 2
+  - uid: 28617
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -42.5,34.5
+      parent: 2
+  - uid: 28618
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -41.5,36.5
+      parent: 2
+  - uid: 28624
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -15.5,42.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#947507FF'
+  - uid: 28629
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -20.5,48.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 28630
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -20.5,47.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 28857
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -12.5,42.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
 - proto: GasPort
   entities:
   - uid: 1675
@@ -121217,6 +122974,54 @@ entities:
     - type: Transform
       pos: -16.5,-41.5
       parent: 2
+  - uid: 5638
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -23.5,36.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 7228
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -25.5,35.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 7333
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -27.5,35.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 8018
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -28.5,35.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 8028
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -30.5,36.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 8029
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -29.5,35.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
   - uid: 8120
     components:
     - type: Transform
@@ -121229,6 +123034,34 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -18.5,51.5
       parent: 2
+  - uid: 8155
+    components:
+    - type: Transform
+      pos: -27.5,37.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 8156
+    components:
+    - type: Transform
+      pos: -26.5,37.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 8157
+    components:
+    - type: Transform
+      pos: -25.5,37.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 8253
+    components:
+    - type: Transform
+      pos: -29.5,37.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
   - uid: 8770
     components:
     - type: Transform
@@ -121245,12 +123078,22 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 8909
+  - uid: 8799
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -28.5,37.5
+      pos: -12.5,44.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#947507FF'
+  - uid: 9113
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -24.5,35.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
   - uid: 9762
     components:
     - type: Transform
@@ -121269,6 +123112,13 @@ entities:
       rot: 3.141592653589793 rad
       pos: 8.5,-35.5
       parent: 2
+  - uid: 11384
+    components:
+    - type: Transform
+      pos: -24.5,37.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
   - uid: 15673
     components:
     - type: Transform
@@ -121343,6 +123193,26 @@ entities:
       rot: 3.141592653589793 rad
       pos: 33.5,-31.5
       parent: 21002
+  - uid: 28416
+    components:
+    - type: Transform
+      pos: -28.5,37.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 28432
+    components:
+    - type: Transform
+      pos: -26.5,15.5
+      parent: 2
+  - uid: 28619
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -21.5,39.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
 - proto: GasPressurePump
   entities:
   - uid: 43
@@ -121399,14 +123269,22 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -36.5,29.5
       parent: 2
-  - uid: 231
+  - uid: 9202
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -28.5,13.5
+      pos: -42.5,35.5
+      parent: 2
+  - uid: 9311
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -41.5,35.5
+      parent: 2
+  - uid: 9603
+    components:
+    - type: Transform
+      pos: -40.5,35.5
       parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 9752
     components:
     - type: Transform
@@ -121441,14 +123319,14 @@ entities:
       targetPressure: 501.325
     - type: AtmosPipeColor
       color: '#0335FCFF'
-- proto: GasThermoMachineFreezer
-  entities:
-  - uid: 3286
+  - uid: 28603
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -23.5,25.5
+      rot: 3.141592653589793 rad
+      pos: -39.5,35.5
       parent: 2
+- proto: GasThermoMachineFreezer
+  entities:
   - uid: 9281
     components:
     - type: Transform
@@ -121459,6 +123337,12 @@ entities:
     - type: Transform
       pos: 20.5,-33.5
       parent: 2
+  - uid: 28555
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -24.5,39.5
+      parent: 2
 - proto: GasThermoMachineFreezerEnabled
   entities:
   - uid: 9011
@@ -121480,11 +123364,11 @@ entities:
       color: '#BB55BBFF'
 - proto: GasThermoMachineHeater
   entities:
-  - uid: 3287
+  - uid: 28556
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -23.5,24.5
+      rot: 3.141592653589793 rad
+      pos: -23.5,39.5
       parent: 2
 - proto: GasThermoMachineHeaterEnabled
   entities:
@@ -121506,68 +123390,123 @@ entities:
       rot: 3.141592653589793 rad
       pos: -8.5,43.5
       parent: 2
+    - type: GasValve
+      open: False
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 8101
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -10.5,43.5
       parent: 2
+    - type: GasValve
+      open: False
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 8102
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -18.5,50.5
       parent: 2
+    - type: GasValve
+      open: False
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 8103
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -18.5,52.5
       parent: 2
-  - uid: 8146
-    components:
-    - type: Transform
-      pos: -24.5,37.5
-      parent: 2
-  - uid: 8149
-    components:
-    - type: Transform
-      pos: -23.5,37.5
-      parent: 2
-  - uid: 8688
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -23.5,32.5
-      parent: 2
+    - type: GasValve
+      open: False
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 8691
+  - uid: 8180
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -24.5,41.5
+      parent: 2
+    - type: GasValve
+      open: False
+    - type: AtmosPipeColor
+      color: '#B3A234FF'
+  - uid: 8689
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -23.5,33.5
+      pos: -28.5,33.5
       parent: 2
+    - type: GasValve
+      open: False
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 8809
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -24.5,49.5
+      parent: 2
+    - type: GasValve
+      open: False
+    - type: AtmosPipeColor
+      color: '#333333FF'
   - uid: 8855
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -39.5,9.5
       parent: 2
-  - uid: 9608
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 8910
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -24.5,43.5
+      parent: 2
+    - type: GasValve
+      open: False
+    - type: AtmosPipeColor
+      color: '#3AB334FF'
+  - uid: 9006
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -35.5,37.5
+      pos: -24.5,48.5
       parent: 2
-  - uid: 9611
+    - type: GasValve
+      open: False
+    - type: AtmosPipeColor
+      color: '#333333FF'
+  - uid: 9026
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -35.5,35.5
+      rot: 3.141592653589793 rad
+      pos: -32.5,32.5
       parent: 2
+    - type: GasValve
+      open: False
+    - type: AtmosPipeColor
+      color: '#B3A234FF'
+  - uid: 9203
+    components:
+    - type: Transform
+      pos: -41.5,37.5
+      parent: 2
+    - type: GasValve
+      open: False
+  - uid: 9211
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -42.5,27.5
+      parent: 2
+    - type: GasValve
+      open: False
   - uid: 9759
     components:
     - type: Transform
@@ -121589,6 +123528,115 @@ entities:
       parent: 2
     - type: GasValve
       open: False
+  - uid: 10182
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -23.5,23.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 23828
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -33.5,32.5
+      parent: 2
+    - type: GasValve
+      open: False
+    - type: AtmosPipeColor
+      color: '#3AB334FF'
+  - uid: 28431
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -23.5,24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 28601
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -40.5,33.5
+      parent: 2
+    - type: GasValve
+      open: False
+  - uid: 28605
+    components:
+    - type: Transform
+      pos: -39.5,37.5
+      parent: 2
+    - type: GasValve
+      open: False
+  - uid: 28623
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -13.5,43.5
+      parent: 2
+    - type: GasValve
+      open: False
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 28827
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -22.5,43.5
+      parent: 2
+    - type: GasValve
+      open: False
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 28829
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -23.5,46.5
+      parent: 2
+    - type: GasValve
+      open: False
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 28840
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -19.5,48.5
+      parent: 2
+    - type: GasValve
+      open: False
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 28842
+    components:
+    - type: Transform
+      pos: -15.5,43.5
+      parent: 2
+    - type: GasValve
+      open: False
+    - type: AtmosPipeColor
+      color: '#947507FF'
+  - uid: 28847
+    components:
+    - type: Transform
+      pos: -16.5,43.5
+      parent: 2
+    - type: GasValve
+      open: False
+    - type: AtmosPipeColor
+      color: '#947507FF'
+  - uid: 28849
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -14.5,40.5
+      parent: 2
+    - type: GasValve
+      open: False
+    - type: AtmosPipeColor
+      color: '#947507FF'
 - proto: GasVentPump
   entities:
   - uid: 56
@@ -121609,6 +123657,17 @@ entities:
       - 5583
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 3136
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -23.5,37.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 28611
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 7348
     components:
     - type: Transform
@@ -121649,6 +123708,14 @@ entities:
       - 18258
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 12821
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 44.5,-6.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 13132
     components:
     - type: Transform
@@ -121966,18 +124033,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 14237
-    components:
-    - type: Transform
-      anchored: False
-      rot: 3.141592653589793 rad
-      pos: 43.5,-6.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-    - type: Physics
-      canCollide: True
-      bodyType: Dynamic
   - uid: 14253
     components:
     - type: Transform
@@ -122536,17 +124591,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 15416
-    components:
-    - type: Transform
-      anchored: False
-      pos: -20.5,-46.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-    - type: Physics
-      canCollide: True
-      bodyType: Dynamic
   - uid: 15417
     components:
     - type: Transform
@@ -123231,17 +125275,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 18407
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 60.5,7.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 18440
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 18410
     components:
     - type: Transform
@@ -123418,6 +125451,16 @@ entities:
       parent: 21002
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 28561
+    components:
+    - type: Transform
+      pos: -20.5,39.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 18564
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
 - proto: GasVentScrubber
   entities:
   - uid: 53
@@ -123459,12 +125502,33 @@ entities:
     - type: Transform
       pos: -8.5,46.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 8131
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 8129
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -15.5,52.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 8130
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 9112
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -30.5,35.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 28611
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 10876
     components:
     - type: Transform
@@ -123516,17 +125580,6 @@ entities:
       - 18570
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 13583
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -30.5,40.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 18567
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 13595
     components:
     - type: Transform
@@ -124658,20 +126711,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 16032
-    components:
-    - type: Transform
-      anchored: False
-      pos: 0.5,-59.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 18240
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-    - type: Physics
-      canCollide: True
-      bodyType: Dynamic
   - uid: 16111
     components:
     - type: Transform
@@ -124980,21 +127019,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 16513
-    components:
-    - type: Transform
-      anchored: False
-      rot: 3.141592653589793 rad
-      pos: -44.5,-1.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 18332
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-    - type: Physics
-      canCollide: True
-      bodyType: Dynamic
   - uid: 16522
     components:
     - type: Transform
@@ -125061,6 +127085,17 @@ entities:
       - 18499
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 16794
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -30.5,40.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 18567
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 18330
     components:
     - type: Transform
@@ -125295,17 +127330,53 @@ entities:
       color: '#FF1212FF'
 - proto: GasVolumePump
   entities:
-  - uid: 8104
+  - uid: 8939
+    components:
+    - type: Transform
+      pos: -20.5,50.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 16795
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -20.5,45.5
       parent: 2
-  - uid: 8105
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 28621
     components:
     - type: Transform
-      pos: -18.5,45.5
+      rot: 1.5707963267948966 rad
+      pos: -17.5,42.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#947507FF'
+  - uid: 28622
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -21.5,40.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 28843
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -13.5,44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#947507FF'
+  - uid: 28856
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -13.5,42.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
 - proto: GlassBoxLaserFilled
   entities:
   - uid: 2740
@@ -125845,6 +127916,18 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -23.5,-42.5
       parent: 2
+  - uid: 1945
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-79.5
+      parent: 2
+  - uid: 2053
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-79.5
+      parent: 2
   - uid: 2062
     components:
     - type: Transform
@@ -125857,6 +127940,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -28.5,-38.5
       parent: 2
+  - uid: 2120
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-83.5
+      parent: 2
   - uid: 2297
     components:
     - type: Transform
@@ -126013,6 +128102,30 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 32.5,-18.5
       parent: 2
+  - uid: 3162
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-83.5
+      parent: 2
+  - uid: 3163
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -11.5,-79.5
+      parent: 2
+  - uid: 3225
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -12.5,-79.5
+      parent: 2
+  - uid: 3226
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -12.5,-83.5
+      parent: 2
   - uid: 3234
     components:
     - type: Transform
@@ -126023,6 +128136,12 @@ entities:
     - type: Transform
       pos: -58.5,-25.5
       parent: 2
+  - uid: 3236
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -11.5,-83.5
+      parent: 2
   - uid: 3272
     components:
     - type: Transform
@@ -127727,12 +129846,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -13.5,52.5
       parent: 2
-  - uid: 8054
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -15.5,53.5
-      parent: 2
   - uid: 8055
     components:
     - type: Transform
@@ -127826,15 +129939,11 @@ entities:
     - type: Transform
       pos: -25.5,39.5
       parent: 2
-  - uid: 8140
+  - uid: 8153
     components:
     - type: Transform
-      pos: -24.5,38.5
-      parent: 2
-  - uid: 8141
-    components:
-    - type: Transform
-      pos: -23.5,38.5
+      rot: -1.5707963267948966 rad
+      pos: -22.5,28.5
       parent: 2
   - uid: 8190
     components:
@@ -127942,12 +130051,6 @@ entities:
     - type: Transform
       pos: -34.5,35.5
       parent: 2
-  - uid: 8369
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -34.5,36.5
-      parent: 2
   - uid: 8370
     components:
     - type: Transform
@@ -128185,16 +130288,6 @@ entities:
     - type: Transform
       pos: -39.5,11.5
       parent: 2
-  - uid: 8654
-    components:
-    - type: Transform
-      pos: -22.5,33.5
-      parent: 2
-  - uid: 8656
-    components:
-    - type: Transform
-      pos: -22.5,32.5
-      parent: 2
   - uid: 8697
     components:
     - type: Transform
@@ -128219,6 +130312,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 46.5,22.5
       parent: 2
+  - uid: 9257
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -35.5,34.5
+      parent: 2
   - uid: 9385
     components:
     - type: Transform
@@ -128349,6 +130448,18 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -41.5,38.5
       parent: 2
+  - uid: 9605
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -36.5,34.5
+      parent: 2
+  - uid: 9618
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -24.5,38.5
+      parent: 2
   - uid: 9700
     components:
     - type: Transform
@@ -128888,12 +130999,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -59.5,-20.5
       parent: 2
-  - uid: 11384
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -60.5,-20.5
-      parent: 2
   - uid: 11413
     components:
     - type: Transform
@@ -129378,6 +131483,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 16.5,43.5
       parent: 2
+  - uid: 15252
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -22.5,23.5
+      parent: 2
   - uid: 15502
     components:
     - type: Transform
@@ -129390,6 +131501,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 66.5,-2.5
       parent: 2
+  - uid: 15663
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -22.5,24.5
+      parent: 2
   - uid: 16028
     components:
     - type: Transform
@@ -129594,30 +131711,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 4.5,-83.5
       parent: 2
-  - uid: 16067
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,-83.5
-      parent: 2
-  - uid: 16068
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.5,-82.5
-      parent: 2
-  - uid: 16069
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.5,-81.5
-      parent: 2
-  - uid: 16070
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.5,-80.5
-      parent: 2
   - uid: 16071
     components:
     - type: Transform
@@ -129792,30 +131885,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -10.5,-78.5
       parent: 2
-  - uid: 16101
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -11.5,-80.5
-      parent: 2
-  - uid: 16102
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -11.5,-81.5
-      parent: 2
-  - uid: 16103
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -11.5,-82.5
-      parent: 2
-  - uid: 16104
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -10.5,-83.5
-      parent: 2
   - uid: 16105
     components:
     - type: Transform
@@ -130142,12 +132211,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -69.5,-51.5
       parent: 2
-  - uid: 19960
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 42.5,-47.5
-      parent: 2
   - uid: 19963
     components:
     - type: Transform
@@ -131345,6 +133408,12 @@ entities:
     - type: Transform
       pos: 11.5,40.5
       parent: 2
+  - uid: 23640
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -22.5,29.5
+      parent: 2
   - uid: 23673
     components:
     - type: Transform
@@ -131570,6 +133639,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: -2.5,-19.5
       parent: 21002
+  - uid: 24126
+    components:
+    - type: Transform
+      pos: -61.5,-19.5
+      parent: 2
   - uid: 24133
     components:
     - type: Transform
@@ -133661,24 +135735,31 @@ entities:
       rot: 3.141592653589793 rad
       pos: -28.5,47.5
       parent: 2
-  - uid: 8222
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 9024
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -28.5,48.5
-      parent: 2
-  - uid: 8223
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -28.5,49.5
-      parent: 2
-  - uid: 8224
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
       pos: -28.5,50.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 16807
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -27.5,51.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17431
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -27.5,46.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
 - proto: HighSecCommandLocked
   entities:
   - uid: 445
@@ -133776,35 +135857,33 @@ entities:
     - type: Transform
       pos: 36.5,22.5
       parent: 2
-  - uid: 5206
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 31.5,-36.5
-      parent: 2
   - uid: 5207
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 32.5,-36.5
+      pos: 37.5,-35.5
       parent: 2
   - uid: 5209
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 34.5,-36.5
+      pos: 36.5,-35.5
       parent: 2
+    - type: Door
+      secondsUntilStateChange: -16897.393
+      state: Opening
   - uid: 5211
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 36.5,-36.5
+      pos: 34.5,-35.5
       parent: 2
   - uid: 5212
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 37.5,-36.5
+      pos: 32.5,-35.5
+      parent: 2
+  - uid: 5302
+    components:
+    - type: Transform
+      pos: 31.5,-35.5
       parent: 2
 - proto: HospitalCurtainsOpen
   entities:
@@ -134146,6 +136225,18 @@ entities:
     - type: Transform
       pos: -46.551716,-18.419298
       parent: 2
+- proto: Igniter
+  entities:
+  - uid: 28832
+    components:
+    - type: Transform
+      pos: -19.477867,39.66971
+      parent: 2
+  - uid: 28833
+    components:
+    - type: Transform
+      pos: -19.21745,39.409294
+      parent: 2
 - proto: InflatableDoor
   entities:
   - uid: 27940
@@ -134327,115 +136418,76 @@ entities:
     - type: Transform
       pos: 2.5,38.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 23779
   - uid: 16239
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 3.5,-47.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 9774
   - uid: 23761
     components:
     - type: Transform
       pos: -34.5,1.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 23775
   - uid: 23762
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -16.5,2.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 23774
   - uid: 23763
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -0.5,22.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 23777
   - uid: 23764
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 1.5,24.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 23778
   - uid: 23766
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -0.5,-47.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 23768
   - uid: 23770
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -0.5,-31.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 23771
   - uid: 23772
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 1.5,-21.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 23773
   - uid: 23780
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 48.5,-0.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 23783
   - uid: 23781
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 39.5,-0.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 18372
   - uid: 23784
     components:
     - type: Transform
       pos: 32.5,1.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 23785
   - uid: 24128
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -46.5,-1.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 23776
 - proto: JetpackBlueFilled
   entities:
   - uid: 6124
@@ -134738,6 +136790,14 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 23.466858,-7.376135
       parent: 2
+- proto: LightTubeOld
+  entities:
+  - uid: 16067
+    components:
+    - type: Transform
+      parent: 16032
+    - type: Physics
+      canCollide: False
 - proto: LockableButtonService
   entities:
   - uid: 4166
@@ -135406,6 +137466,43 @@ entities:
     - type: Transform
       pos: -2.5,-54.5
       parent: 2
+- proto: LockerSecurity
+  entities:
+  - uid: 28506
+    components:
+    - type: Transform
+      pos: 18.5,-42.5
+      parent: 21002
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.14673
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 28507
+          - 28508
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
 - proto: LockerSecurityFilled
   entities:
   - uid: 4284
@@ -135438,11 +137535,6 @@ entities:
     - type: Transform
       pos: 31.5,-30.5
       parent: 2
-  - uid: 28278
-    components:
-    - type: Transform
-      pos: 19.5,-46.5
-      parent: 21002
 - proto: LockerWardenFilled
   entities:
   - uid: 3733
@@ -135593,17 +137685,11 @@ entities:
       parent: 2
 - proto: MagazinePistolSubMachineGunTopMounted
   entities:
-  - uid: 4431
+  - uid: 14233
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 42.7493,-41.037598
-      parent: 2
-  - uid: 4432
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 42.702423,-41.412598
+      pos: 42.740047,-41.364567
       parent: 2
 - proto: MagicDiceBag
   entities:
@@ -135649,18 +137735,6 @@ entities:
     - type: Transform
       pos: -28.5,-18.5
       parent: 2
-  - uid: 2053
-    components:
-    - type: MetaData
-      name: recyclables
-    - type: Transform
-      pos: -55.5,-30.5
-      parent: 2
-    - type: MailingUnit
-      tag: Recycling
-    - type: Configuration
-      config:
-        tag: Recycling
   - uid: 3051
     components:
     - type: Transform
@@ -135716,6 +137790,13 @@ entities:
     - type: Configuration
       config:
         tag: Robotics
+  - uid: 14237
+    components:
+    - type: MetaData
+      name: recyclables
+    - type: Transform
+      pos: -55.5,-30.5
+      parent: 2
   - uid: 17649
     components:
     - type: Transform
@@ -136413,6 +138494,11 @@ entities:
     - type: Transform
       pos: -2.5603397,47.590935
       parent: 2
+  - uid: 28835
+    components:
+    - type: Transform
+      pos: -18.430502,39.566895
+      parent: 2
 - proto: MysteryFigureBox
   entities:
   - uid: 5548
@@ -136511,6 +138597,11 @@ entities:
     - type: Transform
       pos: -57.5,-21.5
       parent: 2
+  - uid: 15320
+    components:
+    - type: Transform
+      pos: -45.5,-53.5
+      parent: 2
   - uid: 18929
     components:
     - type: Transform
@@ -136546,11 +138637,6 @@ entities:
     - type: Transform
       pos: -46.5,-44.5
       parent: 2
-  - uid: 19639
-    components:
-    - type: Transform
-      pos: -45.5,-53.5
-      parent: 2
   - uid: 26885
     components:
     - type: Transform
@@ -136588,11 +138674,6 @@ entities:
       parent: 2
 - proto: NoticeBoard
   entities:
-  - uid: 9945
-    components:
-    - type: Transform
-      pos: -47.5,4.5
-      parent: 2
   - uid: 12302
     components:
     - type: Transform
@@ -137102,6 +139183,16 @@ entities:
       parent: 23853
     - type: Physics
       canCollide: False
+  - uid: 28498
+    components:
+    - type: Transform
+      pos: -3.6705859,-48.272324
+      parent: 2
+  - uid: 28499
+    components:
+    - type: Transform
+      pos: -3.4935024,-48.449406
+      parent: 2
 - proto: PaperBin10
   entities:
   - uid: 23867
@@ -137122,6 +139213,11 @@ entities:
     - type: Transform
       pos: -52.5,-10.5
       parent: 2
+  - uid: 28642
+    components:
+    - type: Transform
+      pos: -15.461342,39.473682
+      parent: 2
 - proto: PaperCaptainsThoughts
   entities:
   - uid: 2743
@@ -137260,22 +139356,17 @@ entities:
   - uid: 5540
     components:
     - type: Transform
-      pos: -23.465305,28.79863
+      pos: -29.266327,23.552301
       parent: 2
   - uid: 9308
     components:
     - type: Transform
-      pos: -25.293972,22.25967
+      pos: -28.741936,23.673273
       parent: 2
   - uid: 9309
     components:
     - type: Transform
-      pos: -25.372097,22.494045
-      parent: 2
-  - uid: 9311
-    components:
-    - type: Transform
-      pos: -27.503128,43.635254
+      pos: -29.741941,23.50736
       parent: 2
   - uid: 9312
     components:
@@ -137503,6 +139594,16 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -52.242474,-9.919532
       parent: 2
+  - uid: 28500
+    components:
+    - type: Transform
+      pos: -3.285169,-48.251488
+      parent: 2
+  - uid: 28643
+    components:
+    - type: Transform
+      pos: -16.680094,39.619514
+      parent: 2
 - proto: PenCap
   entities:
   - uid: 2672
@@ -137550,6 +139651,11 @@ entities:
     - type: Transform
       pos: -38.122,-21.444462
       parent: 2
+  - uid: 28497
+    components:
+    - type: Transform
+      pos: -4.5151863,-48.460827
+      parent: 2
 - proto: PhoneInstrument
   entities:
   - uid: 2675
@@ -137791,11 +139897,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 5.5,-10.5
       parent: 21002
-  - uid: 21135
+  - uid: 28517
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-9.5
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-9.5
       parent: 21002
 - proto: PlasmaWindowDirectional
   entities:
@@ -138049,11 +140155,14 @@ entities:
     - type: Transform
       pos: 12.5,40.5
       parent: 2
-  - uid: 12847
+  - uid: 10728
     components:
     - type: Transform
-      pos: 49.5,21.5
+      anchored: True
+      pos: 50.5,20.5
       parent: 2
+    - type: Physics
+      bodyType: Static
   - uid: 16211
     components:
     - type: Transform
@@ -138061,11 +140170,14 @@ entities:
       parent: 2
 - proto: PortableGeneratorSuperPacman
   entities:
-  - uid: 12848
+  - uid: 10730
     components:
     - type: Transform
-      pos: 53.5,21.5
+      anchored: True
+      pos: 52.5,20.5
       parent: 2
+    - type: Physics
+      bodyType: Static
   - uid: 16213
     components:
     - type: Transform
@@ -138093,6 +140205,13 @@ entities:
     - type: Transform
       pos: -25.5,7.5
       parent: 2
+- proto: PosterContrabandBeachStarYamamoto
+  entities:
+  - uid: 11972
+    components:
+    - type: Transform
+      pos: 25.5,-2.5
+      parent: 2
 - proto: PosterContrabandClown
   entities:
   - uid: 2265
@@ -138108,6 +140227,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: 7.5,25.5
       parent: 2
+  - uid: 19552
+    components:
+    - type: Transform
+      pos: 26.5,-31.5
+      parent: 2
 - proto: PosterContrabandHackingGuide
   entities:
   - uid: 11884
@@ -138141,6 +140265,42 @@ entities:
     - type: Transform
       pos: -32.5,7.5
       parent: 2
+- proto: PosterLegitCarpMount
+  entities:
+  - uid: 28493
+    components:
+    - type: Transform
+      pos: -56.5,8.5
+      parent: 2
+- proto: PosterLegitDickGumshue
+  entities:
+  - uid: 19636
+    components:
+    - type: Transform
+      pos: 42.5,19.5
+      parent: 2
+- proto: PosterLegitDoNotQuestion
+  entities:
+  - uid: 5392
+    components:
+    - type: Transform
+      pos: 28.5,-13.5
+      parent: 2
+- proto: PosterLegitFoamForceAd
+  entities:
+  - uid: 11964
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -49.5,4.5
+      parent: 2
+- proto: PosterLegitIonRifle
+  entities:
+  - uid: 10742
+    components:
+    - type: Transform
+      pos: 34.5,-19.5
+      parent: 2
 - proto: PosterLegitMime
   entities:
   - uid: 23628
@@ -138155,6 +140315,39 @@ entities:
     - type: Transform
       pos: -31.5,-37.5
       parent: 2
+- proto: PosterLegitObey
+  entities:
+  - uid: 5393
+    components:
+    - type: Transform
+      pos: 31.5,-22.5
+      parent: 2
+- proto: PosterLegitPDAAd
+  entities:
+  - uid: 28483
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -12.5,-81.5
+      parent: 2
+  - uid: 28484
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-81.5
+      parent: 2
+  - uid: 28491
+    components:
+    - type: Transform
+      pos: -5.5,54.5
+      parent: 2
+- proto: PosterLegitReportCrimes
+  entities:
+  - uid: 28492
+    components:
+    - type: Transform
+      pos: -5.5,53.5
+      parent: 2
 - proto: PosterLegitThereIsNoGasGiant
   entities:
   - uid: 9176
@@ -138163,6 +140356,23 @@ entities:
       rot: 3.141592653589793 rad
       pos: -29.5,24.5
       parent: 2
+- proto: PosterLegitVacation
+  entities:
+  - uid: 3247
+    components:
+    - type: Transform
+      pos: 6.5,-81.5
+      parent: 2
+  - uid: 28489
+    components:
+    - type: Transform
+      pos: -11.5,-81.5
+      parent: 2
+  - uid: 28490
+    components:
+    - type: Transform
+      pos: -5.5,52.5
+      parent: 2
 - proto: PottedPlant1
   entities:
   - uid: 28294
@@ -138991,9 +141201,6 @@ entities:
     - type: Transform
       pos: 8.5,-18.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 1014
   - uid: 1056
     components:
     - type: Transform
@@ -139226,9 +141433,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 40.5,13.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 2735
   - uid: 2734
     components:
     - type: Transform
@@ -139439,9 +141643,6 @@ entities:
     - type: Transform
       pos: -4.5,38.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 7984
   - uid: 5641
     components:
     - type: Transform
@@ -139631,18 +141832,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: -10.5,35.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 7984
   - uid: 7939
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -3.5,31.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 7984
   - uid: 7940
     components:
     - type: Transform
@@ -139677,6 +141872,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,45.5
       parent: 2
+  - uid: 8793
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -23.5,36.5
+      parent: 2
   - uid: 9163
     components:
     - type: Transform
@@ -139701,18 +141902,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -26.5,20.5
       parent: 2
-  - uid: 9167
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -23.5,29.5
-      parent: 2
-  - uid: 9168
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -23.5,35.5
-      parent: 2
   - uid: 9169
     components:
     - type: Transform
@@ -139747,11 +141936,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -29.5,25.5
       parent: 2
-  - uid: 9177
-    components:
-    - type: Transform
-      pos: -36.5,33.5
-      parent: 2
   - uid: 9178
     components:
     - type: Transform
@@ -140135,6 +142319,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -37.5,-14.5
       parent: 2
+  - uid: 12684
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -30.5,36.5
+      parent: 2
   - uid: 13509
     components:
     - type: Transform
@@ -140511,11 +142701,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 60.5,-11.5
       parent: 2
-  - uid: 19073
-    components:
-    - type: Transform
-      pos: 30.5,-36.5
-      parent: 2
   - uid: 20917
     components:
     - type: Transform
@@ -140675,6 +142860,32 @@ entities:
     - type: Transform
       pos: -5.5,18.5
       parent: 21002
+  - uid: 28434
+    components:
+    - type: Transform
+      pos: -34.5,33.5
+      parent: 2
+  - uid: 28520
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -23.5,31.5
+      parent: 2
+- proto: PoweredlightEmpty
+  entities:
+  - uid: 16032
+    components:
+    - type: Transform
+      pos: 30.5,-36.5
+      parent: 2
+    - type: ContainerContainer
+      containers:
+        light_bulb: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: 16067
+    - type: ApcPowerReceiver
+      powerLoad: 10
 - proto: PoweredLightPostSmall
   entities:
   - uid: 2259
@@ -140807,6 +143018,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 32.5,4.5
       parent: 21002
+  - uid: 28596
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -45.5,27.5
+      parent: 2
 - proto: PoweredlightSodium
   entities:
   - uid: 2183
@@ -141077,6 +143294,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -52.5,-26.5
       parent: 2
+  - uid: 12126
+    components:
+    - type: Transform
+      pos: 3.5,-57.5
+      parent: 2
   - uid: 12286
     components:
     - type: Transform
@@ -141232,12 +143454,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -36.5,-27.5
       parent: 2
-  - uid: 17431
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -21.5,31.5
-      parent: 2
   - uid: 17432
     components:
     - type: Transform
@@ -141547,11 +143763,6 @@ entities:
     - type: Transform
       pos: -35.5,-53.5
       parent: 2
-  - uid: 23843
-    components:
-    - type: Transform
-      pos: -19.5,22.5
-      parent: 2
   - uid: 24007
     components:
     - type: Transform
@@ -141609,6 +143820,40 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 43.5,48.5
       parent: 21002
+  - uid: 28485
+    components:
+    - type: Transform
+      pos: -11.5,-82.5
+      parent: 2
+  - uid: 28486
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -11.5,-80.5
+      parent: 2
+  - uid: 28487
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,-80.5
+      parent: 2
+  - uid: 28488
+    components:
+    - type: Transform
+      pos: 6.5,-82.5
+      parent: 2
+  - uid: 28522
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -21.5,22.5
+      parent: 2
+  - uid: 28523
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -21.5,25.5
+      parent: 2
 - proto: PresentRandomCash
   entities:
   - uid: 9641
@@ -141616,6 +143861,24 @@ entities:
     - type: Transform
       pos: -26.517355,4.481133
       parent: 2
+- proto: PressureControlledValve
+  entities:
+  - uid: 8695
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -26.5,32.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 9020
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -24.5,30.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
 - proto: Protolathe
   entities:
   - uid: 6715
@@ -141697,6 +143960,12 @@ entities:
     - type: Transform
       pos: 48.5,6.5
       parent: 2
+  - uid: 8204
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -30.5,37.5
+      parent: 2
   - uid: 20810
     components:
     - type: Transform
@@ -141735,6 +144004,24 @@ entities:
       rot: 3.141592653589793 rad
       pos: -4.5,16.5
       parent: 21002
+  - uid: 28417
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -23.5,37.5
+      parent: 2
+  - uid: 28426
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -23.5,35.5
+      parent: 2
+  - uid: 28428
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -30.5,35.5
+      parent: 2
 - proto: RadiationCollectorFullTank
   entities:
   - uid: 7090
@@ -143834,6 +146121,11 @@ entities:
     - type: Transform
       pos: -17.5,8.5
       parent: 2
+  - uid: 19988
+    components:
+    - type: Transform
+      pos: 36.5,-57.5
+      parent: 2
   - uid: 21443
     components:
     - type: Transform
@@ -143844,6 +146136,11 @@ entities:
     - type: Transform
       pos: -1.5,-62.5
       parent: 2
+  - uid: 28502
+    components:
+    - type: Transform
+      pos: 32.5,-58.5
+      parent: 2
 - proto: RandomFloraTree
   entities:
   - uid: 8003
@@ -143917,6 +146214,11 @@ entities:
       parent: 2
 - proto: RandomFoodMeal
   entities:
+  - uid: 9632
+    components:
+    - type: Transform
+      pos: -28.5,30.5
+      parent: 2
   - uid: 9666
     components:
     - type: Transform
@@ -144379,11 +146681,6 @@ entities:
       parent: 2
 - proto: RandomSpawner
   entities:
-  - uid: 277
-    components:
-    - type: Transform
-      pos: 28.5,-13.5
-      parent: 2
   - uid: 278
     components:
     - type: Transform
@@ -144516,6 +146813,26 @@ entities:
       parent: 2
 - proto: RandomSpawner100
   entities:
+  - uid: 13018
+    components:
+    - type: Transform
+      pos: 31.5,-37.5
+      parent: 2
+  - uid: 13019
+    components:
+    - type: Transform
+      pos: 34.5,-39.5
+      parent: 2
+  - uid: 13522
+    components:
+    - type: Transform
+      pos: 34.5,-36.5
+      parent: 2
+  - uid: 13664
+    components:
+    - type: Transform
+      pos: 29.5,-39.5
+      parent: 2
   - uid: 23750
     components:
     - type: Transform
@@ -144611,16 +146928,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -17.5,-50.5
       parent: 2
-  - uid: 11941
-    components:
-    - type: Transform
-      pos: -10.5,-74.5
-      parent: 2
-  - uid: 11942
-    components:
-    - type: Transform
-      pos: 5.5,-76.5
-      parent: 2
   - uid: 11945
     components:
     - type: Transform
@@ -144748,14 +147055,11 @@ entities:
       parent: 2
 - proto: Recycler
   entities:
-  - uid: 11571
+  - uid: 19987
     components:
     - type: Transform
       pos: -57.5,-30.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 23758
 - proto: ReinforcedPlasmaWindow
   entities:
   - uid: 1061
@@ -144866,12 +147170,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -13.5,50.5
       parent: 2
-  - uid: 6667
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -15.5,53.5
-      parent: 2
   - uid: 7164
     components:
     - type: Transform
@@ -145152,6 +147450,36 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 15.5,44.5
       parent: 2
+  - uid: 28510
+    components:
+    - type: Transform
+      pos: 2.5,3.5
+      parent: 21002
+  - uid: 28511
+    components:
+    - type: Transform
+      pos: 3.5,3.5
+      parent: 21002
+  - uid: 28512
+    components:
+    - type: Transform
+      pos: 6.5,1.5
+      parent: 21002
+  - uid: 28513
+    components:
+    - type: Transform
+      pos: 7.5,1.5
+      parent: 21002
+  - uid: 28514
+    components:
+    - type: Transform
+      pos: 7.5,-2.5
+      parent: 21002
+  - uid: 28515
+    components:
+    - type: Transform
+      pos: 6.5,-2.5
+      parent: 21002
 - proto: ReinforcedWindow
   entities:
   - uid: 127
@@ -145288,6 +147616,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: -27.5,-17.5
       parent: 2
+  - uid: 827
+    components:
+    - type: Transform
+      pos: -61.5,-19.5
+      parent: 2
   - uid: 1206
     components:
     - type: Transform
@@ -146609,16 +148942,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -3.5,52.5
       parent: 2
-  - uid: 8018
-    components:
-    - type: Transform
-      pos: -22.5,33.5
-      parent: 2
-  - uid: 8019
-    components:
-    - type: Transform
-      pos: -22.5,32.5
-      parent: 2
   - uid: 8077
     components:
     - type: Transform
@@ -146825,12 +149148,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -37.5,33.5
       parent: 2
-  - uid: 8358
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -34.5,36.5
-      parent: 2
   - uid: 8362
     components:
     - type: Transform
@@ -146895,6 +149212,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 4.5,-27.5
       parent: 2
+  - uid: 8820
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -35.5,34.5
+      parent: 2
   - uid: 8875
     components:
     - type: Transform
@@ -146921,6 +149244,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 2.5,-30.5
       parent: 2
+  - uid: 9256
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -36.5,34.5
+      parent: 2
   - uid: 9526
     components:
     - type: Transform
@@ -146951,6 +149280,12 @@ entities:
     - type: Transform
       pos: -45.5,-43.5
       parent: 2
+  - uid: 9615
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -22.5,24.5
+      parent: 2
   - uid: 9679
     components:
     - type: Transform
@@ -147189,12 +149524,6 @@ entities:
     - type: Transform
       pos: -5.5,-63.5
       parent: 2
-  - uid: 10691
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -11.5,-81.5
-      parent: 2
   - uid: 10693
     components:
     - type: Transform
@@ -147305,12 +149634,6 @@ entities:
     - type: Transform
       pos: -7.5,-78.5
       parent: 2
-  - uid: 10716
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -11.5,-80.5
-      parent: 2
   - uid: 10717
     components:
     - type: Transform
@@ -147321,18 +149644,6 @@ entities:
     - type: Transform
       pos: 2.5,-78.5
       parent: 2
-  - uid: 10730
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -11.5,-82.5
-      parent: 2
-  - uid: 10731
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -10.5,-83.5
-      parent: 2
   - uid: 10732
     components:
     - type: Transform
@@ -147393,30 +149704,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 4.5,-83.5
       parent: 2
-  - uid: 10742
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,-83.5
-      parent: 2
-  - uid: 10743
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 6.5,-82.5
-      parent: 2
-  - uid: 10744
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 6.5,-81.5
-      parent: 2
-  - uid: 10745
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 6.5,-80.5
-      parent: 2
   - uid: 10764
     components:
     - type: Transform
@@ -147769,12 +150056,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -59.5,-20.5
       parent: 2
-  - uid: 11374
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -60.5,-20.5
-      parent: 2
   - uid: 11375
     components:
     - type: Transform
@@ -147859,6 +150140,18 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -19.5,-57.5
       parent: 2
+  - uid: 12845
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -12.5,-83.5
+      parent: 2
+  - uid: 12846
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-83.5
+      parent: 2
   - uid: 12988
     components:
     - type: Transform
@@ -148009,6 +150302,18 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 66.5,-2.5
       parent: 2
+  - uid: 16102
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-79.5
+      parent: 2
+  - uid: 16513
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -11.5,-79.5
+      parent: 2
   - uid: 17853
     components:
     - type: Transform
@@ -148048,12 +150353,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 41.5,-47.5
       parent: 2
-  - uid: 19959
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 42.5,-47.5
-      parent: 2
   - uid: 19967
     components:
     - type: Transform
@@ -148072,6 +150371,30 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 45.5,-48.5
       parent: 2
+  - uid: 19989
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-83.5
+      parent: 2
+  - uid: 19990
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-79.5
+      parent: 2
+  - uid: 19991
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -11.5,-83.5
+      parent: 2
+  - uid: 19992
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -12.5,-79.5
+      parent: 2
   - uid: 20256
     components:
     - type: Transform
@@ -148093,18 +150416,6 @@ entities:
     - type: Transform
       pos: -2.5,1.5
       parent: 21002
-  - uid: 21024
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,3.5
-      parent: 21002
-  - uid: 21027
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,3.5
-      parent: 21002
   - uid: 21040
     components:
     - type: Transform
@@ -148128,30 +150439,6 @@ entities:
     - type: Transform
       pos: 0.5,4.5
       parent: 21002
-  - uid: 21050
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.5,1.5
-      parent: 21002
-  - uid: 21051
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 7.5,1.5
-      parent: 21002
-  - uid: 21052
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.5,-2.5
-      parent: 21002
-  - uid: 21053
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 7.5,-2.5
-      parent: 21002
   - uid: 21065
     components:
     - type: Transform
@@ -148300,6 +150587,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 20.5,-10.5
       parent: 21002
+  - uid: 23639
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -22.5,28.5
+      parent: 2
   - uid: 24137
     components:
     - type: Transform
@@ -148401,6 +150694,18 @@ entities:
     - type: Transform
       pos: 26.5,5.5
       parent: 21002
+  - uid: 28440
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -22.5,23.5
+      parent: 2
+  - uid: 28496
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -22.5,29.5
+      parent: 2
 - proto: RemoteSignaller
   entities:
   - uid: 1858
@@ -148445,6 +150750,11 @@ entities:
     - type: Transform
       pos: 18.655752,-41.32538
       parent: 2
+  - uid: 28834
+    components:
+    - type: Transform
+      pos: -18.795084,39.598145
+      parent: 2
 - proto: ResearchAndDevelopmentServer
   entities:
   - uid: 9903
@@ -148739,15 +151049,10 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 8.656728,35.33213
       parent: 2
-  - uid: 8943
+  - uid: 8147
     components:
     - type: Transform
-      pos: -23.596386,29.776003
-      parent: 2
-  - uid: 8945
-    components:
-    - type: Transform
-      pos: -23.455761,29.697878
+      pos: -28.511217,24.442232
       parent: 2
   - uid: 9319
     components:
@@ -148769,6 +151074,11 @@ entities:
     - type: Transform
       pos: 28.332474,49.774113
       parent: 2
+  - uid: 11374
+    components:
+    - type: Transform
+      pos: -28.448717,24.681814
+      parent: 2
   - uid: 13398
     components:
     - type: Transform
@@ -148803,11 +151113,6 @@ entities:
     - type: Transform
       pos: 6.237593,38.62781
       parent: 2
-  - uid: 8939
-    components:
-    - type: Transform
-      pos: -23.433754,31.60024
-      parent: 2
 - proto: SheetPlastic
   entities:
   - uid: 6302
@@ -148856,12 +151161,12 @@ entities:
   - uid: 8940
     components:
     - type: Transform
-      pos: -23.558754,30.865866
+      pos: -29.302883,25.556814
       parent: 2
   - uid: 8942
     components:
     - type: Transform
-      pos: -23.424511,30.713503
+      pos: -29.65705,25.650564
       parent: 2
   - uid: 9316
     components:
@@ -148890,6 +151195,11 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
+  - uid: 20900
+    components:
+    - type: Transform
+      pos: -27.53622,43.555347
+      parent: 2
   - uid: 21560
     components:
     - type: Transform
@@ -148998,87 +151308,55 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 34.5,12.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 2730
   - uid: 2605
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 34.5,15.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 2730
   - uid: 7762
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -1.5,-43.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 10222
   - uid: 7794
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -1.5,-42.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 10222
   - uid: 10164
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -1.5,-44.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 10222
   - uid: 11982
     components:
     - type: Transform
       pos: 20.5,-1.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 24218
   - uid: 16922
     components:
     - type: Transform
       pos: -10.5,-24.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 6175
-      - 1858
   - uid: 17256
     components:
     - type: Transform
       pos: -11.5,-24.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 6175
-      - 1858
   - uid: 18581
     components:
     - type: Transform
       pos: 21.5,-1.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 24218
   - uid: 20831
     components:
     - type: Transform
       pos: 19.5,-1.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 24218
 - proto: ShuttersNormalOpen
   entities:
   - uid: 362
@@ -149087,27 +151365,18 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -28.5,-40.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 23438
   - uid: 363
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -28.5,-39.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 23438
   - uid: 364
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -28.5,-38.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 23438
   - uid: 920
     components:
     - type: Transform
@@ -149116,8 +151385,6 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       invokeCounter: 1
-      links:
-      - 872
   - uid: 921
     components:
     - type: Transform
@@ -149126,8 +151393,6 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       invokeCounter: 1
-      links:
-      - 872
   - uid: 922
     components:
     - type: Transform
@@ -149136,8 +151401,6 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       invokeCounter: 1
-      links:
-      - 872
   - uid: 923
     components:
     - type: Transform
@@ -149146,140 +151409,93 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       invokeCounter: 1
-      links:
-      - 872
   - uid: 924
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 15.5,-17.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 928
   - uid: 925
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 14.5,-17.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 928
   - uid: 926
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 13.5,-17.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 928
   - uid: 927
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 12.5,-17.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 928
   - uid: 1125
     components:
     - type: Transform
       pos: -24.5,-33.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 8947
   - uid: 2365
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 18.5,4.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 3532
   - uid: 2366
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 18.5,5.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 3532
   - uid: 2367
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 18.5,6.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 3532
   - uid: 2368
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 18.5,7.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 3532
   - uid: 2369
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 18.5,8.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 3532
   - uid: 2370
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 18.5,9.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 3532
   - uid: 2600
     components:
     - type: Transform
       pos: 29.5,17.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 2696
   - uid: 2601
     components:
     - type: Transform
       pos: 32.5,17.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 2696
   - uid: 2602
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 27.5,15.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 2694
   - uid: 2603
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 27.5,12.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 2694
   - uid: 3293
     components:
     - type: Transform
@@ -149290,25 +151506,16 @@ entities:
     - type: Transform
       pos: 21.5,2.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 3532
   - uid: 3530
     components:
     - type: Transform
       pos: 23.5,2.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 3532
   - uid: 3531
     components:
     - type: Transform
       pos: 25.5,2.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 3532
   - uid: 3533
     components:
     - type: Transform
@@ -149319,372 +151526,243 @@ entities:
     - type: Transform
       pos: 40.5,-3.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 23782
   - uid: 3535
     components:
     - type: Transform
       pos: 41.5,-3.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 23782
   - uid: 3536
     components:
     - type: Transform
       pos: 42.5,-3.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 23782
   - uid: 3537
     components:
     - type: Transform
       pos: 43.5,-3.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 23782
   - uid: 3799
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 42.5,22.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 3800
   - uid: 4035
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -47.5,6.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 4033
   - uid: 5217
     components:
     - type: Transform
       pos: 40.5,24.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 3800
   - uid: 5584
     components:
     - type: Transform
       pos: -31.5,-33.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 8946
   - uid: 5585
     components:
     - type: Transform
       pos: -30.5,-33.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 8946
   - uid: 5586
     components:
     - type: Transform
       pos: -29.5,-33.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 8946
   - uid: 5742
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 27.5,21.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 2696
   - uid: 6226
     components:
     - type: Transform
       pos: -26.5,-33.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 8947
   - uid: 6394
     components:
     - type: Transform
       pos: 31.5,34.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 6481
   - uid: 6395
     components:
     - type: Transform
       pos: 33.5,34.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 6481
   - uid: 6480
     components:
     - type: Transform
       pos: 35.5,34.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 6481
   - uid: 6576
     components:
     - type: Transform
       pos: -25.5,-33.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 8947
   - uid: 6606
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 2.5,40.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 6652
   - uid: 6607
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 2.5,41.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 6652
   - uid: 6608
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 2.5,42.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 6652
   - uid: 6609
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 2.5,43.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 6652
   - uid: 6610
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 2.5,44.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 6652
   - uid: 6614
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 6.5,43.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 6652
   - uid: 6615
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 6.5,41.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 6652
   - uid: 7860
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -10.5,31.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 7865
   - uid: 7861
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -10.5,32.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 7865
   - uid: 7862
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -10.5,33.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 7865
   - uid: 8941
     components:
     - type: Transform
       pos: -23.5,-33.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 8947
   - uid: 11301
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -57.5,6.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 24149
   - uid: 11302
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -57.5,9.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 24149
   - uid: 11303
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -54.5,13.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 24149
   - uid: 11304
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -53.5,13.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 24149
   - uid: 11305
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -52.5,13.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 24149
   - uid: 11306
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -49.5,9.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 24149
   - uid: 11554
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -51.5,-3.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 18694
   - uid: 11555
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -51.5,-2.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 18694
   - uid: 17900
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -51.5,2.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 18694
   - uid: 24134
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -47.5,0.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 18694
   - uid: 24135
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -47.5,1.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 18694
   - uid: 24136
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -47.5,-4.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 18694
   - uid: 24140
     components:
     - type: Transform
       pos: -54.5,4.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 24149
   - uid: 24142
     components:
     - type: Transform
       pos: -52.5,4.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 24149
   - uid: 24145
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -47.5,2.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 18694
   - uid: 24147
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -47.5,3.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 18694
   - uid: 28362
     components:
     - type: Transform
@@ -149697,9 +151775,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -47.5,-0.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 18694
 - proto: ShuttersRadiation
   entities:
   - uid: 7999
@@ -149708,18 +151783,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 10.5,49.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 1919
   - uid: 8000
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 16.5,49.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 1920
 - proto: ShuttersRadiationOpen
   entities:
   - uid: 9766
@@ -149728,90 +151797,60 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 12.5,-31.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 21223
   - uid: 9767
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 12.5,-30.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 21223
   - uid: 9768
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 12.5,-29.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 21223
   - uid: 9769
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 2.5,-31.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 9782
   - uid: 9770
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 2.5,-30.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 9782
   - uid: 9771
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 2.5,-29.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 9782
   - uid: 9772
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 9.5,-27.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 21223
   - uid: 9773
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 5.5,-27.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 9782
   - uid: 9854
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 10.5,-27.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 21223
   - uid: 9855
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 4.5,-27.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 9782
 - proto: ShuttersWindow
   entities:
   - uid: 10589
@@ -149820,27 +151859,18 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 2.5,-52.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 10588
   - uid: 10590
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 2.5,-53.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 10588
   - uid: 10591
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 2.5,-54.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 10588
 - proto: ShuttersWindowOpen
   entities:
   - uid: 742
@@ -149849,102 +151879,66 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -17.5,6.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 1628
   - uid: 1501
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -17.5,5.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 1628
   - uid: 1502
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -17.5,4.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 1628
   - uid: 1619
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -17.5,7.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 1628
   - uid: 1620
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -17.5,8.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 1628
   - uid: 1621
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -17.5,9.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 1628
   - uid: 1622
     components:
     - type: Transform
       pos: -8.5,18.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 1629
   - uid: 1623
     components:
     - type: Transform
       pos: -7.5,18.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 1629
   - uid: 1624
     components:
     - type: Transform
       pos: -6.5,18.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 1629
   - uid: 1625
     components:
     - type: Transform
       pos: -5.5,18.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 1629
   - uid: 1626
     components:
     - type: Transform
       pos: -4.5,18.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 1629
   - uid: 1627
     components:
     - type: Transform
       pos: -3.5,18.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 1629
 - proto: ShuttleConsoleCircuitboard
   entities:
   - uid: 9463
@@ -150595,10 +152589,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 5.5,-2.5
       parent: 21002
-    - type: DeviceLinkSource
-      linkedPorts:
-        21067:
-        - Pressed: Toggle
   - uid: 21064
     components:
     - type: MetaData
@@ -150795,6 +152785,18 @@ entities:
       linkedPorts:
         23784:
         - Pressed: Toggle
+  - uid: 23829
+    components:
+    - type: MetaData
+      name: blast door
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -17.5,53.5
+      parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        16797:
+        - Pressed: Toggle
   - uid: 24149
     components:
     - type: MetaData
@@ -151110,6 +153112,23 @@ entities:
       parent: 2
 - proto: SignDirectionalGravity
   entities:
+  - uid: 5192
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,39.5
+      parent: 2
+  - uid: 5193
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 20.5,44.5
+      parent: 2
+  - uid: 5206
+    components:
+    - type: Transform
+      pos: 32.5,41.5
+      parent: 2
   - uid: 20984
     components:
     - type: Transform
@@ -151410,6 +153429,13 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -10.5,-34.5
       parent: 2
+- proto: SignFire
+  entities:
+  - uid: 28553
+    components:
+    - type: Transform
+      pos: -27.5,34.5
+      parent: 2
 - proto: SignHydro2
   entities:
   - uid: 23182
@@ -151892,26 +153918,26 @@ entities:
     - type: Transform
       pos: 14.5,42.5
       parent: 2
-  - uid: 12820
-    components:
-    - type: Transform
-      pos: 50.5,20.5
-      parent: 2
-  - uid: 12821
-    components:
-    - type: Transform
-      pos: 52.5,20.5
-      parent: 2
-  - uid: 19552
-    components:
-    - type: Transform
-      pos: -46.5,-53.5
-      parent: 2
-  - uid: 19970
+  - uid: 10260
     components:
     - type: Transform
       pos: 41.5,-46.5
       parent: 2
+  - uid: 10731
+    components:
+    - type: Transform
+      pos: 52.5,19.5
+      parent: 2
+  - uid: 10743
+    components:
+    - type: Transform
+      pos: 50.5,19.5
+      parent: 2
+  - uid: 19639
+    components:
+    - type: Transform
+      pos: -46.5,-53.5
+      parent: 2
   - uid: 20260
     components:
     - type: MetaData
@@ -151941,10 +153967,10 @@ entities:
       parent: 21002
 - proto: SmokingPipe
   entities:
-  - uid: 11965
+  - uid: 16103
     components:
     - type: Transform
-      pos: -10.600379,-82.23077
+      pos: -10.597894,-76.282394
       parent: 2
 - proto: SmokingPipeFilledCannabis
   entities:
@@ -153905,10 +155931,10 @@ entities:
     - type: Transform
       pos: -26.5,20.5
       parent: 2
-  - uid: 24160
+  - uid: 28544
     components:
     - type: Transform
-      pos: -26.5,16.5
+      pos: -23.5,33.5
       parent: 2
 - proto: SpacemenFigureSpawner
   entities:
@@ -154249,10 +156275,10 @@ entities:
       parent: 2
 - proto: SpawnMobCatFloppa
   entities:
-  - uid: 20652
+  - uid: 20675
     components:
     - type: Transform
-      pos: -7.5,34.5
+      pos: 38.5,-2.5
       parent: 2
 - proto: SpawnMobCatRuntime
   entities:
@@ -154469,10 +156495,10 @@ entities:
       parent: 2
 - proto: SpawnMobSlothPaperwork
   entities:
-  - uid: 20675
+  - uid: 20652
     components:
     - type: Transform
-      pos: 38.5,-2.5
+      pos: -7.5,34.5
       parent: 2
 - proto: SpawnMobSlug
   entities:
@@ -155057,6 +157083,16 @@ entities:
     - type: Transform
       pos: -52.5,-39.5
       parent: 2
+  - uid: 28501
+    components:
+    - type: Transform
+      pos: -9.5,-60.5
+      parent: 2
+  - uid: 28503
+    components:
+    - type: Transform
+      pos: -9.5,-58.5
+      parent: 2
 - proto: SpawnPointPsychologist
   entities:
   - uid: 20832
@@ -155304,6 +157340,16 @@ entities:
     - type: Transform
       pos: -28.54587,5.489859
       parent: 2
+  - uid: 8146
+    components:
+    - type: Transform
+      pos: -28.471104,23.642023
+      parent: 2
+  - uid: 9023
+    components:
+    - type: Transform
+      pos: -25.50282,22.116556
+      parent: 2
 - proto: StairDark
   entities:
   - uid: 24254
@@ -156215,14 +158261,6 @@ entities:
       parent: 2
     - type: SurveillanceCamera
       id: Atmos 2
-  - uid: 20900
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -30.5,34.5
-      parent: 2
-    - type: SurveillanceCamera
-      id: Atmos 3
   - uid: 20901
     components:
     - type: Transform
@@ -156337,6 +158375,28 @@ entities:
       - SurveillanceCameraEngineering
       nameSet: True
       id: SMES C
+  - uid: 28860
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -28.5,33.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: Atmos 3
+  - uid: 28861
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -27.5,37.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: Pressure Bank
 - proto: SurveillanceCameraGeneral
   entities:
   - uid: 20951
@@ -157387,47 +159447,34 @@ entities:
     - type: Transform
       pos: -28.5,5.5
       parent: 2
-  - uid: 8843
+  - uid: 8031
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -23.5,30.5
+      pos: -27.5,13.5
       parent: 2
-  - uid: 8844
+  - uid: 8163
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -23.5,29.5
+      rot: 1.5707963267948966 rad
+      pos: -28.5,25.5
       parent: 2
-  - uid: 8845
+  - uid: 8218
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -23.5,28.5
+      rot: 1.5707963267948966 rad
+      pos: -28.5,24.5
       parent: 2
-  - uid: 8846
+  - uid: 8688
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -23.5,31.5
+      rot: 1.5707963267948966 rad
+      pos: -29.5,25.5
       parent: 2
-  - uid: 8848
+  - uid: 8786
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -23.5,23.5
-      parent: 2
-  - uid: 8849
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -24.5,23.5
-      parent: 2
-  - uid: 8850
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -25.5,23.5
+      rot: 1.5707963267948966 rad
+      pos: -28.5,23.5
       parent: 2
   - uid: 8851
     components:
@@ -157465,6 +159512,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: -27.5,43.5
       parent: 2
+  - uid: 9131
+    components:
+    - type: Transform
+      pos: -23.5,29.5
+      parent: 2
   - uid: 9458
     components:
     - type: Transform
@@ -157725,16 +159777,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -19.5,-47.5
       parent: 2
-  - uid: 23828
-    components:
-    - type: Transform
-      pos: -26.5,14.5
-      parent: 2
-  - uid: 23829
-    components:
-    - type: Transform
-      pos: -26.5,15.5
-      parent: 2
   - uid: 24130
     components:
     - type: Transform
@@ -157770,12 +159812,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 17.5,-45.5
       parent: 21002
-  - uid: 25233
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 18.5,-42.5
-      parent: 21002
   - uid: 25236
     components:
     - type: Transform
@@ -157799,6 +159835,46 @@ entities:
     - type: Transform
       pos: -52.5,-9.5
       parent: 2
+  - uid: 28439
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -29.5,23.5
+      parent: 2
+  - uid: 28516
+    components:
+    - type: Transform
+      pos: 19.5,-46.5
+      parent: 21002
+  - uid: 28540
+    components:
+    - type: Transform
+      pos: -23.5,28.5
+      parent: 2
+  - uid: 28639
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -15.5,39.5
+      parent: 2
+  - uid: 28640
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -16.5,39.5
+      parent: 2
+  - uid: 28830
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -18.5,39.5
+      parent: 2
+  - uid: 28831
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -19.5,39.5
+      parent: 2
 - proto: TableCarpet
   entities:
   - uid: 7942
@@ -159434,12 +161510,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -56.5,5.5
       parent: 2
-  - uid: 11828
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -10.5,-82.5
-      parent: 2
   - uid: 11851
     components:
     - type: Transform
@@ -159506,12 +161576,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 5.5,-74.5
       parent: 2
-  - uid: 11948
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,-82.5
-      parent: 2
   - uid: 11950
     components:
     - type: Transform
@@ -160309,10 +162373,15 @@ entities:
       parent: 2
 - proto: trayScanner
   entities:
+  - uid: 9633
+    components:
+    - type: Transform
+      pos: -23.63988,35.604965
+      parent: 2
   - uid: 28349
     components:
     - type: Transform
-      pos: -24.948425,23.617188
+      pos: -28.271633,25.369314
       parent: 2
   - uid: 28352
     components:
@@ -160321,49 +162390,6 @@ entities:
       parent: 2
 - proto: TwoWayLever
   entities:
-  - uid: 3226
-    components:
-    - type: Transform
-      pos: -55.5,-27.5
-      parent: 2
-    - type: DeviceLinkSource
-      linkedPorts:
-        1666:
-        - Left: Forward
-        - Right: Reverse
-        - Middle: Off
-        1667:
-        - Left: Forward
-        - Right: Reverse
-        - Middle: Off
-        3247:
-        - Left: Forward
-        - Right: Reverse
-        - Middle: Off
-        3327:
-        - Left: Forward
-        - Right: Reverse
-        - Middle: Off
-        3652:
-        - Left: Forward
-        - Right: Reverse
-        - Middle: Off
-        1767:
-        - Left: Forward
-        - Right: Reverse
-        - Middle: Off
-        3236:
-        - Left: Forward
-        - Right: Reverse
-        - Middle: Off
-        2120:
-        - Left: Forward
-        - Right: Reverse
-        - Middle: Off
-        3225:
-        - Left: Forward
-        - Right: Reverse
-        - Middle: Off
   - uid: 11354
     components:
     - type: Transform
@@ -160465,22 +162491,64 @@ entities:
         - Left: Forward
         - Right: Reverse
         - Middle: Off
-  - uid: 23273
-    components:
-    - type: Transform
-      pos: -56.5,-27.5
-      parent: 2
-  - uid: 23758
+  - uid: 16101
     components:
+    - type: MetaData
+      name: conveyor
     - type: Transform
       pos: -56.5,-27.5
       parent: 2
     - type: DeviceLinkSource
       linkedPorts:
+        11363:
+        - Left: Forward
+        - Right: Reverse
+        - Middle: Off
+        11364:
+        - Left: Forward
+        - Right: Reverse
+        - Middle: Off
+        11941:
+        - Left: Forward
+        - Right: Reverse
+        - Middle: Off
+        11942:
+        - Left: Forward
+        - Right: Reverse
+        - Middle: Off
+        11948:
+        - Left: Forward
+        - Right: Reverse
+        - Middle: Off
+        11565:
+        - Left: Forward
+        - Right: Reverse
+        - Middle: Off
+        11828:
+        - Left: Forward
+        - Right: Reverse
+        - Middle: Off
         11571:
         - Left: Forward
         - Right: Reverse
         - Middle: Off
+        11596:
+        - Left: Forward
+        - Right: Reverse
+        - Middle: Off
+  - uid: 19975
+    components:
+    - type: MetaData
+      name: recycler
+    - type: Transform
+      pos: -56.5,-28.5
+      parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        19987:
+        - Left: Forward
+        - Right: Reverse
+        - Middle: Off
 - proto: UnfinishedMachineFrame
   entities:
   - uid: 9643
@@ -161760,6 +163828,12 @@ entities:
     - type: Transform
       pos: -23.5,-21.5
       parent: 2
+  - uid: 730
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-83.5
+      parent: 2
   - uid: 731
     components:
     - type: Transform
@@ -164021,6 +166095,12 @@ entities:
     - type: Transform
       pos: 2.5,22.5
       parent: 2
+  - uid: 3327
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -11.5,-81.5
+      parent: 2
   - uid: 3357
     components:
     - type: Transform
@@ -165487,6 +167567,12 @@ entities:
     - type: Transform
       pos: 37.5,-42.5
       parent: 2
+  - uid: 4432
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-81.5
+      parent: 2
   - uid: 4437
     components:
     - type: Transform
@@ -167727,18 +169813,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -34.5,34.5
       parent: 2
-  - uid: 8244
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -35.5,34.5
-      parent: 2
-  - uid: 8245
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -36.5,34.5
-      parent: 2
   - uid: 8246
     components:
     - type: Transform
@@ -167781,24 +169855,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: -43.5,30.5
       parent: 2
-  - uid: 8253
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -42.5,30.5
-      parent: 2
   - uid: 8254
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -41.5,30.5
       parent: 2
-  - uid: 8255
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -40.5,30.5
-      parent: 2
   - uid: 8256
     components:
     - type: Transform
@@ -169268,36 +171330,18 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 2.5,-83.5
       parent: 2
-  - uid: 10725
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 6.5,-83.5
-      parent: 2
-  - uid: 10726
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 6.5,-79.5
-      parent: 2
-  - uid: 10727
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -11.5,-79.5
-      parent: 2
-  - uid: 10728
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -11.5,-83.5
-      parent: 2
   - uid: 10729
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -7.5,-83.5
       parent: 2
+  - uid: 10745
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-81.5
+      parent: 2
   - uid: 10746
     components:
     - type: Transform
@@ -169594,6 +171638,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -58.5,-10.5
       parent: 2
+  - uid: 10846
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-81.5
+      parent: 2
   - uid: 10849
     components:
     - type: Transform
@@ -170781,6 +172831,12 @@ entities:
     - type: Transform
       pos: -48.5,-28.5
       parent: 2
+  - uid: 11962
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -12.5,-81.5
+      parent: 2
   - uid: 12222
     components:
     - type: Transform
@@ -171224,6 +173280,30 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 47.5,21.5
       parent: 2
+  - uid: 12844
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -13.5,-83.5
+      parent: 2
+  - uid: 12850
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-79.5
+      parent: 2
+  - uid: 12851
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -10.5,-83.5
+      parent: 2
+  - uid: 12852
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 42.5,-47.5
+      parent: 2
   - uid: 12940
     components:
     - type: Transform
@@ -171410,6 +173490,17 @@ entities:
     - type: Transform
       pos: 2.5,-55.5
       parent: 2
+  - uid: 16068
+    components:
+    - type: Transform
+      pos: 28.5,-13.5
+      parent: 2
+  - uid: 16104
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-83.5
+      parent: 2
   - uid: 16215
     components:
     - type: Transform
@@ -171420,6 +173511,12 @@ entities:
     - type: Transform
       pos: 11.5,39.5
       parent: 2
+  - uid: 16518
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -13.5,-81.5
+      parent: 2
   - uid: 16627
     components:
     - type: Transform
@@ -171438,6 +173535,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -5.5,48.5
       parent: 2
+  - uid: 16800
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -34.5,36.5
+      parent: 2
   - uid: 18052
     components:
     - type: Transform
@@ -171521,6 +173624,18 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 37.5,9.5
       parent: 2
+  - uid: 18406
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -10.5,-81.5
+      parent: 2
+  - uid: 18407
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -13.5,-79.5
+      parent: 2
   - uid: 18631
     components:
     - type: Transform
@@ -171648,6 +173763,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 45.5,-47.5
       parent: 2
+  - uid: 19970
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-81.5
+      parent: 2
   - uid: 20237
     components:
     - type: Transform
@@ -173958,6 +176079,24 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -5.5,32.5
       parent: 21002
+  - uid: 28436
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -40.5,30.5
+      parent: 2
+  - uid: 28437
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -42.5,30.5
+      parent: 2
+  - uid: 28521
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -22.5,34.5
+      parent: 2
 - proto: WallSolid
   entities:
   - uid: 387
@@ -175291,6 +177430,12 @@ entities:
     - type: Transform
       pos: -25.5,20.5
       parent: 2
+  - uid: 3098
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -27.5,34.5
+      parent: 2
   - uid: 3099
     components:
     - type: Transform
@@ -175312,17 +177457,14 @@ entities:
   - uid: 3129
     components:
     - type: Transform
-      pos: -22.5,23.5
+      rot: 1.5707963267948966 rad
+      pos: -23.5,34.5
       parent: 2
   - uid: 3130
     components:
     - type: Transform
-      pos: -22.5,24.5
-      parent: 2
-  - uid: 3136
-    components:
-    - type: Transform
-      pos: -22.5,25.5
+      rot: 1.5707963267948966 rad
+      pos: -25.5,34.5
       parent: 2
   - uid: 3164
     components:
@@ -176543,6 +178685,12 @@ entities:
     - type: Transform
       pos: 38.5,2.5
       parent: 2
+  - uid: 8019
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -24.5,34.5
+      parent: 2
   - uid: 8020
     components:
     - type: Transform
@@ -176628,6 +178776,24 @@ entities:
     - type: Transform
       pos: 37.5,38.5
       parent: 2
+  - uid: 8170
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -22.5,32.5
+      parent: 2
+  - uid: 8202
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -29.5,34.5
+      parent: 2
+  - uid: 8203
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -30.5,34.5
+      parent: 2
   - uid: 8349
     components:
     - type: Transform
@@ -176770,6 +178936,12 @@ entities:
     - type: Transform
       pos: 25.5,41.5
       parent: 2
+  - uid: 8693
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -28.5,34.5
+      parent: 2
   - uid: 8950
     components:
     - type: Transform
@@ -176790,6 +178962,18 @@ entities:
     - type: Transform
       pos: 44.5,35.5
       parent: 2
+  - uid: 9609
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -22.5,25.5
+      parent: 2
+  - uid: 9616
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -23.5,38.5
+      parent: 2
   - uid: 9693
     components:
     - type: Transform
@@ -176946,21 +179130,6 @@ entities:
     - type: Transform
       pos: 6.5,51.5
       parent: 2
-  - uid: 10182
-    components:
-    - type: Transform
-      pos: -22.5,27.5
-      parent: 2
-  - uid: 10183
-    components:
-    - type: Transform
-      pos: -22.5,28.5
-      parent: 2
-  - uid: 10184
-    components:
-    - type: Transform
-      pos: -22.5,29.5
-      parent: 2
   - uid: 10185
     components:
     - type: Transform
@@ -176971,11 +179140,6 @@ entities:
     - type: Transform
       pos: -22.5,31.5
       parent: 2
-  - uid: 10187
-    components:
-    - type: Transform
-      pos: -22.5,34.5
-      parent: 2
   - uid: 10188
     components:
     - type: Transform
@@ -178026,6 +180190,12 @@ entities:
     - type: Transform
       pos: -51.5,-41.5
       parent: 2
+  - uid: 16779
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -22.5,33.5
+      parent: 2
   - uid: 17129
     components:
     - type: Transform
@@ -178307,6 +180477,11 @@ entities:
     - type: Transform
       pos: 48.5,-22.5
       parent: 21002
+  - uid: 28536
+    components:
+    - type: Transform
+      pos: -22.5,27.5
+      parent: 2
 - proto: WallSolidRust
   entities:
   - uid: 24642
@@ -178451,10 +180626,10 @@ entities:
       parent: 21002
 - proto: WallWeaponCapacitorRecharger
   entities:
-  - uid: 4151
+  - uid: 20081
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
+      rot: -1.5707963267948966 rad
       pos: 48.5,-39.5
       parent: 2
 - proto: WallWood
@@ -178857,10 +181032,10 @@ entities:
       parent: 21002
 - proto: WardrobeBlackFilled
   entities:
-  - uid: 11963
+  - uid: 11160
     components:
     - type: Transform
-      pos: -10.5,-80.5
+      pos: -10.5,-74.5
       parent: 2
 - proto: WardrobeBlueFilled
   entities:
@@ -178913,26 +181088,12 @@ entities:
           showEnts: False
           occludes: True
           ent: null
-- proto: WardrobeGreenFilled
-  entities:
-  - uid: 11961
-    components:
-    - type: Transform
-      pos: -10.5,-75.5
-      parent: 2
 - proto: WardrobeGreyFilled
   entities:
-  - uid: 11962
+  - uid: 3977
     components:
     - type: Transform
-      pos: 5.5,-80.5
-      parent: 2
-- proto: WardrobeMixedFilled
-  entities:
-  - uid: 11968
-    components:
-    - type: Transform
-      pos: 5.5,-75.5
+      pos: 5.5,-76.5
       parent: 2
 - proto: WardrobePinkFilled
   entities:
@@ -178997,11 +181158,11 @@ entities:
       parent: 2
 - proto: WarningAir
   entities:
-  - uid: 8916
+  - uid: 8696
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -22.5,31.5
+      rot: -1.5707963267948966 rad
+      pos: -22.5,25.5
       parent: 2
   - uid: 28304
     components:
@@ -179009,6 +181170,16 @@ entities:
       rot: 3.141592653589793 rad
       pos: 40.5,5.5
       parent: 21002
+  - uid: 28505
+    components:
+    - type: Transform
+      pos: 5.5,-0.5
+      parent: 21002
+  - uid: 28552
+    components:
+    - type: Transform
+      pos: -25.5,34.5
+      parent: 2
 - proto: WarningCO2
   entities:
   - uid: 8912
@@ -179071,11 +181242,11 @@ entities:
       parent: 2
 - proto: WarningWaste
   entities:
-  - uid: 8917
+  - uid: 8699
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -22.5,34.5
+      rot: -1.5707963267948966 rad
+      pos: -22.5,22.5
       parent: 2
   - uid: 8918
     components:
@@ -179286,6 +181457,22 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 56.5,-9.5
       parent: 2
+- proto: WeaponDisabler
+  entities:
+  - uid: 28507
+    components:
+    - type: Transform
+      parent: 28506
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 28508
+    components:
+    - type: Transform
+      parent: 28506
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: WeaponDisablerPractice
   entities:
   - uid: 4152
@@ -179352,6 +181539,14 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
+- proto: WeaponRifleFoam
+  entities:
+  - uid: 15416
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 42.90458,-8.522037
+      parent: 2
 - proto: WeaponShotgunDoubleBarreledRubber
   entities:
   - uid: 4196
@@ -179382,15 +181577,10 @@ entities:
       parent: 2
 - proto: WeaponTurretSyndicateBroken
   entities:
-  - uid: 12786
+  - uid: 10217
     components:
     - type: Transform
-      pos: 48.5,19.5
-      parent: 2
-  - uid: 12787
-    components:
-    - type: Transform
-      pos: 54.5,19.5
+      pos: 48.5,18.5
       parent: 2
   - uid: 12788
     components:
@@ -180119,16 +182309,6 @@ entities:
     - type: Transform
       pos: -25.5,39.5
       parent: 2
-  - uid: 826
-    components:
-    - type: Transform
-      pos: -24.5,38.5
-      parent: 2
-  - uid: 827
-    components:
-    - type: Transform
-      pos: -23.5,38.5
-      parent: 2
   - uid: 828
     components:
     - type: Transform
@@ -180353,6 +182533,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: -16.5,-24.5
       parent: 2
+  - uid: 9617
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -24.5,38.5
+      parent: 2
   - uid: 23168
     components:
     - type: Transform
@@ -181126,7 +183312,7 @@ entities:
       pos: 24.5,2.5
       parent: 21002
     - type: Door
-      secondsUntilStateChange: -319108.34
+      secondsUntilStateChange: -362102
       state: Opening
 - proto: WoodenBench
   entities:
@@ -181366,7 +183552,7 @@ entities:
   - uid: 9262
     components:
     - type: Transform
-      pos: -23.502628,23.552471
+      pos: -25.471455,22.718925
       parent: 2
   - uid: 9448
     components:
diff --git a/Resources/Maps/omega.yml b/Resources/Maps/omega.yml
index 661149f4fe..3cbcd40652 100644
--- a/Resources/Maps/omega.yml
+++ b/Resources/Maps/omega.yml
@@ -10037,73 +10037,46 @@ entities:
     - type: Transform
       pos: 23.5,24.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 2938
   - uid: 2866
     components:
     - type: Transform
       pos: 23.5,28.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 2938
   - uid: 5573
     components:
     - type: Transform
       pos: 21.5,-30.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 6690
   - uid: 5574
     components:
     - type: Transform
       pos: 21.5,-29.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 6690
   - uid: 5575
     components:
     - type: Transform
       pos: 21.5,-28.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 6690
   - uid: 5794
     components:
     - type: Transform
       pos: 2.5,-27.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 6218
   - uid: 5795
     components:
     - type: Transform
       pos: 2.5,-26.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 6218
   - uid: 5796
     components:
     - type: Transform
       pos: 2.5,-25.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 6218
   - uid: 9496
     components:
     - type: Transform
       pos: -44.5,18.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 9504
 - proto: BlockGameArcade
   entities:
   - uid: 4549
@@ -30885,6 +30858,13 @@ entities:
     - type: Transform
       pos: -30.486824,-12.450464
       parent: 4812
+- proto: ClothingOuterCoatDetectiveLoadout
+  entities:
+  - uid: 11805
+    components:
+    - type: Transform
+      pos: -14.486766,-0.42116833
+      parent: 4812
 - proto: ClothingOuterCoatGentle
   entities:
   - uid: 6193
@@ -30892,13 +30872,6 @@ entities:
     - type: Transform
       pos: 13.531586,-11.381834
       parent: 4812
-- proto: ClothingOuterCoatInspector
-  entities:
-  - uid: 11805
-    components:
-    - type: Transform
-      pos: -14.486766,-0.42116833
-      parent: 4812
 - proto: ClothingOuterCoatJensen
   entities:
   - uid: 9193
@@ -31767,99 +31740,66 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 22.5,28.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 3188
   - uid: 2771
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 23.5,28.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 3188
   - uid: 2863
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 19.5,28.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 3188
   - uid: 3013
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 23.5,24.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 3034
   - uid: 3014
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 22.5,24.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 3034
   - uid: 3028
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 20.5,24.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 3034
   - uid: 3029
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 19.5,24.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 3034
   - uid: 3033
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 21.5,24.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 3034
   - uid: 3043
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 20.5,28.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 3188
   - uid: 3046
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 21.5,28.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 3188
   - uid: 11235
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 9.5,-38.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 11245
 - proto: CornSeeds
   entities:
   - uid: 9618
@@ -33255,18 +33195,18 @@ entities:
       rot: 3.141592653589793 rad
       pos: 0.5,-35.5
       parent: 4812
+  - uid: 7416
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -12.5,-21.5
+      parent: 4812
   - uid: 7590
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -9.5,-16.5
       parent: 4812
-  - uid: 7591
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -9.5,-21.5
-      parent: 4812
   - uid: 9012
     components:
     - type: Transform
@@ -33392,6 +33332,12 @@ entities:
     - type: Transform
       pos: 0.5,-20.5
       parent: 4812
+  - uid: 8349
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -9.5,-21.5
+      parent: 4812
   - uid: 10831
     components:
     - type: Transform
@@ -34633,6 +34579,12 @@ entities:
     - type: Transform
       pos: 0.5,-31.5
       parent: 4812
+  - uid: 7591
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -11.5,-21.5
+      parent: 4812
   - uid: 7592
     components:
     - type: Transform
@@ -34717,6 +34669,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: -14.5,-12.5
       parent: 4812
+  - uid: 8348
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -10.5,-21.5
+      parent: 4812
   - uid: 9010
     components:
     - type: Transform
@@ -35235,6 +35193,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 7.5,-14.5
       parent: 4812
+  - uid: 6291
+    components:
+    - type: Transform
+      pos: -12.5,-20.5
+      parent: 4812
   - uid: 6431
     components:
     - type: Transform
@@ -57803,9 +57766,6 @@ entities:
     - type: Transform
       pos: 22.5,-29.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 6313
 - proto: MachineCentrifuge
   entities:
   - uid: 3403
@@ -62681,9 +62641,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 10.5,-38.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 11245
 - proto: ReinforcedPlasmaWindow
   entities:
   - uid: 4138
@@ -65267,161 +65224,104 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,9.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 712
   - uid: 356
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 1.5,8.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 712
   - uid: 357
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 1.5,7.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 712
   - uid: 358
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 1.5,6.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 712
   - uid: 359
     components:
     - type: Transform
       pos: 2.5,4.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 712
   - uid: 360
     components:
     - type: Transform
       pos: 3.5,4.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 712
   - uid: 785
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 1.5,-2.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 1646
   - uid: 786
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 1.5,-0.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 1646
   - uid: 787
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 1.5,-1.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 1646
   - uid: 1929
     components:
     - type: Transform
       pos: -13.5,26.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 2241
   - uid: 1930
     components:
     - type: Transform
       pos: 5.5,27.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 1965
   - uid: 1931
     components:
     - type: Transform
       pos: -10.5,26.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 2241
   - uid: 2234
     components:
     - type: Transform
       pos: -12.5,26.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 2241
   - uid: 2235
     components:
     - type: Transform
       pos: 8.5,27.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 1965
   - uid: 2236
     components:
     - type: Transform
       pos: 7.5,27.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 1965
   - uid: 2835
     components:
     - type: Transform
       pos: 16.5,28.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 2844
   - uid: 2836
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 18.5,30.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 2844
   - uid: 2837
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 18.5,31.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 2844
   - uid: 2870
     components:
     - type: Transform
       pos: 16.5,36.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 2844
   - uid: 3945
     components:
     - type: Transform
@@ -65437,132 +65337,84 @@ entities:
     - type: Transform
       pos: 26.5,-21.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 5576
   - uid: 5508
     components:
     - type: Transform
       pos: 27.5,-21.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 5576
   - uid: 5509
     components:
     - type: Transform
       pos: 25.5,-21.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 5576
   - uid: 6570
     components:
     - type: Transform
       pos: -7.5,-16.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 6587
   - uid: 6574
     components:
     - type: Transform
       pos: -12.5,-13.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 6587
   - uid: 6575
     components:
     - type: Transform
       pos: -9.5,-13.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 6587
   - uid: 6576
     components:
     - type: Transform
       pos: -10.5,-13.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 6587
   - uid: 6577
     components:
     - type: Transform
       pos: -8.5,-13.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 6587
   - uid: 6578
     components:
     - type: Transform
       pos: -7.5,-14.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 6587
   - uid: 6586
     components:
     - type: Transform
       pos: -7.5,-18.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 6587
   - uid: 8153
     components:
     - type: Transform
       pos: -21.5,21.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 8165
   - uid: 8160
     components:
     - type: Transform
       pos: -20.5,21.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 8165
   - uid: 8161
     components:
     - type: Transform
       pos: -23.5,21.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 8165
   - uid: 10673
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -47.5,-8.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 10676
   - uid: 10674
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -47.5,-7.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 10676
   - uid: 10675
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -47.5,-6.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 10676
 - proto: ShuttleConsoleCircuitboard
   entities:
   - uid: 10959
@@ -80493,18 +80345,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -27.5,16.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 4811
   - uid: 7786
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -27.5,19.5
       parent: 4812
-    - type: DeviceLinkSink
-      links:
-      - 4810
 - proto: WindoorTheatreLocked
   entities:
   - uid: 896
diff --git a/Resources/Maps/origin.yml b/Resources/Maps/origin.yml
index 376719da61..a11e94fe83 100644
--- a/Resources/Maps/origin.yml
+++ b/Resources/Maps/origin.yml
@@ -12389,7 +12389,7 @@ entities:
       pos: 19.5,16.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -25630.516
+      secondsUntilStateChange: -25677.166
       state: Opening
   - uid: 156
     components:
@@ -14206,7 +14206,7 @@ entities:
       pos: 51.5,-3.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -24444.334
+      secondsUntilStateChange: -24490.984
       state: Opening
   - uid: 458
     components:
@@ -14215,7 +14215,7 @@ entities:
       pos: 52.5,-3.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -24443.117
+      secondsUntilStateChange: -24489.768
       state: Opening
   - uid: 459
     components:
@@ -82117,13 +82117,6 @@ entities:
     - type: Transform
       pos: 43.5,-7.5
       parent: 2
-- proto: CrateMindShieldImplants
-  entities:
-  - uid: 12996
-    components:
-    - type: Transform
-      pos: 29.5,29.5
-      parent: 2
 - proto: CrateMousetrapBoxes
   entities:
   - uid: 12997
@@ -82206,6 +82199,13 @@ entities:
     - type: Transform
       pos: 29.5,28.5
       parent: 2
+- proto: CrateSecurityTrackingMindshieldImplants
+  entities:
+  - uid: 12996
+    components:
+    - type: Transform
+      pos: 29.5,29.5
+      parent: 2
 - proto: CrateServiceJanitorialSupplies
   entities:
   - uid: 13001
diff --git a/Resources/Maps/packed.yml b/Resources/Maps/packed.yml
index 5e533af961..e41fdcd0eb 100644
--- a/Resources/Maps/packed.yml
+++ b/Resources/Maps/packed.yml
@@ -9971,73 +9971,46 @@ entities:
     - type: Transform
       pos: 35.5,-29.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 202
   - uid: 150
     components:
     - type: Transform
       pos: 47.5,12.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 10321
   - uid: 384
     components:
     - type: Transform
       pos: 5.5,23.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 7463
   - uid: 4257
     components:
     - type: Transform
       pos: 35.5,-33.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 4245
   - uid: 5351
     components:
     - type: Transform
       pos: 63.5,29.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 8665
   - uid: 5361
     components:
     - type: Transform
       pos: 64.5,29.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 8665
   - uid: 5875
     components:
     - type: Transform
       pos: -0.5,-27.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 5857
   - uid: 7462
     components:
     - type: Transform
       pos: 5.5,27.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 374
   - uid: 7618
     components:
     - type: Transform
       pos: 5.5,15.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 6856
   - uid: 11016
     components:
     - type: Transform
@@ -10048,17 +10021,11 @@ entities:
     - type: Transform
       pos: 47.5,-49.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 13115
   - uid: 12891
     components:
     - type: Transform
       pos: 48.5,-49.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 13115
 - proto: BlastDoorOpen
   entities:
   - uid: 2834
@@ -10066,17 +10033,11 @@ entities:
     - type: Transform
       pos: 12.5,-26.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 5685
   - uid: 2835
     components:
     - type: Transform
       pos: 12.5,-27.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 5685
 - proto: BlockGameArcade
   entities:
   - uid: 1812
@@ -32735,7 +32696,7 @@ entities:
           priority: 0
           component: Armor
         title: null
-- proto: ClothingOuterCoatInspector
+- proto: ClothingOuterCoatDetectiveLoadout
   entities:
   - uid: 12229
     components:
@@ -33604,420 +33565,279 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -15.5,15.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 944
   - uid: 2028
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -2.5,15.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 944
   - uid: 2030
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -7.5,15.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 944
   - uid: 2037
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 7.5,27.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 7808
   - uid: 2038
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 8.5,27.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 7808
   - uid: 2039
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 8.5,23.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 2154
   - uid: 2040
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 7.5,23.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 2154
   - uid: 2041
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 6.5,27.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 7808
   - uid: 2042
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 5.5,27.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 7808
   - uid: 2051
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 5.5,23.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 2154
   - uid: 2064
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 4.5,27.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 7808
   - uid: 2066
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 4.5,23.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 2154
   - uid: 2067
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 6.5,23.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 2154
   - uid: 5285
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -14.5,15.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 944
   - uid: 5842
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 2.5,-28.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 5856
   - uid: 5843
     components:
     - type: Transform
       pos: 1.5,-28.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 5856
   - uid: 5844
     components:
     - type: Transform
       pos: 1.5,-29.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 5856
   - uid: 5845
     components:
     - type: Transform
       pos: 1.5,-30.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 5856
   - uid: 5846
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 1.5,-31.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 5856
   - uid: 5847
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 0.5,-31.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 5856
   - uid: 5850
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -0.5,-31.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 5856
   - uid: 5851
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -0.5,-30.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 5856
   - uid: 5852
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -0.5,-28.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 5856
   - uid: 5853
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -0.5,-27.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 5856
   - uid: 5854
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -0.5,-26.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 5856
   - uid: 6775
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -16.5,15.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 944
   - uid: 6820
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -5.5,15.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 944
   - uid: 6823
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -3.5,15.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 944
   - uid: 6825
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 0.5,15.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 944
   - uid: 6843
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 8.5,15.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 944
   - uid: 6844
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 6.5,15.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 944
   - uid: 6846
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -9.5,15.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 944
   - uid: 7585
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -1.5,15.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 944
   - uid: 7586
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 1.5,15.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 944
   - uid: 7667
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 7.5,15.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 944
   - uid: 7671
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -8.5,15.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 944
   - uid: 7672
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -0.5,15.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 944
   - uid: 7841
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 4.5,15.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 944
   - uid: 7849
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -6.5,15.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 944
   - uid: 7875
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 3.5,15.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 944
   - uid: 7876
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -13.5,15.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 944
   - uid: 7878
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -11.5,15.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 944
   - uid: 7879
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -12.5,15.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 944
   - uid: 7880
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -10.5,15.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 944
   - uid: 7888
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -4.5,15.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 944
   - uid: 7891
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 5.5,15.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 944
   - uid: 7949
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 2.5,15.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 944
 - proto: CowToolboxFilled
   entities:
   - uid: 5707
@@ -38276,8 +38096,6 @@ entities:
     - type: Transform
       pos: 21.5,-4.5
       parent: 2
-    - type: ItemCabinet
-      opened: True
   - uid: 783
     components:
     - type: Transform
@@ -58020,23 +57838,6 @@ entities:
     - type: Transform
       pos: 70.5,6.5
       parent: 2
-- proto: LockerMedicine
-  entities:
-  - uid: 11970
-    components:
-    - type: Transform
-      pos: 61.5,4.5
-      parent: 2
-  - uid: 11971
-    components:
-    - type: Transform
-      pos: 62.5,4.5
-      parent: 2
-  - uid: 11972
-    components:
-    - type: Transform
-      pos: 65.5,4.5
-      parent: 2
 - proto: LockerMedicineFilled
   entities:
   - uid: 4115
@@ -58049,6 +57850,21 @@ entities:
     - type: Transform
       pos: 67.5,-6.5
       parent: 2
+  - uid: 5653
+    components:
+    - type: Transform
+      pos: 65.5,4.5
+      parent: 2
+  - uid: 6871
+    components:
+    - type: Transform
+      pos: 62.5,4.5
+      parent: 2
+  - uid: 6872
+    components:
+    - type: Transform
+      pos: 61.5,4.5
+      parent: 2
   - uid: 11402
     components:
     - type: Transform
@@ -58212,9 +58028,6 @@ entities:
     - type: Transform
       pos: 64.5,27.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 152
 - proto: MachineCentrifuge
   entities:
   - uid: 5074
@@ -62743,9 +62556,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -0.5,-29.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 5856
 - proto: ReinforcedPlasmaWindow
   entities:
   - uid: 232
@@ -65619,26 +65429,16 @@ entities:
     - type: Transform
       pos: 44.5,12.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 10322
   - uid: 6513
     components:
     - type: Transform
       pos: 46.5,-11.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 6749
   - uid: 6514
     components:
     - type: Transform
       pos: 47.5,-11.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 6513
-      - 6749
 - proto: ShuttersNormalOpen
   entities:
   - uid: 265
@@ -65646,144 +65446,93 @@ entities:
     - type: Transform
       pos: 34.5,-8.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 1471
   - uid: 267
     components:
     - type: Transform
       pos: 35.5,-8.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 1471
   - uid: 270
     components:
     - type: Transform
       pos: 36.5,-8.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 1471
   - uid: 320
     components:
     - type: Transform
       pos: 8.5,29.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 8163
   - uid: 419
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 37.5,-7.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 1151
   - uid: 913
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 37.5,-4.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 1151
   - uid: 1154
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 37.5,-3.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 1151
   - uid: 1658
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 37.5,-6.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 1151
   - uid: 2087
     components:
     - type: Transform
       pos: 28.5,17.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 12825
   - uid: 2831
     components:
     - type: Transform
       pos: 9.5,29.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 8163
   - uid: 2990
     components:
     - type: Transform
       pos: 50.5,1.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 8288
   - uid: 6512
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 37.5,-5.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 1151
   - uid: 12424
     components:
     - type: Transform
       pos: 49.5,1.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 8288
   - uid: 12425
     components:
     - type: Transform
       pos: 51.5,1.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 8288
   - uid: 12822
     components:
     - type: Transform
       pos: 28.5,20.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 12826
   - uid: 12823
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 28.5,18.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 12825
   - uid: 12824
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 28.5,21.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 12826
 - proto: ShuttersRadiationOpen
   entities:
   - uid: 779
@@ -65791,33 +65540,21 @@ entities:
     - type: Transform
       pos: 19.5,-37.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 1025
   - uid: 780
     components:
     - type: Transform
       pos: 20.5,-37.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 1025
   - uid: 4502
     components:
     - type: Transform
       pos: 22.5,-37.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 1025
   - uid: 4503
     components:
     - type: Transform
       pos: 23.5,-37.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 1025
 - proto: SignAi
   entities:
   - uid: 12242
@@ -82390,18 +82127,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 31.5,20.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 7716
   - uid: 2259
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 31.5,18.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 7718
   - uid: 2421
     components:
     - type: Transform
diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml
index 048b0a2e5c..e232aa3272 100644
--- a/Resources/Maps/saltern.yml
+++ b/Resources/Maps/saltern.yml
@@ -4111,17 +4111,11 @@ entities:
     - type: Transform
       pos: 9.5,6.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 276
   - uid: 116
     components:
     - type: Transform
       pos: 7.5,6.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 276
 - proto: AirlockDetectiveLocked
   entities:
   - uid: 1889
@@ -4320,9 +4314,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 32.5,19.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 11307
     - type: DeviceLinkSource
       linkedPorts:
         11306:
@@ -4332,9 +4323,6 @@ entities:
     - type: Transform
       pos: 31.5,18.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 11306
     - type: DeviceLinkSource
       linkedPorts:
         11307:
@@ -4346,9 +4334,6 @@ entities:
     - type: Transform
       pos: 29.5,20.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 11306
     - type: DeviceLinkSource
       linkedPorts:
         11307:
@@ -4358,9 +4343,6 @@ entities:
     - type: Transform
       pos: 31.5,23.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 11307
     - type: DeviceLinkSource
       linkedPorts:
         11306:
@@ -4379,9 +4361,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 58.5,7.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 175
     - type: DeviceLinkSource
       linkedPorts:
         175:
@@ -4392,9 +4371,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -24.5,24.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 151
     - type: DeviceLinkSource
       linkedPorts:
         151:
@@ -4405,9 +4381,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -26.5,24.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 145
     - type: DeviceLinkSource
       linkedPorts:
         145:
@@ -4418,9 +4391,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 17.5,-31.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 173
     - type: DeviceLinkSource
       linkedPorts:
         173:
@@ -4431,9 +4401,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 15.5,-30.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 172
     - type: DeviceLinkSource
       linkedPorts:
         172:
@@ -4444,9 +4411,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 53.5,8.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 9974
     - type: DeviceLinkSource
       linkedPorts:
         9974:
@@ -4457,9 +4421,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 61.5,7.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 72
     - type: DeviceLinkSource
       linkedPorts:
         72:
@@ -4469,9 +4430,6 @@ entities:
     - type: Transform
       pos: 53.5,4.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 174
     - type: DeviceLinkSource
       linkedPorts:
         174:
@@ -4484,9 +4442,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -24.5,-32.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 183
     - type: DeviceLinkSource
       linkedPorts:
         183:
@@ -4497,9 +4452,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -21.5,-32.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 182
     - type: DeviceLinkSource
       linkedPorts:
         182:
@@ -4509,9 +4461,6 @@ entities:
     - type: Transform
       pos: 16.5,19.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 2465
     - type: DeviceLinkSource
       linkedPorts:
         2465:
@@ -4521,9 +4470,6 @@ entities:
     - type: Transform
       pos: 16.5,22.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 1594
     - type: DeviceLinkSource
       linkedPorts:
         1594:
@@ -5120,17 +5066,11 @@ entities:
     - type: Transform
       pos: 9.5,-6.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 11380
   - uid: 124
     components:
     - type: Transform
       pos: 10.5,-6.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 11380
   - uid: 632
     components:
     - type: MetaData
@@ -5237,9 +5177,6 @@ entities:
     - type: Transform
       pos: -12.5,9.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 9952
   - uid: 1411
     components:
     - type: Transform
@@ -5260,9 +5197,6 @@ entities:
     - type: Transform
       pos: -8.5,9.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 9951
   - uid: 7786
     components:
     - type: MetaData
@@ -6474,105 +6408,66 @@ entities:
     - type: Transform
       pos: 23.5,28.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 7945
   - uid: 1561
     components:
     - type: Transform
       pos: -33.5,-16.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 10218
   - uid: 1756
     components:
     - type: Transform
       pos: 17.5,12.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 2515
   - uid: 3905
     components:
     - type: Transform
       pos: 19.5,28.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 1084
   - uid: 6345
     components:
     - type: Transform
       pos: 51.5,12.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 11053
   - uid: 6348
     components:
     - type: Transform
       pos: 51.5,11.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 11053
   - uid: 6635
     components:
     - type: Transform
       pos: 51.5,13.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 11053
   - uid: 7588
     components:
     - type: Transform
       pos: -15.5,-31.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 10325
   - uid: 10095
     components:
     - type: Transform
       pos: 20.5,25.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 1084
   - uid: 10096
     components:
     - type: Transform
       pos: 22.5,25.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 7945
   - uid: 10201
     components:
     - type: Transform
       pos: -35.5,-16.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 10218
   - uid: 11369
     components:
     - type: Transform
       pos: 58.5,10.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 11372
   - uid: 11370
     components:
     - type: Transform
       pos: 56.5,9.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 11371
 - proto: BlockGameArcade
   entities:
   - uid: 9569
@@ -27306,7 +27201,7 @@ entities:
     - type: Transform
       pos: -11.209741,19.672714
       parent: 31
-- proto: ClothingOuterCoatInspector
+- proto: ClothingOuterCoatDetectiveLoadout
   entities:
   - uid: 7480
     components:
@@ -28091,279 +27986,182 @@ entities:
     - type: Transform
       pos: 20.5,20.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 1084
   - uid: 3387
     components:
     - type: Transform
       pos: 20.5,21.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 1084
   - uid: 3548
     components:
     - type: Transform
       pos: 20.5,23.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 1084
   - uid: 3549
     components:
     - type: Transform
       pos: 20.5,24.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 1084
   - uid: 3550
     components:
     - type: Transform
       pos: 20.5,22.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 1084
   - uid: 7550
     components:
     - type: Transform
       pos: 20.5,19.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 1084
   - uid: 8899
     components:
     - type: Transform
       pos: 20.5,18.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 1084
   - uid: 9138
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 23.5,27.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 7945
   - uid: 9139
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 23.5,26.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 7945
   - uid: 9265
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -35.5,-16.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 10218
   - uid: 9886
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -34.5,-16.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 10218
   - uid: 10033
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -31.5,-18.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 10218
   - uid: 10040
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -31.5,-17.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 10218
   - uid: 10043
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -31.5,-16.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 10218
   - uid: 10045
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 22.5,25.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 7945
   - uid: 10046
     components:
     - type: Transform
       pos: 19.5,28.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 1084
   - uid: 10047
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 22.5,18.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 7945
   - uid: 10048
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 22.5,19.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 7945
   - uid: 10049
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 22.5,20.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 7945
   - uid: 10050
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 22.5,21.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 7945
   - uid: 10051
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 22.5,22.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 7945
   - uid: 10052
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 22.5,23.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 7945
   - uid: 10053
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 22.5,24.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 1084
-      - 7945
   - uid: 10054
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 23.5,28.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 7945
   - uid: 10089
     components:
     - type: Transform
       pos: 20.5,25.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 1084
   - uid: 10090
     components:
     - type: Transform
       pos: 20.5,26.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 1084
   - uid: 10091
     components:
     - type: Transform
       pos: 19.5,27.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 1084
   - uid: 10092
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 19.5,26.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 1084
   - uid: 10093
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 22.5,26.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 7945
   - uid: 10109
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -32.5,-16.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 10218
   - uid: 10110
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -33.5,-16.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 10218
   - uid: 10215
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -36.5,-16.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 10218
 - proto: CrateArtifactContainer
   entities:
   - uid: 99
@@ -48403,9 +48201,6 @@ entities:
     - type: Transform
       pos: 48.339073,12.198484
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 11052
 - proto: InflatableDoorStack
   entities:
   - uid: 3907
@@ -49215,10 +49010,6 @@ entities:
       anchored: True
       pos: 31.5,20.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 9067
-      - 3052
     - type: DeviceLinkSource
       linkedPorts:
         6522:
@@ -49234,10 +49025,6 @@ entities:
       anchored: True
       pos: 31.5,21.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 6522
-      - 9068
     - type: DeviceLinkSource
       linkedPorts:
         3052:
@@ -49282,9 +49069,6 @@ entities:
     - type: Transform
       pos: -15.5,-30.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 9292
 - proto: MachineCentrifuge
   entities:
   - uid: 580
@@ -50297,11 +50081,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -16.707977,-25.58053
       parent: 31
-  - uid: 967
-    components:
-    - type: Transform
-      pos: -1.563138,24.568495
-      parent: 31
   - uid: 2031
     components:
     - type: Transform
@@ -50359,6 +50138,13 @@ entities:
     - type: Transform
       pos: 7.5388803,-23.388987
       parent: 31
+- proto: PhoneInstrument
+  entities:
+  - uid: 967
+    components:
+    - type: Transform
+      pos: -1.5092547,24.523743
+      parent: 31
 - proto: PianoInstrument
   entities:
   - uid: 8425
@@ -53399,7 +53185,12 @@ entities:
   - uid: 3735
     components:
     - type: Transform
-      pos: -15.5,-30.5
+      pos: -16.5,-30.5
+      parent: 31
+  - uid: 7544
+    components:
+    - type: Transform
+      pos: -14.5,-30.5
       parent: 31
 - proto: RandomBoard
   entities:
@@ -53904,9 +53695,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -34.5,-16.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 10218
 - proto: ReinforcedPlasmaWindow
   entities:
   - uid: 439
@@ -56043,24 +55831,16 @@ entities:
       parent: 31
     - type: DeviceLinkSink
       invokeCounter: 2
-      links:
-      - 5132
   - uid: 11118
     components:
     - type: Transform
       pos: -7.5,26.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 11284
   - uid: 11119
     components:
     - type: Transform
       pos: -6.5,26.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 11284
 - proto: ShuttersNormalOpen
   entities:
   - uid: 1475
@@ -56069,112 +55849,73 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 5.5,-10.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 10997
   - uid: 2137
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 5.5,-11.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 10997
   - uid: 2138
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 5.5,-8.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 10996
   - uid: 4693
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -10.5,1.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 4526
   - uid: 4694
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -10.5,0.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 4526
   - uid: 4695
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -10.5,-0.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 4526
   - uid: 8767
     components:
     - type: Transform
       pos: -16.5,7.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 8766
   - uid: 8768
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -16.5,6.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 8766
   - uid: 8770
     components:
     - type: Transform
       pos: -13.5,6.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 8774
   - uid: 8771
     components:
     - type: Transform
       pos: -12.5,6.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 8774
   - uid: 8772
     components:
     - type: Transform
       pos: -7.5,6.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 8774
   - uid: 8773
     components:
     - type: Transform
       pos: -8.5,6.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 8774
   - uid: 9122
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 5.5,-7.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 10996
 - proto: ShuttersRadiationOpen
   entities:
   - uid: 9551
@@ -56182,41 +55923,26 @@ entities:
     - type: Transform
       pos: 61.5,4.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 9557
   - uid: 9552
     components:
     - type: Transform
       pos: 61.5,3.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 9557
   - uid: 9553
     components:
     - type: Transform
       pos: 61.5,2.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 9557
   - uid: 9554
     components:
     - type: Transform
       pos: 61.5,1.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 9557
   - uid: 9555
     components:
     - type: Transform
       pos: 61.5,0.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 9557
 - proto: SignalButton
   entities:
   - uid: 2515
diff --git a/Resources/Prototypes/Alerts/alerts.yml b/Resources/Prototypes/Alerts/alerts.yml
index 72412fde7c..c08453460f 100644
--- a/Resources/Prototypes/Alerts/alerts.yml
+++ b/Resources/Prototypes/Alerts/alerts.yml
@@ -24,7 +24,6 @@
     - category: Thirst
     - alertType: Magboots
     - alertType: Pacified
-    - alertType: Deflecting
 
 - type: entity
   id: AlertSpriteView
@@ -475,11 +474,3 @@
     state: critical
   name: Debug6
   description: Debug
-
-- type: alert
-  id: Deflecting
-  icons:
-  - sprite: /Textures/Interface/Alerts/deflecting.rsi
-    state: deflecting0
-  name: alerts-deflecting-name
-  description: alerts-deflecting-desc
diff --git a/Resources/Prototypes/Anomaly/behaviours.yml b/Resources/Prototypes/Anomaly/behaviours.yml
index e39933c365..dea1ddb69c 100644
--- a/Resources/Prototypes/Anomaly/behaviours.yml
+++ b/Resources/Prototypes/Anomaly/behaviours.yml
@@ -84,7 +84,6 @@
   description: anomaly-behavior-reflect
   components:
   - type: Reflect
-    innate: true
     reflectProb: 0.5
     reflects:
       - Energy
diff --git a/Resources/Prototypes/Atmospherics/thresholds.yml b/Resources/Prototypes/Atmospherics/thresholds.yml
index bd7df23841..5d8eebd522 100644
--- a/Resources/Prototypes/Atmospherics/thresholds.yml
+++ b/Resources/Prototypes/Atmospherics/thresholds.yml
@@ -1,3 +1,12 @@
+# Threshold prototypes for AtmosMonitors
+
+# NOTE: Warning thresholds are given as multipliers of the danger bound. For
+# example, if upperBound=10 (kPa) and upperWarnRound=0.5, that means the upper
+# warning threshold is actually 5 (kPa).
+#
+# As a result, all upperWarn's should be <1 and lowerWarn's should be >1,
+# otherwise the warning will never kick in.
+
 - type: alarmThreshold
   id: stationTemperature
   upperBound: !type:AlarmThresholdSetting
@@ -21,11 +30,7 @@
   lowerWarnAround: !type:AlarmThresholdSetting
     threshold: 1.05 # ~90 kPa
 
-# a reminder that all of these are percentages (where 1 is 100%),
-# so 0.01 is 1%,
-# 0.0001 is 0.01%
-# etc.
-
+# For gas concentrations, threshold=0.1 means 10%
 - type: alarmThreshold
   id: stationOxygen
   lowerBound: !type:AlarmThresholdSetting
@@ -36,17 +41,25 @@
 - type: alarmThreshold
   id: stationCO2
   upperBound: !type:AlarmThresholdSetting
-    threshold: 0.0025
+    threshold: 0.006
   upperWarnAround: !type:AlarmThresholdSetting
-    threshold: 0.5
+    threshold: 0.5 # minor gasping and airloss at 0.3%
 
 - type: alarmThreshold
   id: stationPlasma
   upperBound: !type:AlarmThresholdSetting
-    threshold: 0.00125
+    threshold: 0.005 # lightable beyond this concentration
   upperWarnAround: !type:AlarmThresholdSetting
     threshold: 0.5
 
+- type: alarmThreshold
+  id: stationTritium
+  upperBound: !type:AlarmThresholdSetting
+    threshold: 0.004 # lightable beyond this concentration
+  upperWarnAround: !type:AlarmThresholdSetting
+    threshold: 0.5
+
+# this is a hack, but 150% means never danger on water, but warn at 75%
 - type: alarmThreshold
   id: stationWaterVapor
   upperBound: !type:AlarmThresholdSetting
diff --git a/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml b/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
index b52e853008..09c7e165bf 100644
--- a/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
+++ b/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
@@ -15,7 +15,7 @@
         orGroup: BookPool
       - id: BookBartendersManual
         orGroup: BookPool
-      - id: BookChefGaming
+      - id: BookHowToCookForFortySpaceman
         orGroup: BookPool
       - id: BookLeafLoversSecret
         orGroup: BookPool
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
index 1876de6a53..f4c47cfe9e 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
@@ -173,7 +173,7 @@
       - id: BookSpaceEncyclopedia
       - id: BookTheBookOfControl
       - id: BookBartendersManual
-      - id: BookChefGaming
+      - id: BookHowToCookForFortySpaceman
       - id: BookLeafLoversSecret
       - id: BookEngineersHandbook
       - id: BookScientistsGuidebook
diff --git a/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml b/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml
index 58a49aa6e9..6764cb8496 100644
--- a/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml
@@ -57,8 +57,5 @@
       - id: ClothingEyesGlassesSunglasses
       - id: SpaceCash20000
         amount: 1
-      - id: ClothingUniformJumpsuitTacticool
       - id: ClothingOuterCoatJensen
-      - id: ClothingHandsGlovesCombat
-      - id: ClothingMaskNeckGaiter
-      - id: ToyFigurineThief
+      - id: ClothingHandsGlovesColorBlack
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
index e4f4440bd3..d62cd8f92f 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
@@ -25,6 +25,7 @@
     DrinkGildlagerBottleFull: 2 #if champagne gets less because its premium, then gildlager should match this and have two
     DrinkGrenadineBottleFull: 2
     DrinkJuiceLimeCarton: 3
+    DrinkJuiceLemonCarton: 3
     DrinkJuiceOrangeCarton: 3
     DrinkJuiceTomatoCarton: 3
     DrinkCoffeeLiqueurBottleFull: 3
diff --git a/Resources/Prototypes/Catalog/thief_toolbox_sets.yml b/Resources/Prototypes/Catalog/thief_toolbox_sets.yml
index ccf5160ffb..322fd9261b 100644
--- a/Resources/Prototypes/Catalog/thief_toolbox_sets.yml
+++ b/Resources/Prototypes/Catalog/thief_toolbox_sets.yml
@@ -14,6 +14,7 @@
   - ClothingEyesChameleon
   - ClothingHeadsetChameleon
   - ClothingShoesChameleon
+  - BarberScissors
   - ChameleonProjector
 
 - type: thiefBackpackSet
@@ -28,10 +29,10 @@
   - ClothingEyesGlassesMeson
   - ClothingHandsGlovesColorYellow
   - JawsOfLife
+  - RemoteSignaller
   - Multitool
   - C4
   - C4
-  - ClothingMaskClown
 
 - type: thiefBackpackSet
   id: ChemistrySet
@@ -46,7 +47,7 @@
   - EphedrineChemistryBottle
   - SoapOmega
   - Syringe
-  - DrinkVodkaBottleFull
+  - DrinkShaker
 
 - type: thiefBackpackSet
   id: SyndieSet
@@ -59,7 +60,6 @@
   - AgentIDCard
   - Emag
   - SyndicatePersonalAI
-  - ClothingHeadHatSyndieMAA
   - CigPackSyndicate
   - Telecrystal10 #The thief cannot use them, but it may induce communication with traitors
 
@@ -71,14 +71,10 @@
     sprite: Objects/Tanks/anesthetic.rsi
     state: icon
   content:
-  - ClothingHeadPyjamaSyndicateBlack
-  - ClothingUniformJumpsuitPyjamaSyndicateBlack
-  - NocturineChemistryBottle
   - NocturineChemistryBottle
   - NocturineChemistryBottle
   - HypopenBox
   - NitrousOxideTankFilled
-  - BedsheetSyndie
 
 - type: thiefBackpackSet
   id: CommunicatorSet
@@ -103,7 +99,6 @@
     state: icon
   content:
   - InvisibleCrate
-  - ClothingNeckCloakVoid
   - FultonBeacon
   - Fulton
   - SmokeGrenade
diff --git a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
index f9ff59d6b8..462032547b 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
@@ -169,8 +169,6 @@
     lowPressureMultiplier: 1000
   - type: TemperatureProtection
     coefficient: 0.1
-  - type: FireProtection
-    reduction: 0.2
   - type: Armor
     modifiers:
       coefficients:
@@ -266,4 +264,4 @@
     slots:
     - Hair
     - HeadTop
-    - HeadSide
\ No newline at end of file
+    - HeadSide
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
index 3c50319836..398c383406 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -61,6 +61,8 @@
     lowPressureMultiplier: 1000
   - type: TemperatureProtection
     coefficient: 0.005
+  - type: FireProtection
+    reduction: 0.2
 
 #Engineering Hardsuit
 - type: entity
@@ -688,6 +690,8 @@
   - type: PressureProtection
     highPressureMultiplier: 0.08
     lowPressureMultiplier: 1000
+  - type: FireProtection
+    reduction: 0.2
   - type: Armor
     modifiers:
       coefficients:
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
index e2786f70f0..d220d55f1f 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -495,8 +495,6 @@
   - type: Appearance
   - type: AddAccentClothing
     accent: RussianAccent
-  - type: RussianAccent
-  - type: AccentWearerNameClothing
   - type: Foldable
     canFoldInsideContainer: true
   - type: FoldableClothing
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
index 825e729115..606af0b127 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
@@ -96,7 +96,6 @@
         Heat: 0.4 # this technically means it protects against fires pretty well? -heat is just for lasers and stuff, not atmos temperature
   - type: Reflect
     reflectProb: 1
-    innate: true # armor grants a passive shield that does not require concentration to maintain
     reflects:
       - Energy
 
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
index c6a3f01f15..7c264a596a 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
@@ -110,8 +110,6 @@
     lowPressureMultiplier: 1000
   - type: TemperatureProtection
     coefficient: 0.01
-  - type: FireProtection
-    reduction: 0.75 # almost perfectly sealed, atmos firesuit is better
   - type: ClothingSpeedModifier
     walkModifier: 0.4
     sprintModifier: 0.6
@@ -180,4 +178,4 @@
   id: ClothingOuterBaseMedium
   components:
   - type: Item
-    size: Huge
\ No newline at end of file
+    size: Huge
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
index 1f69f7efb3..e88b184708 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -44,6 +44,8 @@
     lowPressureMultiplier: 1000
   - type: TemperatureProtection
     coefficient: 0.001
+  - type: FireProtection
+    reduction: 0.8
   - type: ExplosionResistance
     damageCoefficient: 0.5
   - type: Armor
@@ -543,7 +545,7 @@
   - type: ExplosionResistance
     damageCoefficient: 0.2
   - type: FireProtection
-    reduction: 0.8 # perfect protection like atmos firesuit for pyro tf2 ops
+    reduction: 0.8
   - type: Armor
     modifiers:
       coefficients:
@@ -860,6 +862,8 @@
     coefficient: 0.001
   - type: ExplosionResistance
     damageCoefficient: 0.2
+  - type: FireProtection
+    reduction: 0.8
   - type: Armor
     modifiers:
       coefficients:
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_single.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_single.yml
index 829ae92fc9..5cfe78c6d5 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_single.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_single.yml
@@ -13,6 +13,8 @@
         state: plain
   - type: RandomSpawner
     prototypes:
+      - FoodBagel
+      - FoodBagelPoppy
       - FoodBurgerJelly
       - FoodBurgerCarp
       - FoodBurgerTofu
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
index bdefd14a45..b6f9287cf7 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
@@ -143,7 +143,7 @@
   - type: GhostRole
     name: ghost-role-information-space-dragon-name
     description: ghost-role-information-space-dragon-description
-    rules: ghost-role-component-space-dragon-rules
+    rules: ghost-role-information-space-dragon-rules
   - type: Sprite
     layers:
     - state: green
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
index 6ff9a9ec90..4e935f4db5 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: BaseMob
+  parent: [BaseMob, StripableInventoryBase]
   id: BaseBorgChassis
   name: cyborg
   description: A man-machine hybrid that assists in station activity. They love being asked to state their laws over and over.
@@ -77,8 +77,6 @@
   - type: SiliconLawProvider
     laws: Crewsimov
   - type: IonStormTarget
-  - type: Strippable
-  - type: InventorySlots
   - type: Inventory
     templateId: borg
   - type: Hands
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 3bc5779b52..a79fbfbf24 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -1049,7 +1049,10 @@
 
 - type: entity
   name: kangaroo
-  parent: [ SimpleMobBase, MobCombat ]
+  parent:
+  - SimpleMobBase
+  - MobCombat
+  - StripableInventoryBase
   id: MobKangaroo
   description: A large marsupial herbivore. It has powerful hind legs, with nails that resemble long claws.
   components:
@@ -1079,15 +1082,9 @@
     templateId: kangaroo
   - type: ReplacementAccent
     accent: kangaroo
-  - type: InventorySlots
-  - type: Strippable
   - type: Butcherable
     spawned:
     - id: FoodMeat
-  - type: UserInterface
-    interfaces:
-      enum.StrippingUiKey.Key:
-        type: StrippableBoundUserInterface
   - type: DamageStateVisuals
     states:
       Alive:
@@ -1151,7 +1148,7 @@
 - type: entity
   name: genetic ancestor
   id: MobBaseAncestor
-  parent: SimpleMobBase
+  parent: [SimpleMobBase, StripableInventoryBase]
   description: The genetic bipedal ancestor of... Uh... Something. Yeah, there's definitely something on the station that descended from whatever this is.
   abstract: true
   components:
@@ -1159,7 +1156,6 @@
   - type: Inventory
     templateId: monkey
     speciesId: monkey
-  - type: InventorySlots
   - type: Deathgasp
     prototype: MonkeyDeathgasp
   - type: Cuffable
@@ -1178,11 +1174,6 @@
         layer:
         - MobLayer
   - type: Stripping
-  - type: Strippable
-  - type: UserInterface
-    interfaces:
-      enum.StrippingUiKey.Key:
-        type: StrippableBoundUserInterface
   - type: Sprite
     drawdepth: Mobs
     layers:
@@ -2371,7 +2362,7 @@
 
 - type: entity
   name: possum
-  parent: SimpleMobBase
+  parent: [SimpleMobBase, StripableInventoryBase]
   id: MobPossum
   description: '"O Possum! My Possum!" -- Walt Whitman, 1865'
   components:
@@ -2396,12 +2387,6 @@
   - type: Inventory
     speciesId: possum
     templateId: pet
-  - type: InventorySlots
-  - type: Strippable
-  - type: UserInterface
-    interfaces:
-      enum.StrippingUiKey.Key:
-        type: StrippableBoundUserInterface
   - type: DamageStateVisuals
     states:
       Alive:
@@ -2446,7 +2431,7 @@
 
 - type: entity
   name: raccoon
-  parent: SimpleMobBase
+  parent: [SimpleMobBase, StripableInventoryBase]
   id: MobRaccoon
   description: Trash panda!
   components:
@@ -2471,12 +2456,6 @@
   - type: Inventory
     speciesId: possum #close enough
     templateId: pet
-  - type: InventorySlots
-  - type: Strippable
-  - type: UserInterface
-    interfaces:
-      enum.StrippingUiKey.Key:
-        type: StrippableBoundUserInterface
   - type: DamageStateVisuals
     states:
       Alive:
@@ -2503,7 +2482,7 @@
 
 - type: entity
   name: fox
-  parent: SimpleMobBase
+  parent: [SimpleMobBase, StripableInventoryBase]
   id: MobFox
   description: They're a fox.
   components:
@@ -2535,12 +2514,6 @@
   - type: Inventory
     speciesId: fox
     templateId: pet
-  - type: InventorySlots
-  - type: Strippable
-  - type: UserInterface
-    interfaces:
-      enum.StrippingUiKey.Key:
-        type: StrippableBoundUserInterface
   - type: DamageStateVisuals
     states:
       Alive:
@@ -2585,7 +2558,7 @@
 
 - type: entity
   name: corgi
-  parent: SimpleMobBase
+  parent: [SimpleMobBase, StripableInventoryBase]
   id: MobCorgi
   description: Finally, a space corgi!
   components:
@@ -2612,12 +2585,6 @@
   - type: Inventory
     speciesId: dog
     templateId: pet
-  - type: InventorySlots
-  - type: Strippable
-  - type: UserInterface
-    interfaces:
-      enum.StrippingUiKey.Key:
-        type: StrippableBoundUserInterface
   - type: DamageStateVisuals
     states:
       Alive:
@@ -2721,7 +2688,6 @@
   - type: Inventory
     speciesId: puppy
     templateId: pet
-  - type: InventorySlots
   - type: DamageStateVisuals
     states:
       Alive:
@@ -2736,7 +2702,7 @@
 
 - type: entity
   name: cat
-  parent: SimpleMobBase
+  parent: [SimpleMobBase, StripableInventoryBase]
   id: MobCat
   description: Feline pet, very funny.
   components:
@@ -2761,12 +2727,6 @@
   - type: Inventory
     speciesId: cat
     templateId: pet
-  - type: InventorySlots
-  - type: Strippable
-  - type: UserInterface
-    interfaces:
-      enum.StrippingUiKey.Key:
-        type: StrippableBoundUserInterface
   - type: DamageStateVisuals
     states:
       Alive:
@@ -2958,7 +2918,7 @@
 
 - type: entity
   name: sloth
-  parent: SimpleMobBase
+  parent: [SimpleMobBase, StripableInventoryBase]
   id: MobSloth
   description: Very slow animal. For people with low energy.
   components:
@@ -2986,12 +2946,6 @@
   - type: Inventory
     speciesId: sloth
     templateId: pet
-  - type: InventorySlots
-  - type: Strippable
-  - type: UserInterface
-    interfaces:
-      enum.StrippingUiKey.Key:
-        type: StrippableBoundUserInterface
   - type: DamageStateVisuals
     states:
       Alive:
@@ -3018,7 +2972,7 @@
 
 - type: entity
   name: ferret
-  parent: SimpleMobBase
+  parent: [SimpleMobBase, StripableInventoryBase]
   id: MobFerret
   description: Just a silly little guy!
   components:
@@ -3043,12 +2997,6 @@
   - type: Inventory
     speciesId: fox #close enough
     templateId: pet
-  - type: InventorySlots
-  - type: Strippable
-  - type: UserInterface
-    interfaces:
-      enum.StrippingUiKey.Key:
-        type: StrippableBoundUserInterface
   - type: DamageStateVisuals
     states:
       Alive:
@@ -3076,7 +3024,7 @@
 
 - type: entity
   name: hamster
-  parent: [ SimpleMobBase, MobCombat ]
+  parent: [ SimpleMobBase, MobCombat, StripableInventoryBase]
   id: MobHamster
   description: A cute, fluffy, robust hamster.
   components:
@@ -3140,12 +3088,6 @@
   - type: Inventory
     speciesId: hamster
     templateId: hamster
-  - type: InventorySlots
-  - type: Strippable
-  - type: UserInterface
-    interfaces:
-      enum.StrippingUiKey.Key:
-        type: StrippableBoundUserInterface
   - type: DamageStateVisuals
     states:
       Alive:
@@ -3222,7 +3164,7 @@
 
 - type: entity
   name: pig
-  parent: SimpleMobBase
+  parent: [SimpleMobBase, StripableInventoryBase]
   id: MobPig
   description: Oink.
   components:
@@ -3258,12 +3200,6 @@
     offspring:
     - id: MobPig
   - type: ReproductivePartner
-  - type: InventorySlots
-  - type: Strippable
-  - type: UserInterface
-    interfaces:
-      enum.StrippingUiKey.Key:
-        type: StrippableBoundUserInterface
   - type: DamageStateVisuals
     states:
       Alive:
@@ -3294,7 +3230,7 @@
 
 - type: entity
   name: diona nymph
-  parent: SimpleMobBase
+  parent: [SimpleMobBase, StripableInventoryBase]
   id: MobDionaNymph
   description: It's like a cat, only.... branch-ier.
   components:
@@ -3319,15 +3255,9 @@
   - type: Inventory
     speciesId: cat
     templateId: pet
-  - type: InventorySlots
-  - type: Strippable
   - type: Bloodstream
     bloodReagent: Sap
     bloodMaxVolume: 60
-  - type: UserInterface
-    interfaces:
-      enum.StrippingUiKey.Key:
-        type: StrippableBoundUserInterface
   - type: DamageStateVisuals
     states:
       Alive:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/hellspawn.yml b/Resources/Prototypes/Entities/Mobs/NPCs/hellspawn.yml
index e0a3a76456..45fb6a12bd 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/hellspawn.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/hellspawn.yml
@@ -56,7 +56,6 @@
   - type: Perishable
   - type: Reflect
     reflectProb: 0.7
-    innate: true
     reflects:
       - Energy
   - type: Fixtures
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
index 32c71408d5..718c4236cf 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
@@ -182,7 +182,7 @@
 
 - type: entity
   name: Bingus
-  parent: SimpleMobBase
+  parent: [SimpleMobBase, StripableInventoryBase]
   id: MobBingus
   description: Bingus my beloved...
   components:
@@ -207,12 +207,6 @@
   - type: Inventory
     speciesId: cat
     templateId: pet
-  - type: InventorySlots
-  - type: Strippable
-  - type: UserInterface
-    interfaces:
-      enum.StrippingUiKey.Key:
-        type: StrippableBoundUserInterface
   - type: DamageStateVisuals
     states:
       Alive:
@@ -245,7 +239,7 @@
 
 - type: entity
   name: McGriff
-  parent: SimpleMobBase
+  parent: [SimpleMobBase, StripableInventoryBase]
   id: MobMcGriff
   description: This dog can tell something smells around here, and that something is CRIME!
   components:
@@ -270,12 +264,6 @@
   - type: Inventory
     speciesId: puppy
     templateId: pet
-  - type: InventorySlots
-  - type: Strippable
-  - type: UserInterface
-    interfaces:
-      enum.StrippingUiKey.Key:
-        type: StrippableBoundUserInterface
   - type: DamageStateVisuals
     states:
       Alive:
@@ -344,7 +332,7 @@
 
 - type: entity
   name: Walter
-  parent: SimpleMobBase
+  parent: [SimpleMobBase, StripableInventoryBase]
   id: MobWalter
   description: He likes chems and treats. Walter.
   components:
@@ -369,12 +357,6 @@
   - type: Inventory
     speciesId: dog
     templateId: pet
-  - type: InventorySlots
-  - type: Strippable
-  - type: UserInterface
-    interfaces:
-      enum.StrippingUiKey.Key:
-        type: StrippableBoundUserInterface
   - type: DamageStateVisuals
     states:
       Alive:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
index b3bb5d4d07..1686b723b5 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
@@ -249,7 +249,10 @@
       path: /Audio/Ambience/Objects/periodic_beep.ogg
 
 - type: entity
-  parent: [MobSiliconBase, ShowMedicalIcons]
+  parent:
+  - MobSiliconBase
+  - ShowMedicalIcons
+  - StripableInventoryBase
   id: MobMedibot
   name: medibot
   description: No substitute for a doctor, but better than nothing.
@@ -291,19 +294,17 @@
       path: /Audio/Ambience/Objects/periodic_beep.ogg
   - type: Advertise
     pack: MedibotAds
+  - type: Inventory
+    templateId: medibot
 
 - type: entity
-  parent: MobSiliconBase
+  parent:
+  - MobSiliconBase
+  - StripableInventoryBase
   id: MobMimeBot
   name: mimebot
   description: Why not give mimebot a friendly wave.
   components:
-  - type: InventorySlots
-  - type: Strippable
-  - type: UserInterface
-    interfaces:
-      enum.StrippingUiKey.Key:
-        type: StrippableBoundUserInterface
   - type: Sprite
     layers:
     - map: ["enum.DamageStateVisualLayers.Base"]
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
index 7b321e80df..91f5e952e9 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
@@ -121,7 +121,7 @@
 - type: entity
   name: space kangaroo
   id: MobKangarooSpace
-  parent: MobSpaceBasic
+  parent: [MobSpaceBasic, StripableInventoryBase]
   description: It looks friendly. Why don't you give it a hug?
   components:
   - type: Sprite
@@ -167,12 +167,6 @@
       collection: FootstepBounce
   - type: ReplacementAccent
     accent: kangaroo
-  - type: InventorySlots
-  - type: Strippable
-  - type: UserInterface
-    interfaces:
-      enum.StrippingUiKey.Key:
-        type: StrippableBoundUserInterface
 
 - type: entity
   id: MobKangarooSpaceSalvage
diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
index 8b0f60ca58..a0eb01e03b 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: MobObserver
+  parent: [MobObserver, InventoryBase]
   id: AdminObserver
   name: admin observer
   noSpawn: true
@@ -87,7 +87,6 @@
   - type: ShowAntagIcons
   - type: Inventory
     templateId: aghost
-  - type: InventorySlots
   - type: Loadout
     prototypes: [ MobAghostGear ]
   - type: BypassInteractionChecks
diff --git a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
index 6a11c96686..eececb70da 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
@@ -176,7 +176,7 @@
 - type: entity
   name: HoloClown
   id: MobHoloClownGuardian
-  parent: MobGuardianBase
+  parent: [MobGuardianBase, InventoryBase]
   description: A mesmerising whirl of hard-light patterns weaves a blue colored clown of dubious origin.
   components:
     - type: GhostRole
@@ -237,7 +237,6 @@
           Piercing: 4
         groups:
           Burn: 3
-    - type: InventorySlots
     - type: MeleeWeapon
       angle: 30
       animation: WeaponArcFist
diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml
index 5aae3bd478..42adc806fd 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -4,6 +4,7 @@
   - BaseMob
   - MobDamageable
   - MobCombat
+  - StripableInventoryBase
   id: BaseMobSpecies
   abstract: true
   components:
@@ -152,8 +153,6 @@
   - type: Hands
   - type: ComplexInteraction
   - type: Internals
-  - type: Inventory
-  - type: InventorySlots
   - type: FloatingVisuals
   - type: Climbing
   - type: Cuffable
@@ -191,7 +190,6 @@
     - NanoTrasen
   - type: CreamPied
   - type: Stripping
-  - type: Strippable
   - type: UserInterface
     interfaces:
       enum.VoiceMaskUIKey.Key:
@@ -290,12 +288,11 @@
 - type: entity
   save: false
   id: BaseSpeciesDummy
+  parent: InventoryBase
   abstract: true
   components:
   - type: Hands
   - type: ComplexInteraction
-  - type: Inventory
-  - type: InventorySlots
   - type: ContainerContainer
   - type: Icon
     sprite: Mobs/Species/Human/parts.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
index f2b2c0450f..0c069f615e 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
@@ -193,3 +193,18 @@
           Quantity: 100
   - type: Sprite
     sprite: Objects/Consumable/Drinks/oatmilk.rsi
+    
+- type: entity
+  parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull]
+  id: DrinkJuiceLemonCarton
+  name: lemon juice
+  description: First it's sour, then it's still sour.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: JuiceLemon
+          Quantity: 50
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/lemonjuice.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
index 5c55f9ff17..5d77c91a5d 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
@@ -1218,7 +1218,7 @@
         - ReagentId: JuiceLemon
           Quantity: 30
   - type: Icon
-    sprite: Objects/Consumable/Drinks/lemonjuice.rsi
+    sprite: Objects/Consumable/Drinks/lemonjuiceglass.rsi
     state: icon
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bagel.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bagel.yml
new file mode 100644
index 0000000000..8f23b6c7df
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bagel.yml
@@ -0,0 +1,49 @@
+# When adding new food also add to random spawner located in Resources\Prototypes\Entities\Markers\Spawners\Random\Food_Drinks\food_baked_whole.yml & food_baked_single.yml
+# Base
+
+- type: entity
+  id: FoodBagelBase
+  parent: FoodInjectableBase
+  abstract: true
+  description: A delicious bagel.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - bread
+  - type: Sprite
+    sprite: Objects/Consumable/Food/Baked/bagel.rsi
+    state: bagel
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 7
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 5
+
+- type: entity
+  id: FoodBagel
+  name: bagel
+  parent: FoodBagelBase
+
+- type: entity
+  id: FoodBagelPoppy
+  parent: FoodBagelBase
+  name: poppy seed bagel
+  description: A delicious bagel topped with bicaridine-infused poppy seeds.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - bread
+      - medicine
+  - type: Sprite
+    state: bagel-poppy
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 12
+        reagents:
+        - ReagentId: Bicaridine
+          Quantity: 5
+        - ReagentId: Nutriment
+          Quantity: 5
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
index a92dc9b25d..51d9465073 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
@@ -751,6 +751,9 @@
   - type: Sprite
     layers:
     - state: moldy-slice
+  - type: Tag
+    tags:
+    - Trash
   - type: SolutionContainerManager
     solutions:
       food:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
index 154f34063c..3004dc4cb2 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
@@ -531,6 +531,9 @@
   - type: Sprite
     layers:
     - state: moldy-slice
+  - type: Tag
+    tags:
+    - Trash
   - type: SolutionContainerManager
     solutions:
       food:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
index dcf2f3355c..be23c2e43f 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
@@ -305,6 +305,24 @@
   - type: Tag
     tags:
     - Slice
+  - type: Construction
+    graph: DoughRope
+    node: start
+
+- type: entity
+  name: dough rope
+  parent: FoodBakingBase
+  id: FoodDoughRope
+  description: A thin noodle of dough. Can be cooked into a bagel.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - dough
+  - type: Sprite
+    state: dough-rope
+  - type: Construction
+    graph: DoughRope
+    node: rolled
 
 - type: entity
   name: cornmeal dough
diff --git a/Resources/Prototypes/Entities/Objects/Fun/immovable_rod.yml b/Resources/Prototypes/Entities/Objects/Fun/immovable_rod.yml
index e52f66d39b..69f0ed415e 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/immovable_rod.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/immovable_rod.yml
@@ -93,6 +93,7 @@
   components:
   - type: ImmovableRod
     randomizeVelocity: false
+    maxSpeed: 0
 
 - type: entity
   parent: ImmovableRodKeepTilesStill
diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index 86060b1bbe..1ac622db86 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -896,7 +896,7 @@
         - BulletFoam
     capacity: 1
     soundInsert:
-      path: /Audio/Weapons/drawbow2.ogg
+      path: /Audio/Items/bow_pull.ogg
   - type: ContainerContainer
     containers:
       ballistic-ammo: !type:Container
diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
index acbe005738..70d340b2b3 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
@@ -496,8 +496,6 @@
     layerStates:
       - bananium
       - bananium_1
-  - type: RadiationSource
-    intensity: 0.1
   - type: FlavorProfile
     flavors:
       - banana
diff --git a/Resources/Prototypes/Entities/Objects/Misc/books.yml b/Resources/Prototypes/Entities/Objects/Misc/books.yml
index 3fc90048dd..fd4cac781b 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/books.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/books.yml
@@ -110,10 +110,10 @@
     - Bartender
 
 - type: entity
-  id: BookChefGaming
+  id: BookHowToCookForFortySpaceman
   parent: BaseItem
-  name: chef gaming
-  description: A book about cooking written by a gamer chef.
+  name: How To Cook For Forty Spacemen
+  description: A book about cooking written by a space chef.
   components:
   - type: Sprite
     sprite: Objects/Misc/books.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
index 3b2e4cd8f1..7de91cbb63 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
@@ -176,22 +176,6 @@
   - type: Stack
     stackType: FloorTileTechmaint
 
-- type: entity
-  name: reinforced tile
-  parent: FloorTileItemBase
-  id: FloorTileItemReinforced
-  components:
-  - type: Sprite
-    state: reinforced
-  - type: Item
-    heldPrefix: reinforced
-  - type: FloorTile
-    outputs:
-      - Plating
-      - FloorReinforced
-  - type: Stack
-    stackType: FloorTileReinforced
-
 # TODO add a catwalk tile item once tile smoothing is supported
 
 - type: entity
@@ -1133,4 +1117,4 @@
     stackType: FloorTileWoodLarge
   - type: Construction
     graph: TileWoodLarge
-    node: woodtilelarge
\ No newline at end of file
+    node: woodtilelarge
diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
index e7ebb1b98d..dc24ac485a 100644
--- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml
+++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
@@ -36,13 +36,13 @@
       thresholds:
         - trigger:
             !type:DamageTrigger
-            damage: 80
+            damage: 140
           behaviors:
             - !type:DoActsBehavior
               acts: [ "Destruction" ]
         - trigger:
             !type:DamageTrigger
-            damage: 40 #This is probably enough damage before it breaks
+            damage: 100 #This is probably enough damage before it breaks
           behaviors:
             - !type:DoActsBehavior
               acts: [ "Destruction" ]
@@ -70,6 +70,18 @@
   components:
     - type: StaticPrice
       price: 90
+    - type: Blocking
+      passiveBlockModifier:
+        coefficients:
+          Blunt: 0.7
+          Slash: 0.7
+      activeBlockModifier:
+        coefficients:
+          Blunt: 0.5
+          Slash: 0.5
+        flatReductions:
+          Blunt: 1
+          Slash: 1
 
 - type: entity
   name: riot laser shield
@@ -84,12 +96,12 @@
     - type: Blocking
       passiveBlockModifier:
         coefficients:
-          Heat: 0.8
+          Heat: 0.7
       activeBlockModifier:
         coefficients:
-          Heat: 0.7
+          Heat: 0.5
         flatReductions:
-          Heat: 2
+          Heat: 1
 
 - type: entity
   name: riot bullet shield
@@ -104,15 +116,12 @@
     - type: Blocking
       passiveBlockModifier:
         coefficients:
-          Blunt: 0.8
-          Piercing: 0.8
+          Piercing: 0.7
       activeBlockModifier:
         coefficients:
-          Blunt: 0.7
-          Piercing: 0.7
+          Piercing: 0.5
         flatReductions:
-          Blunt: 1.5
-          Piercing: 1.5
+          Piercing: 1
 
 #Craftable shields
 
@@ -313,7 +322,7 @@
   name: mirror shield
   parent: BaseShield
   id: MirrorShield
-  description: Glows an eerie red. You hear the Geometer whispering...
+  description: Eerily glows red... you hear the geometer whispering
   components:
     - type: Sprite
       state: mirror-icon
@@ -321,7 +330,6 @@
       heldPrefix: mirror
     - type: Reflect
       reflectProb: 0.95
-      innate: true
       reflects:
         - Energy
     - type: Blocking #Mirror shield reflects heat/laser, but is relatively weak to everything else.
@@ -409,7 +417,6 @@
     - type: Reflect
       enabled: false
       reflectProb: 0.95
-      innate: true
       reflects:
         - Energy
     - type: Blocking
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
index dab6f9f20f..99d39a8249 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
@@ -92,6 +92,19 @@
   - type: GuideHelp
     guides:
     - Robotics
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 400
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+      - !type:ChangeConstructionNodeBehavior
+        node: start
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
 
 - type: entity
   id: MechRipley
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
index 13ebe4b8f4..d83a292ebe 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
@@ -347,7 +347,8 @@
 
 # Pills
 - type: entity
-  name: pill (dexalin 10u)
+  name: pill
+  suffix: Dexalin 10u
   parent: Pill
   id: PillDexalin
   components:
@@ -366,10 +367,10 @@
           Quantity: 10
 
 - type: entity
-  name: pill canister (dexalin 10u)
+  name: pill canister
   parent: PillCanister
   id: PillCanisterDexalin
-  suffix: Dexalin, 7
+  suffix: Dexalin 10u, 7
   components:
   - type: Label
     currentLabel: dexalin 10u
@@ -379,7 +380,8 @@
       amount: 7
 
 - type: entity
-  name: pill (dylovene 10u)
+  name: pill
+  suffix: Dylovene 10u
   parent: Pill
   id: PillDylovene
   components:
@@ -398,10 +400,10 @@
           Quantity: 10
 
 - type: entity
-  name: pill canister (dylovene 10u)
+  name: pill canister
   parent: PillCanister
   id: PillCanisterDylovene
-  suffix: Dylovene, 5
+  suffix: Dylovene 10u, 5
   components:
   - type: Label
     currentLabel: dylovene 10u
@@ -411,7 +413,8 @@
       amount: 5
 
 - type: entity
-  name: pill (hyronalin 10u)
+  name: pill
+  suffix: Hyronalin 10u
   parent: Pill
   id: PillHyronalin
   components:
@@ -430,10 +433,10 @@
           Quantity: 10
 
 - type: entity
-  name: pill canister (hyronalin 10u)
+  name: pill canister
   parent: PillCanister
   id: PillCanisterHyronalin
-  suffix: Hyronalin, 5
+  suffix: Hyronalin 10u, 5
   components:
   - type: Label
     currentLabel: hyronalin 10u
@@ -443,7 +446,8 @@
       amount: 5
 
 - type: entity
-  name: pill (iron 10u)
+  name: pill
+  suffix: Iron 10u
   parent: Pill
   id: PillIron
   components:
@@ -462,7 +466,8 @@
           Quantity: 10
 
 - type: entity
-  name: pill (copper 10u)
+  name: pill
+  suffix: Copper 10u
   parent: Pill
   id: PillCopper
   components:
@@ -481,10 +486,10 @@
           Quantity: 10
 
 - type: entity
-  name: pill canister (iron 10u)
+  name: pill canister
   parent: PillCanister
   id: PillCanisterIron
-  suffix: Iron, 5
+  suffix: Iron 10u, 5
   components:
   - type: Label
     currentLabel: iron 10u
@@ -494,10 +499,10 @@
       amount: 5
 
 - type: entity
-  name: pill canister (copper 10u)
+  name: pill canister
   parent: PillCanister
   id: PillCanisterCopper
-  suffix: Copper, 5
+  suffix: Copper 10u, 5
   components:
   - type: Label
     currentLabel: copper 10u
@@ -507,7 +512,8 @@
       amount: 5
 
 - type: entity
-  name: pill (kelotane 10u)
+  name: pill
+  suffix: Kelotane 10u
   parent: Pill
   id: PillKelotane
   components:
@@ -526,10 +532,10 @@
           Quantity: 10
 
 - type: entity
-  name: pill canister (kelotane 10u)
+  name: pill canister
   parent: PillCanister
   id: PillCanisterKelotane
-  suffix: Kelotane, 5
+  suffix: Kelotane 10u, 5
   components:
   - type: Label
     currentLabel: kelotane 10u
@@ -539,7 +545,8 @@
       amount: 5
 
 - type: entity
-  name: pill (dermaline 10u)
+  name: pill
+  suffix: Dermaline 10u
   parent: Pill
   id: PillDermaline
   components:
@@ -558,10 +565,10 @@
           Quantity: 10
 
 - type: entity
-  name: pill canister (dermaline 10u)
+  name: pill canister
   parent: PillCanister
   id: PillCanisterDermaline
-  suffix: Dermaline, 5
+  suffix: Dermaline 10u, 5
   components:
   - type: Label
     currentLabel: dermaline 10u
@@ -584,7 +591,8 @@
           Quantity: 15
 
 - type: entity
-  name: pill (tricordrazine 10u)
+  name: pill
+  suffix: Tricordrazine 10u
   parent: Pill
   id: PillTricordrazine
   components:
@@ -603,10 +611,10 @@
           Quantity: 10
 
 - type: entity
-  name: pill canister (tricordrazine 10u)
+  name: pill canister
   parent: PillCanister
   id: PillCanisterTricordrazine
-  suffix: Tricordrazine, 5
+  suffix: Tricordrazine 10u, 5
   components:
   - type: Label
     currentLabel: tricordrazine 10u
@@ -616,7 +624,8 @@
       amount: 5
 
 - type: entity
-  name: pill (bicaridine 10u)
+  name: pill
+  suffix: Bicaridine 10u
   parent: Pill
   id: PillBicaridine
   components:
@@ -635,10 +644,10 @@
           Quantity: 10
 
 - type: entity
-  name: pill canister (bicaridine 10u)
+  name: pill canister
   parent: PillCanister
   id: PillCanisterBicaridine
-  suffix: Bicaridine, 5
+  suffix: Bicaridine 10u, 5
   components:
   - type: Label
     currentLabel: bicaridine 10u
@@ -648,7 +657,8 @@
       amount: 5
 
 - type: entity
-  name: pill (charcoal 10u)
+  name: pill
+  suffix: Charcoal 10u
   parent: Pill
   id: PillCharcoal
   components:
@@ -667,10 +677,10 @@
           Quantity: 10
 
 - type: entity
-  name: pill canister (charcoal 10u)
+  name: pill canister
   parent: PillCanister
   id: PillCanisterCharcoal
-  suffix: Charcoal, 3
+  suffix: Charcoal 10u, 3
   components:
   - type: Label
     currentLabel: charcoal 10u
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
index f3a8215e3d..ae309661fe 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
@@ -58,6 +58,7 @@
     containers:
       gun_magazine: !type:ContainerSlot
       gun_chamber: !type:ContainerSlot
+  - type: AmmoCounter
   - type: MagazineVisuals
     magState: mag
     steps: 1
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
index 592fe56b47..fbf8b1003c 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
@@ -78,8 +78,6 @@
     malus: 0
   - type: Reflect
     enabled: false
-    reflectProb: 0.5
-    minReflectProb: 0.25
   - type: IgnitionSource
     temperature: 700
 
@@ -220,7 +218,7 @@
   name: double-bladed energy sword
   parent: EnergySword
   id: EnergySwordDouble
-  description: Syndicate Command's intern thought that having only one blade on energy swords was not cool enough. This can be stored in pockets.
+  description: Syndicate Command Interns thought that having one blade on the energy sword was not enough. This can be stored in pockets.
   components:
   - type: EnergySword
   - type: ItemToggle
@@ -271,8 +269,7 @@
     size: Small
     sprite: Objects/Weapons/Melee/e_sword_double-inhands.rsi
   - type: Reflect
-    reflectProb: .80
-    minReflectProb: .65
+    reflectProb: .75
     spread: 75
   - type: UseDelay
     delay: 1
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
index 11e7f983e0..7cc33b7155 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
@@ -13,17 +13,12 @@
     attackRate: 1.5
     damage:
       types:
-        Slash: 15
+        Slash: 17 #cmon, it has to be at least BETTER than the rest.
     soundHit:
         path: /Audio/Weapons/bladeslice.ogg
   - type: Reflect
     enabled: true
-    # Design intent: a robust captain or tot can sacrifice movement to make the most of this weapon, but they have to
-    # really restrict themselves to walking speed or less.
-    reflectProb: 0.5
-    velocityBeforeNotMaxProb: 1.0
-    velocityBeforeMinProb: 3.0
-    minReflectProb: 0.1
+    reflectProb: .1
     spread: 90
   - type: Item
     size: Normal
@@ -88,9 +83,6 @@
     - Back
     - Belt
   - type: Reflect
-    reflectProb: 0.3
-    velocityBeforeNotMaxProb: 6.0 # don't punish ninjas for being ninjas
-    velocityBeforeMinProb: 10.0
 
 - type: entity
   name: machete
@@ -160,7 +152,7 @@
     wideAnimationRotation: -135
     damage:
       types:
-        Slash: 15
+        Slash: 16
     soundHit:
         path: /Audio/Weapons/bladeslice.ogg
   - type: Item
@@ -172,7 +164,7 @@
   name: The Throngler
   parent: BaseItem
   id: Throngler
-  description: Why would someone make this?
+  description: Why would you make this?
   components:
     - type: Sharp
     - type: Sprite
@@ -193,10 +185,7 @@
         path: /Audio/Effects/explosion_small1.ogg
     - type: Reflect
       enabled: true
-      reflectProb: 0.5 # In robust hands, deflects as well as an e-sword
-      velocityBeforeNotMaxProb: 1.0
-      velocityBeforeMinProb: 3.0
-      minReflectProb: 0.1
+      reflectProb: .25
       spread: 90
     - type: Item
       size: Ginormous
diff --git a/Resources/Prototypes/Entities/Structures/Decoration/mannequin.yml b/Resources/Prototypes/Entities/Structures/Decoration/mannequin.yml
index 4a2b0d3c3f..39d58973bb 100644
--- a/Resources/Prototypes/Entities/Structures/Decoration/mannequin.yml
+++ b/Resources/Prototypes/Entities/Structures/Decoration/mannequin.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: Mannequin
-  parent: BaseStructureDynamic
+  parent: [BaseStructureDynamic, StripableInventoryBase]
   name: mannequin
   description: It can wear any clothing with style.
   components:
@@ -19,7 +19,7 @@
     - map: [ "neck" ]
     - map: [ "back" ]
     - map: [ "mask" ]
-    - map: [ "head" ] 
+    - map: [ "head" ]
   - type: Rotatable
   - type: Fixtures
     fixtures:
@@ -87,9 +87,3 @@
         ent: null
   - type: Inventory
     templateId: mannequin
-  - type: InventorySlots
-  - type: Strippable
-  - type: UserInterface
-    interfaces:
-      enum.StrippingUiKey.Key:
-        type: StrippableBoundUserInterface
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
index abb12f9313..3f9a9bc222 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
@@ -153,7 +153,7 @@
   - type: PointLight
     radius: 1.5
     energy: 1.6
-    color: "#c94242"
+    color: "#43ccb5"
   - type: Computer
     board: CargoShuttleConsoleCircuitboard
   - type: StealTarget
@@ -183,7 +183,7 @@
     - type: PointLight
       radius: 1.5
       energy: 1.6
-      color: "#c94242"
+      color: "#43ccb5"
     - type: Computer
       board: SalvageShuttleConsoleCircuitboard
     - type: StealTarget
@@ -1114,4 +1114,4 @@
   - type: AccessReader # only used for dangerous things
     access: [["ResearchDirector"]]
   - type: Lock
-    unlockOnClick: false
\ No newline at end of file
+    unlockOnClick: false
diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
index 16a5aa55d4..55f83c8c3c 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
@@ -1337,7 +1337,7 @@
   - type: PointLight
     radius: 1.5
     energy: 1.6
-    color: "#9dc5c9"
+    color: "#b89f25"
   - type: AccessReader
     access: [["Salvage"]]
   - type: GuideHelp
@@ -1421,6 +1421,10 @@
       shader: unshaded
     - texture: Structures/Machines/VendingMachines/maintenance_panel.png
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
+  - type: PointLight
+    radius: 1.3
+    energy: 1.6
+    color: "#43ccb5"
   - type: AccessReader
     access: [["Medical"]]
   - type: GuideHelp
@@ -1454,6 +1458,10 @@
       shader: unshaded
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
+  - type: PointLight
+    radius: 1.5
+    energy: 1.6
+    color: "#326e3f"
   - type: AccessReader
     access: [["Hydroponics"]]
 
@@ -1510,6 +1518,10 @@
       shader: unshaded
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
+  - type: PointLight
+    radius: 1.5
+    energy: 1.6
+    color: "#d82929"
   - type: AccessReader
     access: [["Security"]]
 
@@ -1594,6 +1606,10 @@
       shader: unshaded
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
+  - type: PointLight
+    radius: 1.5
+    energy: 1.6
+    color: "#b89e2a"
   - type: AccessReader
     access: [["Cargo"]]
 
@@ -1706,6 +1722,10 @@
       shader: unshaded
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
+  - type: PointLight
+    radius: 1.5
+    energy: 1.6
+    color: "#b89e2a"
   - type: AccessReader
     access: [["Engineering"]]
 
@@ -1734,6 +1754,10 @@
       shader: unshaded
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
+  - type: PointLight
+    radius: 1.5
+    energy: 1.6
+    color: "#b89e2a"
   - type: AccessReader
     access: [["Engineering"]]
 
@@ -1818,6 +1842,10 @@
       shader: unshaded
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
+  - type: PointLight
+    radius: 1.5
+    energy: 1.6
+    color: "#6927C5"
   - type: AccessReader
     access: [["Janitor"]]
 
@@ -1874,6 +1902,10 @@
       shader: unshaded
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
+  - type: PointLight
+    radius: 1.5
+    energy: 1.6
+    color: "#d82929"
   - type: AccessReader
     access: [["NuclearOperative"], ["SyndicateAgent"]]
 
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml
index 213b0b893d..4961f90be9 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml
@@ -301,6 +301,7 @@
             In: { state: vent_in }
             Out: { state: vent_out }
             Welded: { state: vent_welded }
+            Lockout: { state: vent_lockout }
     - type: PipeColorVisuals
     - type: GasVentPump
       inlet: inlet
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml
index 2231fc4ddc..6d10b1521e 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml
@@ -30,7 +30,7 @@
     - type: AtmosDevice
     - type: GasMiner
       maxExternalPressure: 300
-      spawnAmount: 200
+      spawnAmount: 400
 
 - type: entity
   name: O2 gas miner
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
index 2b00fec246..63c7665978 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
@@ -21,7 +21,7 @@
     - type: CollideOnAnchor
 
 - type: entity
-  parent: GasUnaryBase
+  parent: [GasUnaryBase, AirSensorBase]
   id: GasVentPump
   name: air vent
   description: Has a valve and a pump attached to it.
@@ -31,28 +31,7 @@
     - type: ApcPowerReceiver
     - type: ExtensionCableReceiver
     - type: DeviceNetwork
-      deviceNetId: AtmosDevices
-      receiveFrequencyId: AtmosMonitor
-      transmitFrequencyId: AtmosMonitor
       prefix: device-address-prefix-vent
-      sendBroadcastAttemptEvent: true
-      examinableAddress: true
-    - type: WiredNetworkConnection
-    - type: DeviceNetworkRequiresPower
-    - type: AtmosDevice
-    - type: AtmosMonitor
-      temperatureThresholdId: stationTemperature
-      pressureThresholdId: stationPressure
-      gasThresholdPrototypes:
-        Oxygen: stationOxygen
-        Nitrogen: ignore
-        CarbonDioxide: stationCO2
-        Plasma: stationPlasma # everything below is usually bad
-        Tritium: danger
-        WaterVapor: stationWaterVapor
-        Ammonia: stationAmmonia
-        NitrousOxide: stationNO
-        Frezon: danger
     - type: Tag
       tags:
         - GasVent
@@ -76,6 +55,7 @@
             In: { state: vent_in }
             Out: { state: vent_out }
             Welded: { state: vent_welded }
+            Lockout: { state: vent_lockout }
     - type: GasVentPump
     - type: Construction
       graph: GasUnary
@@ -97,7 +77,6 @@
   placement:
     mode: SnapgridCenter
   components:
-    # TODO ATMOS: Find sprite for this.
     - type: Sprite
       drawdepth: FloorObjects
       sprite: Structures/Piping/Atmospherics/vent.rsi
@@ -105,7 +84,7 @@
         - sprite: Structures/Piping/Atmospherics/pipe.rsi
           state: pipeHalf
           map: [ "enum.PipeVisualLayers.Pipe" ]
-        - state: vent_off
+        - state: vent_passive
           map: [ "enum.SubfloorLayers.FirstLayer" ]
     - type: Appearance
     - type: PipeColorVisuals
@@ -115,7 +94,7 @@
       node: passivevent
 
 - type: entity
-  parent: GasUnaryBase
+  parent: [GasUnaryBase, AirSensorBase]
   id: GasVentScrubber
   name: air scrubber
   description: Has a valve and pump attached to it.
@@ -125,25 +104,7 @@
     - type: ApcPowerReceiver
     - type: ExtensionCableReceiver
     - type: DeviceNetwork
-      deviceNetId: AtmosDevices
-      receiveFrequencyId: AtmosMonitor
-      transmitFrequencyId: AtmosMonitor
       prefix: device-address-prefix-scrubber
-      examinableAddress: true
-    - type: DeviceNetworkRequiresPower
-    - type: AtmosMonitor
-      temperatureThresholdId: stationTemperature
-      pressureThresholdId: stationPressure
-      gasThresholdPrototypes:
-        Oxygen: stationOxygen
-        Nitrogen: ignore
-        CarbonDioxide: stationCO2
-        Plasma: stationPlasma # everything below is usually bad
-        Tritium: danger
-        WaterVapor: stationWaterVapor
-        Ammonia: stationAmmonia
-        NitrousOxide: stationNO
-        Frezon: danger
     - type: Tag
       tags:
         - GasScrubber
diff --git a/Resources/Prototypes/Entities/Structures/Power/apc.yml b/Resources/Prototypes/Entities/Structures/Power/apc.yml
index 1621ac858c..0948cdb4cc 100644
--- a/Resources/Prototypes/Entities/Structures/Power/apc.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/apc.yml
@@ -204,7 +204,7 @@
 - type: entity
   parent: BaseAPC
   id: APCBasic
-  suffix: Basic, 50kW
+  suffix: Basic, 50kJ
   components:
   - type: Battery
     maxCharge: 50000
@@ -213,7 +213,7 @@
 - type: entity
   parent: BaseAPC
   id: APCHighCapacity
-  suffix: High Capacity, 100kW
+  suffix: High Capacity, 100kJ
   components:
   - type: Battery
     maxCharge: 100000
@@ -222,7 +222,7 @@
 - type: entity
   parent: BaseAPC
   id: APCSuperCapacity
-  suffix: Super Capacity, 150kW
+  suffix: Super Capacity, 150kJ
   components:
   - type: Battery
     maxCharge: 150000
@@ -231,7 +231,7 @@
 - type: entity
   parent: BaseAPC
   id: APCHyperCapacity
-  suffix: Hyper Capacity, 200kW
+  suffix: Hyper Capacity, 200kJ
   components:
   - type: Battery
     maxCharge: 200000
diff --git a/Resources/Prototypes/Entities/Structures/Power/smes.yml b/Resources/Prototypes/Entities/Structures/Power/smes.yml
index 1e3559e5a9..15f28eb53e 100644
--- a/Resources/Prototypes/Entities/Structures/Power/smes.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/smes.yml
@@ -95,7 +95,7 @@
 - type: entity
   parent: BaseSMES
   id: SMESBasic
-  suffix: Basic, 8MW
+  suffix: Basic, 8MJ
   components:
   - type: Battery
     maxCharge: 8000000
diff --git a/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml b/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml
index 2df48a584c..b118b85c4d 100644
--- a/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml
@@ -1,7 +1,39 @@
+- type: entity
+  id: AirSensorBase
+  abstract: true
+  components:
+    - type: DeviceNetwork
+      deviceNetId: AtmosDevices
+      receiveFrequencyId: AtmosMonitor
+      transmitFrequencyId: AtmosMonitor
+      prefix: device-address-prefix-sensor
+      sendBroadcastAttemptEvent: true
+      examinableAddress: true
+    - type: WiredNetworkConnection
+    - type: DeviceNetworkRequiresPower
+    - type: AtmosDevice
+    - type: AtmosMonitor
+      temperatureThresholdId: stationTemperature
+      pressureThresholdId: stationPressure
+      gasThresholdPrototypes:
+        Oxygen: stationOxygen
+        Nitrogen: ignore
+        CarbonDioxide: stationCO2
+        Plasma: stationPlasma
+        Tritium: stationTritium
+        WaterVapor: stationWaterVapor
+        Ammonia: stationAmmonia
+        NitrousOxide: stationNO
+        Frezon: danger
+    - type: Tag
+      tags:
+        - AirSensor
+
 - type: entity
   id: AirSensor
   name: air sensor
   description: Air sensor. It senses air.
+  parent: AirSensorBase
   placement:
     mode: SnapgridCenter
   components:
@@ -35,32 +67,6 @@
     - type: InteractionOutline
     - type: ApcPowerReceiver
     - type: ExtensionCableReceiver
-    - type: DeviceNetwork
-      deviceNetId: AtmosDevices
-      receiveFrequencyId: AtmosMonitor
-      transmitFrequencyId: AtmosMonitor
-      prefix: device-address-prefix-sensor
-      sendBroadcastAttemptEvent: true
-      examinableAddress: true
-    - type: WiredNetworkConnection
-    - type: DeviceNetworkRequiresPower
-    - type: AtmosDevice
-    - type: AtmosMonitor
-      temperatureThresholdId: stationTemperature
-      pressureThresholdId: stationPressure
-      gasThresholdPrototypes:
-        Oxygen: stationOxygen
-        Nitrogen: ignore
-        CarbonDioxide: stationCO2
-        Plasma: stationPlasma # everything below is usually bad
-        Tritium: danger
-        WaterVapor: stationWaterVapor
-        Ammonia: stationAmmonia
-        NitrousOxide: stationNO
-        Frezon: danger
-    - type: Tag
-      tags:
-        - AirSensor
     - type: AccessReader
       access: [ [ "Atmospherics" ] ]
     - type: Construction
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/noticeboard.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/noticeboard.yml
index f2315583e3..2da4fbc3c4 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/noticeboard.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/noticeboard.yml
@@ -7,6 +7,7 @@
   components:
   - type: WallMount
   - type: Sprite
+    drawdepth: WallMountedItems
     sprite: Structures/Wallmounts/noticeboard.rsi
     layers:
       - state: noticeboard
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
index 1bdf66f5b7..ecf2b0525e 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
@@ -36,6 +36,9 @@
     - Status
     lastSignals:
       Status: false
+  - type: Tag
+    tags:
+    - Structure
 
 - type: entity
   id: SignalButton
@@ -96,6 +99,9 @@
               collection: MetalBreak
               params:
                 volume: -8
+  - type: Tag
+    tags:
+    - Structure
 
 - type: entity
   id: ApcNetSwitch
@@ -129,6 +135,9 @@
       graph: LightSwitchGraph
       node: LightSwitchNode
     - type: Fixtures
+    - type: Tag
+      tags:
+      - Structure
 
 - type: entity
   id: TwoWayLever
@@ -179,6 +188,9 @@
         - Left
         - Right
         - Middle
+    - type: Tag
+      tags:
+      - Structure
 
 #directional
 
diff --git a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
index c6c3692e59..d131805bf5 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
@@ -273,6 +273,28 @@
           state: rock_asteroid_west
         - state: rock_bananium
 
+- type: entity
+  id: AsteroidRockSalt
+  parent: AsteroidRock
+  description: An ore vein rich with salt.
+  suffix: Salt
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreSalt
+    - type: Sprite
+      layers:
+        - state: rock_asteroid
+        - map: [ "enum.EdgeLayer.South" ]
+          state: rock_asteroid_south
+        - map: [ "enum.EdgeLayer.East" ]
+          state: rock_asteroid_east
+        - map: [ "enum.EdgeLayer.North" ]
+          state: rock_asteroid_north
+        - map: [ "enum.EdgeLayer.West" ]
+          state: rock_asteroid_west
+        - state: rock_salt
+
 - type: entity
   id: AsteroidRockArtifactFragment
   parent: AsteroidRock
@@ -316,6 +338,9 @@
   - type: IconSmooth
     key: walls
     mode: NoSprite
+  - type: Icon
+    sprite: Structures/Walls/rock.rsi
+    state: ironrock
   - type: SmoothEdge
   - type: Sprite
     sprite: Structures/Walls/rock.rsi
@@ -330,28 +355,6 @@
       - map: [ "enum.EdgeLayer.West" ]
         state: ironrock_west
 
-- type: entity
-  id: AsteroidRockSalt
-  parent: AsteroidRock
-  description: An ore vein rich with salt.
-  suffix: Salt
-  components:
-    - type: OreVein
-      oreChance: 1.0
-      currentOre: OreSalt
-    - type: Sprite
-      layers:
-        - state: rock_asteroid
-        - map: [ "enum.EdgeLayer.South" ]
-          state: rock_asteroid_south
-        - map: [ "enum.EdgeLayer.East" ]
-          state: rock_asteroid_east
-        - map: [ "enum.EdgeLayer.North" ]
-          state: rock_asteroid_north
-        - map: [ "enum.EdgeLayer.West" ]
-          state: rock_asteroid_west
-        - state: rock_salt
-
 - type: entity
   id: IronRockMining
   parent: IronRock
@@ -363,6 +366,226 @@
     oreChance: 0.33
     oreRarityPrototypeId: RandomOreDistributionStandard
 
+# Ore veins
+- type: entity
+  id: IronRockCoal
+  parent: IronRock
+  description: An ore vein rich with coal.
+  suffix: Coal
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreCoal
+    - type: Sprite
+      layers:
+        - state: ironrock
+        - map: [ "enum.EdgeLayer.South" ]
+          state: ironrock_south
+        - map: [ "enum.EdgeLayer.East" ]
+          state: ironrock_east
+        - map: [ "enum.EdgeLayer.North" ]
+          state: ironrock_north
+        - map: [ "enum.EdgeLayer.West" ]
+          state: ironrock_west
+        - state: rock_coal
+
+- type: entity
+  id: IronRockGold
+  parent: IronRock
+  description: An ore vein rich with gold.
+  suffix: Gold
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreGold
+    - type: Sprite
+      layers:
+        - state: ironrock
+        - map: [ "enum.EdgeLayer.South" ]
+          state: ironrock_south
+        - map: [ "enum.EdgeLayer.East" ]
+          state: ironrock_east
+        - map: [ "enum.EdgeLayer.North" ]
+          state: ironrock_north
+        - map: [ "enum.EdgeLayer.West" ]
+          state: ironrock_west
+        - state: rock_gold
+
+- type: entity
+  id: IronRockPlasma
+  parent: IronRock
+  description: An ore vein rich with plasma.
+  suffix: Plasma
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OrePlasma
+    - type: Sprite
+      layers:
+        - state: ironrock
+        - map: [ "enum.EdgeLayer.South" ]
+          state: ironrock_south
+        - map: [ "enum.EdgeLayer.East" ]
+          state: ironrock_east
+        - map: [ "enum.EdgeLayer.North" ]
+          state: ironrock_north
+        - map: [ "enum.EdgeLayer.West" ]
+          state: ironrock_west
+        - state: rock_phoron
+
+- type: entity
+  id: IronRockQuartz
+  parent: IronRock
+  description: An ore vein rich with quartz.
+  suffix: Quartz
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreSpaceQuartz
+    - type: Sprite
+      layers:
+        - state: ironrock
+        - map: [ "enum.EdgeLayer.South" ]
+          state: ironrock_south
+        - map: [ "enum.EdgeLayer.East" ]
+          state: ironrock_east
+        - map: [ "enum.EdgeLayer.North" ]
+          state: ironrock_north
+        - map: [ "enum.EdgeLayer.West" ]
+          state: ironrock_west
+        - state: rock_quartz
+
+- type: entity
+  id: IronRockSilver
+  parent: IronRock
+  description: An ore vein rich with silver.
+  suffix: Silver
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreSilver
+    - type: Sprite
+      layers:
+        - state: ironrock
+        - map: [ "enum.EdgeLayer.South" ]
+          state: ironrock_south
+        - map: [ "enum.EdgeLayer.East" ]
+          state: ironrock_east
+        - map: [ "enum.EdgeLayer.North" ]
+          state: ironrock_north
+        - map: [ "enum.EdgeLayer.West" ]
+          state: ironrock_west
+        - state: rock_silver
+
+- type: entity
+  id: IronRockIron
+  parent: IronRock
+  description: An ore vein rich with iron.
+  suffix: Iron
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreSteel
+    - type: Sprite
+      layers:
+        - state: ironrock
+        - map: [ "enum.EdgeLayer.South" ]
+          state: ironrock_south
+        - map: [ "enum.EdgeLayer.East" ]
+          state: ironrock_east
+        - map: [ "enum.EdgeLayer.North" ]
+          state: ironrock_north
+        - map: [ "enum.EdgeLayer.West" ]
+          state: ironrock_west
+        - state: rock_tin
+
+- type: entity
+  id: IronRockUranium
+  parent: IronRock
+  description: An ore vein rich with uranium.
+  suffix: Uranium
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreUranium
+    - type: Sprite
+      layers:
+        - state: ironrock
+        - map: [ "enum.EdgeLayer.South" ]
+          state: ironrock_south
+        - map: [ "enum.EdgeLayer.East" ]
+          state: ironrock_east
+        - map: [ "enum.EdgeLayer.North" ]
+          state: ironrock_north
+        - map: [ "enum.EdgeLayer.West" ]
+          state: ironrock_west
+        - state: rock_uranium
+
+- type: entity
+  id: IronRockBananium
+  parent: IronRock
+  description: An ore vein rich with bananium.
+  suffix: Bananium
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreBananium
+    - type: Sprite
+      layers:
+        - state: ironrock
+        - map: [ "enum.EdgeLayer.South" ]
+          state: ironrock_south
+        - map: [ "enum.EdgeLayer.East" ]
+          state: ironrock_east
+        - map: [ "enum.EdgeLayer.North" ]
+          state: ironrock_north
+        - map: [ "enum.EdgeLayer.West" ]
+          state: ironrock_west
+        - state: rock_bananium
+
+- type: entity
+  id: IronRockSalt
+  parent: IronRock
+  description: An ore vein rich with salt.
+  suffix: Salt
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreSalt
+    - type: Sprite
+      layers:
+        - state: ironrock
+        - map: [ "enum.EdgeLayer.South" ]
+          state: ironrock_south
+        - map: [ "enum.EdgeLayer.East" ]
+          state: ironrock_east
+        - map: [ "enum.EdgeLayer.North" ]
+          state: ironrock_north
+        - map: [ "enum.EdgeLayer.West" ]
+          state: ironrock_west
+        - state: rock_salt
+
+- type: entity
+  id: IronRockArtifactFragment
+  parent: IronRock
+  description: A rock wall. What's that sticking out of it?
+  suffix: Artifact Fragment
+  components:
+  - type: OreVein
+    oreChance: 1.0
+    currentOre: OreArtifactFragment
+  - type: Sprite
+    layers:
+    - state: ironrock
+    - map: [ "enum.EdgeLayer.South" ]
+      state: ironrock_south
+    - map: [ "enum.EdgeLayer.East" ]
+      state: ironrock_east
+    - map: [ "enum.EdgeLayer.North" ]
+      state: ironrock_north
+    - map: [ "enum.EdgeLayer.West" ]
+      state: ironrock_west
+    - state: rock_artifact_fragment
 
 # Rocks and ore veins
 - type: entity
diff --git a/Resources/Prototypes/Entities/Tiles/lava.yml b/Resources/Prototypes/Entities/Tiles/lava.yml
index 72641309b3..36c7b80b81 100644
--- a/Resources/Prototypes/Entities/Tiles/lava.yml
+++ b/Resources/Prototypes/Entities/Tiles/lava.yml
@@ -13,8 +13,12 @@
     blacklist:
       tags:
         - Catwalk
-  - type: Lava
-    fireStacks: 0.75
+  - type: TileEntityEffect
+    effects:
+    - !type:FlammableReaction
+      multiplier: 3.75
+      multiplierOnExisting: 0.75
+    - !type:Ignite
   - type: Transform
     anchored: true
   - type: SyncSprite
diff --git a/Resources/Prototypes/Entities/Tiles/liquid_plasma.yml b/Resources/Prototypes/Entities/Tiles/liquid_plasma.yml
index 08f4653863..869db08597 100644
--- a/Resources/Prototypes/Entities/Tiles/liquid_plasma.yml
+++ b/Resources/Prototypes/Entities/Tiles/liquid_plasma.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: FloorLiquidPlasmaEntity
   name: liquid plasma
   description: Sweet, expensive nectar. Don't consume.
@@ -13,8 +13,12 @@
     blacklist:
       tags:
       - Catwalk
-  - type: Lava
-    fireStacks: 0.75
+  - type: TileEntityEffect
+    effects:
+    - !type:FlammableReaction
+      multiplier: 3.75
+      multiplierOnExisting: 0.75
+    - !type:Ignite
   - type: Transform
     anchored: true
   - type: SyncSprite
diff --git a/Resources/Prototypes/InventoryTemplates/inventorybase.yml b/Resources/Prototypes/InventoryTemplates/inventorybase.yml
new file mode 100644
index 0000000000..2334c6784e
--- /dev/null
+++ b/Resources/Prototypes/InventoryTemplates/inventorybase.yml
@@ -0,0 +1,17 @@
+- type: entity
+  abstract: true
+  id: InventoryBase
+  components:
+    - type: Inventory
+    - type: InventorySlots
+
+- type: entity
+  abstract: true
+  parent: InventoryBase
+  id: StripableInventoryBase
+  components:
+  - type: Strippable
+  - type: UserInterface
+    interfaces:
+      enum.StrippingUiKey.Key:
+        type: StrippableBoundUserInterface
diff --git a/Resources/Prototypes/InventoryTemplates/medibot_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/medibot_inventory_template.yml
new file mode 100644
index 0000000000..bfc561486b
--- /dev/null
+++ b/Resources/Prototypes/InventoryTemplates/medibot_inventory_template.yml
@@ -0,0 +1,11 @@
+- type: inventoryTemplate
+  id: medibot
+  slots:
+  - name: head
+    slotTexture: head
+    slotFlags: HEAD
+    stripTime: 3
+    uiWindowPos: 1,0
+    strippingWindowPos: 0,0
+    displayName: Head
+    offset: 0.10, -0.35
diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
index e3da71b4c1..57d2e5827d 100644
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -38,8 +38,6 @@
 - type: loadoutGroup
   id: Survival
   name: loadout-group-survival-basic
-  minLimit: 1
-  maxLimit: 1
   hidden: true
   loadouts:
   - EmergencyNitrogen
@@ -410,8 +408,6 @@
 - type: loadoutGroup
   id: SurvivalClown
   name: loadout-group-survival-clown
-  minLimit: 2
-  maxLimit: 2
   hidden: true
   loadouts:
   - EmergencyNitrogenClown
@@ -733,8 +729,6 @@
 - type: loadoutGroup
   id: SurvivalExtended
   name: loadout-group-survival-extended
-  minLimit: 2
-  maxLimit: 2
   hidden: true
   loadouts:
   - EmergencyNitrogenExtended
@@ -1013,8 +1007,6 @@
 - type: loadoutGroup
   id: SurvivalSecurity
   name: loadout-group-survival-security
-  minLimit: 2
-  maxLimit: 2
   hidden: true
   loadouts:
   - EmergencyNitrogenSecurity
@@ -1195,8 +1187,6 @@
 - type: loadoutGroup
   id: SurvivalMedical
   name: loadout-group-survival-medical
-  minLimit: 2
-  maxLimit: 2
   hidden: true
   loadouts:
   - EmergencyNitrogenMedical
@@ -1230,8 +1220,6 @@
 - type: loadoutGroup
   id: SurvivalSyndicate
   name: loadout-group-survival-syndicate
-  minLimit: 2
-  maxLimit: 2
   hidden: true
   loadouts:
   - EmergencyNitrogenSyndicate
diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml
index f2f7648521..4f27c6949b 100644
--- a/Resources/Prototypes/Loadouts/role_loadouts.yml
+++ b/Resources/Prototypes/Loadouts/role_loadouts.yml
@@ -7,8 +7,9 @@
   - CaptainJumpsuit
   - CaptainBackpack
   - CaptainOuterClothing
-  - Trinkets
   - Survival
+  - Trinkets
+
 
 - type: roleLoadout
   id: JobHeadOfPersonnel
@@ -19,8 +20,8 @@
   - HoPBackpack
   - HoPOuterClothing
   - Glasses
-  - Trinkets
   - Survival
+  - Trinkets
 
 # Civilian
 - type: roleLoadout
@@ -33,8 +34,8 @@
   - PassengerOuterClothing
   - PassengerShoes
   - Glasses
-  - Trinkets
   - Survival
+  - Trinkets
 
 - type: roleLoadout
   id: JobBartender
@@ -44,8 +45,8 @@
   - CommonBackpack
   - BartenderOuterClothing
   - Glasses
-  - Trinkets
   - Survival
+  - Trinkets
 
 - type: roleLoadout
   id: JobServiceWorker
@@ -53,8 +54,8 @@
   - BartenderJumpsuit
   - CommonBackpack
   - Glasses
-  - Trinkets
   - Survival
+  - Trinkets
 
 - type: roleLoadout
   id: JobChef
@@ -65,8 +66,8 @@
   - CommonBackpack
   - ChefOuterClothing
   - Glasses
-  - Trinkets
   - Survival
+  - Trinkets
 
 - type: roleLoadout
   id: JobLibrarian
@@ -74,8 +75,8 @@
   - LibrarianJumpsuit
   - CommonBackpack
   - Glasses
-  - Trinkets
   - Survival
+  - Trinkets
 
 - type: roleLoadout
   id: JobLawyer
@@ -84,8 +85,8 @@
   - LawyerJumpsuit
   - CommonBackpack
   - Glasses
-  - Trinkets
   - Survival
+  - Trinkets
 
 - type: roleLoadout
   id: JobChaplain
@@ -97,8 +98,8 @@
   - CommonBackpack
   - ChaplainOuterClothing
   - Glasses
-  - Trinkets
   - Survival
+  - Trinkets
 
 - type: roleLoadout
   id: JobJanitor
@@ -109,9 +110,9 @@
   - CommonBackpack
   - JanitorOuterClothing
   - Glasses
+  - Survival
   - Trinkets
   - JanitorPlunger
-  - Survival
 
 - type: roleLoadout
   id: JobBotanist
@@ -121,8 +122,8 @@
   - BotanistBackpack
   - BotanistOuterClothing
   - Glasses
-  - Trinkets
   - Survival
+  - Trinkets
 
 - type: roleLoadout
   id: JobClown
@@ -133,8 +134,8 @@
   - ClownOuterClothing
   - ClownShoes
   - Glasses
-  - Trinkets
   - SurvivalClown
+  - Trinkets
 
 - type: roleLoadout
   id: JobMime
@@ -145,8 +146,8 @@
   - MimeBackpack
   - MimeOuterClothing
   - Glasses
-  - Trinkets
   - Survival
+  - Trinkets
 
 - type: roleLoadout
   id: JobMusician
@@ -155,9 +156,9 @@
   - CommonBackpack
   - MusicianOuterClothing
   - Glasses
+  - Survival
   - Trinkets
   - Instruments
-  - Survival
 
 # Cargo
 - type: roleLoadout
@@ -170,8 +171,8 @@
   - QuartermasterOuterClothing
   - QuartermasterShoes
   - Glasses
-  - Trinkets
   - Survival
+  - Trinkets
 
 - type: roleLoadout
   id: JobCargoTechnician
@@ -182,8 +183,8 @@
   - CargoTechnicianOuterClothing
   - CargoTechnicianShoes
   - Glasses
-  - Trinkets
   - Survival
+  - Trinkets
 
 - type: roleLoadout
   id: JobSalvageSpecialist
@@ -192,8 +193,8 @@
   - SalvageSpecialistOuterClothing
   - SalvageSpecialistShoes
   - Glasses
-  - Trinkets
   - Survival
+  - Trinkets
 
 # Engineering
 - type: roleLoadout
@@ -205,16 +206,16 @@
   - ChiefEngineerNeck
   - ChiefEngineerOuterClothing
   - ChiefEngineerShoes
-  - Trinkets
   - SurvivalExtended
+  - Trinkets
 
 - type: roleLoadout
   id: JobTechnicalAssistant
   groups:
   - TechnicalAssistantJumpsuit
   - StationEngineerBackpack
-  - Trinkets
   - SurvivalExtended
+  - Trinkets
 
 - type: roleLoadout
   id: JobStationEngineer
@@ -225,8 +226,8 @@
   - StationEngineerOuterClothing
   - StationEngineerShoes
   - StationEngineerID
-  - Trinkets
   - SurvivalExtended
+  - Trinkets
 
 - type: roleLoadout
   id: JobAtmosphericTechnician
@@ -235,8 +236,8 @@
   - AtmosphericTechnicianBackpack
   - AtmosphericTechnicianOuterClothing
   - AtmosphericTechnicianShoes
-  - Trinkets
   - SurvivalExtended
+  - Trinkets
 
 # Science
 - type: roleLoadout
@@ -250,8 +251,8 @@
   - ScientistGloves
   - ResearchDirectorShoes
   - Glasses
-  - Trinkets
   - Survival
+  - Trinkets
 
 - type: roleLoadout
   id: JobScientist
@@ -265,8 +266,8 @@
   - ScientistShoes
   - ScientistPDA
   - Glasses
-  - Trinkets
   - Survival
+  - Trinkets
 
 - type: roleLoadout
   id: JobResearchAssistant
@@ -274,8 +275,8 @@
   - ResearchAssistantJumpsuit
   - ScientistBackpack
   - Glasses
-  - Trinkets
   - Survival
+  - Trinkets
 
 # Security
 - type: roleLoadout
@@ -288,8 +289,8 @@
   - SecurityBelt
   - HeadofSecurityOuterClothing
   - SecurityShoes
-  - Trinkets
   - SurvivalSecurity
+  - Trinkets
 
 - type: roleLoadout
   id: JobWarden
@@ -300,8 +301,8 @@
   - SecurityBelt
   - WardenOuterClothing
   - SecurityShoes
-  - Trinkets
   - SurvivalSecurity
+  - Trinkets
 
 - type: roleLoadout
   id: JobSecurityOfficer
@@ -313,8 +314,8 @@
   - SecurityShoes
   - SecurityPDA
   - SecurityBelt
-  - Trinkets
   - SurvivalSecurity
+  - Trinkets
 
 - type: roleLoadout
   id: JobDetective
@@ -325,16 +326,16 @@
   - SecurityBackpack
   - DetectiveOuterClothing
   - SecurityShoes
-  - Trinkets
   - SurvivalSecurity
+  - Trinkets
 
 - type: roleLoadout
   id: JobSecurityCadet
   groups:
   - SecurityCadetJumpsuit
   - SecurityBackpack
-  - Trinkets
   - SurvivalSecurity
+  - Trinkets
 
 # Medical
 - type: roleLoadout
@@ -349,8 +350,8 @@
   - ChiefMedicalOfficerNeck
   - ChiefMedicalOfficerShoes
   - Glasses
-  - Trinkets
   - SurvivalMedical
+  - Trinkets
 
 - type: roleLoadout
   id: JobMedicalDoctor
@@ -364,8 +365,8 @@
   - MedicalShoes
   - MedicalDoctorPDA
   - Glasses
-  - Trinkets
   - SurvivalMedical
+  - Trinkets
 
 - type: roleLoadout
   id: JobMedicalIntern
@@ -373,8 +374,8 @@
   - MedicalInternJumpsuit
   - MedicalBackpack
   - Glasses
-  - Trinkets
   - SurvivalMedical
+  - Trinkets
 
 - type: roleLoadout
   id: JobChemist
@@ -385,8 +386,8 @@
   - ChemistBackpack
   - ChemistOuterClothing
   - MedicalShoes
-  - Trinkets
   - SurvivalMedical
+  - Trinkets
 
 - type: roleLoadout
   id: JobParamedic
@@ -399,8 +400,8 @@
   - ParamedicOuterClothing
   - ParamedicShoes
   - Glasses
-  - Trinkets
   - SurvivalMedical
+  - Trinkets
 
 # Wildcards
 - type: roleLoadout
@@ -408,8 +409,8 @@
   groups:
   - CommonBackpack
   - Glasses
-  - Trinkets
   - Survival
+  - Trinkets
 
 - type: roleLoadout
   id: JobReporter
@@ -417,16 +418,16 @@
   - ReporterJumpsuit
   - CommonBackpack
   - Glasses
-  - Trinkets
   - Survival
+  - Trinkets
 
 - type: roleLoadout
   id: JobPsychologist
   groups:
   - MedicalBackpack
   - Glasses
-  - Trinkets
   - Survival
+  - Trinkets
 
 - type: roleLoadout
   id: JobBoxer
@@ -435,8 +436,8 @@
   - BoxerGloves
   - CommonBackpack
   - Glasses
-  - Trinkets
   - Survival
+  - Trinkets
 
 # These loadouts will be used without player configuration, thus they must be designed to work without manual selection
 
diff --git a/Resources/Prototypes/Reagents/biological.yml b/Resources/Prototypes/Reagents/biological.yml
index 0c53ae10fd..b4846d931e 100644
--- a/Resources/Prototypes/Reagents/biological.yml
+++ b/Resources/Prototypes/Reagents/biological.yml
@@ -18,7 +18,7 @@
     Drink:
       effects:
       - !type:SatiateThirst
-        factor: 1.5
+        factor: 1.0
         conditions:
           - !type:OrganType
             type: Human
@@ -27,7 +27,7 @@
       effects:
         - !type:AdjustReagent
           reagent: UncookedAnimalProteins
-          amount: 0.5
+          amount: 0.1
     Medicine:
       effects:
       - !type:HealthChange
@@ -76,7 +76,7 @@
       # Delicious!
       effects:
       - !type:SatiateHunger
-        factor: 1.5
+        factor: 1
   footstepSound:
     collection: FootstepBlood
     params:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/food/doughrope.yml b/Resources/Prototypes/Recipes/Construction/Graphs/food/doughrope.yml
new file mode 100644
index 0000000000..52a9a817cf
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/food/doughrope.yml
@@ -0,0 +1,13 @@
+- type: constructionGraph
+  id: DoughRope
+  start: start
+  graph:
+  - node: start
+    entity: FoodDoughSlice
+    edges:
+    - to: rolled
+      steps:
+      - tool: Rolling
+        doAfter: 1
+  - node: rolled
+    entity: FoodDoughRope
\ No newline at end of file
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/ame_shielding.yml b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/ame_shielding.yml
index cf2bf9aaf7..bec98e7310 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/ame_shielding.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/ame_shielding.yml
@@ -3,11 +3,14 @@
   start: start
   graph:
     - node: start
+    - node: startBroken
 
     - node: ameShielding
       entity: AmeShielding
       edges:
         - to: start
+          conditions:
+            - !type:AmeShieldIntegrity
           completed:
             - !type:AdminLog  # I don't like logging it like this. The log should include the user, AMEShielding EntityID, and AMEPart EntityID, and there should also be a start of attempt log.
               message: "An AME shielding was deconstructed"
@@ -18,3 +21,16 @@
           steps:
             - tool: Welding
               doAfter: 3
+
+        - to: startBroken
+          conditions:
+            - !type:AmeShieldIntegrity
+              checkAbove: false
+          completed:
+            - !type:SpawnPrototype
+              prototype: SheetSteel1
+              amount: 5
+            - !type:DeleteEntity
+          steps:
+            - tool: Welding
+              doAfter: 3
diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
index 8cb4c55146..0a8ff18aad 100644
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -6,6 +6,24 @@
   solids:
     FoodDoughSlice: 1 # one third of a standard bread dough recipe
 
+#Bagels
+- type: microwaveMealRecipe
+  id: RecipeBagel
+  name: bagel recipe
+  result: FoodBagel
+  time: 5
+  solids:
+    FoodDoughRope: 1 # created by rolling a dough slice.
+
+- type: microwaveMealRecipe
+  id: RecipeBagelPoppy
+  name: poppyseed bagel recipe
+  result: FoodBagelPoppy
+  time: 5
+  solids:
+    FoodDoughRope: 1
+    PoppySeeds: 1
+
 #Burgers
 
 - type: microwaveMealRecipe
diff --git a/Resources/Prototypes/SoundCollections/NukeMusic.yml b/Resources/Prototypes/SoundCollections/NukeMusic.yml
index 51782d8bd5..be58f89e0a 100644
--- a/Resources/Prototypes/SoundCollections/NukeMusic.yml
+++ b/Resources/Prototypes/SoundCollections/NukeMusic.yml
@@ -3,4 +3,5 @@
   files:
     - /Audio/StationEvents/running_out.ogg
     - /Audio/StationEvents/countdown.ogg
-    - /Audio/StationEvents/clearly_nuclear.ogg
\ No newline at end of file
+    - /Audio/StationEvents/clearly_nuclear.ogg    
+    - /Audio/StationEvents/sound_station_14.ogg
\ No newline at end of file
diff --git a/Resources/Prototypes/Stacks/floor_tile_stacks.yml b/Resources/Prototypes/Stacks/floor_tile_stacks.yml
index c88786f0dc..01bd916a67 100644
--- a/Resources/Prototypes/Stacks/floor_tile_stacks.yml
+++ b/Resources/Prototypes/Stacks/floor_tile_stacks.yml
@@ -58,12 +58,6 @@
   spawn: FloorTileItemGold
   maxCount: 30
 
-- type: stack
-  id: FloorTileReinforced
-  name: reinforced tile
-  spawn: FloorTileItemReinforced
-  maxCount: 30
-
 - type: stack
   id: FloorTileMono
   name: mono tile
diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml
index 52efdc7d47..602e9bc441 100644
--- a/Resources/Prototypes/Tiles/floors.yml
+++ b/Resources/Prototypes/Tiles/floors.yml
@@ -621,7 +621,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepHull
-  itemDrop: FloorTileItemReinforced
+  itemDrop: PartRodMetal1
   heatCapacity: 10000
 
 - type: tile
@@ -1839,7 +1839,7 @@
   isSubfloor: false
   footstepSounds:
     collection: FootstepHull
-  itemDrop: FloorTileItemReinforced #same case as FloorHull
+  itemDrop: PartRodMetal1 #same case as FloorHull
 
 # Faux sci tiles
 
@@ -1932,4 +1932,4 @@
   barestepSounds:
     collection: BarestepWood
   itemDrop: FloorTileItemWoodLarge
-  heatCapacity: 10000
\ No newline at end of file
+  heatCapacity: 10000
diff --git a/Resources/Prototypes/Wires/layouts.yml b/Resources/Prototypes/Wires/layouts.yml
index 8d6be674e8..3939655707 100644
--- a/Resources/Prototypes/Wires/layouts.yml
+++ b/Resources/Prototypes/Wires/layouts.yml
@@ -4,6 +4,7 @@
   - !type:PowerWireAction
   - !type:PowerWireAction
     pulseTimeout: 15
+  - !type:LogWireAction
   - !type:DoorBoltWireAction
   - !type:DoorBoltLightWireAction
   - !type:DoorTimingWireAction
@@ -57,6 +58,7 @@
   wires:
   - !type:PowerWireAction
   - !type:AccessWireAction
+  - !type:LogWireAction
   - !type:VendingMachineContrabandWireAction
   - !type:VendingMachineEjectItemWireAction
   - !type:SpeechWireAction
@@ -66,6 +68,7 @@
   wires:
   - !type:PowerWireAction
   - !type:AccessWireAction
+  - !type:LogWireAction
   - !type:AirAlarmPanicWire
   - !type:AtmosMonitorDeviceNetWire
 
@@ -121,6 +124,7 @@
   - !type:PowerWireAction
   - !type:PowerWireAction
     pulseTimeout: 15
+  - !type:LogWireAction
   - !type:DoorBoltWireAction
   - !type:DoorBoltLightWireAction
   - !type:DoorTimingWireAction
diff --git a/Resources/Prototypes/_CP14/Entities/fire.yml b/Resources/Prototypes/_CP14/Entities/fire.yml
index d2f345a52c..1e65ccd65e 100644
--- a/Resources/Prototypes/_CP14/Entities/fire.yml
+++ b/Resources/Prototypes/_CP14/Entities/fire.yml
@@ -30,11 +30,20 @@
           - ItemMask
         density: 1000
         hard: false
-  - type: Lava
-    fireStacks: 0.2
   - type: StepTrigger
     requiredTriggeredSpeed: 0
     intersectRatio: 0.1
+    blacklist:
+      tags:
+        - Catwalk
+  - type: TileEntityEffect
+    effects:
+    - !type:FlammableReaction
+      multiplier: 1.75
+      multiplierOnExisting: 0.75
+    - !type:Ignite
+  - type: Transform
+    anchored: true
   - type: AmbientSound
     enabled: true
     volume: -5
diff --git a/Resources/Prototypes/lobbyscreens.yml b/Resources/Prototypes/lobbyscreens.yml
index a3c41dfe85..38616b6382 100644
--- a/Resources/Prototypes/lobbyscreens.yml
+++ b/Resources/Prototypes/lobbyscreens.yml
@@ -2,7 +2,7 @@
 - type: lobbyBackground
   id: Beginning
   background: /Textures/_CP14/LobbyScreens/beginning.webp
-  
+
 - type: lobbyBackground
   id: TypicalAlchemistDay
   background: /Textures/_CP14/LobbyScreens/typicalAlchemistDay.webp
diff --git a/Resources/Textures/Clothing/Belt/securitywebbing.rsi/equipped-BELT.png b/Resources/Textures/Clothing/Belt/securitywebbing.rsi/equipped-BELT.png
index 42d3c6a629..b562888980 100644
Binary files a/Resources/Textures/Clothing/Belt/securitywebbing.rsi/equipped-BELT.png and b/Resources/Textures/Clothing/Belt/securitywebbing.rsi/equipped-BELT.png differ
diff --git a/Resources/Textures/Clothing/Belt/securitywebbing.rsi/icon.png b/Resources/Textures/Clothing/Belt/securitywebbing.rsi/icon.png
index 6a4bbd21bc..f380c1fc75 100644
Binary files a/Resources/Textures/Clothing/Belt/securitywebbing.rsi/icon.png and b/Resources/Textures/Clothing/Belt/securitywebbing.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Belt/securitywebbing.rsi/inhand-left.png b/Resources/Textures/Clothing/Belt/securitywebbing.rsi/inhand-left.png
index dbce144c60..482a3db2a7 100644
Binary files a/Resources/Textures/Clothing/Belt/securitywebbing.rsi/inhand-left.png and b/Resources/Textures/Clothing/Belt/securitywebbing.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Belt/securitywebbing.rsi/inhand-right.png b/Resources/Textures/Clothing/Belt/securitywebbing.rsi/inhand-right.png
index 8280138ae7..b90aaf6a46 100644
Binary files a/Resources/Textures/Clothing/Belt/securitywebbing.rsi/inhand-right.png and b/Resources/Textures/Clothing/Belt/securitywebbing.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Belt/securitywebbing.rsi/meta.json b/Resources/Textures/Clothing/Belt/securitywebbing.rsi/meta.json
index a01a9c6cb9..fead05bd2f 100644
--- a/Resources/Textures/Clothing/Belt/securitywebbing.rsi/meta.json
+++ b/Resources/Textures/Clothing/Belt/securitywebbing.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 and modified by DieselMohawk for SS14",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Effects/ssd.rsi/default0.png b/Resources/Textures/Effects/ssd.rsi/default0.png
index bfd8c84da9..962a7298cf 100644
Binary files a/Resources/Textures/Effects/ssd.rsi/default0.png and b/Resources/Textures/Effects/ssd.rsi/default0.png differ
diff --git a/Resources/Textures/Effects/ssd.rsi/meta.json b/Resources/Textures/Effects/ssd.rsi/meta.json
index 6c5e7b24e3..6e9db0d8de 100644
--- a/Resources/Textures/Effects/ssd.rsi/meta.json
+++ b/Resources/Textures/Effects/ssd.rsi/meta.json
@@ -1,10 +1,10 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Take from https://github.com/Skyrat-SS13/Skyrat-tg/blob/92377cd6203bc4d93a6e289d7b857e19bb6cf338/modular_skyrat/modules/indicators/icons/ssd_indicator.dmi",
+  "copyright": "Take from https://github.com/Skyrat-SS13/Skyrat-tg/blob/92377cd6203bc4d93a6e289d7b857e19bb6cf338/modular_skyrat/modules/indicators/icons/ssd_indicator.dmi and changed by Macoron",
   "size": {
-    "x": 32,
-    "y": 32
+    "x": 8,
+    "y": 8
   },
   "states": [
     {
diff --git a/Resources/Textures/Interface/Alerts/deflecting.rsi/deflecting0.png b/Resources/Textures/Interface/Alerts/deflecting.rsi/deflecting0.png
deleted file mode 100644
index 37404e77f7..0000000000
Binary files a/Resources/Textures/Interface/Alerts/deflecting.rsi/deflecting0.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Alerts/deflecting.rsi/meta.json b/Resources/Textures/Interface/Alerts/deflecting.rsi/meta.json
deleted file mode 100644
index f5d94c891a..0000000000
--- a/Resources/Textures/Interface/Alerts/deflecting.rsi/meta.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Deflecting icon by Ubaser",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "deflecting0"
-        }
-    ]
-}
diff --git a/Resources/Textures/LobbyScreens/attributions.yml b/Resources/Textures/LobbyScreens/attributions.yml
index 52a3ee7773..1df5da9a2b 100644
--- a/Resources/Textures/LobbyScreens/attributions.yml
+++ b/Resources/Textures/LobbyScreens/attributions.yml
@@ -51,4 +51,9 @@
 - files: ["janishootout.webp"]
   license: "CC0-1.0"
   copyright: "psychpsyo on Github/Twitter"
+  source: "https://github.com/space-wizards/space-station-14"
+
+- files: ["reclaimer-nuke.webp"]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "GetOutMarutak,aka.Snicket on Discord/github/Cara/Ko-fi"
   source: "https://github.com/space-wizards/space-station-14"
\ No newline at end of file
diff --git a/Resources/Textures/LobbyScreens/blueprint.png.yml b/Resources/Textures/LobbyScreens/blueprint.webp.yml
similarity index 100%
rename from Resources/Textures/LobbyScreens/blueprint.png.yml
rename to Resources/Textures/LobbyScreens/blueprint.webp.yml
diff --git a/Resources/Textures/LobbyScreens/justaweekaway.yml b/Resources/Textures/LobbyScreens/justaweekaway.webp.yml
similarity index 100%
rename from Resources/Textures/LobbyScreens/justaweekaway.yml
rename to Resources/Textures/LobbyScreens/justaweekaway.webp.yml
diff --git a/Resources/Textures/LobbyScreens/reclaimer-nuke.webp b/Resources/Textures/LobbyScreens/reclaimer-nuke.webp
new file mode 100644
index 0000000000..b169086104
Binary files /dev/null and b/Resources/Textures/LobbyScreens/reclaimer-nuke.webp differ
diff --git a/Resources/Textures/LobbyScreens/robotics.webp.yml b/Resources/Textures/LobbyScreens/reclaimer-nuke.webp.yml
similarity index 100%
rename from Resources/Textures/LobbyScreens/robotics.webp.yml
rename to Resources/Textures/LobbyScreens/reclaimer-nuke.webp.yml
diff --git a/Resources/Textures/LobbyScreens/robotics.webp b/Resources/Textures/LobbyScreens/robotics.webp
deleted file mode 100644
index 43d32581cf..0000000000
Binary files a/Resources/Textures/LobbyScreens/robotics.webp and /dev/null differ
diff --git a/Resources/Textures/LobbyScreens/supermatter.webp b/Resources/Textures/LobbyScreens/supermatter.webp
deleted file mode 100644
index d5fb190ae6..0000000000
Binary files a/Resources/Textures/LobbyScreens/supermatter.webp and /dev/null differ
diff --git a/Resources/Textures/LobbyScreens/supermatter.webp.yml b/Resources/Textures/LobbyScreens/supermatter.webp.yml
deleted file mode 100644
index dabd6601f7..0000000000
--- a/Resources/Textures/LobbyScreens/supermatter.webp.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-sample:
-  filter: true
diff --git a/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/icon.png
index 01abf17a36..7f37864ba6 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/icon_open.png
new file mode 100644
index 0000000000..72485a8e56
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/icon_open.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/meta.json
index db0ac608ed..9e1d9a9075 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/meta.json
@@ -1 +1,17 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]}
\ No newline at end of file
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_open"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bagel.rsi/bagel-poppy.png b/Resources/Textures/Objects/Consumable/Food/Baked/bagel.rsi/bagel-poppy.png
new file mode 100644
index 0000000000..e9b8cc143d
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bagel.rsi/bagel-poppy.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bagel.rsi/bagel.png b/Resources/Textures/Objects/Consumable/Food/Baked/bagel.rsi/bagel.png
new file mode 100644
index 0000000000..1f36b3b186
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bagel.rsi/bagel.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bagel.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/bagel.rsi/meta.json
new file mode 100644
index 0000000000..fcd9dc077d
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Food/Baked/bagel.rsi/meta.json
@@ -0,0 +1,17 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Bagel and BagelPoppy were created by DrEnzyme",
+    "size": {
+      "x": 32,
+      "y": 32
+    },
+    "states": [
+      {
+        "name": "bagel"
+      },
+      {
+        "name": "bagel-poppy"
+      }
+    ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough-rope.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough-rope.png
new file mode 100644
index 0000000000..864df464cc
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough-rope.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json
index 6633b0b0bd..b4317b0c76 100644
--- a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json
@@ -52,6 +52,9 @@
     {
       "name": "dough-pie"
     },
+    {
+      "name": "dough-rope"
+    },
     {
       "name": "dough-flat"
     },
diff --git a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_gay.png b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_gay.png
index 7cc17bc3a2..4a653dfc7b 100644
Binary files a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_gay.png and b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_gay.png differ
diff --git a/Resources/Textures/Objects/Misc/module.rsi/cargodisk.png b/Resources/Textures/Objects/Misc/module.rsi/cargodisk.png
index ffdb773aa9..5633f0f486 100644
Binary files a/Resources/Textures/Objects/Misc/module.rsi/cargodisk.png and b/Resources/Textures/Objects/Misc/module.rsi/cargodisk.png differ
diff --git a/Resources/Textures/Objects/Misc/module.rsi/datadisk0.png b/Resources/Textures/Objects/Misc/module.rsi/datadisk0.png
deleted file mode 100644
index 4b5e7bf0fd..0000000000
Binary files a/Resources/Textures/Objects/Misc/module.rsi/datadisk0.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/module.rsi/datadisk1.png b/Resources/Textures/Objects/Misc/module.rsi/datadisk1.png
deleted file mode 100644
index 5a7801cd46..0000000000
Binary files a/Resources/Textures/Objects/Misc/module.rsi/datadisk1.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/module.rsi/datadisk2.png b/Resources/Textures/Objects/Misc/module.rsi/datadisk2.png
deleted file mode 100644
index a30a7a7853..0000000000
Binary files a/Resources/Textures/Objects/Misc/module.rsi/datadisk2.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/module.rsi/datadisk3.png b/Resources/Textures/Objects/Misc/module.rsi/datadisk3.png
deleted file mode 100644
index 1f01386891..0000000000
Binary files a/Resources/Textures/Objects/Misc/module.rsi/datadisk3.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/module.rsi/datadisk4.png b/Resources/Textures/Objects/Misc/module.rsi/datadisk4.png
deleted file mode 100644
index 9fd4781032..0000000000
Binary files a/Resources/Textures/Objects/Misc/module.rsi/datadisk4.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/module.rsi/datadisk5.png b/Resources/Textures/Objects/Misc/module.rsi/datadisk5.png
deleted file mode 100644
index 1f0ec86f62..0000000000
Binary files a/Resources/Textures/Objects/Misc/module.rsi/datadisk5.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/module.rsi/datadisk6.png b/Resources/Textures/Objects/Misc/module.rsi/datadisk6.png
deleted file mode 100644
index e76bf1784c..0000000000
Binary files a/Resources/Textures/Objects/Misc/module.rsi/datadisk6.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/module.rsi/datadisk_base.png b/Resources/Textures/Objects/Misc/module.rsi/datadisk_base.png
index 655475caff..7ac86185e8 100644
Binary files a/Resources/Textures/Objects/Misc/module.rsi/datadisk_base.png and b/Resources/Textures/Objects/Misc/module.rsi/datadisk_base.png differ
diff --git a/Resources/Textures/Objects/Misc/module.rsi/datadisk_label.png b/Resources/Textures/Objects/Misc/module.rsi/datadisk_label.png
index 7eb0695977..ce7c2fe134 100644
Binary files a/Resources/Textures/Objects/Misc/module.rsi/datadisk_label.png and b/Resources/Textures/Objects/Misc/module.rsi/datadisk_label.png differ
diff --git a/Resources/Textures/Objects/Misc/module.rsi/holodisk.png b/Resources/Textures/Objects/Misc/module.rsi/holodisk.png
index 52faf6b4cc..1632fc20d6 100644
Binary files a/Resources/Textures/Objects/Misc/module.rsi/holodisk.png and b/Resources/Textures/Objects/Misc/module.rsi/holodisk.png differ
diff --git a/Resources/Textures/Objects/Misc/module.rsi/meta.json b/Resources/Textures/Objects/Misc/module.rsi/meta.json
index d7b9e7601e..ba3abaa2dd 100644
--- a/Resources/Textures/Objects/Misc/module.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/module.rsi/meta.json
@@ -1 +1 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/tgstation/tgstation at 0d9c9a8233dfc3fc55edc538955a761a6328bee0, generic, service, command, science, security, medical, supply, and engineering taken from shiptest at https://github.com/shiptest-ss13/Shiptest/pull/1473, disk sprites taken from tgstation at commit https://github.com/tgstation/tgstation/commit/32a2e3e4ceda3ef442c1496cbc6c6a896d684702, additional sprites created by EmoGarbage404", "states": [{"name": "abductor_mod"}, {"name": "airalarm_electronics"}, {"name": "ash_plating"}, {"name": "beaker_holder"}, {"name": "blank_mod"}, {"name": "bluespacearray"}, {"name": "boris"}, {"name": "boris_recharging", "delays": [[1.0, 1.0]]}, {"name": "card_mini"}, {"name": "card_mod"}, {"name": "cargodisk"}, {"name": "cart_connector"}, {"name": "cddrive"}, {"name": "cell"}, {"name": "cell_con"}, {"name": "cell_con_micro"}, {"name": "cell_micro"}, {"name": "cell_mini"}, {"name": "charger_APC"}, {"name": "charger_lambda"}, {"name": "charger_pda"}, {"name": "charger_wire"}, {"name": "clock_mod", "delays": [[0.6, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "command"}, {"name": "cpu"}, {"name": "cpu_adv"}, {"name": "cpu_command"}, {"name": "cpu_engineering"}, {"name": "cpu_medical"}, {"name": "cpu_science"}, {"name": "cpu_security"}, {"name": "cpu_service"}, {"name": "cpu_super", "delays": [[0.1, 0.1]]}, {"name": "cpu_supply"}, {"name": "cpuboard"}, {"name": "cpuboard_adv"}, {"name": "cpuboard_super", "delays": [[0.1, 0.1]]}, {"name": "cyborg_upgrade"}, {"name": "cyborg_upgrade1"}, {"name": "cyborg_upgrade2"}, {"name": "cyborg_upgrade3"}, {"name": "cyborg_upgrade4"}, {"name": "cyborg_upgrade5"}, {"name": "datadisk_base"}, {"name": "datadisk0"}, {"name": "datadisk1"}, {"name": "datadisk2"}, {"name": "datadisk3"}, {"name": "datadisk4"}, {"name": "datadisk5"}, {"name": "datadisk6"}, {"name": "datadisk_gene", "delays": [[0.1, 0.1, 0.1]]}, {"name": "datadisk_hydro", "delays": [[0.1, 0.1, 0.1]]}, {"name": "datadisk_label"}, {"name": "depositbox"}, {"name": "door_electronics"}, {"name": "engineering"}, {"name": "flopdrive"}, {"name": "generic"}, {"name": "harddisk"}, {"name": "harddisk_micro"}, {"name": "harddisk_mini"}, {"name": "holodisk", "delays": [[0.1, 0.1]]}, {"name": "id_mod"}, {"name": "mainboard"}, {"name": "mcontroller"}, {"name": "medical"}, {"name": "net_wired"}, {"name": "nucleardisk", "delays": [[0.1, 0.1]]}, {"name": "power_mod"}, {"name": "printer"}, {"name": "printer_mini"}, {"name": "prizevendor"}, {"name": "radio"}, {"name": "radio_micro"}, {"name": "radio_mini"}, {"name": "ram"}, {"name": "rndmajordisk"}, {"name": "science"}, {"name": "secmodschematic"}, {"name": "security"}, {"name": "selfrepair_off"}, {"name": "selfrepair_on", "delays": [[0.1, 0.1, 0.1, 0.1]]}, {"name": "service"}, {"name": "servo"}, {"name": "ssd"}, {"name": "ssd_large"}, {"name": "ssd_micro"}, {"name": "ssd_mini"}, {"name": "std_mod"}, {"name": "supply"}]}
\ No newline at end of file
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/tgstation/tgstation at 0d9c9a8233dfc3fc55edc538955a761a6328bee0, generic, service, command, science, security, medical, supply, and engineering taken from shiptest at https://github.com/shiptest-ss13/Shiptest/pull/1473, additional sprites created by EmoGarbage404", "states": [{"name": "abductor_mod"}, {"name": "airalarm_electronics"}, {"name": "ash_plating"}, {"name": "beaker_holder"}, {"name": "blank_mod"}, {"name": "bluespacearray"}, {"name": "boris"}, {"name": "boris_recharging", "delays": [[1.0, 1.0]]}, {"name": "card_mini"}, {"name": "card_mod"}, {"name": "cargodisk"}, {"name": "cart_connector"}, {"name": "cddrive"}, {"name": "cell"}, {"name": "cell_con"}, {"name": "cell_con_micro"}, {"name": "cell_micro"}, {"name": "cell_mini"}, {"name": "charger_APC"}, {"name": "charger_lambda"}, {"name": "charger_pda"}, {"name": "charger_wire"}, {"name": "clock_mod", "delays": [[0.6, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "command"}, {"name": "cpu"}, {"name": "cpu_adv"}, {"name": "cpu_command"}, {"name": "cpu_engineering"}, {"name": "cpu_medical"}, {"name": "cpu_science"}, {"name": "cpu_security"}, {"name": "cpu_service"}, {"name": "cpu_super", "delays": [[0.1, 0.1]]}, {"name": "cpu_supply"}, {"name": "cpuboard"}, {"name": "cpuboard_adv"}, {"name": "cpuboard_super", "delays": [[0.1, 0.1]]}, {"name": "cyborg_upgrade"}, {"name": "cyborg_upgrade1"}, {"name": "cyborg_upgrade2"}, {"name": "cyborg_upgrade3"}, {"name": "cyborg_upgrade4"}, {"name": "cyborg_upgrade5"}, {"name": "datadisk_base"},  {"name": "datadisk_gene", "delays": [[0.1, 0.1, 0.1]]}, {"name": "datadisk_hydro", "delays": [[0.1, 0.1, 0.1]]}, {"name": "datadisk_label"}, {"name": "depositbox"}, {"name": "door_electronics"}, {"name": "engineering"}, {"name": "flopdrive"}, {"name": "generic"}, {"name": "harddisk"}, {"name": "harddisk_micro"}, {"name": "harddisk_mini"}, {"name": "holodisk", "delays": [[0.1, 0.1]]}, {"name": "id_mod"}, {"name": "mainboard"}, {"name": "mcontroller"}, {"name": "medical"}, {"name": "net_wired"}, {"name": "power_mod"}, {"name": "printer"}, {"name": "printer_mini"}, {"name": "prizevendor"}, {"name": "radio"}, {"name": "radio_micro"}, {"name": "radio_mini"}, {"name": "ram"}, {"name": "rndmajordisk"}, {"name": "science"}, {"name": "secmodschematic"}, {"name": "security"}, {"name": "selfrepair_off"}, {"name": "selfrepair_on", "delays": [[0.1, 0.1, 0.1, 0.1]]}, {"name": "service"}, {"name": "servo"}, {"name": "ssd"}, {"name": "ssd_large"}, {"name": "ssd_micro"}, {"name": "ssd_mini"}, {"name": "std_mod"}, {"name": "supply"}]}
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Misc/module.rsi/nucleardisk.png b/Resources/Textures/Objects/Misc/module.rsi/nucleardisk.png
deleted file mode 100644
index 8fb09b3651..0000000000
Binary files a/Resources/Textures/Objects/Misc/module.rsi/nucleardisk.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/nukedisk.rsi/icon.png b/Resources/Textures/Objects/Misc/nukedisk.rsi/icon.png
index 8fb09b3651..05155b22f5 100644
Binary files a/Resources/Textures/Objects/Misc/nukedisk.rsi/icon.png and b/Resources/Textures/Objects/Misc/nukedisk.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Misc/nukedisk.rsi/inhand-left.png b/Resources/Textures/Objects/Misc/nukedisk.rsi/inhand-left.png
new file mode 100644
index 0000000000..f7034df28b
Binary files /dev/null and b/Resources/Textures/Objects/Misc/nukedisk.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Misc/nukedisk.rsi/inhand-right.png b/Resources/Textures/Objects/Misc/nukedisk.rsi/inhand-right.png
new file mode 100644
index 0000000000..f7034df28b
Binary files /dev/null and b/Resources/Textures/Objects/Misc/nukedisk.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Misc/nukedisk.rsi/meta.json b/Resources/Textures/Objects/Misc/nukedisk.rsi/meta.json
index aeda729c56..22ea9ffd38 100644
--- a/Resources/Textures/Objects/Misc/nukedisk.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/nukedisk.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/32a2e3e4ceda3ef442c1496cbc6c6a896d684702",
+  "copyright": "Taken from vgstation13 at commit 16e3e20a6bb0f335e241c47382eff3871a1787f1",
   "size": {
     "x": 32,
     "y": 32
@@ -15,6 +15,50 @@
           0.1
         ]
       ]
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1
+        ]
+      ]
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk0.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk0.png
deleted file mode 100644
index 9c48deb74b..0000000000
Binary files a/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk0.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk1.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk1.png
deleted file mode 100644
index 03079a2bfc..0000000000
Binary files a/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk1.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk2.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk2.png
deleted file mode 100644
index a54808387d..0000000000
Binary files a/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk2.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk3.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk3.png
deleted file mode 100644
index 089c064f4b..0000000000
Binary files a/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk3.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk4.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk4.png
deleted file mode 100644
index 459c4e9c3f..0000000000
Binary files a/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk4.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk5.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk5.png
deleted file mode 100644
index a0884cc43f..0000000000
Binary files a/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk5.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk6.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk6.png
deleted file mode 100644
index cd74424372..0000000000
Binary files a/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk6.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/meta.json b/Resources/Textures/Objects/Misc/stock_parts.rsi/meta.json
index fac7308401..a7211231bb 100644
--- a/Resources/Textures/Objects/Misc/stock_parts.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/stock_parts.rsi/meta.json
@@ -66,76 +66,6 @@
     {
       "name": "card_reader"
     },
-    {
-      "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": [
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/freezerOff.png b/Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/freezerOff.png
index d47969aaeb..8256e40d46 100644
Binary files a/Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/freezerOff.png and b/Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/freezerOff.png differ
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/freezerOn.png b/Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/freezerOn.png
index fdf6db8d6e..1455c0fea1 100644
Binary files a/Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/freezerOn.png and b/Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/freezerOn.png differ
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/freezerPanelOpen.png b/Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/freezerPanelOpen.png
index 2b12a2d5c0..503a4a3648 100644
Binary files a/Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/freezerPanelOpen.png and b/Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/freezerPanelOpen.png differ
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/heaterOff.png b/Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/heaterOff.png
index 3ed5ae46f9..143b458345 100644
Binary files a/Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/heaterOff.png and b/Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/heaterOff.png differ
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/heaterOn.png b/Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/heaterOn.png
index 597e2cc9cf..7e102dbc0d 100644
Binary files a/Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/heaterOn.png and b/Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/heaterOn.png differ
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/heaterPanelOpen.png b/Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/heaterPanelOpen.png
index 53905e1e8c..f41cceb593 100644
Binary files a/Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/heaterPanelOpen.png and b/Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/heaterPanelOpen.png differ
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/meta.json b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/meta.json
index 0d11425210..74e1688748 100644
--- a/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/meta.json
+++ b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/meta.json
@@ -7,6 +7,10 @@
    "license":"CC-BY-SA-3.0",
    "copyright":"Taken from https://github.com/BeeStation/BeeStation-Hornet at commit 4ccd79de285e79e504308bcd6fa5908d6b7685f7",
    "states":[
+      {
+         "name":"vent_passive",
+         "directions" : 4
+      },
       {
          "name":"vent_off",
          "directions" : 4
@@ -24,6 +28,10 @@
          "name":"vent_in",
          "directions" : 4,
          "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 ] ]
+      },
+      {
+         "name":"vent_lockout",
+         "directions" : 4
       }
    ]
 }
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_lockout.png b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_lockout.png
new file mode 100644
index 0000000000..bf0b9c928e
Binary files /dev/null and b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_lockout.png differ
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_passive.png b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_passive.png
new file mode 100644
index 0000000000..5ff27ef759
Binary files /dev/null and b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_passive.png differ
diff --git a/Resources/Textures/Structures/Power/Generation/teg.rsi/circ-0.png b/Resources/Textures/Structures/Power/Generation/teg.rsi/circ-0.png
index 73508ad504..04d1707df3 100644
Binary files a/Resources/Textures/Structures/Power/Generation/teg.rsi/circ-0.png and b/Resources/Textures/Structures/Power/Generation/teg.rsi/circ-0.png differ
diff --git a/Resources/Textures/Structures/Power/Generation/teg.rsi/circ-1.png b/Resources/Textures/Structures/Power/Generation/teg.rsi/circ-1.png
index a86d1c040f..47a428f41d 100644
Binary files a/Resources/Textures/Structures/Power/Generation/teg.rsi/circ-1.png and b/Resources/Textures/Structures/Power/Generation/teg.rsi/circ-1.png differ
diff --git a/Resources/Textures/Structures/Power/Generation/teg.rsi/circ-2.png b/Resources/Textures/Structures/Power/Generation/teg.rsi/circ-2.png
index 7a79ba85c5..b7bc260d68 100644
Binary files a/Resources/Textures/Structures/Power/Generation/teg.rsi/circ-2.png and b/Resources/Textures/Structures/Power/Generation/teg.rsi/circ-2.png differ
diff --git a/Resources/migration.yml b/Resources/migration.yml
index a617c3caa6..ae649bdec4 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -382,4 +382,11 @@ DoorRemoteFirefight: null
 AirlockServiceCaptainLocked: AirlockCaptainLocked
 
 # 2024-06-15
-ClothingOuterCoatInspector: ClothingOuterCoatDetectiveLoadout
\ No newline at end of file
+ClothingOuterCoatInspector: ClothingOuterCoatDetectiveLoadout
+
+# 2024-06-23
+FloorTileItemReinforced: PartRodMetal1
+
+
+#2024-06-25
+BookChefGaming: BookHowToCookForFortySpaceman
diff --git a/RobustToolbox b/RobustToolbox
index da5416a2da..860c9af2bf 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit da5416a2da2745044a1ed4f2aa5d0af294e8b705
+Subproject commit 860c9af2bfbf1477b96519067ef5e62b2525d987