diff --git a/.github/workflows/labeler-untriaged.yml b/.github/workflows/labeler-untriaged.yml
index 630122aa087..775aab26546 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/CustomControls/PlayerListControl.xaml b/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml
index 5d630425aba..ef679e778d9 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 dcc1a05bb54..3df57de57b3 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 8f27b17d2dc..cceb21f14d7 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 6157a96f42b..e06fc6e8ac5 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 4a1719cbf8a..a7c4c35494d 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 03fd52f446a..72a594469d2 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 @@ protected override void EnteredTree()
             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 df1c7aee658..6420396788a 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 c06d9161334..c516acda2a2 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 @@ protected override void EnteredTree()
                 _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 9916972ac16..8a80e74c1f4 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 242fcf2b82e..f2dba57bff7 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 3353d0873ef..302ca8f21fd 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 @@ protected override void EnteredTree()
             {
                 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 dbc65772019..4102912d693 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 1183efb9b5b..b3c4a83ed41 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 @@ protected override void EnteredTree()
             {
                 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 ea89916ba8c..821389150d6 100644
--- a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml
+++ b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml
@@ -5,8 +5,8 @@
     <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"/>
+                   Text="{Loc object-tab-object-type}" />
+            <LineEdit Name="SearchLineEdit" PlaceHolder="{Loc object-tab-object-search}" HorizontalExpand="True" SizeFlagsStretchRatio="1"/>
             <OptionButton Name="ObjectTypeOptions" HorizontalExpand="True" SizeFlagsStretchRatio="0.25"/>
         </BoxContainer>
         <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
diff --git a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
index c8606ca80d5..67e0db01eeb 100644
--- a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
@@ -41,7 +41,7 @@ public ObjectsTab()
         foreach (var type in Enum.GetValues(typeof(ObjectsTabSelection)))
         {
             _selections.Add((ObjectsTabSelection)type!);
-            ObjectTypeOptions.AddItem(Enum.GetName((ObjectsTabSelection)type)!);
+            ObjectTypeOptions.AddItem(Loc.GetString($"object-tab-object-type-{((Enum.GetName((ObjectsTabSelection)type))!.ToString().ToLower())}"));
         }
 
         ListHeader.OnHeaderClicked += HeaderClicked;
diff --git a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml
index 25a96df1d37..e0723d4bdc5 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 826945e7cc0..2187c40ce98 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 @@ protected override void Dispose(bool disposing)
         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 439441b133c..2c8a400ecdb 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 e69de29bb2d..00000000000
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 fb5cd4f51a4..7e1dca0d6f0 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/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs
index c43b7312909..0364e1f931f 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.Corvax.TTS;
 using Content.Client.Options;
 using Content.Client.Eui;
@@ -35,6 +36,7 @@
 using Robust.Shared.ContentPack;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Replays;
+using Robust.Shared.Timing;
 
 namespace Content.Client.Entry
 {
@@ -70,6 +72,7 @@ public sealed class EntryPoint : GameClient
         [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()
         {
@@ -208,5 +211,13 @@ private void SwitchToDefaultState(bool disconnected = false)
                 _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 b476971a13a..60d2b6a6ef6 100644
--- a/Content.Client/Examine/ExamineSystem.cs
+++ b/Content.Client/Examine/ExamineSystem.cs
@@ -46,6 +46,8 @@ public sealed class ExamineSystem : ExamineSystemShared
 
         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 f79f8b916a1..a1cba2ed3fb 100644
--- a/Content.Client/IoC/ClientContentIoC.cs
+++ b/Content.Client/IoC/ClientContentIoC.cs
@@ -3,6 +3,7 @@
 using Content.Client.Chat.Managers;
 using Content.Client.Clickable;
 using Content.Client.Corvax.TTS;
+using Content.Client.DebugMon;
 using Content.Client.Eui;
 using Content.Client.GhostKick;
 using Content.Client.Launcher;
@@ -49,6 +50,7 @@ public static void Register()
             collection.Register<DocumentParsingManager>();
             collection.Register<ContentReplayPlaybackManager, ContentReplayPlaybackManager>();
             collection.Register<ISharedPlaytimeManager, JobRequirementsManager>();
+            collection.Register<DebugMonitorManager>();
         }
     }
 }
diff --git a/Content.Client/Options/UI/OptionDropDown.xaml b/Content.Client/Options/UI/OptionDropDown.xaml
new file mode 100644
index 00000000000..58dcdca6c8b
--- /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 00000000000..506e241a06e
--- /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 00000000000..fa2d78c67ff
--- /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 00000000000..6a377f7ee19
--- /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 4f624c1bb69..90486a196ad 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 35a3f751bbf..61037f4e4af 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 @@ public OptionsMenu()
             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 00000000000..fafdee4df76
--- /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 00000000000..31dd9897f4e
--- /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 00000000000..54d92b2b11c
--- /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 00000000000..15182fbf126
--- /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 08b4575b31c..7fa5ea00cf2 100644
--- a/Content.Client/Options/UI/Tabs/AudioTab.xaml
+++ b/Content.Client/Options/UI/Tabs/AudioTab.xaml
@@ -1,141 +1,27 @@
 <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-tts-volume'}" HorizontalExpand="True" />
-                    <Control MinSize="8 0" />
-                    <Slider Name="TtsVolumeSlider"
-                            MinValue="0"
-                            MaxValue="200"
-                            HorizontalExpand="True"
-                            MinSize="80 0"
-                            Rounded="True" />
-                    <Control MinSize="8 0" />
-                    <Label Name="TtsVolumeLabel" 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" />
+                <!-- Corvax-TTS-Start --><ui:OptionSlider Name="SliderVolumeTts" Title="{Loc 'ui-options-tts-volume'}" /><!-- Corvax-TTS-End -->
+                <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 527ae8de8fb..7b3e078f5d3 100644
--- a/Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
@@ -4,216 +4,79 @@
 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
-{
-    [GenerateTypedNameReferences]
-    public sealed partial class AudioTab : Control
-    {
-        [Dependency] private readonly IConfigurationManager _cfg = default!;
-        private readonly IAudioManager _audio;
-
-        public AudioTab()
-        {
-            RobustXamlLoader.Load(this);
-            IoCManager.InjectDependencies(this);
-
-            _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);
-
-            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;
-            TtsVolumeSlider.OnValueChanged += OnTtsVolumeSliderChanged; // Corvax-TTS
-            LobbyMusicCheckBox.OnToggled += OnLobbyMusicCheckToggled;
-            RestartSoundsCheckBox.OnToggled += OnRestartSoundsCheckToggled;
-            EventMusicCheckBox.OnToggled += OnEventMusicCheckToggled;
-            AdminSoundsCheckBox.OnToggled += OnAdminSoundsCheckToggled;
-
-            AmbienceSoundsSlider.MinValue = _cfg.GetCVar(CCVars.MinMaxAmbientSourcesConfigured);
-            AmbienceSoundsSlider.MaxValue = _cfg.GetCVar(CCVars.MaxMaxAmbientSourcesConfigured);
-
-            Reset();
-        }
+namespace Content.Client.Options.UI.Tabs;
 
-        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;
-            TtsVolumeSlider.OnValueChanged -= OnTtsVolumeSliderChanged; // Corvax-TTS
-            base.Dispose(disposing);
-        }
-
-        private void OnLobbyVolumeSliderChanged(Range obj)
-        {
-            UpdateChanges();
-        }
-
-        private void OnInterfaceVolumeSliderChanged(Range obj)
-        {
-            UpdateChanges();
-        }
-
-        private void OnAmbientMusicVolumeSliderChanged(Range obj)
-        {
-            UpdateChanges();
-        }
-
-        private void OnAmbienceVolumeSliderChanged(Range obj)
-        {
-            UpdateChanges();
-        }
-
-        private void OnAmbienceSoundsSliderChanged(Range obj)
-        {
-            UpdateChanges();
-        }
+[GenerateTypedNameReferences]
+public sealed partial class AudioTab : Control
+{
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
+    [Dependency] private readonly IAudioManager _audio = default!;
 
-        private void OnMasterVolumeSliderChanged(Range range)
-        {
-            _audio.SetMasterGain(MasterVolumeSlider.Value / 100f * ContentAudioSystem.MasterVolumeMultiplier);
-            UpdateChanges();
-        }
+    public AudioTab()
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
 
-        private void OnMidiVolumeSliderChanged(Range range)
-        {
-            UpdateChanges();
-        }
+        var masterVolume = Control.AddOptionPercentSlider(
+            CVars.AudioMasterVolume,
+            SliderVolumeMaster,
+            scale: ContentAudioSystem.MasterVolumeMultiplier);
+        masterVolume.ImmediateValueChanged += OnMasterVolumeSliderChanged;
 
         // Corvax-TTS-Start
-        private void OnTtsVolumeSliderChanged(Range obj)
-        {
-            UpdateChanges();
-        }
+        Control.AddOptionPercentSlider(
+            CCCVars.TTSVolume,
+            SliderVolumeTts,
+            scale: ContentAudioSystem.TtsMultiplier);
         // Corvax-TTS-End
 
-        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(CCCVars.TTSVolume, TtsVolumeSlider.Value / 100f * ContentAudioSystem.TtsMultiplier); // Corvax-TTS
-
-            _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;
-            TtsVolumeSlider.Value = _cfg.GetCVar(CCCVars.TTSVolume) * 100f / ContentAudioSystem.TtsMultiplier; // Corvax-TTS
-
-            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 isTtsVolumeSame =
-                Math.Abs(TtsVolumeSlider.Value - _cfg.GetCVar(CCCVars.TTSVolume) * 100f / ContentAudioSystem.TtsMultiplier) < 0.01f;
+        Control.AddOptionPercentSlider(
+            CVars.MidiVolume,
+            SliderVolumeMidi,
+            scale: ContentAudioSystem.MidiVolumeMultiplier);
+
+        Control.AddOptionPercentSlider(
+            CCVars.AmbientMusicVolume,
+            SliderVolumeAmbientMusic,
+            scale: ContentAudioSystem.AmbientMusicMultiplier);
+
+        Control.AddOptionPercentSlider(
+            CCVars.AmbienceVolume,
+            SliderVolumeAmbience,
+            scale: ContentAudioSystem.AmbienceMultiplier);
+
+        Control.AddOptionPercentSlider(
+            CCVars.LobbyMusicVolume,
+            SliderVolumeLobby,
+            scale: ContentAudioSystem.LobbyMultiplier);
+
+        Control.AddOptionPercentSlider(
+            CCVars.InterfaceVolume,
+            SliderVolumeInterface,
+            scale: ContentAudioSystem.InterfaceMultiplier);
+
+        Control.AddOptionSlider(
+            CCVars.MaxAmbientSources,
+            SliderMaxAmbienceSounds,
+            _cfg.GetCVar(CCVars.MinMaxAmbientSourcesConfigured),
+            _cfg.GetCVar(CCVars.MaxMaxAmbientSourcesConfigured));
+
+        Control.AddOptionCheckBox(CCVars.LobbyMusicEnabled, LobbyMusicCheckBox);
+        Control.AddOptionCheckBox(CCVars.RestartSoundsEnabled, RestartSoundsCheckBox);
+        Control.AddOptionCheckBox(CCVars.EventMusicEnabled, EventMusicCheckBox);
+        Control.AddOptionCheckBox(CCVars.AdminSoundsEnabled, AdminSoundsCheckBox);
+
+        Control.Initialize();
+    }
 
-            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;
-            isEverythingSame = isEverythingSame && isTtsVolumeSame; // Corvax-TTS
-            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));
-            TtsVolumeLabel.Text =
-                Loc.GetString("ui-options-volume-percent", ("volume", TtsVolumeSlider.Value / 100)); // Corvax-TTS
-            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 ec1b9aa002f..f1b9743cad3 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>
-            </BoxContainer>
-            <BoxContainer Orientation="Horizontal">
-                <Label Name="ViewportWidthSliderDisplay" />
-                <Control MinSize="4 0" />
-                <Slider Name="ViewportWidthSlider"
-                        Rounded="True"
-                        MinWidth="200" />
+                <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>
-            <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 a22adf3e632..f53a2edd957 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.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
-    {
-        private static readonly float[] UIScaleOptions =
-        {
-            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();
-            };
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
 
-            ViewportScaleSlider.OnValueChanged += _ =>
-            {
-                UpdateApplyButton();
-                UpdateViewportScale();
-            };
+    public GraphicsTab()
+    {
+        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();
+    }
 
-            ViewportWidthSlider.OnValueChanged += _ =>
-            {
-                UpdateViewportWidthDisplay();
-                UpdateApplyButton();
-            };
+    private void UpdateViewportSettingsVisibility()
+    {
+        ViewportScaleSlider.Visible = !ViewportStretchCheckBox.Pressed;
+        IntegerScalingCheckBox.Visible = ViewportStretchCheckBox.Pressed;
+        ViewportVerticalFitCheckBox.Visible = ViewportStretchCheckBox.Pressed;
+        ViewportWidthSlider.Visible = !ViewportStretchCheckBox.Pressed || !ViewportVerticalFitCheckBox.Pressed;
+    }
 
-            ViewportVerticalFitCheckBox.OnToggled += _ =>
-            {
-                UpdateViewportScale();
-                UpdateApplyButton();
-            };
+    private void UpdateViewportWidthRange()
+    {
+        var min = _cfg.GetCVar(CCVars.ViewportMinimumWidth);
+        var max = _cfg.GetCVar(CCVars.ViewportMaximumWidth);
 
-            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();
-        }
+        ViewportWidthSlider.Slider.MinValue = min;
+        ViewportWidthSlider.Slider.MaxValue = max;
+    }
 
-        private void OnUIScaleChanged(OptionButton.ItemSelectedEventArgs args)
-        {
-            UIScaleOption.SelectId(args.Id);
-            UpdateApplyButton();
-        }
+    private sealed class OptionLightingQuality : BaseOption
+    {
+        private readonly IConfigurationManager _cfg;
+        private readonly OptionDropDown _dropDown;
 
-        private void OnApplyButtonPressed(BaseButton.ButtonEventArgs args)
-        {
-            _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();
-        }
+        private const int QualityVeryLow = 0;
+        private const int QualityLow = 1;
+        private const int QualityMedium = 2;
+        private const int QualityHigh = 3;
 
-        private void OnCheckBoxToggled(BaseButton.ButtonToggledEventArgs args)
-        {
-            UpdateApplyButton();
-        }
+        private const int QualityDefault = QualityMedium;
 
-        private void OnLightingQualityChanged(OptionButton.ItemSelectedEventArgs args)
+        public OptionLightingQuality(OptionsTabControlRow controller, IConfigurationManager cfg, OptionDropDown dropDown) : base(controller)
         {
-            LightingPresetOption.SelectId(args.Id);
-            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 UpdateApplyButton()
+        private void OnOptionSelected(OptionButton.ItemSelectedEventArgs obj)
         {
-            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;
+            _dropDown.Button.SelectId(obj.Id);
+            ValueChanged();
         }
 
-        private bool ConfigIsFullscreen =>
-            _cfg.GetCVar(CVars.DisplayWindowMode) == (int) WindowMode.Fullscreen;
-
-        public void UpdateProperties()
+        public override void LoadValue()
         {
-            FullscreenCheckBox.Pressed = ConfigIsFullscreen;
+            _dropDown.Button.SelectId(GetConfigLightingQuality());
         }
 
-
-        private float ConfigUIScale => _cfg.GetCVar(CVars.DisplayUIScale);
-
-        private int GetConfigLightingQuality()
+        public override void SaveValue()
         {
-            var val = _cfg.GetCVar(CVars.LightResolutionScale);
-            var soft = _cfg.GetCVar(CVars.LightSoftShadows);
-            if (val <= 0.125)
-            {
-                return 0;
-            }
-            else if ((val <= 0.5) && !soft)
-            {
-                return 1;
-            }
-            else if (val <= 0.5)
+            switch (_dropDown.Button.SelectedId)
             {
-                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 @@ private void SetConfigLightingQuality(int value)
             }
         }
 
-        private static int GetConfigUIScalePreset(float value)
+        public override void ResetToDefault()
         {
-            for (var i = 0; i < UIScaleOptions.Length; i++)
-            {
-                if (MathHelper.CloseToPercent(UIScaleOptions[i], value))
-                {
-                    return 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;
 
-            return 0;
+            if (val <= 0.5)
+                return QualityMedium;
+
+            return QualityHigh;
         }
+    }
+
+    private sealed class OptionFullscreen : BaseOptionCVar<int>
+    {
+        private readonly CheckBox _checkBox;
 
-        private void UpdateViewportScale()
+        protected override int Value
         {
-            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));
+            get => _checkBox.Pressed ? (int) WindowMode.Fullscreen : (int) WindowMode.Windowed;
+            set => _checkBox.Pressed = (value == (int) WindowMode.Fullscreen);
         }
 
-        private void UpdateViewportWidthRange()
+        public OptionFullscreen(
+            OptionsTabControlRow controller,
+            IConfigurationManager cfg,
+            CheckBox checkBox)
+            : base(controller, cfg, CVars.DisplayWindowMode)
         {
-            var min = _cfg.GetCVar(CCVars.ViewportMinimumWidth);
-            var max = _cfg.GetCVar(CCVars.ViewportMaximumWidth);
+            _checkBox = checkBox;
+            _checkBox.OnToggled += _ =>
+            {
+                ValueChanged();
+            };
+        }
+    }
 
-            ViewportWidthSlider.MinValue = min;
-            ViewportWidthSlider.MaxValue = max;
+    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 UpdateViewportWidthDisplay()
+        public OptionIntegerScaling(
+            OptionsTabControlRow controller,
+            IConfigurationManager cfg,
+            CheckBox checkBox)
+            : base(controller, cfg, CCVars.ViewportSnapToleranceMargin)
         {
-            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 0c6ec380424..c1733e209db 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 13e3fd05f55..2aad4e1d0b6 100644
--- a/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs
@@ -5,201 +5,54 @@
 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
-{
-    [GenerateTypedNameReferences]
-    public sealed partial class MiscTab : Control
-    {
-        [Dependency] private readonly IPlayerManager _playerManager = default!;
-        [Dependency] private readonly IConfigurationManager _cfg = default!;
-        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-
-        private readonly Dictionary<string, int> _hudThemeIdToIndex = new();
-
-        public MiscTab()
-        {
-            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();
-        }
+namespace Content.Client.Options.UI.Tabs;
 
-        private void OnCheckBoxToggled(BaseButton.ButtonToggledEventArgs args)
-        {
-            UpdateApplyButton();
-        }
+[GenerateTypedNameReferences]
+public sealed partial class MiscTab : Control
+{
+    [Dependency] private readonly IPlayerManager _playerManager = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
-        private void OnHudThemeChanged(OptionButton.ItemSelectedEventArgs args)
-        {
-            HudThemeOption.SelectId(args.Id);
-            UpdateApplyButton();
-        }
+    public MiscTab()
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
 
-        private void OnChatWindowOpacitySliderChanged(Range range)
+        var themes = _prototypeManager.EnumeratePrototypes<HudThemePrototype>().ToList();
+        themes.Sort();
+        var themeEntries = new List<OptionDropDownCVar<string>.ValueOption>();
+        foreach (var gear in themes)
         {
-            ChatWindowOpacityLabel.Text = Loc.GetString("ui-options-chat-window-opacity-percent",
-                ("opacity", range.Value));
-            UpdateApplyButton();
+            themeEntries.Add(new OptionDropDownCVar<string>.ValueOption(gear.ID, Loc.GetString(gear.Name)));
         }
 
-        private void OnScreenShakeIntensitySliderChanged(Range obj)
+        var layoutEntries = new List<OptionDropDownCVar<string>.ValueOption>();
+        foreach (var layout in Enum.GetValues(typeof(ScreenType)))
         {
-            ScreenShakeIntensityLabel.Text = Loc.GetString("ui-options-screen-shake-percent", ("intensity", ScreenShakeIntensitySlider.Value / 100f));
-            UpdateApplyButton();
+            layoutEntries.Add(new OptionDropDownCVar<string>.ValueOption(layout.ToString()!, layout.ToString()!));
         }
 
-        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);
-            }
+        // Channel can be null in replays so.
+        // ReSharper disable once ConditionalAccessQualifierIsNonNullableAccordingToAPIContract
+        ShowOocPatronColor.Visible = _playerManager.LocalSession?.Channel?.UserData.PatronTier is { };
 
-            _cfg.SaveToFile();
-            UpdateApplyButton();
-        }
+        Control.AddOptionDropDown(CVars.InterfaceTheme, DropDownHudTheme, themeEntries);
+        Control.AddOptionDropDown(CCVars.UILayout, DropDownHudLayout, layoutEntries);
 
-        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 b80a855f986..a74a118cd0f 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 void OpenStorageWindow(Entity<StorageComponent> entity)
 
     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/Alerts/Controls/AlertControl.cs b/Content.Client/UserInterface/Systems/Alerts/Controls/AlertControl.cs
index 6327757dec2..19432cd7992 100644
--- a/Content.Client/UserInterface/Systems/Alerts/Controls/AlertControl.cs
+++ b/Content.Client/UserInterface/Systems/Alerts/Controls/AlertControl.cs
@@ -52,20 +52,12 @@ public AlertControl(AlertPrototype alert, short? severity)
             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 @@ protected override void FrameUpdate(FrameEventArgs args)
             _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 6e2bfa75291..95f65cd31e8 100644
--- a/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs
+++ b/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs
@@ -4,10 +4,11 @@
 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;
@@ -37,6 +42,22 @@ public VendingMachineMenu()
             };
         }
 
+        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
@@ -73,11 +94,16 @@ public void Populate(List<VendingMachineInventoryEntry> inventory, out List<int>
                 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 00000000000..3fa7e64f1a4
--- /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 00000000000..dbd612c7101
--- /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.Server.Database/Migrations/Postgres/20240621120713_ConnectionLogTimeIndex.Designer.cs b/Content.Server.Database/Migrations/Postgres/20240621120713_ConnectionLogTimeIndex.Designer.cs
new file mode 100644
index 00000000000..8bd837236af
--- /dev/null
+++ b/Content.Server.Database/Migrations/Postgres/20240621120713_ConnectionLogTimeIndex.Designer.cs
@@ -0,0 +1,1915 @@
+// <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("20240621120713_ConnectionLogTimeIndex")]
+    partial class ConnectionLogTimeIndex
+    {
+        /// <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.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/20240621120713_ConnectionLogTimeIndex.cs b/Content.Server.Database/Migrations/Postgres/20240621120713_ConnectionLogTimeIndex.cs
new file mode 100644
index 00000000000..736e9e37a22
--- /dev/null
+++ b/Content.Server.Database/Migrations/Postgres/20240621120713_ConnectionLogTimeIndex.cs
@@ -0,0 +1,27 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Postgres
+{
+    /// <inheritdoc />
+    public partial class ConnectionLogTimeIndex : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateIndex(
+                name: "IX_connection_log_time",
+                table: "connection_log",
+                column: "time");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropIndex(
+                name: "IX_connection_log_time",
+                table: "connection_log");
+        }
+    }
+}
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 00000000000..5d89f3dd29b
--- /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 00000000000..192e87ac96b
--- /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 1038c15ddb7..01d6dae4965 100644
--- a/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
+++ b/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
@@ -512,6 +512,51 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     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")
@@ -559,6 +604,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.HasIndex("ServerId")
                         .HasDatabaseName("IX_connection_log_server_id");
 
+                    b.HasIndex("Time");
+
                     b.HasIndex("UserId");
 
                     b.ToTable("connection_log", null, t =>
diff --git a/Content.Server.Database/Migrations/Sqlite/20240621120705_ConnectionLogTimeIndex.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20240621120705_ConnectionLogTimeIndex.Designer.cs
new file mode 100644
index 00000000000..b3e512548ad
--- /dev/null
+++ b/Content.Server.Database/Migrations/Sqlite/20240621120705_ConnectionLogTimeIndex.Designer.cs
@@ -0,0 +1,1840 @@
+// <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("20240621120705_ConnectionLogTimeIndex")]
+    partial class ConnectionLogTimeIndex
+    {
+        /// <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.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/20240621120705_ConnectionLogTimeIndex.cs b/Content.Server.Database/Migrations/Sqlite/20240621120705_ConnectionLogTimeIndex.cs
new file mode 100644
index 00000000000..f97c62f6ccf
--- /dev/null
+++ b/Content.Server.Database/Migrations/Sqlite/20240621120705_ConnectionLogTimeIndex.cs
@@ -0,0 +1,27 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Sqlite
+{
+    /// <inheritdoc />
+    public partial class ConnectionLogTimeIndex : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateIndex(
+                name: "IX_connection_log_time",
+                table: "connection_log",
+                column: "time");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropIndex(
+                name: "IX_connection_log_time",
+                table: "connection_log");
+        }
+    }
+}
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 00000000000..acce21c2bd9
--- /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 00000000000..ffe5a475507
--- /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 63044dafaa7..94e5ca7270b 100644
--- a/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
+++ b/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
@@ -483,6 +483,49 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     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")
@@ -528,6 +571,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.HasIndex("ServerId")
                         .HasDatabaseName("IX_connection_log_server_id");
 
+                    b.HasIndex("Time");
+
                     b.HasIndex("UserId");
 
                     b.ToTable("connection_log", (string)null);
diff --git a/Content.Server.Database/Model.cs b/Content.Server.Database/Model.cs
index a9e86204c04..610b314d096 100644
--- a/Content.Server.Database/Model.cs
+++ b/Content.Server.Database/Model.cs
@@ -41,6 +41,7 @@ protected ServerDbContext(DbContextOptions options) : base(options)
         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)
         {
@@ -187,6 +188,9 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             modelBuilder.Entity<ConnectionLog>()
                 .HasIndex(p => p.UserId);
 
+            modelBuilder.Entity<ConnectionLog>()
+                .HasIndex(p => p.Time);
+
             modelBuilder.Entity<ConnectionLog>()
                 .Property(p => p.ServerId)
                 .HasDefaultValue(0);
@@ -1132,4 +1136,57 @@ public class RoleWhitelist
         [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 00000000000..1e97d5c9d67
--- /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/Unary/Components/GasVentPumpComponent.cs b/Content.Server/Atmos/Piping/Unary/Components/GasVentPumpComponent.cs
index 2ba4603a9bd..74186ed36e3 100644
--- a/Content.Server/Atmos/Piping/Unary/Components/GasVentPumpComponent.cs
+++ b/Content.Server/Atmos/Piping/Unary/Components/GasVentPumpComponent.cs
@@ -40,7 +40,7 @@ public sealed partial class GasVentPumpComponent : Component
         /// </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/Connection/ConnectionManager.cs b/Content.Server/Connection/ConnectionManager.cs
index 32323c7cb69..cd69ea2ab8e 100644
--- a/Content.Server/Connection/ConnectionManager.cs
+++ b/Content.Server/Connection/ConnectionManager.cs
@@ -1,8 +1,10 @@
 using System.Collections.Immutable;
+using System.Linq;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using Content.Corvax.Interfaces.Server;
 using Content.Corvax.Interfaces.Shared;
+using Content.Server.Chat.Managers;
 using Content.Server.Database;
 using Content.Server.GameTicking;
 using Content.Server.Preferences.Managers;
@@ -12,7 +14,9 @@
 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;
 
 /*
@@ -53,6 +57,7 @@ public sealed class ConnectionManager : IConnectionManager
         [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 ISharedSponsorsManager? _sponsorsMgr; // Corvax-Sponsors
         private IServerVPNGuardManager? _vpnGuardMgr; // Corvax-VPNGuard
 
@@ -66,6 +71,7 @@ public void Initialize()
             IoCManager.Instance!.TryResolveType(out _sponsorsMgr); // Corvax-Sponsors
             _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;
         }
@@ -134,6 +140,42 @@ private async Task NetMgrOnConnecting(NetConnectingArgs e)
             }
         }
 
+        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 e2d0d7338a4..f611eee04ec 100644
--- a/Content.Server/Connection/GrantConnectBypassCommand.cs
+++ b/Content.Server/Connection/GrantConnectBypassCommand.cs
@@ -4,7 +4,7 @@
 
 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 00000000000..f76fb6d3f76
--- /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/Corvax/StationGoal/StationGoalCommand.cs b/Content.Server/Corvax/StationGoal/StationGoalCommand.cs
index 8f1c451dc9b..6c0a3c58ab2 100644
--- a/Content.Server/Corvax/StationGoal/StationGoalCommand.cs
+++ b/Content.Server/Corvax/StationGoal/StationGoalCommand.cs
@@ -1,5 +1,6 @@
 using System.Linq;
 using Content.Server.Administration;
+using Content.Server.Commands;
 using Content.Shared.Administration;
 using Robust.Shared.Console;
 using Robust.Shared.Prototypes;
@@ -9,19 +10,27 @@ namespace Content.Server.Corvax.StationGoal
     [AdminCommand(AdminFlags.Fun)]
     public sealed class StationGoalCommand : IConsoleCommand
     {
+        [Dependency] private readonly IEntityManager _entManager = default!;
+
         public string Command => "sendstationgoal";
         public string Description => Loc.GetString("send-station-goal-command-description");
         public string Help => Loc.GetString("send-station-goal-command-help-text", ("command", Command));
 
         public void Execute(IConsoleShell shell, string argStr, string[] args)
         {
-            if (args.Length != 1)
+            if (args.Length != 2)
             {
-                shell.WriteError(Loc.GetString("shell-need-exactly-one-argument"));
+                shell.WriteError(Loc.GetString("shell-wrong-arguments-number"));
                 return;
             }
 
-            var protoId = args[0];
+            if (!NetEntity.TryParse(args[0], out var euidNet) || !_entManager.TryGetEntity(euidNet, out var euid))
+            {
+                shell.WriteError($"Failed to parse euid '{args[0]}'.");
+                return;
+            }
+
+            var protoId = args[1];
             var prototypeManager = IoCManager.Resolve<IPrototypeManager>();
             if (!prototypeManager.TryIndex<StationGoalPrototype>(protoId, out var proto))
             {
@@ -30,24 +39,27 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
             }
 
             var stationGoalPaper = IoCManager.Resolve<IEntityManager>().System<StationGoalPaperSystem>();
-            if (!stationGoalPaper.SendStationGoal(proto))
+            if (!stationGoalPaper.SendStationGoal(euid, protoId))
             {
                 shell.WriteError("Station goal was not sent");
                 return;
             }
         }
-        
+
         public CompletionResult GetCompletion(IConsoleShell shell, string[] args)
         {
-            if (args.Length == 1)
+            switch (args.Length)
             {
-                var options = IoCManager.Resolve<IPrototypeManager>()
-                    .EnumeratePrototypes<StationGoalPrototype>()
-                    .Select(p => new CompletionOption(p.ID));
+                case 1:
+                    var stations = ContentCompletionHelper.StationIds(_entManager);
+                    return CompletionResult.FromHintOptions(stations, "[StationId]");
+                case 2:
+                    var options = IoCManager.Resolve<IPrototypeManager>()
+                        .EnumeratePrototypes<StationGoalPrototype>()
+                        .Select(p => new CompletionOption(p.ID));
 
-                return CompletionResult.FromHintOptions(options, Loc.GetString("send-station-goal-command-arg-id"));
+                    return CompletionResult.FromHintOptions(options, Loc.GetString("send-station-goal-command-arg-id"));
             }
-
             return CompletionResult.Empty;
         }
     }
diff --git a/Content.Server/Corvax/StationGoal/StationGoalComponent.cs b/Content.Server/Corvax/StationGoal/StationGoalComponent.cs
new file mode 100644
index 00000000000..c822d33ea83
--- /dev/null
+++ b/Content.Server/Corvax/StationGoal/StationGoalComponent.cs
@@ -0,0 +1,14 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Corvax.StationGoal
+{
+    /// <summary>
+    ///     if attached to a station prototype, will send the station a random goal from the list
+    /// </summary>
+    [RegisterComponent]
+    public sealed partial class StationGoalComponent : Component
+    {
+        [DataField]
+        public List<ProtoId<StationGoalPrototype>> Goals = new();
+    }
+}
diff --git a/Content.Server/Corvax/StationGoal/StationGoalPaperSystem.cs b/Content.Server/Corvax/StationGoal/StationGoalPaperSystem.cs
index 069c8deec23..3cd9e9ce056 100644
--- a/Content.Server/Corvax/StationGoal/StationGoalPaperSystem.cs
+++ b/Content.Server/Corvax/StationGoal/StationGoalPaperSystem.cs
@@ -1,5 +1,8 @@
 using System.Linq;
 using Content.Server.Fax;
+using Content.Server.GameTicking.Events;
+using Content.Server.Station.Components;
+using Content.Server.Station.Systems;
 using Content.Shared.Fax.Components;
 using Content.Shared.GameTicking;
 using Content.Shared.Paper;
@@ -14,67 +17,100 @@ namespace Content.Server.Corvax.StationGoal
     /// </summary>
     public sealed class StationGoalPaperSystem : EntitySystem
     {
-        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+        [Dependency] private readonly IPrototypeManager _proto = default!;
         [Dependency] private readonly IRobustRandom _random = default!;
-        [Dependency] private readonly FaxSystem _faxSystem = default!;
+        [Dependency] private readonly FaxSystem _fax = default!;
         [Dependency] private readonly IPlayerManager _playerManager = default!;
+        [Dependency] private readonly StationSystem _station = default!;
 
         public override void Initialize()
         {
             base.Initialize();
-            SubscribeLocalEvent<RoundStartedEvent>(OnRoundStarted);
+            SubscribeLocalEvent<RoundStartingEvent>(OnRoundStarting);
         }
 
-        private void OnRoundStarted(RoundStartedEvent ev)
+        private void OnRoundStarting(RoundStartingEvent ev)
         {
-            SendRandomGoal();
-        }
-
-        public bool SendRandomGoal()
-        {
-            var availableGoals = _prototypeManager.EnumeratePrototypes<StationGoalPrototype>().ToList();
             var playerCount = _playerManager.PlayerCount;
 
-            var validGoals = availableGoals.Where(goal =>
-                    (!goal.MinPlayers.HasValue || playerCount >= goal.MinPlayers.Value) &&
-                    (!goal.MaxPlayers.HasValue || playerCount <= goal.MaxPlayers.Value)).ToList();
-
-            if (!validGoals.Any())
+            var query = EntityQueryEnumerator<StationGoalComponent>();
+            while (query.MoveNext(out var uid, out var station))
             {
-                return false;
+                var tempGoals = new List<ProtoId<StationGoalPrototype>>(station.Goals);
+                StationGoalPrototype? selGoal = null;
+                while (tempGoals.Count > 0)
+                {
+                    var goalId = _random.Pick(tempGoals);
+                    var goalProto = _proto.Index(goalId);
+
+                    if (playerCount > goalProto.MaxPlayers ||
+                        playerCount < goalProto.MinPlayers)
+                    {
+                        tempGoals.Remove(goalId);
+                        continue;
+                    }
+
+                    selGoal = goalProto;
+                    break;
+                }
+
+                if (selGoal is null)
+                    return;
+
+                if (SendStationGoal(uid, selGoal))
+                {
+                    Log.Info($"Goal {selGoal.ID} has been sent to station {MetaData(uid).EntityName}");
+                }
             }
+        }
 
-            var goal = _random.Pick(validGoals);
-            return SendStationGoal(goal);
+        public bool SendStationGoal(EntityUid? ent, ProtoId<StationGoalPrototype> goal)
+        {
+            return SendStationGoal(ent, _proto.Index(goal));
         }
 
         /// <summary>
-        ///     Send a station goal to all faxes which are authorized to receive it.
+        ///     Send a station goal on selected station to all faxes which are authorized to receive it.
         /// </summary>
         /// <returns>True if at least one fax received paper</returns>
-        public bool SendStationGoal(StationGoalPrototype goal)
+        public bool SendStationGoal(EntityUid? ent, StationGoalPrototype goal)
         {
-            var faxes = EntityManager.EntityQuery<FaxMachineComponent>();
+            if (ent is null)
+                return false;
+
+            if (!TryComp<StationDataComponent>(ent, out var stationData))
+                return false;
+
+            var printout = new FaxPrintout(
+                Loc.GetString(goal.Text, ("station", MetaData(ent.Value).EntityName)),
+                Loc.GetString("station-goal-fax-paper-name"),
+                null,
+                null,
+                "paper_stamp-centcom",
+                new List<StampDisplayInfo>
+                {
+                    new() { StampedName = Loc.GetString("stamp-component-stamped-name-centcom"), StampedColor = Color.FromHex("#006600") },
+                });
+
             var wasSent = false;
-            foreach (var fax in faxes)
+            var query = EntityQueryEnumerator<FaxMachineComponent>();
+            while (query.MoveNext(out var faxUid, out var fax))
             {
-                if (!fax.ReceiveStationGoal) continue;
+                if (!fax.ReceiveStationGoal)
+                    continue;
 
-                var printout = new FaxPrintout(
-                    Loc.GetString(goal.Text),
-                    Loc.GetString("station-goal-fax-paper-name"),
-                    null,
-                    null,
-                    "paper_stamp-centcom",
-                    new List<StampDisplayInfo>
+                var largestGrid = _station.GetLargestGrid(stationData);
+                var grid = Transform(faxUid).GridUid;
+                if (grid is not null && largestGrid == grid.Value)
+                {
+                    _fax.Receive(faxUid, printout, null, fax);
+                    foreach (var spawnEnt in goal.Spawns)
                     {
-                        new() { StampedName = Loc.GetString("stamp-component-stamped-name-centcom"), StampedColor = Color.FromHex("#006600") },
-                    });
-                _faxSystem.Receive(fax.Owner, printout, null, fax);
-
-                wasSent = true;
+                        SpawnAtPosition(spawnEnt, Transform(faxUid).Coordinates);
+                    }
+                    wasSent = true;
+                }
             }
-
             return wasSent;
         }
     }
diff --git a/Content.Server/Corvax/StationGoal/StationGoalPrototype.cs b/Content.Server/Corvax/StationGoal/StationGoalPrototype.cs
index ad96aac4d8d..f35eb4976eb 100644
--- a/Content.Server/Corvax/StationGoal/StationGoalPrototype.cs
+++ b/Content.Server/Corvax/StationGoal/StationGoalPrototype.cs
@@ -17,5 +17,11 @@ public sealed class StationGoalPrototype : IPrototype
         [DataField]
         public int? MaxPlayers;
 
+        /// <summary>
+        /// Goal may require certain items to complete. These items will appear near the receving fax machine at the start of the round.
+        /// TODO: They should be spun up at the tradepost instead of at the fax machine, but I'm too lazy to do that right now. Maybe in the future.
+        /// </summary>
+        [DataField]
+        public List<EntProtoId> Spawns = new();
     }
 }
diff --git a/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs b/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
index e63c03bd5e7..aa1ab3daccd 100644
--- a/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
+++ b/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
@@ -17,6 +17,7 @@
 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 override void Initialize()
         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 void AfterInsert(EntityUid uid, SharedDisposalUnitComponent component, En
         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 7cb31b5b4e0..93ee18f6831 100644
--- a/Content.Server/Doors/Systems/FirelockSystem.cs
+++ b/Content.Server/Doors/Systems/FirelockSystem.cs
@@ -93,7 +93,7 @@ private void OnAtmosAlarm(EntityUid uid, FirelockComponent component, AtmosAlarm
             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/GameTicking/Commands/ForceMapCommand.cs b/Content.Server/GameTicking/Commands/ForceMapCommand.cs
index 5d2191fb52d..4cc30ff38af 100644
--- a/Content.Server/GameTicking/Commands/ForceMapCommand.cs
+++ b/Content.Server/GameTicking/Commands/ForceMapCommand.cs
@@ -29,8 +29,19 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
             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/Labels/Label/LabelSystem.cs b/Content.Server/Labels/Label/LabelSystem.cs
index 17d18918fea..cbf29e16a26 100644
--- a/Content.Server/Labels/Label/LabelSystem.cs
+++ b/Content.Server/Labels/Label/LabelSystem.cs
@@ -5,7 +5,6 @@
 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 @@ public sealed class LabelSystem : SharedLabelSystem
     {
         [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 @@ public override void Initialize()
         {
             base.Initialize();
 
-            SubscribeLocalEvent<LabelComponent, MapInitEvent>(OnLabelCompMapInit);
             SubscribeLocalEvent<PaperLabelComponent, ComponentInit>(OnComponentInit);
             SubscribeLocalEvent<PaperLabelComponent, ComponentRemove>(OnComponentRemove);
             SubscribeLocalEvent<PaperLabelComponent, EntInsertedIntoContainerMessage>(OnContainerModified);
@@ -35,17 +32,6 @@ public override void Initialize()
             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 @@ public override void Label(EntityUid uid, string? text, MetaDataComponent? metad
                 label = EnsureComp<LabelComponent>(uid);
 
             label.CurrentLabel = text;
-            _nameMod.RefreshNameModifiers(uid);
+            NameMod.RefreshNameModifiers(uid);
 
             Dirty(uid, label);
         }
diff --git a/Content.Server/Singularity/EntitySystems/ContainmentFieldSystem.cs b/Content.Server/Singularity/EntitySystems/ContainmentFieldSystem.cs
index 561db76a470..3944e94c20d 100644
--- a/Content.Server/Singularity/EntitySystems/ContainmentFieldSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/ContainmentFieldSystem.cs
@@ -26,7 +26,7 @@ private void HandleFieldCollide(EntityUid uid, ContainmentFieldComponent compone
     {
         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/Tabletop/TabletopSystem.cs b/Content.Server/Tabletop/TabletopSystem.cs
index caa319a0b71..f152648e214 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.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 @@ public sealed partial class TabletopSystem : SharedTabletopSystem
         [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 @@ private void OnTabletopRequestTakeOut(TabletopRequestTakeOut msg, EntitySessionE
 
         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.Shared.Database/LogType.cs b/Content.Shared.Database/LogType.cs
index 33a5d30c6a9..eb2b8e1f6f9 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 cbd3f5acd67..903ceab186d 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 efdbff3bb88..5d1932a959c 100644
--- a/Content.Shared/Access/Systems/AccessReaderSystem.cs
+++ b/Content.Shared/Access/Systems/AccessReaderSystem.cs
@@ -382,18 +382,15 @@ private bool FindStationRecordKeyItem(EntityUid uid, [NotNullWhen(true)] out Sta
     }
 
     /// <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 @@ private void LogAccess(Entity<AccessReaderComponent> ent, EntityUid accessor)
             && 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/Atmos/Atmospherics.cs b/Content.Shared/Atmos/Atmospherics.cs
index 6e640b287b6..1e40daf3dde 100644
--- a/Content.Shared/Atmos/Atmospherics.cs
+++ b/Content.Shared/Atmos/Atmospherics.cs
@@ -286,7 +286,8 @@ public static class Atmospherics
         ///     (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/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index 1a1a7f02262..a0e9157e922 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -440,6 +440,16 @@ public static readonly CVarDef<bool>
         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
          */
@@ -832,6 +842,15 @@ public static readonly CVarDef<bool>
         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/Clothing/LoadoutSystem.cs b/Content.Shared/Clothing/LoadoutSystem.cs
index f1b1dc36d90..1bab86e90fd 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 override void Initialize()
     {
         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 a927e1a6970..14507ce1f5c 100644
--- a/Content.Shared/CombatMode/Pacification/PacificationSystem.cs
+++ b/Content.Shared/CombatMode/Pacification/PacificationSystem.cs
@@ -54,7 +54,8 @@ private void ShowPopup(Entity<PacifiedComponent> user, EntityUid target, string
             && !(_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 03350d2e644..e613848c5c7 100644
--- a/Content.Shared/Doors/Systems/SharedFirelockSystem.cs
+++ b/Content.Shared/Doors/Systems/SharedFirelockSystem.cs
@@ -21,6 +21,7 @@ public override void Initialize()
 
         // Access/Prying
         SubscribeLocalEvent<FirelockComponent, BeforeDoorOpenedEvent>(OnBeforeDoorOpened);
+        SubscribeLocalEvent<FirelockComponent, BeforePryEvent>(OnBeforePry);
         SubscribeLocalEvent<FirelockComponent, GetPryTimeModifierEvent>(OnDoorGetPryTimeModifier);
         SubscribeLocalEvent<FirelockComponent, PriedEvent>(OnAfterPried);
 
@@ -60,6 +61,14 @@ private void OnBeforeDoorOpened(EntityUid uid, FirelockComponent component, Befo
             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/Examine/ExamineSystemShared.Group.cs b/Content.Shared/Examine/ExamineSystemShared.Group.cs
index bd284f321c8..22aeeeeab87 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 @@ public override void Initialize()
             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 8831213c352..4100b07483f 100644
--- a/Content.Shared/Examine/ExamineSystemShared.cs
+++ b/Content.Shared/Examine/ExamineSystemShared.cs
@@ -3,6 +3,7 @@
 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 @@ public abstract partial class ExamineSystemShared : EntitySystem
 
         protected const float ExamineBlurrinessMult = 2.5f;
 
+        private EntityQuery<GhostComponent> _ghostQuery;
+
         /// <summary>
         ///     Creates a new examine tooltip with arbitrary info.
         /// </summary>
@@ -54,6 +57,10 @@ public bool IsInDetailsRange(EntityUid examiner, EntityUid entity)
             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/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs
index 1e4c49211f5..48076ca360f 100644
--- a/Content.Shared/Interaction/SharedInteractionSystem.cs
+++ b/Content.Shared/Interaction/SharedInteractionSystem.cs
@@ -486,6 +486,21 @@ public void InteractHand(EntityUid user, EntityUid target)
         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 @@ public void InteractUsing(
             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/Labels/EntitySystems/SharedLabelSystem.cs b/Content.Shared/Labels/EntitySystems/SharedLabelSystem.cs
index f1998e524d9..eb3a0f185b9 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 789b484cfd3..9f5348a10f0 100644
--- a/Content.Shared/MagicMirror/SharedMagicMirrorSystem.cs
+++ b/Content.Shared/MagicMirror/SharedMagicMirrorSystem.cs
@@ -42,7 +42,7 @@ private void OnMirrorRangeCheck(EntityUid uid, MagicMirrorComponent component, r
             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/Loadouts/RoleLoadout.cs b/Content.Shared/Preferences/Loadouts/RoleLoadout.cs
index 128cf9b485c..ea0d85716b3 100644
--- a/Content.Shared/Preferences/Loadouts/RoleLoadout.cs
+++ b/Content.Shared/Preferences/Loadouts/RoleLoadout.cs
@@ -145,9 +145,12 @@ public void EnsureValid(HumanoidCharacterProfile profile, ICommonSession session
             // 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, groupProtoLoadouts.Count); i++) // Corvax-Loadout: Use groupProtoLoadouts instead of groupProto.Loadouts
+                foreach (var protoId in groupProtoLoadouts) // Corvax-Loadout: Use groupProtoLoadouts instead of groupProto.Loadouts
                 {
-                    if (!protoManager.TryIndex(groupProtoLoadouts[i], out var loadoutProto)) // Corvax-Loadout
+                    if (loadouts.Count >= groupProto.MinLimit)
+                        break;
+
+                    if (!protoManager.TryIndex(protoId, out var loadoutProto))
                         continue;
 
                     var defaultLoadout = new Loadout()
@@ -214,11 +217,10 @@ public void SetDefault(HumanoidCharacterProfile? profile, ICommonSession? sessio
             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))
@@ -235,7 +237,6 @@ public void SetDefault(HumanoidCharacterProfile? profile, ICommonSession? sessio
 
                     loadouts.Add(defaultLoadout);
                     Apply(loadoutProto);
-                    addedCount++;
                 }
             }
         }
diff --git a/Content.Shared/Prying/Components/PryingComponent.cs b/Content.Shared/Prying/Components/PryingComponent.cs
index 6651e2b5744..93713e52c67 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 52459c4f744..10c80cfab59 100644
--- a/Content.Shared/Prying/Systems/PryingSystem.cs
+++ b/Content.Shared/Prying/Systems/PryingSystem.cs
@@ -109,7 +109,7 @@ private bool CanPry(EntityUid target, EntityUid user, out string? message, Pryin
 
         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 @@ private bool CanPry(EntityUid target, EntityUid user, out string? message, Pryin
                 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 43163a0c5cd..621bbe8ff94 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 f9976219079..4e6ebb23d21 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
+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
 {
-    /// <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);
+    public static readonly AudioParams DefaultParams = AudioParams.Default.WithVolume(-2f);
 
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("sound", required: true)]
-        public SoundSpecifier? Sound;
-    }
+    [AutoNetworkedField]
+    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField(required: true)]
+    public SoundSpecifier? Sound;
 }
diff --git a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
index 2b434befe53..5c2e0080a69 100644
--- a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
@@ -96,6 +96,7 @@ public override void Initialize()
             subs.Event<BoundUIClosedEvent>(OnBoundUIClosed);
         });
 
+        SubscribeLocalEvent<StorageComponent, ComponentRemove>(OnRemove);
         SubscribeLocalEvent<StorageComponent, MapInitEvent>(OnMapInit);
         SubscribeLocalEvent<StorageComponent, GetVerbsEvent<ActivationVerb>>(AddUiVerb);
         SubscribeLocalEvent<StorageComponent, ComponentGetState>(OnStorageGetState);
@@ -133,6 +134,11 @@ public override void Initialize()
         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/Weapons/Reflect/ReflectComponent.cs b/Content.Shared/Weapons/Reflect/ReflectComponent.cs
index 5d8432ac776..8e7b8975d9d 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;
 
-    [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.
+    /// 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.
+    [DataField("spread"), ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
+    public Angle Spread = Angle.FromDegrees(45);
 
-    /// <summary>
-    /// Minimum probability for a projectile to be reflected.
-    /// </summary>
-    [DataField]
-    public float MinReflectProb = 0.1f;
+    [DataField("soundOnReflect")]
+    public SoundSpecifier? SoundOnReflect = new SoundPathSpecifier("/Audio/Weapons/Guns/Hits/laser_sear_wall.ogg");
 }
 
 [Flags]
diff --git a/Content.Shared/Weapons/Reflect/ReflectSystem.cs b/Content.Shared/Weapons/Reflect/ReflectSystem.cs
index 9b89be6202a..7a2e733bf7c 100644
--- a/Content.Shared/Weapons/Reflect/ReflectSystem.cs
+++ b/Content.Shared/Weapons/Reflect/ReflectSystem.cs
@@ -3,18 +3,16 @@
 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;
+        foreach (var ent in _inventorySystem.GetHandOrInventoryEntities(uid, SlotFlags.All & ~SlotFlags.POCKET))
+        {
+            if (!TryReflectHitscan(uid, ent, args.Shooter, args.SourceItem, args.Direction, out var dir))
+                continue;
 
-        args.Cancelled = true;
+            args.Direction = dir.Value;
+            args.Reflected = true;
+            break;
+        }
     }
 
-    private void OnObjectReflectHitscanAttempt(Entity<ReflectComponent> obj, ref HitScanReflectAttemptEvent args)
+    private void OnReflectUserCollide(EntityUid uid, ReflectUserComponent component, ref ProjectileReflectAttemptEvent 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;
+        foreach (var ent in _inventorySystem.GetHandOrInventoryEntities(uid, SlotFlags.All & ~SlotFlags.POCKET))
+        {
+            if (!TryReflectProjectile(uid, ent, args.ProjUid))
+                continue;
 
-        args.Direction = dir.Value;
-        args.Reflected = true;
+            args.Cancelled = true;
+            break;
+        }
     }
 
-    private void OnObjectReflectProjectileAttempt(Entity<ReflectComponent> obj, ref ProjectileReflectAttemptEvent args)
+    private void OnReflectCollide(EntityUid uid, ReflectComponent component, ref ProjectileReflectAttemptEvent args)
     {
         if (args.Cancelled)
             return;
 
-        if (!TryReflectProjectile(obj, obj, (args.ProjUid, args.Component)))
-            return;
-
-        args.Cancelled = true;
+        if (TryReflectProjectile(uid, uid, args.ProjUid, reflect: component))
+            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)
+    private bool TryReflectProjectile(EntityUid user, EntityUid reflector, EntityUid projectile, ProjectileComponent? projectileComp = null, ReflectComponent? reflect = null)
     {
-        bestReflector = null;
-
-        foreach (var entityUid in _inventorySystem.GetHandOrInventoryEntities(user.Owner, SlotFlags.WITHOUT_POCKET))
-        {
-            if (!TryComp<ReflectComponent>(entityUid, out var comp))
-                continue;
-
-            if (!comp.Enabled)
-                continue;
-
-            if (bestReflector != null && bestReflector.Value.Comp.ReflectProb >= comp.ReflectProb)
-                continue;
-
-            if (projectile != null && (comp.Reflects & projectile.Value.Comp.Reflective) == 0x0)
-                continue;
-
-            bestReflector = (entityUid, comp);
-        }
-
-        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?
+        if (!Resolve(reflector, ref reflect, false) ||
+            !reflect.Enabled ||
             !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)))
+            (reflect.Reflects & reflective.Reflective) == 0x0 ||
+            !_random.Prob(reflect.ReflectProb) ||
+            !TryComp<PhysicsComponent>(projectile, out var physics))
+        {
             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 @@ private bool TryReflectProjectile(EntityUid user, Entity<ReflectComponent> refle
         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 @@ private bool TryReflectHitscan(
         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 db13d28d838..b38cb56a898 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 24c4ecca9a1..dad08b5dc31 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 e63b18a627f..70ecf1d2e77 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 00000000000..206d29ee5dc
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 84f31adef45..196e719539b 100644
--- a/Resources/Changelog/Admin.yml
+++ b/Resources/Changelog/Admin.yml
@@ -330,5 +330,19 @@ 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
 Name: Admin
 Order: 1
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 68ccd7a6d4c..69de6e7a900 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,229 +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.
@@ -3850,3 +3625,209 @@
   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
diff --git a/Resources/ConfigPresets/Corvax/echo.toml b/Resources/ConfigPresets/Corvax/echo.toml
index 123015aeeda..cb2514b5374 100644
--- a/Resources/ConfigPresets/Corvax/echo.toml
+++ b/Resources/ConfigPresets/Corvax/echo.toml
@@ -10,8 +10,8 @@ map_rotation = true
 enabled = true
 show_reason = true
 min_account_age = 0
-min_overall_minutes = 600
-custom_reason = "Для доступа на этот сервер вам необходимо отыграть на другом сервере Corvax как минимум 10 часов."
+min_overall_minutes = 1800
+custom_reason = "Для доступа на этот сервер вам необходимо отыграть на другом сервере Corvax как минимум 30 часов."
 
 [rules]
 time = 10.0
diff --git a/Resources/ConfigPresets/WizardsDen/wizardsDen.toml b/Resources/ConfigPresets/WizardsDen/wizardsDen.toml
index 46e53c0c885..807b21b4694 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/Credits/ADTeam.txt b/Resources/Credits/ADTeam.txt
index 20d27f9616c..11a0c03ab36 100644
--- a/Resources/Credits/ADTeam.txt
+++ b/Resources/Credits/ADTeam.txt
@@ -1,4 +1,4 @@
-Adventure Time Development
+Adventure Time Development:
 xTray85, Big_Chungus, Nopeengener, Schrodinger71, Friskis, Modern.df, Aserovich, JustKekc,
 xelasto, Stepka, Kotя, Кусь, dikiybanan, Bolper, RevengenRat, Tamioki, AnderFan, Nezer,
 Username228, eddiemercury, TORGOVEC471, TORGOVEC471
\ No newline at end of file
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 00000000000..40ab4737dcc
--- /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 b067774d0ae..3c13d56c948 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 00000000000..8b5cc195b1d
--- /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 00000000000..8c54d791602
--- /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 00000000000..75b5ff071a3
--- /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 00000000000..b58bce5286b
--- /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 0288efcaa44..0899d20c8d2 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,9 @@
 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
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 f9f9f6b5c9f..1cca5c7a934 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 9fd44d7f3ae..047bc8cbcb5 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 24bc60cbf15..319809da40a 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/escape-menu/ui/options-menu.ftl b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
index d07f9127a47..39a72260e2e 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 df2ca687867..573aa78a286 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/ss14-ru/prototypes/corvax/entities/clothing/uniforms/jumpskirts.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/clothing/uniforms/jumpskirts.ftl
index 064f0c79ddd..0022c10c1be 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/clothing/uniforms/jumpskirts.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/clothing/uniforms/jumpskirts.ftl
@@ -12,9 +12,9 @@ ent-ClothingUniformJumpskirtSchool = school skirt
     .desc = Stylish and comfortable school skirt.
 ent-ClothingUniformJumpskirtCapTurtleneck = captain's turtleneck
     .desc = True captain's turtleneck.
-ent-ClothingUniformJumpskirtHoPTurtleneck = head's of personal turtleneck
-    .desc = Turtleneck of papers god.
-ent-ClothingUniformJumpskirtHoSBlack = head's of security black skirt
-    .desc = Main villain's skirt.
-ent-ClothingUniformJumpskirtRDFormal = research director's formal skirt
-    .desc = Evil genius skirt.
+ent-ClothingUniformJumpskirtHoPTurtleneck = head of personal's turtleneck
+    .desc = It's Head of Personal's turtleneck.
+ent-ClothingUniformJumpskirtHoSBlack = head of security's black skirt
+    .desc = It's Head of Security's black skirt.
+ent-ClothingUniformJumpskirtRDClassical = research director's classical skirt
+    .desc = It's Research Director's classical skirt.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/clothing/uniforms/jumpsuits.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/clothing/uniforms/jumpsuits.ftl
index c29c8463444..74269d94759 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/clothing/uniforms/jumpsuits.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/clothing/uniforms/jumpsuits.ftl
@@ -8,9 +8,9 @@ ent-ClothingUniformJumpsuitCentcomAdmiral = admiral's uniform
     .desc = A uniform worn by those with the rank Admiral in the Nanotrasen Navy.
 ent-ClothingUniformJumpsuitCapTurtleneck = captain's turtleneck
     .desc = True captain's turtleneck.
-ent-ClothingUniformJumpsuitHoPTurtleneck = head's of personal turtleneck
-    .desc = Turtleneck of papers god.
-ent-ClothingUniformJumpsuitHoSBlack = head's of security black suit
-    .desc = Main villain's suit.
-ent-ClothingUniformJumpsuitRDFormal = research director's formal suit
-    .desc = Evil genius suit.
+ent-ClothingUniformJumpsuitHoPTurtleneck = head of personal's turtleneck
+    .desc = It's Head of Personal's turtleneck.
+ent-ClothingUniformJumpsuitHoSBlack = head of security's black suit
+    .desc = It's Head of Security's black suit.
+ent-ClothingUniformJumpsuitRDClassical = research director's classical suit
+    .desc = It's Research Director's сlassical suit.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/objects/misc/tiles.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/objects/misc/tiles.ftl
new file mode 100644
index 00000000000..5c9b21d0c29
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/objects/misc/tiles.ftl
@@ -0,0 +1,36 @@
+ent-FloorTileItemWoodParquet = tiles-wood-parquet
+    .desc = { ent-FloorTileItemBase.desc }
+ent-FloorTileItemWoodBlack = tiles-wood-black
+    .desc = { ent-FloorTileItemBase.desc }
+ent-FloorTileItemWoodDark = tiles-wood-dark
+    .desc = { ent-FloorTileItemBase.desc }
+ent-FloorTileItemWoodLight = tiles-wood-light
+    .desc = { ent-FloorTileItemBase.desc }
+ent-FloorTileItemWoodRed = tiles-wood-red
+    .desc = { ent-FloorTileItemBase.desc }
+ent-FloorTileItemWoodLargeBlack = large black wood floor
+    .desc = { ent-FloorTileItemBase.desc }
+ent-FloorTileItemWoodLargeDark = large dark wood floor
+    .desc = { ent-FloorTileItemBase.desc }
+ent-FloorTileItemWoodLargeLight = large light wood floor
+    .desc = { ent-FloorTileItemBase.desc }
+ent-FloorTileItemWoodLargeRed = large red wood floor
+    .desc = { ent-FloorTileItemBase.desc }
+ent-FloorTileItemWoodParquetBlack = parquet black wood floor
+    .desc = { ent-FloorTileItemBase.desc }
+ent-FloorTileItemWoodParquetDark = parquet dark wood floor
+    .desc = { ent-FloorTileItemBase.desc }
+ent-FloorTileItemWoodParquetLight = parquet light wood floor
+    .desc = { ent-FloorTileItemBase.desc }
+ent-FloorTileItemWoodParquetRed = parquet red wood floor
+    .desc = { ent-FloorTileItemBase.desc }
+ent-FloorTileItemWoodChess = chess wood floor
+    .desc = { ent-FloorTileItemBase.desc }
+ent-FloorTileItemWoodChessBlack = chess black wood floor
+    .desc = { ent-FloorTileItemBase.desc }
+ent-FloorTileItemWoodChessDark = chess dark wood floor
+    .desc = { ent-FloorTileItemBase.desc }
+ent-FloorTileItemWoodChessLight = chess light wood floor
+    .desc = { ent-FloorTileItemBase.desc }
+ent-FloorTileItemWoodChessRed = chess red wood floor
+    .desc = { ent-FloorTileItemBase.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/stations/base.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/stations/base.ftl
new file mode 100644
index 00000000000..520b9df451f
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/stations/base.ftl
@@ -0,0 +1,2 @@
+ent-BaseStationGoal = { "" }
+    .desc = { "" }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks-cartons.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks-cartons.ftl
index d93ac50df48..b99499c4d4d 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks-cartons.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks-cartons.ftl
@@ -21,3 +21,5 @@ ent-DrinkSoyMilkCarton = soy milk
     .desc = White and nutritious soy goodness!
 ent-DrinkOatMilkCarton = oat milk
     .desc = It's oat milk. Tan and nutritious goodness!
+ent-DrinkJuiceLemonCarton = lemon juice
+    .desc = First it's sour, then it's still sour.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/baked/bagel.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/baked/bagel.ftl
new file mode 100644
index 00000000000..5306b66ebf3
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/baked/bagel.ftl
@@ -0,0 +1,6 @@
+ent-FoodBagelBase = { ent-FoodInjectableBase }
+    .desc = A delicious bagel.
+ent-FoodBagel = bagel
+    .desc = { ent-FoodBagelBase.desc }
+ent-FoodBagelPoppy = poppy seed bagel
+    .desc = A delicious bagel topped with bicaridine-infused poppy seeds.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/ingredients.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/ingredients.ftl
index ab61632eefe..b07d075dd5d 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/ingredients.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/ingredients.ftl
@@ -30,6 +30,8 @@ ent-FoodDough = dough
     .desc = A piece of dough.
 ent-FoodDoughSlice = dough slice
     .desc = A slice of dough. Can be cooked into a bun.
+ent-FoodDoughRope = dough rope
+    .desc = A thin noodle of dough. Can be cooked into a bagel.
 ent-FoodDoughCornmeal = cornmeal dough
     .desc = A piece of cornmeal dough.
 ent-FoodDoughCornmealSlice = cornmeal dough slice
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/tiles.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/tiles.ftl
index 0ba39a65e69..1872afee3ae 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/tiles.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/tiles.ftl
@@ -16,8 +16,6 @@ ent-FloorTileItemDark = dark tile
     .desc = { ent-FloorTileItemBase.desc }
 ent-FloorTileItemTechmaint = techmaint floor
     .desc = { ent-FloorTileItemBase.desc }
-ent-FloorTileItemReinforced = reinforced tile
-    .desc = { ent-FloorTileItemBase.desc }
 ent-FloorTileItemMono = mono tile
     .desc = { ent-FloorTileItemBase.desc }
 ent-FloorTileItemLino = linoleum floor
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/shields/shields.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/shields/shields.ftl
index 589d466db31..d5517c8655d 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/shields/shields.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/shields/shields.ftl
@@ -15,7 +15,7 @@ ent-WebShield = web shield
 ent-ClockworkShield = clockwork shield
     .desc = Ratvar oyrffrf lbh jvgu uvf cebgrpgvba.
 ent-MirrorShield = mirror shield
-    .desc = Glows an eerie red. You hear the Geometer whispering...
+    .desc = Eerily glows red... you hear the geometer whispering
 ent-EnergyShield = energy shield
     .desc = Exotic energy shield, when folded, can even fit in your pocket.
 ent-BrokenEnergyShield = broken energy shield
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/medical/healing.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/medical/healing.ftl
index 2d4c60d8afc..f37756afe66 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/medical/healing.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/medical/healing.ftl
@@ -52,57 +52,67 @@ ent-AloeCream = aloe cream
 ent-HealingToolbox = healing toolbox
     .desc = A powerful toolbox imbued with robust energy. It can heal your wounds and fill you with murderous intent.
     .suffix = DO NOT MAP
-ent-PillDexalin = pill (dexalin 10u)
+ent-PillDexalin = pill
+    .suffix = Dexalin 10u
     .desc = { ent-Pill.desc }
-ent-PillCanisterDexalin = pill canister (dexalin 10u)
-    .suffix = Dexalin, 7
+ent-PillCanisterDexalin = pill canister
+    .suffix = Dexalin 10u, 7
     .desc = { ent-PillCanister.desc }
-ent-PillDylovene = pill (dylovene 10u)
+ent-PillDylovene = pill
+    .suffix = Dylovene 10u
     .desc = { ent-Pill.desc }
-ent-PillCanisterDylovene = pill canister (dylovene 10u)
-    .suffix = Dylovene, 5
+ent-PillCanisterDylovene = pill canister
+    .suffix = Dylovene 10u, 5
     .desc = { ent-PillCanister.desc }
-ent-PillHyronalin = pill (hyronalin 10u)
+ent-PillHyronalin = pill
+    .suffix = Hyronalin 10u
     .desc = { ent-Pill.desc }
-ent-PillCanisterHyronalin = pill canister (hyronalin 10u)
-    .suffix = Hyronalin, 5
+ent-PillCanisterHyronalin = pill canister
+    .suffix = Hyronalin 10u, 5
     .desc = { ent-PillCanister.desc }
-ent-PillIron = pill (iron 10u)
+ent-PillIron = pill
+    .suffix = Iron 10u
     .desc = { ent-Pill.desc }
-ent-PillCopper = pill (copper 10u)
+ent-PillCopper = pill
+    .suffix = Copper 10u
     .desc = { ent-Pill.desc }
-ent-PillCanisterIron = pill canister (iron 10u)
-    .suffix = Iron, 5
+ent-PillCanisterIron = pill canister
+    .suffix = Iron 10u, 5
     .desc = { ent-PillCanister.desc }
-ent-PillCanisterCopper = pill canister (copper 10u)
-    .suffix = Copper, 5
+ent-PillCanisterCopper = pill canister
+    .suffix = Copper 10u, 5
     .desc = { ent-PillCanister.desc }
-ent-PillKelotane = pill (kelotane 10u)
+ent-PillKelotane = pill
+    .suffix = Kelotane 10u
     .desc = { ent-Pill.desc }
-ent-PillCanisterKelotane = pill canister (kelotane 10u)
-    .suffix = Kelotane, 5
+ent-PillCanisterKelotane = pill canister
+    .suffix = Kelotane 10u, 5
     .desc = { ent-PillCanister.desc }
-ent-PillDermaline = pill (dermaline 10u)
+ent-PillDermaline = pill
+    .suffix = Dermaline 10u
     .desc = { ent-Pill.desc }
-ent-PillCanisterDermaline = pill canister (dermaline 10u)
-    .suffix = Dermaline, 5
+ent-PillCanisterDermaline = pill canister
+    .suffix = Dermaline 10u, 5
     .desc = { ent-PillCanister.desc }
 ent-PillSpaceDrugs = space mirage
     .desc = { ent-Pill.desc }
-ent-PillTricordrazine = pill (tricordrazine 10u)
+ent-PillTricordrazine = pill
+    .suffix = Tricordrazine 10u
     .desc = { ent-Pill.desc }
-ent-PillCanisterTricordrazine = pill canister (tricordrazine 10u)
-    .suffix = Tricordrazine, 5
+ent-PillCanisterTricordrazine = pill canister
+    .suffix = Tricordrazine 10u, 5
     .desc = { ent-PillCanister.desc }
-ent-PillBicaridine = pill (bicaridine 10u)
+ent-PillBicaridine = pill
+    .suffix = Bicaridine 10u
     .desc = { ent-Pill.desc }
-ent-PillCanisterBicaridine = pill canister (bicaridine 10u)
-    .suffix = Bicaridine, 5
+ent-PillCanisterBicaridine = pill canister
+    .suffix = Bicaridine 10u, 5
     .desc = { ent-PillCanister.desc }
-ent-PillCharcoal = pill (charcoal 10u)
+ent-PillCharcoal = pill
+    .suffix = Charcoal 10u
     .desc = { ent-Pill.desc }
-ent-PillCanisterCharcoal = pill canister (charcoal 10u)
-    .suffix = Charcoal, 3
+ent-PillCanisterCharcoal = pill canister
+    .suffix = Charcoal 10u, 3
     .desc = { ent-PillCanister.desc }
 ent-PillRomerol = romerol pill
     .desc = { ent-Pill.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/e_sword.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/e_sword.ftl
index 6e687d9ab83..e4f5f81b8dc 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/e_sword.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/e_sword.ftl
@@ -9,4 +9,4 @@ ent-EnergyDaggerBox = e-dagger box
 ent-EnergyCutlass = energy cutlass
     .desc = An exotic energy weapon.
 ent-EnergySwordDouble = double-bladed energy sword
-    .desc = Syndicate Command's intern thought that having only one blade on energy swords was not cool enough. This can be stored in pockets.
+    .desc = Syndicate Command Interns thought that having one blade on the energy sword was not enough. This can be stored in pockets.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/sword.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/sword.ftl
index 660822f227d..5855dc3a7e2 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/sword.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/sword.ftl
@@ -11,4 +11,4 @@ ent-Claymore = claymore
 ent-Cutlass = cutlass
     .desc = A wickedly curved blade, often seen in the hands of space pirates.
 ent-Throngler = The Throngler
-    .desc = Why would someone make this?
+    .desc = Why would you make this?
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/specific/atmospherics/sensor.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/specific/atmospherics/sensor.ftl
index ac99c4e1668..5cc77f31644 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/specific/atmospherics/sensor.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/specific/atmospherics/sensor.ftl
@@ -1,3 +1,5 @@
+ent-AirSensorBase = { "" }
+    .desc = { "" }
 ent-AirSensor = air sensor
     .desc = Air sensor. It senses air.
 ent-AirSensorAssembly = air sensor assembly
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/asteroid.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/asteroid.ftl
index a6543f6de30..6e8e191bd1a 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/asteroid.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/asteroid.ftl
@@ -36,6 +36,9 @@ ent-AsteroidRockUraniumCrab = { ent-AsteroidRockUranium }
 ent-AsteroidRockBananium = { ent-AsteroidRock }
     .desc = An ore vein rich with bananium.
     .suffix = Bananium
+ent-AsteroidRockSalt = { ent-AsteroidRock }
+    .desc = An ore vein rich with salt.
+    .suffix = Salt
 ent-AsteroidRockArtifactFragment = { ent-AsteroidRock }
     .desc = A rock wall. What's that sticking out of it?
     .suffix = Artifact Fragment
@@ -45,12 +48,39 @@ ent-AsteroidRockMining = asteroid rock
 ent-IronRock = ironrock
     .desc = A rocky asteroid.
     .suffix = Low Ore Yield
-ent-AsteroidRockSalt = { ent-AsteroidRock }
-    .desc = An ore vein rich with salt.
-    .suffix = Salt
 ent-IronRockMining = ironrock
     .desc = An asteroid.
     .suffix = higher ore yield
+ent-IronRockCoal = { ent-IronRock }
+    .desc = An ore vein rich with coal.
+    .suffix = Coal
+ent-IronRockGold = { ent-IronRock }
+    .desc = An ore vein rich with gold.
+    .suffix = Gold
+ent-IronRockPlasma = { ent-IronRock }
+    .desc = An ore vein rich with plasma.
+    .suffix = Plasma
+ent-IronRockQuartz = { ent-IronRock }
+    .desc = An ore vein rich with quartz.
+    .suffix = Quartz
+ent-IronRockSilver = { ent-IronRock }
+    .desc = An ore vein rich with silver.
+    .suffix = Silver
+ent-IronRockIron = { ent-IronRock }
+    .desc = An ore vein rich with iron.
+    .suffix = Iron
+ent-IronRockUranium = { ent-IronRock }
+    .desc = An ore vein rich with uranium.
+    .suffix = Uranium
+ent-IronRockBananium = { ent-IronRock }
+    .desc = An ore vein rich with bananium.
+    .suffix = Bananium
+ent-IronRockSalt = { ent-IronRock }
+    .desc = An ore vein rich with salt.
+    .suffix = Salt
+ent-IronRockArtifactFragment = { ent-IronRock }
+    .desc = A rock wall. What's that sticking out of it?
+    .suffix = Artifact Fragment
 ent-WallRock = rock
     .suffix = planetmap
     .desc = { ent-BaseWall.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/inventorytemplates/inventorybase.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/inventorytemplates/inventorybase.ftl
new file mode 100644
index 00000000000..b03cffa3632
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/inventorytemplates/inventorybase.ftl
@@ -0,0 +1,4 @@
+ent-InventoryBase = { "" }
+    .desc = { "" }
+ent-StripableInventoryBase = { ent-InventoryBase }
+    .desc = { ent-InventoryBase.desc }
diff --git a/Resources/Locale/en-US/thief/backpack.ftl b/Resources/Locale/en-US/thief/backpack.ftl
index f5d313c8b01..0911bc042b6 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 00000000000..735816a52dd
--- /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 851241f85c1..a1ebec9e7d3 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/Locale/ru-RU/administration/admin-alerts.ftl b/Resources/Locale/ru-RU/administration/admin-alerts.ftl
new file mode 100644
index 00000000000..9b2e52d6236
--- /dev/null
+++ b/Resources/Locale/ru-RU/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/ru-RU/administration/ui/actions.ftl b/Resources/Locale/ru-RU/administration/ui/actions.ftl
index 6910099187e..f0a9d13ae8c 100644
--- a/Resources/Locale/ru-RU/administration/ui/actions.ftl
+++ b/Resources/Locale/ru-RU/administration/ui/actions.ftl
@@ -1,3 +1,4 @@
+admin-player-actions-reason = Reason
 admin-player-actions-bans = Бан-лист
 admin-player-actions-notes = Заметки
 admin-player-actions-kick = Кикнуть
diff --git a/Resources/Locale/ru-RU/administration/ui/player-list-control.ftl b/Resources/Locale/ru-RU/administration/ui/player-list-control.ftl
new file mode 100644
index 00000000000..8b5cc195b1d
--- /dev/null
+++ b/Resources/Locale/ru-RU/administration/ui/player-list-control.ftl
@@ -0,0 +1 @@
+player-list-filter = Filter
diff --git a/Resources/Locale/ru-RU/administration/ui/tabs/admin-tab/teleport.ftl b/Resources/Locale/ru-RU/administration/ui/tabs/admin-tab/teleport.ftl
new file mode 100644
index 00000000000..8c54d791602
--- /dev/null
+++ b/Resources/Locale/ru-RU/administration/ui/tabs/admin-tab/teleport.ftl
@@ -0,0 +1 @@
+admin-ui-teleport = Teleport
diff --git a/Resources/Locale/ru-RU/administration/ui/tabs/adminbus-tab/blueprints.ftl b/Resources/Locale/ru-RU/administration/ui/tabs/adminbus-tab/blueprints.ftl
new file mode 100644
index 00000000000..00b83cdddfa
--- /dev/null
+++ b/Resources/Locale/ru-RU/administration/ui/tabs/adminbus-tab/blueprints.ftl
@@ -0,0 +1,8 @@
+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/ru-RU/administration/ui/tabs/atmos-tab.ftl b/Resources/Locale/ru-RU/administration/ui/tabs/atmos-tab.ftl
new file mode 100644
index 00000000000..c590241ce4a
--- /dev/null
+++ b/Resources/Locale/ru-RU/administration/ui/tabs/atmos-tab.ftl
@@ -0,0 +1,11 @@
+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/ru-RU/administration/ui/tabs/object-tab.ftl b/Resources/Locale/ru-RU/administration/ui/tabs/object-tab.ftl
index 52bc8905f5d..781abfc5916 100644
--- a/Resources/Locale/ru-RU/administration/ui/tabs/object-tab.ftl
+++ b/Resources/Locale/ru-RU/administration/ui/tabs/object-tab.ftl
@@ -1,2 +1,7 @@
 object-tab-entity-id = ID сущности
 object-tab-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
diff --git a/Resources/Locale/ru-RU/administration/ui/tabs/player-tab.ftl b/Resources/Locale/ru-RU/administration/ui/tabs/player-tab.ftl
index 44f7b001b56..5f3a021dfdf 100644
--- a/Resources/Locale/ru-RU/administration/ui/tabs/player-tab.ftl
+++ b/Resources/Locale/ru-RU/administration/ui/tabs/player-tab.ftl
@@ -1,3 +1,4 @@
+player-tab-player-count = Players: { $count }
 player-tab-username = Пользователь
 player-tab-character = Персонаж
 player-tab-job = Должность
diff --git a/Resources/Locale/ru-RU/administration/ui/tabs/round-tab.ftl b/Resources/Locale/ru-RU/administration/ui/tabs/round-tab.ftl
index 9f67aade38f..10c7b993843 100644
--- a/Resources/Locale/ru-RU/administration/ui/tabs/round-tab.ftl
+++ b/Resources/Locale/ru-RU/administration/ui/tabs/round-tab.ftl
@@ -1 +1,4 @@
+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 = Перезапустить СЕЙЧАС
diff --git a/Resources/Locale/ru-RU/corvax/station-goal/station-goal-component.ftl b/Resources/Locale/ru-RU/corvax/station-goal/station-goal-component.ftl
index 3fd07abf2ac..cd71d0d0444 100644
--- a/Resources/Locale/ru-RU/corvax/station-goal/station-goal-component.ftl
+++ b/Resources/Locale/ru-RU/corvax/station-goal/station-goal-component.ftl
@@ -1,18 +1,18 @@
 station-goal-fax-paper-name = бумага
 station-goal-shuttle =
-    Цель вашей смены построить пилотируемый шаттл в космосе и обеспечить его всем необходимым для выживания.
+    Цель смены станции { $station } - постройка пилотируемого шаттла в космосе и обеспечение его всем необходимым для выживания.
     Чтобы её выполнить отделу снабжения нужно заказать все необходимые ресурсы для инженерного и научного отделов.
     Инженерному отделу необходимо построить его, а научный отдел должен предоставить инженерному отделу и шаттлу всю необходимую экипировку.
 station-goal-singularity =
-    Цель вашей смены построить генератор основанный на сверхмассивной Сингулярности.
-    Чтобы её выполнить инженерному отделу понадобится построить сдерживающую клетку, отделу снабжения потребуется заказать все необходимые материалы.
+    Цель смены станции { $station } - постройка генератора основанного на сверхмассивной Сингулярности.
+    Чтобы её выполнить, инженерному отделу понадобится построить сдерживающую клетку, отделу снабжения потребуется заказать все необходимые материалы.
     Сдерживающая клетка должна быть способна сдержать сингулярность третьего класса.
 station-goal-solar-panels =
-    Цель вашей смены организовать систему запасного питания для станции на основе солнечных панелей.
+    Цель смены станции { $station } - организовать систему запасного питания для станции на основе солнечных панелей.
     Для этого вам понадобится заказать все необходимые материалы в отделе снабжения и после построить 2 новые ветки солнечных панелей инженерным отделом.
     А так же обеспечить изолированность производимой ими энергии в новые 3 СМЭСа не подключённые к общей сети станции.
 station-goal-artifacts =
-    Цель вашей смены обнаружить, исследовать и доставить космические артефакты.
+    Цель смены станции { $station } - обнаружение, исследование и доставка космических артефактов.
     Для её выполнения будет необходима работа утилизаторов для поиска и доставки артефактов с обломков вокруг станции.
     После доставки их необходимо передать в специальном контейнере отделу исследования для изучения и документирования их свойств.
     Необходимо доставить на шаттле эвакуации в специальных контейнерах как минимум 2 полностью изученных и задокументированных артефакта.
@@ -24,7 +24,7 @@ station-goal-artifacts =
     - ФИ и должность ответственного
     Документ должен быть удостоверен печатью научного руководителя.
 station-goal-bank =
-    Цель вашей смены постройка орбитального хранилища с припасами и технологиями.
+    Цель смены станции { $station } - постройка орбитального хранилища с припасами и технологиями.
     Хранилище должно быть размещено в космосе отдельно от основной станции, проследите за прочностью его конструкции, случайный метеорит не должен повредить его.
     В хранилище необходимо разместить 4 ящика:
     - ящик с продвинутыми медикаментами
@@ -33,11 +33,11 @@ station-goal-bank =
     - ящик с ценными, но не уникальными платами
     Проследите за сохранностью содержимого в хранилище до окончания смены.
 station-goal-zoo =
-    Цель вашей смены улучшить рекреацию персонала на станции.
+    Цель смены станции { $station } - улучшение рекреации персонала на станции.
     Инженерному отделу необходимо построить зоопарк в недалёкой доступности от дорматориев с как минимум тремя вольерами разных видов животных заказанных в отделе снабжения.
     Обеспечьте животных пищей, как минимум одним роботом уборщиком в каждый вольер и всем необходимым для жизни в зависимости от вида животного.
 station-goal-mining-outpost =
-    Цель вашей смены постройка орбитального шахтёрского аванпоста для добычи руды и ресурсов с астероидов.
+    Цель смены станции { $station } - постройка орбитального шахтёрского аванпоста для добычи руды и ресурсов с астероидов.
     Аванпост должен быть размещён в космосе отдельно от основной станции.
     Проследите за прочностью его конструкции, случайный метеорит не должен повредить его.
     Аванпост должен иметь следующее:
@@ -51,6 +51,12 @@ station-goal-mining-outpost =
     - 4 набора медикаментов от физического урона
     Проследите за сохранностью аванпоста до окончания смены.
 station-goal-tesla =
-    Цель вашей смены построить генератор основанный на высоковольтной Тесле.
+    Цель смены станции { $station } - постройка генератора основанного на высоковольтной Тесле.
     Чтобы её выполнить инженерному отделу понадобится построить сдерживающую клетку, отделу снабжения потребуется заказать все необходимые материалы.
     Сдерживающая клетка должна быть способна сдерживать теслу без риска разрушения эмиттеров.
+station-goal-frame-repair =
+    Цель вашей смены - завершить строительство станции { $station }, достроив каждому отделу помещения, необходимые для успешной работы. Также вам необходимо построить кухню и гидропонику для сервисного отдела, оружейную и место содержания заключенных для отдела Службы безопасности и обеспечить свободный проход пассажиров станции до отбытия, без необходимости выхода в открытый космос.
+    Для помощи в выполнении цели мы будет каждые 5 минут высылать вам припасы на специальной посадочной площадке в центре станции.
+    Слава НТ!
+station-goal-delta-xeno-repair = Цель смены станции { $station } - восстановление заброшенного ксенобиологического сектора научного отдела. Вам необходимо полностью восстановить электропитание, атмос, привести внешний вид к изначальному состоянию, и поймать минимум трех слаймов любых форм в ксенобиологические клетки, для их изучения последующей сменой.
+station-goal-delta-ambusol = Цель смены станции { $station } - восстановление заброшенного вирусологического сектора медицинского отдела. Вам необходимо полностью восстановить электропитание, атмос, привести внешний вид к изначальному состоянию, и в стерильных условиях вирусологии провести синтезацию 500u Амбузола, из предоставленных трех пилюль Ромерола.
diff --git a/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl b/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl
index fe3d13b0178..50d737f8e03 100644
--- a/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl
+++ b/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl
@@ -1,6 +1,7 @@
 ## General stuff
 
 ui-options-title = Игровые настройки
+ui-options-tab-accessibility = Accessibility
 ui-options-tab-graphics = Графика
 ui-options-tab-controls = Управление
 ui-options-tab-audio = Аудио
@@ -9,6 +10,7 @@ ui-options-tab-misc = Основные
 ui-options-apply = Применить
 ui-options-reset-all = Сбросить всё
 ui-options-default = По-умолчанию
+ui-options-value-percent = { TOSTRING($value, "P0") }
 
 # Misc/General menu
 
@@ -35,6 +37,10 @@ ui-options-event-music = Музыка событий
 ui-options-admin-sounds = Музыка админов
 ui-options-volume-label = Громкость
 ui-options-volume-percent = { TOSTRING($volume, "P0") }
+ui-options-display-label = Display
+ui-options-quality-label = Quality
+ui-options-misc-label = Misc
+ui-options-interface-label = Interface
 
 ## Graphics menu
 
@@ -69,6 +75,7 @@ ui-options-scale-175 = 175%
 ui-options-scale-200 = 200%
 ui-options-hud-theme = Тема HUD:
 ui-options-hud-theme-default = По умолчанию
+ui-options-vp-scale-value = x{ $scale }
 ui-options-hud-theme-plasmafire = Плазма
 ui-options-hud-theme-slimecore = Слаймкор
 ui-options-hud-theme-clockwork = Механизм
diff --git a/Resources/Locale/ru-RU/game-ticking/forcemap-command.ftl b/Resources/Locale/ru-RU/game-ticking/forcemap-command.ftl
index 9c1a65bef94..1a5ac6de4a2 100644
--- a/Resources/Locale/ru-RU/game-ticking/forcemap-command.ftl
+++ b/Resources/Locale/ru-RU/game-ticking/forcemap-command.ftl
@@ -3,5 +3,7 @@
 forcemap-command-description = Заставляет игру начать с заданной карты в следующем раунде.
 forcemap-command-help = forcemap <map ID>
 forcemap-command-need-one-argument = forcemap принимает один аргумент — путь к файлу карты.
+forcemap-command-map-not-found = No eligible map exists with name { $map }.
 forcemap-command-success = В следующем раунде игра принудительно начнётся с карты { $map }.
+forcemap-command-cleared = Cleared the forced map setting.
 forcemap-command-arg-map = <map ID>
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/misc/tiles.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/misc/tiles.ftl
new file mode 100644
index 00000000000..5c9b21d0c29
--- /dev/null
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/misc/tiles.ftl
@@ -0,0 +1,36 @@
+ent-FloorTileItemWoodParquet = tiles-wood-parquet
+    .desc = { ent-FloorTileItemBase.desc }
+ent-FloorTileItemWoodBlack = tiles-wood-black
+    .desc = { ent-FloorTileItemBase.desc }
+ent-FloorTileItemWoodDark = tiles-wood-dark
+    .desc = { ent-FloorTileItemBase.desc }
+ent-FloorTileItemWoodLight = tiles-wood-light
+    .desc = { ent-FloorTileItemBase.desc }
+ent-FloorTileItemWoodRed = tiles-wood-red
+    .desc = { ent-FloorTileItemBase.desc }
+ent-FloorTileItemWoodLargeBlack = large black wood floor
+    .desc = { ent-FloorTileItemBase.desc }
+ent-FloorTileItemWoodLargeDark = large dark wood floor
+    .desc = { ent-FloorTileItemBase.desc }
+ent-FloorTileItemWoodLargeLight = large light wood floor
+    .desc = { ent-FloorTileItemBase.desc }
+ent-FloorTileItemWoodLargeRed = large red wood floor
+    .desc = { ent-FloorTileItemBase.desc }
+ent-FloorTileItemWoodParquetBlack = parquet black wood floor
+    .desc = { ent-FloorTileItemBase.desc }
+ent-FloorTileItemWoodParquetDark = parquet dark wood floor
+    .desc = { ent-FloorTileItemBase.desc }
+ent-FloorTileItemWoodParquetLight = parquet light wood floor
+    .desc = { ent-FloorTileItemBase.desc }
+ent-FloorTileItemWoodParquetRed = parquet red wood floor
+    .desc = { ent-FloorTileItemBase.desc }
+ent-FloorTileItemWoodChess = chess wood floor
+    .desc = { ent-FloorTileItemBase.desc }
+ent-FloorTileItemWoodChessBlack = chess black wood floor
+    .desc = { ent-FloorTileItemBase.desc }
+ent-FloorTileItemWoodChessDark = chess dark wood floor
+    .desc = { ent-FloorTileItemBase.desc }
+ent-FloorTileItemWoodChessLight = chess light wood floor
+    .desc = { ent-FloorTileItemBase.desc }
+ent-FloorTileItemWoodChessRed = chess red wood floor
+    .desc = { ent-FloorTileItemBase.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/tiles/tile.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/tiles/tile.ftl
deleted file mode 100644
index df71251325e..00000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/tiles/tile.ftl
+++ /dev/null
@@ -1,18 +0,0 @@
-ent-FloorTileItemWoodParquet = деревянный паркет
-ent-FloorTileItemWoodChess = деревянный шахматный пол
-ent-FloorTileItemWoodBlack = чёрный деревянный пол
-ent-FloorTileItemWoodLargeBlack = большой чёрный деревянный пол
-ent-FloorTileItemWoodParquetBlack = чёрный деревянный паркет
-ent-FloorTileItemWoodChessBlack = чёрный деревянный шахматный пол
-ent-FloorTileItemWoodDark = тёмный деревянный пол
-ent-FloorTileItemWoodLargeDark = большой тёмный деревянный пол
-ent-FloorTileItemWoodParquetDark = тёмный деревянный паркет
-ent-FloorTileItemWoodChessDark = тёмный деревянный шахматный пол
-ent-FloorTileItemWoodLight = светлый деревянный пол
-ent-FloorTileItemWoodLargeLight = большой светлый деревянный пол
-ent-FloorTileItemWoodParquetLight = светлый деревянный паркет
-ent-FloorTileItemWoodChessLight = светлый деревянный шахматный пол
-ent-FloorTileItemWoodRed = красный деревянный пол
-ent-FloorTileItemWoodLargeRed = большой красный деревянный пол
-ent-FloorTileItemWoodParquetRed = красный деревянный паркет
-ent-FloorTileItemWoodChessRed = красный деревянный шахматный пол
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/stations/base.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/stations/base.ftl
new file mode 100644
index 00000000000..520b9df451f
--- /dev/null
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/stations/base.ftl
@@ -0,0 +1,2 @@
+ent-BaseStationGoal = { "" }
+    .desc = { "" }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks-cartons.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks-cartons.ftl
index 68a514f4e07..e96ae9e9068 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks-cartons.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks-cartons.ftl
@@ -21,3 +21,5 @@ ent-DrinkSoyMilkCarton = соевое молоко
     .desc = Белое и питательное соевое удовольствие!
 ent-DrinkOatMilkCarton = овсяное молоко
     .desc = Бежевое и питательное удовольствие!
+ent-DrinkJuiceLemonCarton = lemon juice
+    .desc = First it's sour, then it's still sour.
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/baked/bagel.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/baked/bagel.ftl
new file mode 100644
index 00000000000..5306b66ebf3
--- /dev/null
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/baked/bagel.ftl
@@ -0,0 +1,6 @@
+ent-FoodBagelBase = { ent-FoodInjectableBase }
+    .desc = A delicious bagel.
+ent-FoodBagel = bagel
+    .desc = { ent-FoodBagelBase.desc }
+ent-FoodBagelPoppy = poppy seed bagel
+    .desc = A delicious bagel topped with bicaridine-infused poppy seeds.
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/ingredients.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/ingredients.ftl
index f9b6390b3f9..ec6b4cdf424 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/ingredients.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/ingredients.ftl
@@ -30,6 +30,8 @@ ent-FoodDough = тесто
     .desc = Большой кусок теста.
 ent-FoodDoughSlice = кусок теста
     .desc = Кусок теста. Из него готовятся булочки.
+ent-FoodDoughRope = dough rope
+    .desc = A thin noodle of dough. Can be cooked into a bagel.
 ent-FoodDoughCornmeal = кукурузное тесто
     .desc = Большой кусок кукурузного теста.
 ent-FoodDoughCornmealSlice = кусок кукурузного теста
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/healing.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/healing.ftl
index ca05a3e8d91..3915bcae6cb 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/healing.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/healing.ftl
@@ -54,36 +54,43 @@ ent-HealingToolbox = лечащий тулбокс
     .suffix = НЕ МАППИТЬ
 ent-PillDexalin = таблетка (дексалин 10 ед.)
     .desc = { ent-Pill.desc }
+    .suffix = Dexalin 10u
 ent-PillCanisterDexalin = баночка для таблеток (дексалин 10 ед.)
     .suffix = Дексалин, 7
     .desc = { ent-PillCanister.desc }
 ent-PillDylovene = таблетка (диловен 10 ед.)
     .desc = { ent-Pill.desc }
+    .suffix = Dylovene 10u
 ent-PillCanisterDylovene = баночка для таблеток (диловен 10 ед.)
     .suffix = Диловен, 5
     .desc = { ent-PillCanister.desc }
 ent-PillHyronalin = таблетка (хироналин 10 ед.)
     .desc = { ent-Pill.desc }
+    .suffix = Hyronalin 10u
 ent-PillCanisterHyronalin = баночка для таблеток (хироналин 10 ед.)
     .suffix = Хироналин, 5
     .desc = { ent-PillCanister.desc }
 ent-PillIron = таблетка (железо 10 ед.)
     .desc = { ent-Pill.desc }
+    .suffix = Iron 10u
 ent-PillCanisterIron = баночка для таблеток (железо 10 ед.)
     .suffix = Железо, 5
     .desc = { ent-PillCanister.desc }
 ent-PillCopper = таблетка (медь 10 ед.)
     .desc = { ent-Pill.desc }
+    .suffix = Copper 10u
 ent-PillCanisterCopper = баночка для таблеток (медь 10 ед.)
     .suffix = Медь, 5
     .desc = { ent-PillCanister.desc }
 ent-PillKelotane = таблетка (келотан 10 ед.)
     .desc = { ent-Pill.desc }
+    .suffix = Kelotane 10u
 ent-PillCanisterKelotane = баночка для таблеток (келотан 10 ед.)
     .suffix = Келотан, 5
     .desc = { ent-PillCanister.desc }
 ent-PillDermaline = таблетка (дермалин 10 ед.)
     .desc = { ent-Pill.desc }
+    .suffix = Dermaline 10u
 ent-PillCanisterDermaline = баночка для таблеток (дермалин 10 ед.)
     .suffix = Дермалин, 5
     .desc = { ent-PillCanister.desc }
@@ -91,16 +98,19 @@ ent-PillSpaceDrugs = космические наркотики
     .desc = { ent-Pill.desc }
 ent-PillTricordrazine = таблетка (трикордразин 10 ед.)
     .desc = { ent-Pill.desc }
+    .suffix = Tricordrazine 10u
 ent-PillCanisterTricordrazine = баночка для таблеток (трикордразин 10 ед.)
     .suffix = Трикордразин, 5
     .desc = { ent-PillCanister.desc }
 ent-PillBicaridine = таблетка (бикаридин 10 ед.)
     .desc = { ent-Pill.desc }
+    .suffix = Bicaridine 10u
 ent-PillCanisterBicaridine = баночка для таблеток (бикаридин 10 ед.)
     .suffix = Бикаридин, 5
     .desc = { ent-PillCanister.desc }
 ent-PillCharcoal = таблетка (уголь 10 ед.)
     .desc = { ent-Pill.desc }
+    .suffix = Charcoal 10u
 ent-PillCanisterCharcoal = баночка для таблеток (уголь 10 ед.)
     .suffix = Уголь, 3
     .desc = { ent-PillCanister.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/specific/atmospherics/sensor.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/specific/atmospherics/sensor.ftl
index d319010ab9f..de7d7333846 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/specific/atmospherics/sensor.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/specific/atmospherics/sensor.ftl
@@ -1,3 +1,5 @@
+ent-AirSensorBase = { "" }
+    .desc = { "" }
 ent-AirSensor = сенсор воздуха
     .desc = Воздушный сенсор. Чувствует воздух.
 ent-AirSensorAssembly = корпус сенсора воздуха
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/asteroid.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/asteroid.ftl
index 6e5c6650226..9e20612d8ef 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/asteroid.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/asteroid.ftl
@@ -52,6 +52,36 @@ ent-AsteroidRockSalt = { ent-AsteroidRock }
 ent-IronRockMining = железный камень
     .desc = Астероид.
     .suffix = Высокое содержание руды
+ent-IronRockCoal = { ent-IronRock }
+    .desc = An ore vein rich with coal.
+    .suffix = Coal
+ent-IronRockGold = { ent-IronRock }
+    .desc = An ore vein rich with gold.
+    .suffix = Gold
+ent-IronRockPlasma = { ent-IronRock }
+    .desc = An ore vein rich with plasma.
+    .suffix = Plasma
+ent-IronRockQuartz = { ent-IronRock }
+    .desc = An ore vein rich with quartz.
+    .suffix = Quartz
+ent-IronRockSilver = { ent-IronRock }
+    .desc = An ore vein rich with silver.
+    .suffix = Silver
+ent-IronRockIron = { ent-IronRock }
+    .desc = An ore vein rich with iron.
+    .suffix = Iron
+ent-IronRockUranium = { ent-IronRock }
+    .desc = An ore vein rich with uranium.
+    .suffix = Uranium
+ent-IronRockBananium = { ent-IronRock }
+    .desc = An ore vein rich with bananium.
+    .suffix = Bananium
+ent-IronRockSalt = { ent-IronRock }
+    .desc = An ore vein rich with salt.
+    .suffix = Salt
+ent-IronRockArtifactFragment = { ent-IronRock }
+    .desc = A rock wall. What's that sticking out of it?
+    .suffix = Artifact Fragment
 ent-WallRock = камень
     .desc = { ent-BaseStructure.desc }
     .suffix = планета
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/inventorytemplates/inventorybase.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/inventorytemplates/inventorybase.ftl
new file mode 100644
index 00000000000..b03cffa3632
--- /dev/null
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/inventorytemplates/inventorybase.ftl
@@ -0,0 +1,4 @@
+ent-InventoryBase = { "" }
+    .desc = { "" }
+ent-StripableInventoryBase = { ent-InventoryBase }
+    .desc = { ent-InventoryBase.desc }
diff --git a/Resources/Locale/ru-RU/thief/backpack.ftl b/Resources/Locale/ru-RU/thief/backpack.ftl
index f2fb76828aa..d773b72fb81 100644
--- a/Resources/Locale/ru-RU/thief/backpack.ftl
+++ b/Resources/Locale/ru-RU/thief/backpack.ftl
@@ -4,7 +4,7 @@ thief-backpack-window-description =
     Теперь вам необходимо вспомнить, что вы в него положили.
     Выберите { $maxCount } { $maxCount ->
         [1] набор
-        *[other] разных набора
+       *[other] разных набора
     } из списка.
 thief-backpack-window-selected = Выбрано наборов: ({ $selectedCount }/{ $maxCount })
 thief-backpack-window-approve-button = Принять
diff --git a/Resources/Locale/ru-RU/wires/log-wire.ftl b/Resources/Locale/ru-RU/wires/log-wire.ftl
new file mode 100644
index 00000000000..735816a52dd
--- /dev/null
+++ b/Resources/Locale/ru-RU/wires/log-wire.ftl
@@ -0,0 +1 @@
+log-wire-pulse-access-log = ERROR: Electromagnetic spike detected
diff --git a/Resources/Locale/ru-RU/wires/wire-names.ftl b/Resources/Locale/ru-RU/wires/wire-names.ftl
index 2f68ec2be13..24bff2f53ef 100644
--- a/Resources/Locale/ru-RU/wires/wire-names.ftl
+++ b/Resources/Locale/ru-RU/wires/wire-names.ftl
@@ -66,3 +66,4 @@ wire-name-bomb-boom = БУУМ
 wire-name-bomb-bolt = БОЛТ
 wire-name-speech = ДНМК
 wire-name-listen = МИКР
+wire-name-log = LOG
diff --git a/Resources/Maps/Nonstations/nukieplanet.yml b/Resources/Maps/Nonstations/nukieplanet.yml
index 35e00358ec5..20fb68f2ccd 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 93ca5144351..3aa6a3f7ea4 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 5152862dee0..20419b28721 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 d220057d5e9..5a2a7d1c3c4 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 655c0ff53d2..52393f3fb2c 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/corvax_frame.yml b/Resources/Maps/corvax_frame.yml
index 91cb5a1ebfd..1f133c2a77f 100644
--- a/Resources/Maps/corvax_frame.yml
+++ b/Resources/Maps/corvax_frame.yml
@@ -2195,8 +2195,6 @@ entities:
       parent: 183
     - type: DeviceLinkSink
       invokeCounter: 1
-      links:
-      - 480
     - type: DeviceLinkSource
       linkedPorts:
         480:
@@ -2208,8 +2206,6 @@ entities:
       parent: 183
     - type: DeviceLinkSink
       invokeCounter: 1
-      links:
-      - 479
     - type: DeviceLinkSource
       linkedPorts:
         479:
@@ -2292,8 +2288,6 @@ entities:
       parent: 183
     - type: DeviceLinkSink
       invokeCounter: 1
-      links:
-      - 481
     - type: DeviceLinkSource
       linkedPorts:
         481:
@@ -2307,8 +2301,6 @@ entities:
       parent: 183
     - type: DeviceLinkSink
       invokeCounter: 1
-      links:
-      - 473
     - type: DeviceLinkSource
       linkedPorts:
         473:
@@ -3021,27 +3013,18 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -1.5,9.5
       parent: 183
-    - type: DeviceLinkSink
-      links:
-      - 657
   - uid: 468
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -0.5,9.5
       parent: 183
-    - type: DeviceLinkSink
-      links:
-      - 657
   - uid: 469
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 0.5,9.5
       parent: 183
-    - type: DeviceLinkSink
-      links:
-      - 657
 - proto: BorgCharger
   entities:
   - uid: 905
@@ -6234,14 +6217,6 @@ entities:
       pos: 5.5,7.5
       parent: 183
 - proto: ComputerComms
-  entities:
-  - uid: 672
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 9.5,12.5
-      parent: 183
-- proto: ComputerId
   entities:
   - uid: 679
     components:
@@ -7348,9 +7323,6 @@ entities:
       parent: 183
     - type: SpawnOnTrigger
       proto: FrameStationRandomSpawner
-    - type: DeviceLinkSink
-      links:
-      - 637
     - type: ExplodeOnTrigger
     - type: Explosive
       repeatable: True
@@ -7368,9 +7340,6 @@ entities:
       parent: 183
     - type: SpawnOnTrigger
       proto: FrameStationRandomSpawner
-    - type: DeviceLinkSink
-      links:
-      - 637
     missingComponents:
     - DeleteOnTrigger
 - proto: ExtendedEmergencyNitrogenTankFilled
@@ -7455,6 +7424,13 @@ entities:
     - type: Transform
       pos: 5.5,13.5
       parent: 183
+- proto: FaxMachineCaptain
+  entities:
+  - uid: 672
+    components:
+    - type: Transform
+      pos: 9.5,12.5
+      parent: 183
 - proto: FireAlarm
   entities:
   - uid: 1625
@@ -10117,6 +10093,15 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
+- proto: IDComputerCircuitboard
+  entities:
+  - uid: 1258
+    components:
+    - type: Transform
+      parent: 1100
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: InflatableDoor
   entities:
   - uid: 217
@@ -10369,6 +10354,7 @@ entities:
           occludes: True
           ents:
           - 2077
+          - 1258
         paper_label: !type:ContainerSlot
           showEnts: False
           occludes: True
@@ -10867,25 +10853,6 @@ entities:
     - type: Transform
       pos: 15.5,34.5
       parent: 183
-- proto: Paper
-  entities:
-  - uid: 2061
-    components:
-    - type: Transform
-      pos: 9.392816,11.551641
-      parent: 183
-    - type: Paper
-      stampState: paper_stamp-centcom
-      stampedBy:
-      - stampedColor: '#006600FF'
-        stampedName: stamp-component-stamped-name-centcom
-      content: >
-        Цель вашей смены - завершить строительство станции типа Frame, достроив каждому отделу помещения, необходимые для успешной работы. Также вам необходимо построить кухню и гидропонику для сервисного отдела, оружейную и место содержания заключенных для отдела Службы безопасности и обеспечить свободный проход пассажиров станции до отбытия, без необходимости выхода в открытый космос.
-
-
-        Для помощи в выполнении цели мы будет каждые 5 минут высылать вам припасы на специальной посадочной площадке в центре станции.
-
-        Слава НТ!
 - proto: PartRodMetal
   entities:
   - uid: 778
@@ -11349,9 +11316,6 @@ entities:
     - type: ApcPowerReceiver
       powerLoad: 0
       needsPower: False
-    - type: DeviceLinkSink
-      links:
-      - 637
   - uid: 2071
     components:
     - type: Transform
@@ -11367,9 +11331,6 @@ entities:
     - type: ApcPowerReceiver
       powerLoad: 0
       needsPower: False
-    - type: DeviceLinkSink
-      links:
-      - 637
 - proto: Protolathe
   entities:
   - uid: 739
@@ -11735,6 +11696,13 @@ entities:
     - type: Transform
       pos: 9.5,6.5
       parent: 183
+- proto: SalvageExpeditionsComputerCircuitboard
+  entities:
+  - uid: 2104
+    components:
+    - type: Transform
+      pos: 12.720777,1.4060018
+      parent: 183
 - proto: SalvageMagnet
   entities:
   - uid: 992
@@ -11750,6 +11718,18 @@ entities:
     - type: Transform
       pos: 8.5,7.5
       parent: 183
+- proto: ShardGlass
+  entities:
+  - uid: 2106
+    components:
+    - type: Transform
+      pos: 12.855494,1.9927481
+      parent: 183
+  - uid: 2107
+    components:
+    - type: Transform
+      pos: 13.730494,1.5969146
+      parent: 183
 - proto: SheetPlasma1
   entities:
   - uid: 706
@@ -11818,6 +11798,11 @@ entities:
     - type: Transform
       pos: -9.995162,21.40628
       parent: 183
+  - uid: 2105
+    components:
+    - type: Transform
+      pos: 12.38617,1.3851688
+      parent: 183
 - proto: ShuttersNormalOpen
   entities:
   - uid: 108
@@ -11826,9 +11811,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 4.5,-0.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 114
 - proto: ShuttleWindow
   entities:
   - uid: 109
@@ -11930,9 +11912,6 @@ entities:
         - Timer: Toggle
         2060:
         - Timer: Trigger
-    - type: DeviceLinkSink
-      links:
-      - 638
     - type: ApcPowerReceiver
       needsPower: False
     - type: Stealth
@@ -11954,9 +11933,6 @@ entities:
       linkedPorts:
         637:
         - Timer: Trigger
-    - type: DeviceLinkSink
-      links:
-      - 637
     - type: ApcPowerReceiver
       needsPower: False
     - type: ActiveSignalTimer
@@ -12786,21 +12762,23 @@ entities:
       parent: 183
 - proto: SteelBench
   entities:
-  - uid: 1258
+  - uid: 1562
     components:
     - type: Transform
-      pos: -2.5,7.5
+      rot: -1.5707963267948966 rad
+      pos: 0.5,5.5
       parent: 183
-  - uid: 1261
+  - uid: 2061
     components:
     - type: Transform
-      pos: -3.5,7.5
+      rot: 3.141592653589793 rad
+      pos: -2.5,7.5
       parent: 183
-  - uid: 1562
+  - uid: 2103
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,5.5
+      rot: 3.141592653589793 rad
+      pos: -3.5,7.5
       parent: 183
 - proto: StoolBar
   entities:
@@ -13017,6 +12995,12 @@ entities:
     - type: Transform
       pos: 9.5,19.5
       parent: 183
+  - uid: 1261
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 9.5,12.5
+      parent: 183
 - proto: TegCenter
   entities:
   - uid: 787
@@ -15284,9 +15268,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 1.5,-3.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 13
 - proto: WindoorServiceLocked
   entities:
   - uid: 418
diff --git a/Resources/Maps/fland.yml b/Resources/Maps/fland.yml
index 56eb8ec73a9..58ff9247b85 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 f7a2a605646..7657d84e170 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 44fe0358922..a8143f716ed 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,19 +60891,19 @@ entities:
     - type: Transform
       pos: -54.487633,-18.620468
       parent: 5350
-- proto: ClothingOuterCoatGentle
+- proto: ClothingOuterCoatDetectiveLoadout
   entities:
-  - uid: 13742
+  - uid: 23129
     components:
     - type: Transform
-      pos: 23.465069,24.654417
+      pos: -22.593464,38.504482
       parent: 5350
-- proto: ClothingOuterCoatInspector
+- proto: ClothingOuterCoatGentle
   entities:
-  - uid: 23129
+  - uid: 13742
     components:
     - type: Transform
-      pos: -22.593464,38.504482
+      pos: 23.465069,24.654417
       parent: 5350
 - proto: ClothingOuterCoatJensen
   entities:
@@ -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 34c01f3a3fb..646d3e270a6 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
@@ -207,7 +207,7 @@ entities:
           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
@@ -271,7 +271,7 @@ entities:
           version: 6
         2,-4:
           ind: 2,-4
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAKQAAAAAAKQAAAAACgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKQAAAAAAKQAAAAACKQAAAAADKQAAAAABKQAAAAAAKQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKQAAAAADKQAAAAADKQAAAAACKQAAAAABKQAAAAABKQAAAAABgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKQAAAAAAKQAAAAACKQAAAAABKQAAAAACKQAAAAAAKQAAAAACKQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKQAAAAABKQAAAAABKQAAAAABKQAAAAADKQAAAAABKQAAAAACKQAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKQAAAAACKQAAAAAAKQAAAAABKQAAAAABKQAAAAABKQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKQAAAAAAKQAAAAADKQAAAAACKQAAAAAAKQAAAAADKQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAbwAAAAAAKQAAAAACKQAAAAACbwAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAbwAAAAAAKQAAAAABKQAAAAAAbwAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAbwAAAAAAKQAAAAACKQAAAAACbwAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAbwAAAAAAKQAAAAABKQAAAAACbwAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAbwAAAAAAKQAAAAABKQAAAAAAbwAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAbwAAAAAAKQAAAAACKQAAAAAAbwAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAKQAAAAAAKQAAAAACgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKQAAAAAAKQAAAAACKQAAAAADKQAAAAABKQAAAAAAKQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKQAAAAADKQAAAAADKQAAAAACKQAAAAABKQAAAAABKQAAAAABgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKQAAAAAAKQAAAAACKQAAAAABKQAAAAACKQAAAAAAKQAAAAACKQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKQAAAAABKQAAAAABKQAAAAABKQAAAAADKQAAAAABKQAAAAACKQAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKQAAAAACKQAAAAAAKQAAAAABKQAAAAABKQAAAAABKQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKQAAAAAAKQAAAAADKQAAAAACKQAAAAAAKQAAAAADKQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAbwAAAAAAKQAAAAACKQAAAAACbwAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAbwAAAAAAKQAAAAABKQAAAAAAbwAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAbwAAAAAAKQAAAAACKQAAAAACbwAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAbwAAAAAAKQAAAAABKQAAAAACbwAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAbwAAAAAAKQAAAAABKQAAAAAAbwAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAbwAAAAAAKQAAAAACKQAAAAAAbwAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         1,-4:
           ind: 1,-4
@@ -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
@@ -3138,6 +3138,12 @@ entities:
             1309: 58.021324,0.5489143
             1310: 57.96924,-1.1594192
             3383: 57.99387,-2.411529
+        - node:
+            angle: 1.5707963267948966 rad
+            color: '#FFFFFFFF'
+            id: Caution
+          decals:
+            3557: 56.20735,16.017925
         - node:
             color: '#52B4E996'
             id: CheckerNWSE
@@ -4685,8 +4691,6 @@ entities:
             1953: 3,-66
             1954: 3,-65
             1955: 3,-64
-            1990: -11,-82
-            1991: -11,-81
             1992: -10,-81
             1993: -10,-80
             1994: -10,-79
@@ -5267,9 +5271,6 @@ 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
@@ -6886,7 +6887,8 @@ entities:
           -5,-13:
             0: 65535
           -12,-14:
-            0: 65535
+            0: 40959
+            4: 24576
           -12,-13:
             0: 65535
           -11,-14:
@@ -6933,7 +6935,7 @@ entities:
             0: 65535
           10,11:
             0: 12908
-            4: 275
+            5: 275
           11,8:
             0: 65535
           11,9:
@@ -7252,7 +7254,7 @@ entities:
             0: 44971
           5,12:
             0: 65503
-            5: 32
+            4: 32
           5,13:
             0: 15359
           5,14:
@@ -7356,16 +7358,16 @@ entities:
           -11,4:
             0: 7967
             8: 224
-            4: 57344
+            5: 57344
           -11,5:
             0: 7967
-            4: 57568
+            5: 57568
           -11,6:
             0: 65311
-            4: 224
+            5: 224
           -11,7:
             0: 7967
-            4: 57568
+            5: 57568
           -12,9:
             0: 65433
           -12,10:
@@ -7561,7 +7563,8 @@ entities:
           6,-13:
             0: 13107
           12,4:
-            0: 65535
+            0: 65527
+            3: 8
           12,5:
             0: 65535
           13,4:
@@ -8060,10 +8063,10 @@ entities:
           - 0
           - 0
         - volume: 2500
-          temperature: 293.15
+          temperature: 293.14975
           moles:
-          - 0
-          - 0
+          - 20.078888
+          - 75.53487
           - 0
           - 0
           - 0
@@ -8075,10 +8078,10 @@ entities:
           - 0
           - 0
         - volume: 2500
-          temperature: 293.14975
+          temperature: 293.15
           moles:
-          - 20.078888
-          - 75.53487
+          - 0
+          - 0
           - 0
           - 0
           - 0
@@ -8406,6 +8409,43 @@ entities:
             id: Basalt9
           decals:
             56: 11.336716,9.096708
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileWhiteInnerNe
+          decals:
+            95: 4,-3
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileWhiteInnerSe
+          decals:
+            94: 4,1
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileWhiteLineE
+          decals:
+            81: 7,-2
+            82: 7,0
+            91: 4,-2
+            92: 4,0
+            93: 4,-1
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileWhiteLineN
+          decals:
+            98: -2,1
+            99: -1,1
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileWhiteLineS
+          decals:
+            96: -1,-3
+            97: -2,-3
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileWhiteLineW
+          decals:
+            89: 6,0
+            90: 6,-2
         - node:
             color: '#FFFFFFFF'
             id: BushAThree
@@ -8570,6 +8610,14 @@ entities:
           decals:
             18: 19.09259,-9.995552
             46: 25.186539,-9.033943
+        - node:
+            color: '#DE3A3A96'
+            id: DiagonalOverlay
+          decals:
+            77: 5,-2
+            78: 5,0
+            79: 8,0
+            80: 8,-2
     - type: GridAtmosphere
       version: 2
       data:
@@ -9135,7 +9183,8 @@ entities:
           4,-12:
             0: 65534
           4,-11:
-            0: 3839
+            0: 3775
+            1: 64
           4,-9:
             0: 61412
           5,-12:
@@ -9784,7 +9833,6 @@ entities:
       - 15934
       - 16030
       - 16033
-      - 16032
       - 16533
       - 14793
       - 14782
@@ -10243,7 +10291,6 @@ entities:
       - 24087
       - 18325
       - 18324
-      - 16513
       - 18292
       - 16511
       - 15356
@@ -10331,7 +10378,6 @@ entities:
       - 18368
       - 18370
       - 18371
-      - 18407
       - 18439
       - 18408
   - uid: 18443
@@ -11414,27 +11460,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
@@ -12024,18 +12061,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 +12095,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 +12107,6 @@ entities:
     - type: Transform
       pos: -50.5,-49.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 19543
     - type: DeviceLinkSource
       linkedPorts:
         19543:
@@ -12088,9 +12116,6 @@ entities:
     - type: Transform
       pos: -49.5,-51.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 19542
     - type: DeviceLinkSource
       linkedPorts:
         19542:
@@ -12100,10 +12125,6 @@ entities:
     - type: Transform
       pos: -47.5,-54.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 19546
-      - 19545
     - type: DeviceLinkSource
       linkedPorts:
         19545:
@@ -12115,9 +12136,6 @@ entities:
     - type: Transform
       pos: -48.5,-55.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 19544
     - type: DeviceLinkSource
       linkedPorts:
         19544:
@@ -12127,9 +12145,6 @@ entities:
     - type: Transform
       pos: -46.5,-55.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 19544
     - type: DeviceLinkSource
       linkedPorts:
         19544:
@@ -12168,8 +12183,6 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       invokeCounter: 1
-      links:
-      - 8431
     - type: DeviceLinkSource
       linkedPorts:
         8431:
@@ -12182,56 +12195,37 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       invokeCounter: 1
-      links:
-      - 8424
     - type: DeviceLinkSource
       linkedPorts:
         8424:
         - DoorStatus: DoorBolt
 - proto: AirlockExternalGlassCargoLocked
   entities:
-  - uid: 10846
+  - uid: 11331
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -58.5,-17.5
+      pos: -58.5,-2.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 11363
-    - type: DeviceLinkSource
-      linkedPorts:
-        11363:
-        - DoorStatus: DoorBolt
-  - uid: 10848
+  - uid: 11332
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -58.5,-19.5
+      pos: -58.5,-4.5
       parent: 2
-  - uid: 11331
+  - uid: 28494
     components:
     - type: Transform
-      pos: -58.5,-2.5
+      pos: -58.5,-19.5
       parent: 2
-  - uid: 11332
+  - uid: 28495
     components:
     - type: Transform
-      pos: -58.5,-4.5
+      pos: -58.5,-17.5
       parent: 2
-  - uid: 11363
+  - uid: 28496
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -61.5,-17.5
+      pos: -61.5,-19.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 10846
-    - type: DeviceLinkSource
-      linkedPorts:
-        10846:
-        - DoorStatus: DoorBolt
 - proto: AirlockExternalGlassEngineeringLocked
   entities:
   - uid: 6828
@@ -12239,9 +12233,6 @@ entities:
     - type: Transform
       pos: 41.5,49.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 6829
     - type: DeviceLinkSource
       linkedPorts:
         6829:
@@ -12251,9 +12242,6 @@ entities:
     - type: Transform
       pos: 37.5,49.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 6828
     - type: DeviceLinkSource
       linkedPorts:
         6828:
@@ -12264,9 +12252,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 6.5,56.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 7623
     - type: DeviceLinkSource
       linkedPorts:
         7623:
@@ -12277,9 +12262,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 3.5,55.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 7622
     - type: DeviceLinkSource
       linkedPorts:
         7622:
@@ -12290,9 +12272,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 3.5,52.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 7621
     - type: DeviceLinkSource
       linkedPorts:
         7621:
@@ -12303,9 +12282,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 5.5,52.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 7615
     - type: DeviceLinkSource
       linkedPorts:
         7615:
@@ -12318,8 +12294,6 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       invokeCounter: 1
-      links:
-      - 8048
     - type: DeviceLinkSource
       linkedPorts:
         8048:
@@ -12332,8 +12306,6 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       invokeCounter: 1
-      links:
-      - 7830
     - type: DeviceLinkSource
       linkedPorts:
         7830:
@@ -12346,8 +12318,6 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       invokeCounter: 1
-      links:
-      - 8053
     - type: DeviceLinkSource
       linkedPorts:
         8053:
@@ -12360,8 +12330,6 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       invokeCounter: 1
-      links:
-      - 8052
     - type: DeviceLinkSource
       linkedPorts:
         8052:
@@ -12374,8 +12342,6 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       invokeCounter: 1
-      links:
-      - 19974
     - type: DeviceLinkSource
       linkedPorts:
         19974:
@@ -12388,8 +12354,6 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       invokeCounter: 1
-      links:
-      - 19973
     - type: DeviceLinkSource
       linkedPorts:
         19973:
@@ -12400,9 +12364,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 52.5,27.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 20254
     - type: DeviceLinkSource
       linkedPorts:
         20254:
@@ -12413,9 +12374,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 50.5,27.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 20253
     - type: DeviceLinkSource
       linkedPorts:
         20253:
@@ -12428,9 +12386,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 57.5,-19.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 3783
   - uid: 3781
     components:
     - type: Transform
@@ -12457,9 +12412,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 55.5,-31.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 3781
   - uid: 7763
     components:
     - type: Transform
@@ -12470,15 +12422,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 +12462,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 4.5,-12.5
       parent: 21002
-    - type: DeviceLinkSink
-      links:
-      - 22784
     - type: DeviceLinkSource
       linkedPorts:
         22784:
@@ -12503,8 +12473,6 @@ entities:
       parent: 21002
     - type: DeviceLinkSink
       invokeCounter: 1
-      links:
-      - 24609
     - type: DeviceLinkSource
       linkedPorts:
         24609:
@@ -12517,9 +12485,6 @@ entities:
       parent: 21002
     - type: DeviceLinkSink
       invokeCounter: 2
-      links:
-      - 24601
-      - 24606
     - type: DeviceLinkSource
       linkedPorts:
         24601:
@@ -12534,9 +12499,6 @@ entities:
       parent: 21002
     - type: DeviceLinkSink
       invokeCounter: 2
-      links:
-      - 24601
-      - 24600
     - type: DeviceLinkSource
       linkedPorts:
         24601:
@@ -12550,8 +12512,6 @@ entities:
       parent: 21002
     - type: DeviceLinkSink
       invokeCounter: 1
-      links:
-      - 24599
     - type: DeviceLinkSource
       linkedPorts:
         24599:
@@ -12604,12 +12564,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 +12610,6 @@ entities:
       linkedPorts:
         6863:
         - DoorStatus: DoorBolt
-    - type: DeviceLinkSink
-      links:
-      - 6864
   - uid: 6991
     components:
     - type: Transform
@@ -12672,6 +12623,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 +12659,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 +12686,6 @@ entities:
       parent: 21002
     - type: DeviceLinkSink
       invokeCounter: 2
-      links:
-      - 24600
-      - 24606
     - type: DeviceLinkSource
       linkedPorts:
         24600:
@@ -12721,9 +12699,6 @@ entities:
       parent: 21002
     - type: DeviceLinkSink
       invokeCounter: 2
-      links:
-      - 24622
-      - 24623
     - type: DeviceLinkSource
       linkedPorts:
         24622:
@@ -12737,9 +12712,6 @@ entities:
       parent: 21002
     - type: DeviceLinkSink
       invokeCounter: 2
-      links:
-      - 24616
-      - 24615
     - type: DeviceLinkSource
       linkedPorts:
         24615:
@@ -12753,9 +12725,6 @@ entities:
       parent: 21002
     - type: DeviceLinkSink
       invokeCounter: 2
-      links:
-      - 24614
-      - 24616
     - type: DeviceLinkSource
       linkedPorts:
         24614:
@@ -12769,9 +12738,6 @@ entities:
       parent: 21002
     - type: DeviceLinkSink
       invokeCounter: 2
-      links:
-      - 24614
-      - 24615
     - type: DeviceLinkSource
       linkedPorts:
         24614:
@@ -12785,9 +12751,6 @@ entities:
       parent: 21002
     - type: DeviceLinkSink
       invokeCounter: 2
-      links:
-      - 24619
-      - 24618
     - type: DeviceLinkSource
       linkedPorts:
         24618:
@@ -12801,9 +12764,6 @@ entities:
       parent: 21002
     - type: DeviceLinkSink
       invokeCounter: 2
-      links:
-      - 24619
-      - 24617
     - type: DeviceLinkSource
       linkedPorts:
         24619:
@@ -12817,9 +12777,6 @@ entities:
       parent: 21002
     - type: DeviceLinkSink
       invokeCounter: 2
-      links:
-      - 24618
-      - 24617
     - type: DeviceLinkSource
       linkedPorts:
         24618:
@@ -12833,8 +12790,6 @@ entities:
       parent: 21002
     - type: DeviceLinkSink
       invokeCounter: 1
-      links:
-      - 24621
     - type: DeviceLinkSource
       linkedPorts:
         24621:
@@ -12846,8 +12801,6 @@ entities:
       parent: 21002
     - type: DeviceLinkSink
       invokeCounter: 1
-      links:
-      - 24620
     - type: DeviceLinkSource
       linkedPorts:
         24620:
@@ -12859,9 +12812,6 @@ entities:
       parent: 21002
     - type: DeviceLinkSink
       invokeCounter: 2
-      links:
-      - 24613
-      - 24623
     - type: DeviceLinkSource
       linkedPorts:
         24623:
@@ -12875,9 +12825,6 @@ entities:
       parent: 21002
     - type: DeviceLinkSink
       invokeCounter: 2
-      links:
-      - 24622
-      - 24613
     - type: DeviceLinkSource
       linkedPorts:
         24622:
@@ -12933,9 +12880,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 30.5,51.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 6820
   - uid: 6864
     components:
     - type: Transform
@@ -13091,350 +13035,313 @@ entities:
     - type: Transform
       pos: 41.5,7.5
       parent: 2
-- proto: AirlockMaint
+- proto: AirlockMaintAtmoLocked
   entities:
-  - uid: 353
+  - uid: 8847
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 59.5,-13.5
+      rot: 3.141592653589793 rad
+      pos: -22.5,26.5
       parent: 2
-  - uid: 555
+- proto: AirlockMaintBarLocked
+  entities:
+  - uid: 468
     components:
     - type: Transform
-      pos: -2.5,-21.5
+      pos: -20.5,16.5
       parent: 2
-  - uid: 730
+- proto: AirlockMaintCargoLocked
+  entities:
+  - uid: 11317
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -27.5,-23.5
+      pos: -51.5,-13.5
       parent: 2
-  - uid: 813
+- proto: AirlockMaintChemLocked
+  entities:
+  - uid: 1642
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 25.5,-12.5
+      pos: -14.5,-43.5
       parent: 2
-  - uid: 1143
+- proto: AirlockMaintEngiLocked
+  entities:
+  - uid: 6
     components:
     - type: Transform
-      pos: -23.5,3.5
+      pos: -17.5,38.5
       parent: 2
-  - uid: 1330
+  - uid: 20661
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -23.5,-2.5
+      rot: 1.5707963267948966 rad
+      pos: 36.5,42.5
       parent: 2
-  - uid: 1434
+- proto: AirlockMaintHydroLocked
+  entities:
+  - uid: 3330
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -33.5,-23.5
+      rot: 1.5707963267948966 rad
+      pos: 16.5,21.5
       parent: 2
-  - uid: 1551
+- proto: AirlockMaintJanitorLocked
+  entities:
+  - uid: 3036
     components:
     - type: Transform
-      pos: -36.5,-29.5
+      pos: 25.5,-3.5
       parent: 2
-  - uid: 1861
+- proto: AirlockMaintKitchenLocked
+  entities:
+  - uid: 419
     components:
     - type: Transform
-      pos: -53.5,-29.5
+      pos: -17.5,21.5
       parent: 2
-  - uid: 1945
+- proto: AirlockMaintLocked
+  entities:
+  - uid: 2180
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -22.5,-45.5
+      rot: 3.141592653589793 rad
+      pos: -41.5,-35.5
       parent: 2
-  - uid: 3162
+  - uid: 5156
     components:
     - type: Transform
-      pos: 28.5,-2.5
+      pos: 43.5,27.5
       parent: 2
-  - uid: 3163
+  - uid: 7384
     components:
     - type: Transform
-      pos: 36.5,3.5
+      pos: 26.5,-44.5
       parent: 2
-  - uid: 3977
+  - uid: 11965
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 46.5,-40.5
+      pos: -36.5,-29.5
       parent: 2
-    - type: Door
-      secondsUntilStateChange: -424809.1
-      state: Opening
-  - uid: 4137
+  - uid: 11973
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 46.5,-34.5
+      pos: 25.5,-12.5
       parent: 2
-  - uid: 5192
+  - uid: 12127
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 26.5,-37.5
+      pos: -33.5,-23.5
       parent: 2
-  - uid: 5193
+  - uid: 12130
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 26.5,-38.5
+      pos: -23.5,3.5
       parent: 2
-  - uid: 5302
+  - uid: 12786
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 27.5,25.5
+      pos: -2.5,-21.5
       parent: 2
-  - uid: 5392
+  - uid: 12822
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,24.5
+      pos: 59.5,-13.5
       parent: 2
-  - uid: 5393
+  - uid: 12842
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,28.5
+      pos: -27.5,-23.5
       parent: 2
-  - uid: 5397
+  - uid: 12843
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 20.5,26.5
+      pos: -23.5,-2.5
       parent: 2
-  - uid: 5398
+  - uid: 16554
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 27.5,28.5
+      pos: -19.5,24.5
       parent: 2
-  - uid: 5462
+  - uid: 23273
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 19.5,30.5
+      pos: -53.5,-29.5
       parent: 2
-  - uid: 5543
+  - uid: 23537
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 10.5,30.5
+      pos: -22.5,-45.5
       parent: 2
-  - uid: 6580
+  - uid: 23758
     components:
     - type: Transform
-      pos: 37.5,44.5
+      pos: 28.5,-2.5
       parent: 2
-  - uid: 7798
+  - uid: 23803
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 17.5,18.5
+      pos: 36.5,3.5
       parent: 2
-  - uid: 7941
+  - uid: 23831
     components:
     - type: Transform
-      pos: -14.5,37.5
+      pos: 46.5,-40.5
       parent: 2
-  - uid: 7970
+  - uid: 23833
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -17.5,33.5
+      pos: 46.5,-34.5
       parent: 2
-  - uid: 7971
+  - uid: 23835
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -19.5,30.5
+      pos: 26.5,-37.5
       parent: 2
-  - uid: 8502
+  - uid: 23837
     components:
     - type: Transform
-      pos: 23.5,-29.5
+      pos: 26.5,-38.5
       parent: 2
-  - uid: 9935
+  - uid: 23839
     components:
     - type: Transform
-      pos: 3.5,-26.5
+      pos: 27.5,25.5
       parent: 2
-  - uid: 10217
+  - uid: 23841
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -36.5,-9.5
+      rot: 3.141592653589793 rad
+      pos: -37.5,-53.5
       parent: 2
-  - uid: 10260
+  - uid: 24219
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -18.5,-48.5
+      pos: -1.5,24.5
       parent: 2
-  - uid: 10285
+  - uid: 25233
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -20.5,-50.5
+      pos: 3.5,28.5
       parent: 2
-  - uid: 10292
+  - uid: 28274
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -22.5,-48.5
+      pos: 20.5,26.5
       parent: 2
-  - uid: 10596
+  - uid: 28278
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,-49.5
+      pos: 27.5,28.5
       parent: 2
-  - uid: 10656
+  - uid: 28282
     components:
     - type: Transform
-      pos: -10.5,-57.5
+      pos: 19.5,30.5
       parent: 2
-  - uid: 10956
+  - uid: 28284
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 57.5,6.5
+      pos: 10.5,30.5
       parent: 2
-  - uid: 11565
+  - uid: 28448
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -48.5,-16.5
+      pos: 37.5,44.5
       parent: 2
-  - uid: 12126
+  - uid: 28449
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -48.5,-29.5
+      pos: 17.5,18.5
       parent: 2
-  - uid: 12127
+  - uid: 28450
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -39.5,-26.5
+      pos: -14.5,37.5
       parent: 2
-  - uid: 12130
+  - uid: 28451
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -38.5,-10.5
+      pos: -17.5,33.5
       parent: 2
-  - uid: 12475
+  - uid: 28452
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -50.5,-43.5
+      pos: -19.5,30.5
       parent: 2
-  - uid: 12476
+  - uid: 28453
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -47.5,-39.5
+      pos: 23.5,-29.5
       parent: 2
-- proto: AirlockMaintAtmoLocked
-  entities:
-  - uid: 8847
+  - uid: 28454
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -22.5,26.5
+      pos: 3.5,-26.5
       parent: 2
-- proto: AirlockMaintBarLocked
-  entities:
-  - uid: 468
+  - uid: 28455
     components:
     - type: Transform
-      pos: -20.5,16.5
+      pos: -36.5,-9.5
       parent: 2
-- proto: AirlockMaintCargoLocked
-  entities:
-  - uid: 11317
+  - uid: 28456
     components:
     - type: Transform
-      pos: -51.5,-13.5
+      pos: -18.5,-48.5
       parent: 2
-- proto: AirlockMaintChemLocked
-  entities:
-  - uid: 1642
+  - uid: 28457
     components:
     - type: Transform
-      pos: -14.5,-43.5
+      pos: -20.5,-50.5
       parent: 2
-- proto: AirlockMaintEngiLocked
-  entities:
-  - uid: 6
+  - uid: 28458
     components:
     - type: Transform
-      pos: -17.5,38.5
+      pos: -22.5,-48.5
       parent: 2
-  - uid: 20661
+  - uid: 28459
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 36.5,42.5
+      pos: 5.5,-49.5
       parent: 2
-- proto: AirlockMaintHydroLocked
-  entities:
-  - uid: 3330
+  - uid: 28460
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 16.5,21.5
+      pos: -10.5,-57.5
       parent: 2
-- proto: AirlockMaintJanitorLocked
-  entities:
-  - uid: 3036
+  - uid: 28461
     components:
     - type: Transform
-      pos: 25.5,-3.5
+      pos: 57.5,6.5
       parent: 2
-- proto: AirlockMaintKitchenLocked
-  entities:
-  - uid: 419
+  - uid: 28462
     components:
     - type: Transform
-      pos: -17.5,21.5
+      pos: -48.5,-16.5
       parent: 2
-- proto: AirlockMaintLocked
-  entities:
-  - uid: 2180
+  - uid: 28463
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -41.5,-35.5
+      pos: -48.5,-29.5
       parent: 2
-  - uid: 5156
+  - uid: 28464
     components:
     - type: Transform
-      pos: 43.5,27.5
+      pos: -39.5,-26.5
       parent: 2
-  - uid: 7384
+  - uid: 28465
     components:
     - type: Transform
-      pos: 26.5,-44.5
+      pos: -38.5,-10.5
       parent: 2
-  - uid: 16554
+  - uid: 28466
     components:
     - type: Transform
-      pos: -19.5,24.5
+      pos: -50.5,-43.5
       parent: 2
-  - uid: 23841
+  - uid: 28467
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -37.5,-53.5
+      pos: -47.5,-39.5
       parent: 2
 - proto: AirlockMaintMedLocked
   entities:
@@ -13512,9 +13419,6 @@ entities:
       parent: 2
     - type: DoorBolt
       boltsDown: True
-    - type: DeviceLinkSink
-      links:
-      - 23551
   - uid: 680
     components:
     - type: Transform
@@ -13523,9 +13427,6 @@ entities:
       parent: 2
     - type: DoorBolt
       boltsDown: True
-    - type: DeviceLinkSink
-      links:
-      - 23559
   - uid: 681
     components:
     - type: Transform
@@ -13534,9 +13435,6 @@ entities:
       parent: 2
     - type: DoorBolt
       boltsDown: True
-    - type: DeviceLinkSink
-      links:
-      - 23558
   - uid: 682
     components:
     - type: Transform
@@ -13544,9 +13442,6 @@ entities:
       parent: 2
     - type: DoorBolt
       boltsDown: True
-    - type: DeviceLinkSink
-      links:
-      - 23557
   - uid: 683
     components:
     - type: Transform
@@ -13555,9 +13450,6 @@ entities:
       parent: 2
     - type: DoorBolt
       boltsDown: True
-    - type: DeviceLinkSink
-      links:
-      - 4166
   - uid: 684
     components:
     - type: Transform
@@ -13566,9 +13458,6 @@ entities:
       parent: 2
     - type: DoorBolt
       boltsDown: True
-    - type: DeviceLinkSink
-      links:
-      - 23556
   - uid: 685
     components:
     - type: Transform
@@ -13620,7 +13509,7 @@ entities:
       pos: -3.5,-35.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -540976.5
+      secondsUntilStateChange: -571169.8
       state: Opening
   - uid: 1496
     components:
@@ -13882,24 +13771,17 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 0.5,0.5
       parent: 21002
-  - uid: 21067
+  - uid: 21068
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 8.5,-1.5
+      pos: 8.5,0.5
       parent: 21002
-    - type: DeviceLinkSink
-      links:
-      - 21063
-  - uid: 21068
+  - uid: 28504
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 8.5,0.5
+      pos: 8.5,-1.5
       parent: 21002
-    - type: DeviceLinkSink
-      links:
-      - 21064
 - proto: AirlockSecurityLawyerLocked
   entities:
   - uid: 3747
@@ -15338,6 +15220,8 @@ entities:
       parent: 2
   - uid: 2023
     components:
+    - type: MetaData
+      name: Park APC
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -23.5,-7.5
@@ -34446,6 +34330,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -61.5,-19.5
       parent: 2
+  - uid: 10848
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-82.5
+      parent: 2
   - uid: 11333
     components:
     - type: Transform
@@ -34456,11 +34346,29 @@ 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: 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
@@ -35419,225 +35327,141 @@ 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
 - proto: BlastDoorOpen
   entities:
   - uid: 12801
@@ -35645,25 +35469,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 +35729,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 +35769,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
@@ -36563,6 +36397,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 +36427,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 +36452,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 +36852,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 +37262,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 +43227,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
@@ -46133,16 +46022,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
@@ -49738,6 +49617,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
@@ -53638,19 +53537,52 @@ entities:
     - type: Transform
       pos: -59.5,-17.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
 - 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 +53593,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 +56773,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 +56843,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 +57318,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 +57333,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 +57703,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 +57753,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 +59023,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 +59048,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 +59183,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
@@ -66639,15 +66556,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:
@@ -68710,6 +68633,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 +68663,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 +68770,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 +68877,12 @@ 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: 8400
     components:
     - type: Transform
@@ -69063,6 +69021,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: -38.5,10.5
       parent: 2
+  - uid: 8754
+    components:
+    - type: Transform
+      pos: 52.5,20.5
+      parent: 2
   - uid: 8772
     components:
     - type: Transform
@@ -69608,12 +69571,35 @@ entities:
     - type: Transform
       pos: -4.5,46.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
@@ -70808,21 +70794,6 @@ entities:
       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 +70812,17 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 66.5,6.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 +72074,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:
@@ -72354,6 +72336,54 @@ 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
 - proto: Chair
   entities:
   - uid: 495
@@ -72895,6 +72925,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 +73448,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 +73947,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 +74366,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 +74468,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 +74626,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
@@ -74772,6 +74862,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 +74878,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 +75242,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 +75267,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 +75424,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 +75532,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 +76109,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 +76462,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 +77171,7 @@ entities:
           ent: null
 - proto: CrateInternals
   entities:
-  - uid: 19636
+  - uid: 11961
     components:
     - type: Transform
       pos: -45.5,-52.5
@@ -77198,13 +77225,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 +77246,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
@@ -86743,6 +86770,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 +86967,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 +87014,7 @@ entities:
   - uid: 19088
     components:
     - type: Transform
-      pos: 37.326473,-37.33899
+      pos: 36.382908,-36.606503
       parent: 2
 - proto: ElectricGrillMachineCircuitboard
   entities:
@@ -87694,9 +87731,6 @@ entities:
     - type: Transform
       pos: 60.5,-20.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 4246
   - uid: 7214
     components:
     - type: Transform
@@ -87823,11 +87857,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 +87870,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:
@@ -93959,7 +93987,7 @@ entities:
       parent: 2
 - proto: GasMixer
   entities:
-  - uid: 8670
+  - uid: 11963
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
@@ -94590,18 +94618,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 8754
-    components:
-    - type: Transform
-      anchored: False
-      rot: 1.5707963267948966 rad
-      pos: -24.5,19.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-    - type: Physics
-      canCollide: True
-      bodyType: Dynamic
   - uid: 8990
     components:
     - type: Transform
@@ -97142,18 +97158,6 @@ 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
   - uid: 7355
     components:
     - type: Transform
@@ -99179,6 +99183,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
@@ -103381,18 +103393,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 +103401,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 +104763,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
@@ -111273,17 +111254,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
@@ -115996,17 +115966,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 16518
-    components:
-    - type: Transform
-      anchored: False
-      pos: -42.5,-12.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-    - type: Physics
-      canCollide: True
-      bodyType: Dynamic
   - uid: 16913
     components:
     - type: Transform
@@ -116420,17 +116379,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 +117484,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
@@ -118782,26 +118718,22 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 11596
+  - uid: 11908
     components:
     - type: Transform
-      anchored: False
-      rot: -1.5707963267948966 rad
-      pos: 0.5,42.5
+      rot: 3.141592653589793 rad
+      pos: -0.5,50.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-    - type: Physics
-      canCollide: True
-      bodyType: Dynamic
-  - uid: 11908
+  - uid: 11968
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,50.5
+      rot: 1.5707963267948966 rad
+      pos: 43.5,-6.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#0335FCFF'
   - uid: 12297
     components:
     - type: Transform
@@ -119310,18 +119242,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
@@ -119380,18 +119300,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 +120264,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 +120347,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 +120920,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
@@ -121399,14 +121276,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -36.5,29.5
       parent: 2
-  - uid: 231
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -28.5,13.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 9752
     components:
     - type: Transform
@@ -121423,6 +121292,14 @@ entities:
     - type: Transform
       pos: 6.5,-33.5
       parent: 2
+  - uid: 12820
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -28.5,13.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 23065
     components:
     - type: Transform
@@ -121649,6 +121526,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 +121851,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 +122409,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 +123093,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
@@ -124658,20 +124509,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 +124817,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
@@ -125845,6 +125667,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 +125691,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 +125853,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 +125887,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
@@ -129594,30 +129464,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 +129638,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 +129964,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
@@ -133776,35 +133592,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: -4097.083
+      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:
@@ -134327,115 +134141,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 +134513,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 +135189,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 +135258,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 +135408,11 @@ entities:
       parent: 2
 - proto: MagazinePistolSubMachineGunTopMounted
   entities:
-  - uid: 4431
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 42.7493,-41.037598
-      parent: 2
-  - uid: 4432
+  - uid: 14233
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 42.702423,-41.412598
+      pos: 42.740047,-41.364567
       parent: 2
 - proto: MagicDiceBag
   entities:
@@ -135649,18 +135458,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 +135513,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
@@ -136511,6 +136315,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 +136355,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 +136392,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 +136901,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
@@ -137503,6 +137312,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -52.242474,-9.919532
       parent: 2
+  - uid: 28500
+    components:
+    - type: Transform
+      pos: -3.285169,-48.251488
+      parent: 2
 - proto: PenCap
   entities:
   - uid: 2672
@@ -137550,6 +137364,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 +137610,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 +137868,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 +137883,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 +137918,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 +137940,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 +137978,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 +138028,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 +138069,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 +138914,6 @@ entities:
     - type: Transform
       pos: 8.5,-18.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 1014
   - uid: 1056
     components:
     - type: Transform
@@ -139226,9 +139146,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 40.5,13.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 2735
   - uid: 2734
     components:
     - type: Transform
@@ -139439,9 +139356,6 @@ entities:
     - type: Transform
       pos: -4.5,38.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 7984
   - uid: 5641
     components:
     - type: Transform
@@ -139631,18 +139545,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
@@ -140511,11 +140419,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 +140578,21 @@ entities:
     - type: Transform
       pos: -5.5,18.5
       parent: 21002
+- 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
@@ -141077,6 +140995,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
@@ -141609,6 +141532,28 @@ 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
 - proto: PresentRandomCash
   entities:
   - uid: 9641
@@ -143834,6 +143779,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 +143794,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
@@ -144379,11 +144334,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 +144466,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 +144581,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 +144708,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
@@ -145152,6 +145109,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
@@ -147189,12 +147176,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 +147286,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 +147296,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 +147356,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
@@ -147859,6 +147798,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 +147960,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 +148011,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 +148029,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 +148074,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 +148097,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
@@ -148998,87 +148943,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 +149000,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 +149020,6 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       invokeCounter: 1
-      links:
-      - 872
   - uid: 921
     components:
     - type: Transform
@@ -149126,8 +149028,6 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       invokeCounter: 1
-      links:
-      - 872
   - uid: 922
     components:
     - type: Transform
@@ -149136,8 +149036,6 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       invokeCounter: 1
-      links:
-      - 872
   - uid: 923
     components:
     - type: Transform
@@ -149146,140 +149044,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 +149141,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 +149161,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 +149410,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -47.5,-0.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 18694
 - proto: ShuttersRadiation
   entities:
   - uid: 7999
@@ -149708,18 +149418,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 +149432,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 +149494,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 +149514,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 +150224,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 5.5,-2.5
       parent: 21002
-    - type: DeviceLinkSource
-      linkedPorts:
-        21067:
-        - Pressed: Toggle
   - uid: 21064
     components:
     - type: MetaData
@@ -151110,6 +150735,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
@@ -151892,25 +151534,25 @@ entities:
     - type: Transform
       pos: 14.5,42.5
       parent: 2
-  - uid: 12820
+  - uid: 10260
     components:
     - type: Transform
-      pos: 50.5,20.5
+      pos: 41.5,-46.5
       parent: 2
-  - uid: 12821
+  - uid: 10731
     components:
     - type: Transform
-      pos: 52.5,20.5
+      pos: 52.5,19.5
       parent: 2
-  - uid: 19552
+  - uid: 10743
     components:
     - type: Transform
-      pos: -46.5,-53.5
+      pos: 50.5,19.5
       parent: 2
-  - uid: 19970
+  - uid: 19639
     components:
     - type: Transform
-      pos: 41.5,-46.5
+      pos: -46.5,-53.5
       parent: 2
   - uid: 20260
     components:
@@ -151941,10 +151583,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:
@@ -155057,6 +154699,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
@@ -157770,12 +157422,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 +157445,11 @@ entities:
     - type: Transform
       pos: -52.5,-9.5
       parent: 2
+  - uid: 28516
+    components:
+    - type: Transform
+      pos: 19.5,-46.5
+      parent: 21002
 - proto: TableCarpet
   entities:
   - uid: 7942
@@ -159434,12 +159085,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 +159151,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
@@ -160321,49 +159960,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,19 +160061,61 @@ entities:
         - Left: Forward
         - Right: Reverse
         - Middle: Off
-  - uid: 23273
+  - uid: 16101
     components:
+    - type: MetaData
+      name: conveyor
     - type: Transform
       pos: -56.5,-27.5
       parent: 2
-  - uid: 23758
+    - 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,-27.5
+      pos: -56.5,-28.5
       parent: 2
     - type: DeviceLinkSource
       linkedPorts:
-        11571:
+        19987:
         - Left: Forward
         - Right: Reverse
         - Middle: Off
@@ -161760,6 +161398,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 +163665,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 +165137,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
@@ -169268,35 +168924,17 @@ 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
+  - uid: 10729
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -11.5,-83.5
+      pos: -7.5,-83.5
       parent: 2
-  - uid: 10729
+  - uid: 10745
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -7.5,-83.5
+      pos: 6.5,-81.5
       parent: 2
   - uid: 10746
     components:
@@ -169594,6 +169232,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 +170425,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 +170874,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 +171084,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 +171105,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
@@ -171521,6 +171212,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 +171351,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
@@ -178451,10 +178160,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 +178566,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 +178622,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
-    components:
-    - type: Transform
-      pos: 5.5,-80.5
-      parent: 2
-- proto: WardrobeMixedFilled
-  entities:
-  - uid: 11968
+  - uid: 3977
     components:
     - type: Transform
-      pos: 5.5,-75.5
+      pos: 5.5,-76.5
       parent: 2
 - proto: WardrobePinkFilled
   entities:
@@ -179009,6 +178704,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: 40.5,5.5
       parent: 21002
+  - uid: 28505
+    components:
+    - type: Transform
+      pos: 5.5,-0.5
+      parent: 21002
 - proto: WarningCO2
   entities:
   - uid: 8912
@@ -179286,6 +178986,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 +179068,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 +179106,10 @@ entities:
       parent: 2
 - proto: WeaponTurretSyndicateBroken
   entities:
-  - uid: 12786
-    components:
-    - type: Transform
-      pos: 48.5,19.5
-      parent: 2
-  - uid: 12787
+  - uid: 10217
     components:
     - type: Transform
-      pos: 54.5,19.5
+      pos: 48.5,18.5
       parent: 2
   - uid: 12788
     components:
@@ -181126,7 +180845,7 @@ entities:
       pos: 24.5,2.5
       parent: 21002
     - type: Door
-      secondsUntilStateChange: -319108.34
+      secondsUntilStateChange: -349301.7
       state: Opening
 - proto: WoodenBench
   entities:
diff --git a/Resources/Maps/omega.yml b/Resources/Maps/omega.yml
index 661149f4fe2..3cbcd406524 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,19 +30858,19 @@ entities:
     - type: Transform
       pos: -30.486824,-12.450464
       parent: 4812
-- proto: ClothingOuterCoatGentle
+- proto: ClothingOuterCoatDetectiveLoadout
   entities:
-  - uid: 6193
+  - uid: 11805
     components:
     - type: Transform
-      pos: 13.531586,-11.381834
+      pos: -14.486766,-0.42116833
       parent: 4812
-- proto: ClothingOuterCoatInspector
+- proto: ClothingOuterCoatGentle
   entities:
-  - uid: 11805
+  - uid: 6193
     components:
     - type: Transform
-      pos: -14.486766,-0.42116833
+      pos: 13.531586,-11.381834
       parent: 4812
 - proto: ClothingOuterCoatJensen
   entities:
@@ -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,17 +33195,17 @@ entities:
       rot: 3.141592653589793 rad
       pos: 0.5,-35.5
       parent: 4812
-  - uid: 7590
+  - uid: 7416
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -9.5,-16.5
+      rot: 3.141592653589793 rad
+      pos: -12.5,-21.5
       parent: 4812
-  - uid: 7591
+  - uid: 7590
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -9.5,-21.5
+      rot: 1.5707963267948966 rad
+      pos: -9.5,-16.5
       parent: 4812
   - uid: 9012
     components:
@@ -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 376719da61c..a11e94fe83c 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 5e533af961d..e41fdcd0eb5 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,34 +57838,32 @@ entities:
     - type: Transform
       pos: 70.5,6.5
       parent: 2
-- proto: LockerMedicine
+- proto: LockerMedicineFilled
   entities:
-  - uid: 11970
+  - uid: 4115
     components:
     - type: Transform
-      pos: 61.5,4.5
+      pos: 57.5,-15.5
       parent: 2
-  - uid: 11971
+  - uid: 5098
     components:
     - type: Transform
-      pos: 62.5,4.5
+      pos: 67.5,-6.5
       parent: 2
-  - uid: 11972
+  - uid: 5653
     components:
     - type: Transform
       pos: 65.5,4.5
       parent: 2
-- proto: LockerMedicineFilled
-  entities:
-  - uid: 4115
+  - uid: 6871
     components:
     - type: Transform
-      pos: 57.5,-15.5
+      pos: 62.5,4.5
       parent: 2
-  - uid: 5098
+  - uid: 6872
     components:
     - type: Transform
-      pos: 67.5,-6.5
+      pos: 61.5,4.5
       parent: 2
   - uid: 11402
     components:
@@ -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 048b0a2e5ce..e232aa32721 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 72412fde7cc..c08453460f4 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 e39933c365c..dea1ddb69c3 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 bd7df23841f..5d8eebd5220 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 faf5bc5ea57..85a941f27be 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 1876de6a53b..f4c47cfe9e4 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 58a49aa6e95..6764cb8496a 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 e327f5a0fc0..dcbd230804f 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
@@ -26,6 +26,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 ccf5160ffb2..322fd9261b5 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/Corvax/Entities/Stations/base.yml b/Resources/Prototypes/Corvax/Entities/Stations/base.yml
new file mode 100644
index 00000000000..8aaaf00b712
--- /dev/null
+++ b/Resources/Prototypes/Corvax/Entities/Stations/base.yml
@@ -0,0 +1,14 @@
+- type: entity
+  id: BaseStationGoal
+  abstract: true
+  components:
+    - type: StationGoal
+      goals:
+      - Shuttle
+      - Singularity
+      - SolarPanels
+      - Artifacts
+      - Bank
+      - Zoo
+      - MiningOutpost
+      - Tesla
\ No newline at end of file
diff --git a/Resources/Prototypes/Corvax/Entities/Stations/nanotrasen.yml b/Resources/Prototypes/Corvax/Entities/Stations/nanotrasen.yml
index dfca9d7167d..21b8566016a 100644
--- a/Resources/Prototypes/Corvax/Entities/Stations/nanotrasen.yml
+++ b/Resources/Prototypes/Corvax/Entities/Stations/nanotrasen.yml
@@ -3,6 +3,7 @@
   id: NanotrasenStationNoArrivals
   parent:
     - BaseStation
+    - BaseStationGoal
     - BaseStationNews
     - BaseStationCargo
     - BaseStationJobsSpawning
diff --git a/Resources/Prototypes/Corvax/Maps/astra.yml b/Resources/Prototypes/Corvax/Maps/astra.yml
index bb1ccb915c5..bb8e1fd516a 100644
--- a/Resources/Prototypes/Corvax/Maps/astra.yml
+++ b/Resources/Prototypes/Corvax/Maps/astra.yml
@@ -64,7 +64,14 @@
             Quartermaster: [ 1, 1 ]
             SalvageSpecialist: [ 3, 3 ]
             CargoTechnician: [ 4, 5 ]
-
-
-
-
+        - type: StationGoal
+          goals:
+          - Shuttle
+          - Singularity
+          - SolarPanels
+          - Artifacts
+          - Bank
+          - Zoo
+          - MiningOutpost
+          - Tesla
+          - VirusologyAmbusol
\ No newline at end of file
diff --git a/Resources/Prototypes/Corvax/Maps/delta.yml b/Resources/Prototypes/Corvax/Maps/delta.yml
index 2f51df3a933..e3a012684a6 100644
--- a/Resources/Prototypes/Corvax/Maps/delta.yml
+++ b/Resources/Prototypes/Corvax/Maps/delta.yml
@@ -58,3 +58,15 @@
             Psychologist: [ 1, 1 ]
             Detective: [ 1, 1 ]
             Paramedic: [ 1, 1 ]
+        - type: StationGoal
+          goals:
+          - Shuttle
+          - Singularity
+          - SolarPanels
+          - Artifacts
+          - Bank
+          - Zoo
+          - MiningOutpost
+          - Tesla
+          - XenobiologyRepair
+          - VirusologyAmbusol
diff --git a/Resources/Prototypes/Corvax/Maps/frame.yml b/Resources/Prototypes/Corvax/Maps/frame.yml
index 71644271e9a..24ccc641eec 100644
--- a/Resources/Prototypes/Corvax/Maps/frame.yml
+++ b/Resources/Prototypes/Corvax/Maps/frame.yml
@@ -64,3 +64,6 @@
             # cargo
             SalvageSpecialist: [ 3, 3 ]
             CargoTechnician: [ 2, 2 ]
+        - type: StationGoal
+          goals:
+          - FrameRepair
diff --git a/Resources/Prototypes/Corvax/Maps/pearl.yml b/Resources/Prototypes/Corvax/Maps/pearl.yml
index 99a2e212a30..4f49826da2f 100644
--- a/Resources/Prototypes/Corvax/Maps/pearl.yml
+++ b/Resources/Prototypes/Corvax/Maps/pearl.yml
@@ -66,3 +66,11 @@
             Quartermaster: [ 1, 1 ]
             SalvageSpecialist: [ 3, 3 ]
             CargoTechnician: [ 3, 3 ]
+        - type: StationGoal
+          goals:
+          - SolarPanels
+          - Artifacts
+          - Bank
+          - Zoo
+          - MiningOutpost
+          - Tesla
\ No newline at end of file
diff --git a/Resources/Prototypes/Corvax/Maps/silly.yml b/Resources/Prototypes/Corvax/Maps/silly.yml
index 6706edab27c..8f3362cd1ff 100644
--- a/Resources/Prototypes/Corvax/Maps/silly.yml
+++ b/Resources/Prototypes/Corvax/Maps/silly.yml
@@ -91,3 +91,11 @@
             Quartermaster: [ 1, 1 ]
             SalvageSpecialist: [ 3, 3 ]
             CargoTechnician: [ 3, 3 ]
+        - type: StationGoal
+          goals:
+          - SolarPanels
+          - Artifacts
+          - Bank
+          - Zoo
+          - MiningOutpost
+          - Tesla
\ No newline at end of file
diff --git a/Resources/Prototypes/Corvax/Maps/terra.yml b/Resources/Prototypes/Corvax/Maps/terra.yml
index 56f294700f3..dc667bc0aba 100644
--- a/Resources/Prototypes/Corvax/Maps/terra.yml
+++ b/Resources/Prototypes/Corvax/Maps/terra.yml
@@ -76,7 +76,11 @@
             Quartermaster: [ 1, 1 ]
             SalvageSpecialist: [ 2, 3 ]
             CargoTechnician: [ 2, 2 ]
-
-
-
-
+        - type: StationGoal
+          goals:
+          - SolarPanels
+          - Artifacts
+          - Bank
+          - Zoo
+          - MiningOutpost
+          - Tesla
\ No newline at end of file
diff --git a/Resources/Prototypes/Corvax/Objectives/goals.yml b/Resources/Prototypes/Corvax/Objectives/goals.yml
index b11a3a167c5..94b0ee07d9e 100644
--- a/Resources/Prototypes/Corvax/Objectives/goals.yml
+++ b/Resources/Prototypes/Corvax/Objectives/goals.yml
@@ -1,31 +1,51 @@
+# General goals
+
 - type: stationGoal
-  id: StationGoalShuttle
+  id: Shuttle
   text: station-goal-shuttle
 
 - type: stationGoal
-  id: StationGoalSingularity
+  id: Singularity
   text: station-goal-singularity
 
 - type: stationGoal
-  id: StationGoalSolarPanels
+  id: SolarPanels
   text: station-goal-solar-panels
 
 - type: stationGoal
-  id: StationGoalArtifacts
+  id: Artifacts
   text: station-goal-artifacts
 
 - type: stationGoal
-  id: StationGoalBank
+  id: Bank
   text: station-goal-bank
 
 - type: stationGoal
-  id: StationGoalZoo
+  id: Zoo
   text: station-goal-zoo
 
 - type: stationGoal
-  id: StationGoalMiningOutpost
+  id: MiningOutpost
   text: station-goal-mining-outpost
 
 - type: stationGoal
-  id: StationGoalTesla
+  id: Tesla
   text: station-goal-tesla
+
+# Special goals
+
+- type: stationGoal
+  id: FrameRepair
+  text: station-goal-frame-repair
+
+- type: stationGoal
+  id: XenobiologyRepair
+  text: station-goal-delta-xeno-repair
+
+- type: stationGoal
+  id: VirusologyAmbusol
+  text: station-goal-delta-ambusol
+  spawns:
+  - PillRomerol
+  - PillRomerol
+  - PillRomerol
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
index f9ff59d6b8b..462032547b2 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 1dae4f463a7..61486e7f3c4 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
@@ -692,6 +694,8 @@
   - type: PressureProtection
     highPressureMultiplier: 0.08
     lowPressureMultiplier: 1000
+  - type: FireProtection
+    reduction: 0.2
   - type: Armor
     modifiers:
       coefficients:
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
index 825e729115c..606af0b127a 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 c6a3f01f15b..7c264a596a0 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 1f69f7efb32..e88b1847083 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 829ae92fc9d..5cfe78c6d5a 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 bdefd14a452..b6f9287cf7f 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 c5500de3519..6212323d199 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 3bc5779b52f..a79fbfbf246 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 e0a3a764561..45fb6a12bdd 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 19ccf96ed90..4436ebc612c 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 b3bb5d4d07f..1686b723b59 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 7b321e80dff..91f5e952e92 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 9b339e6c008..17545b8e5a5 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 6a11c966860..eececb70da5 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 eeabecef8b2..d956f1871d7 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 f2b2c0450f0..0c069f615ee 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 5c55f9ff17d..5d77c91a5db 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 00000000000..8f23b6c7df9
--- /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 a92dc9b25df..51d94650731 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 154f34063c8..3004dc4cb2b 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 dcf2f3355ce..be23c2e43f6 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/Misc/books.yml b/Resources/Prototypes/Entities/Objects/Misc/books.yml
index 3fc90048dd5..fd4cac781ba 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 3b2e4cd8f1b..7de91cbb636 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 0c1a080fb1a..c173cf08969 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/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
index 13ebe4b8f47..d83a292ebee 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 f3a8215e3d7..ae309661fee 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 4fb45378ba1..8d9f615a2ea 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
 # Corvax-HiddenDesc-Start
@@ -271,7 +269,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
@@ -322,8 +320,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 11e7f983e05..7cc33b71550 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/Stations/nanotrasen.yml b/Resources/Prototypes/Entities/Stations/nanotrasen.yml
index ab885b03e53..9090c81fd56 100644
--- a/Resources/Prototypes/Entities/Stations/nanotrasen.yml
+++ b/Resources/Prototypes/Entities/Stations/nanotrasen.yml
@@ -10,6 +10,7 @@
   id: StandardNanotrasenStation
   parent:
     - BaseStation
+    - BaseStationGoal # Corvax
     - BaseStationNews
     - BaseStationCargo
     - BaseStationJobsSpawning
diff --git a/Resources/Prototypes/Entities/Structures/Decoration/mannequin.yml b/Resources/Prototypes/Entities/Structures/Decoration/mannequin.yml
index 4a2b0d3c3f4..39d58973bb7 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 abb12f93132..3f9a9bc222e 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/Piping/Atmospherics/unary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
index 2b00fec246f..207d5ee6929 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
@@ -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/Specific/Atmospherics/sensor.yml b/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml
index 2df48a584cd..b118b85c4db 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 f2315583e3c..2da4fbc3c4c 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 1bdf66f5b78..ecf2b0525ed 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 c6c3692e598..d131805bf51 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
@@ -331,8 +356,196 @@
         state: ironrock_west
 
 - type: entity
-  id: AsteroidRockSalt
-  parent: AsteroidRock
+  id: IronRockMining
+  parent: IronRock
+  name: ironrock
+  suffix: higher ore yield
+  description: An asteroid.
+  components:
+  - type: OreVein
+    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:
@@ -341,28 +554,38 @@
       currentOre: OreSalt
     - type: Sprite
       layers:
-        - state: rock_asteroid
+        - state: ironrock
         - map: [ "enum.EdgeLayer.South" ]
-          state: rock_asteroid_south
+          state: ironrock_south
         - map: [ "enum.EdgeLayer.East" ]
-          state: rock_asteroid_east
+          state: ironrock_east
         - map: [ "enum.EdgeLayer.North" ]
-          state: rock_asteroid_north
+          state: ironrock_north
         - map: [ "enum.EdgeLayer.West" ]
-          state: rock_asteroid_west
+          state: ironrock_west
         - state: rock_salt
 
 - type: entity
-  id: IronRockMining
+  id: IronRockArtifactFragment
   parent: IronRock
-  name: ironrock
-  suffix: higher ore yield
-  description: An asteroid.
+  description: A rock wall. What's that sticking out of it?
+  suffix: Artifact Fragment
   components:
   - type: OreVein
-    oreChance: 0.33
-    oreRarityPrototypeId: RandomOreDistributionStandard
-
+    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/InventoryTemplates/inventorybase.yml b/Resources/Prototypes/InventoryTemplates/inventorybase.yml
new file mode 100644
index 00000000000..2334c6784e6
--- /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 00000000000..bfc561486b1
--- /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 5de01794f58..124f3c02310 100644
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -39,8 +39,6 @@
 - type: loadoutGroup
   id: Survival
   name: loadout-group-survival-basic
-  minLimit: 1
-  maxLimit: 1
   hidden: true
   loadouts:
   - EmergencyNitrogen
@@ -419,8 +417,6 @@
 - type: loadoutGroup
   id: SurvivalClown
   name: loadout-group-survival-clown
-  minLimit: 2
-  maxLimit: 2
   hidden: true
   loadouts:
   - EmergencyNitrogenClown
@@ -742,8 +738,6 @@
 - type: loadoutGroup
   id: SurvivalExtended
   name: loadout-group-survival-extended
-  minLimit: 2
-  maxLimit: 2
   hidden: true
   loadouts:
   - EmergencyNitrogenExtended
@@ -1031,8 +1025,6 @@
 - type: loadoutGroup
   id: SurvivalSecurity
   name: loadout-group-survival-security
-  minLimit: 2
-  maxLimit: 2
   hidden: true
   loadouts:
   - EmergencyNitrogenSecurity
@@ -1213,8 +1205,6 @@
 - type: loadoutGroup
   id: SurvivalMedical
   name: loadout-group-survival-medical
-  minLimit: 2
-  maxLimit: 2
   hidden: true
   loadouts:
   - EmergencyNitrogenMedical
@@ -1248,8 +1238,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 37ad9b58cff..a040a2c8cc7 100644
--- a/Resources/Prototypes/Loadouts/role_loadouts.yml
+++ b/Resources/Prototypes/Loadouts/role_loadouts.yml
@@ -2,32 +2,34 @@
 - type: roleLoadout
   id: JobCaptain
   groups:
+  - Inventory # Corvax-Loadouts
   - CaptainHead
   - CaptainNeck
   - CaptainJumpsuit
   - CaptainBackpack
   - CaptainOuterClothing
-  - Trinkets
   - Survival
-  - Inventory # Corvax-Loadouts
+  - Trinkets
+
 
 - type: roleLoadout
   id: JobHeadOfPersonnel
   groups:
+  - Inventory # Corvax-Loadouts
   - HoPHead
   - HoPNeck
   - HoPJumpsuit
   - HoPBackpack
   - HoPOuterClothing
   - Glasses
-  - Trinkets
   - Survival
-  - Inventory # Corvax-Loadouts
+  - Trinkets
 
 # Civilian
 - type: roleLoadout
   id: JobPassenger
   groups:
+  - Inventory # Corvax-Loadouts
   - PassengerJumpsuit
   - CommonBackpack
   - PassengerFace
@@ -35,69 +37,69 @@
   - PassengerOuterClothing
   - PassengerShoes
   - Glasses
-  - Trinkets
   - Survival
-  - Inventory # Corvax-Loadouts
+  - Trinkets
 
 - type: roleLoadout
   id: JobBartender
   groups:
+  - Inventory # Corvax-Loadouts
   - BartenderHead
   - BartenderJumpsuit
   - CommonBackpack
   - BartenderOuterClothing
   - Glasses
-  - Trinkets
   - Survival
-  - Inventory # Corvax-Loadouts
+  - Trinkets
 
 - type: roleLoadout
   id: JobServiceWorker
   groups:
+  - Inventory # Corvax-Loadouts
   - BartenderJumpsuit
   - CommonBackpack
   - Glasses
-  - Trinkets
   - Survival
-  - Inventory # Corvax-Loadouts
+  - Trinkets
 
 - type: roleLoadout
   id: JobChef
   groups:
+  - Inventory # Corvax-Loadouts
   - ChefHead
   - ChefMask
   - ChefJumpsuit
   - CommonBackpack
   - ChefOuterClothing
   - Glasses
-  - Trinkets
   - Survival
-  - Inventory # Corvax-Loadouts
+  - Trinkets
 
 - type: roleLoadout
   id: JobLibrarian
   groups:
+  - Inventory # Corvax-Loadouts
   - LibrarianJumpsuit
   - CommonBackpack
   - Glasses
-  - Trinkets
   - Survival
-  - Inventory # Corvax-Loadouts
+  - Trinkets
 
 - type: roleLoadout
   id: JobLawyer
   groups:
+  - Inventory # Corvax-Loadouts
   - LawyerNeck
   - LawyerJumpsuit
   - CommonBackpack
   - Glasses
-  - Trinkets
   - Survival
-  - Inventory # Corvax-Loadouts
+  - Trinkets
 
 - type: roleLoadout
   id: JobChaplain
   groups:
+  - Inventory # Corvax-Loadouts
   - ChaplainHead
   - ChaplainMask
   - ChaplainNeck
@@ -105,78 +107,78 @@
   - CommonBackpack
   - ChaplainOuterClothing
   - Glasses
-  - Trinkets
   - Survival
-  - Inventory # Corvax-Loadouts
+  - Trinkets
 
 - type: roleLoadout
   id: JobJanitor
   groups:
+  - Inventory # Corvax-Loadouts
   - JanitorHead
   - JanitorJumpsuit
   - JanitorGloves
   - CommonBackpack
   - JanitorOuterClothing
   - Glasses
+  - Survival
   - Trinkets
   - JanitorPlunger
-  - Survival
-  - Inventory # Corvax-Loadouts
 
 - type: roleLoadout
   id: JobBotanist
   groups:
+  - Inventory # Corvax-Loadouts
   - BotanistHead
   - BotanistJumpsuit
   - BotanistBackpack
   - BotanistOuterClothing
   - Glasses
-  - Trinkets
   - Survival
-  - Inventory # Corvax-Loadouts
+  - Trinkets
 
 - type: roleLoadout
   id: JobClown
   groups:
+  - Inventory # Corvax-Loadouts
   - ClownHead
   - ClownJumpsuit
   - ClownBackpack
   - ClownOuterClothing
   - ClownShoes
   - Glasses
-  - Trinkets
   - SurvivalClown
-  - Inventory # Corvax-Loadouts
+  - Trinkets
 
 - type: roleLoadout
   id: JobMime
   groups:
+  - Inventory # Corvax-Loadouts
   - MimeHead
   - MimeMask
   - MimeJumpsuit
   - MimeBackpack
   - MimeOuterClothing
   - Glasses
-  - Trinkets
   - Survival
-  - Inventory # Corvax-Loadouts
+  - Trinkets
 
 - type: roleLoadout
   id: JobMusician
   groups:
+  - Inventory # Corvax-Loadouts
   - MusicianJumpsuit
   - CommonBackpack
   - MusicianOuterClothing
   - Glasses
+  - Survival
   - Trinkets
   - Instruments
-  - Survival
-  - Inventory # Corvax-Loadouts
 
 # Cargo
 - type: roleLoadout
   id: JobQuartermaster
   groups:
+  - Inventory # Corvax-Loadouts
   - QuartermasterHead
   - QuartermasterNeck
   - QuartermasterJumpsuit
@@ -184,85 +186,85 @@
   - QuartermasterOuterClothing
   - QuartermasterShoes
   - Glasses
-  - Trinkets
   - Survival
-  - Inventory # Corvax-Loadouts
+  - Trinkets
 
 - type: roleLoadout
   id: JobCargoTechnician
   groups:
+  - Inventory # Corvax-Loadouts
   - CargoTechnicianHead
   - CargoTechnicianJumpsuit
   - CargoTechnicianBackpack
   - CargoTechnicianOuterClothing
   - CargoTechnicianShoes
   - Glasses
-  - Trinkets
   - Survival
-  - Inventory # Corvax-Loadouts
+  - Trinkets
 
 - type: roleLoadout
   id: JobSalvageSpecialist
   groups:
+  - Inventory # Corvax-Loadouts
   - SalvageSpecialistBackpack
   - SalvageSpecialistOuterClothing
   - SalvageSpecialistShoes
   - Glasses
-  - Trinkets
   - Survival
-  - Inventory # Corvax-Loadouts
+  - Trinkets
 
 # Engineering
 - type: roleLoadout
   id: JobChiefEngineer
   groups:
+  - Inventory # Corvax-Loadouts
   - ChiefEngineerHead
   - ChiefEngineerJumpsuit
   - ChiefEngineerBackpack # Corvax-Loadouts
   - ChiefEngineerNeck
   - ChiefEngineerOuterClothing
   - ChiefEngineerShoes
-  - Trinkets
   - SurvivalExtended
-  - Inventory # Corvax-Loadouts
+  - Trinkets
 
 - type: roleLoadout
   id: JobTechnicalAssistant
   groups:
+  - Inventory # Corvax-Loadouts
   - TechnicalAssistantJumpsuit
   - StationEngineerBackpack
-  - Trinkets
   - SurvivalExtended
-  - Inventory # Corvax-Loadouts
+  - Trinkets
 
 - type: roleLoadout
   id: JobStationEngineer
   groups:
+  - Inventory # Corvax-Loadouts
   - StationEngineerHead
   - StationEngineerJumpsuit
   - StationEngineerBackpack
   - StationEngineerOuterClothing
   - StationEngineerShoes
   - StationEngineerID
-  - Trinkets
   - SurvivalExtended
-  - Inventory # Corvax-Loadouts
+  - Trinkets
 
 - type: roleLoadout
   id: JobAtmosphericTechnician
   groups:
+  - Inventory # Corvax-Loadouts
   - AtmosphericTechnicianJumpsuit
   - AtmosphericTechnicianBackpack
   - AtmosphericTechnicianOuterClothing
   - AtmosphericTechnicianShoes
-  - Trinkets
   - SurvivalExtended
-  - Inventory # Corvax-Loadouts
+  - Trinkets
 
 # Science
 - type: roleLoadout
   id: JobResearchDirector
   groups:
+  - Inventory # Corvax-Loadouts
   - ResearchDirectorHead
   - ResearchDirectorNeck
   - ResearchDirectorJumpsuit
@@ -271,13 +273,13 @@
   - ScientistGloves
   - ResearchDirectorShoes
   - Glasses
-  - Trinkets
   - Survival
-  - Inventory # Corvax-Loadouts
+  - Trinkets
 
 - type: roleLoadout
   id: JobScientist
   groups:
+  - Inventory # Corvax-Loadouts
   - ScientistHead
   - ScientistNeck
   - ScientistJumpsuit
@@ -287,24 +289,24 @@
   - ScientistShoes
   - ScientistPDA
   - Glasses
-  - Trinkets
   - Survival
-  - Inventory # Corvax-Loadouts
+  - Trinkets
 
 - type: roleLoadout
   id: JobResearchAssistant
   groups:
+  - Inventory # Corvax-Loadouts
   - ResearchAssistantJumpsuit
   - ScientistBackpack
   - Glasses
-  - Trinkets
   - Survival
-  - Inventory # Corvax-Loadouts
+  - Trinkets
 
 # Security
 - type: roleLoadout
   id: JobHeadOfSecurity
   groups:
+  - Inventory # Corvax-Loadouts
   - HeadofSecurityHead
   - HeadofSecurityNeck
   - HeadofSecurityJumpsuit
@@ -312,26 +314,26 @@
   - SecurityBelt
   - HeadofSecurityOuterClothing
   - SecurityShoes
-  - Trinkets
   - SurvivalSecurity
-  - Inventory # Corvax-Loadouts
+  - Trinkets
 
 - type: roleLoadout
   id: JobWarden
   groups:
+  - Inventory # Corvax-Loadouts
   - WardenHead
   - WardenJumpsuit
   - SecurityBackpack
   - SecurityBelt
   - WardenOuterClothing
   - SecurityShoes
-  - Trinkets
   - SurvivalSecurity
-  - Inventory # Corvax-Loadouts
+  - Trinkets
 
 - type: roleLoadout
   id: JobSecurityOfficer
   groups:
+  - Inventory # Corvax-Loadouts
   - SecurityHead
   - SecurityJumpsuit
   - SecurityBackpack
@@ -339,36 +341,36 @@
   - SecurityShoes
   - SecurityPDA
   - SecurityBelt
-  - Trinkets
   - SurvivalSecurity
-  - Inventory # Corvax-Loadouts
+  - Trinkets
 
 - type: roleLoadout
   id: JobDetective
   groups:
+  - Inventory # Corvax-Loadouts
   - DetectiveHead
   - DetectiveNeck
   - DetectiveJumpsuit
   - SecurityBackpack
   - DetectiveOuterClothing
   - SecurityShoes
-  - Trinkets
   - SurvivalSecurity
-  - Inventory # Corvax-Loadouts
+  - Trinkets
 
 - type: roleLoadout
   id: JobSecurityCadet
   groups:
+  - Inventory # Corvax-Loadouts
   - SecurityCadetJumpsuit
   - SecurityBackpack
-  - Trinkets
   - SurvivalSecurity
-  - Inventory # Corvax-Loadouts
+  - Trinkets
 
 # Medical
 - type: roleLoadout
   id: JobChiefMedicalOfficer
   groups:
+  - Inventory # Corvax-Loadouts
   - ChiefMedicalOfficerHead
   - MedicalMask
   - ChiefMedicalOfficerJumpsuit
@@ -378,13 +380,13 @@
   - ChiefMedicalOfficerNeck
   - ChiefMedicalOfficerShoes
   - Glasses
-  - Trinkets
   - SurvivalMedical
-  - Inventory # Corvax-Loadouts
+  - Trinkets
 
 - type: roleLoadout
   id: JobMedicalDoctor
   groups:
+  - Inventory # Corvax-Loadouts
   - MedicalDoctorHead
   - MedicalMask
   - MedicalDoctorJumpsuit
@@ -394,36 +396,36 @@
   - MedicalShoes
   - MedicalDoctorPDA
   - Glasses
-  - Trinkets
   - SurvivalMedical
-  - Inventory # Corvax-Loadouts
+  - Trinkets
 
 - type: roleLoadout
   id: JobMedicalIntern
   groups:
+  - Inventory # Corvax-Loadouts
   - MedicalInternJumpsuit
   - MedicalBackpack
   - Glasses
-  - Trinkets
   - SurvivalMedical
-  - Inventory # Corvax-Loadouts
+  - Trinkets
 
 - type: roleLoadout
   id: JobChemist
   groups:
+  - Inventory # Corvax-Loadouts
   - MedicalMask
   - ChemistJumpsuit
   - MedicalGloves
   - ChemistBackpack
   - ChemistOuterClothing
   - MedicalShoes
-  - Trinkets
   - SurvivalMedical
-  - Inventory # Corvax-Loadouts
+  - Trinkets
 
 - type: roleLoadout
   id: JobParamedic
   groups:
+  - Inventory # Corvax-Loadouts
   - ParamedicHead
   - MedicalMask
   - ParamedicJumpsuit
@@ -432,49 +434,48 @@
   - ParamedicOuterClothing
   - ParamedicShoes
   - Glasses
-  - Trinkets
   - SurvivalMedical
-  - Inventory # Corvax-Loadouts
+  - Trinkets
 
 # Wildcards
 - type: roleLoadout
   id: JobZookeeper
   groups:
+  - Inventory # Corvax-Loadouts
   - CommonBackpack
   - Glasses
-  - Trinkets
   - Survival
-  - Inventory # Corvax-Loadouts
+  - Trinkets
 
 - type: roleLoadout
   id: JobReporter
   groups:
+  - Inventory # Corvax-Loadouts
   - ReporterJumpsuit
   - CommonBackpack
   - Glasses
-  - Trinkets
   - Survival
-  - Inventory # Corvax-Loadouts
+  - Trinkets
 
 - type: roleLoadout
   id: JobPsychologist
   groups:
+  - Inventory # Corvax-Loadouts
   - MedicalBackpack
   - Glasses
-  - Trinkets
   - Survival
-  - Inventory # Corvax-Loadouts
+  - Trinkets
 
 - type: roleLoadout
   id: JobBoxer
   groups:
+  - Inventory # Corvax-Loadouts
   - BoxerJumpsuit
   - BoxerGloves
   - CommonBackpack
   - Glasses
-  - Trinkets
   - Survival
-  - Inventory # Corvax-Loadouts
+  - Trinkets
 
 # These loadouts will be used without player configuration, thus they must be designed to work without manual selection
 
diff --git a/Resources/Prototypes/Maps/box.yml b/Resources/Prototypes/Maps/box.yml
index 65721b01d84..ecd4ef07404 100644
--- a/Resources/Prototypes/Maps/box.yml
+++ b/Resources/Prototypes/Maps/box.yml
@@ -34,7 +34,7 @@
             TechnicalAssistant: [ 4, 4 ]
             #medical
             ChiefMedicalOfficer: [ 1, 1 ]
-            Chemist: [ 2, 3 ]
+            Chemist: [ 2, 2 ]
             MedicalDoctor: [ 4, 4 ]
             Paramedic: [ 1, 1 ]
             MedicalIntern: [ 4, 4 ]
diff --git a/Resources/Prototypes/Maps/meta.yml b/Resources/Prototypes/Maps/meta.yml
index 502559656a6..67600c501d6 100644
--- a/Resources/Prototypes/Maps/meta.yml
+++ b/Resources/Prototypes/Maps/meta.yml
@@ -34,7 +34,7 @@
             TechnicalAssistant: [ 3, 6 ]
             #medical
             ChiefMedicalOfficer: [ 1, 1 ]
-            Chemist: [ 3, 3 ]
+            Chemist: [ 2, 2 ]
             MedicalDoctor: [ 5, 5 ]
             MedicalIntern: [ 3, 6 ]
             Paramedic: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/oasis.yml b/Resources/Prototypes/Maps/oasis.yml
index 343920c4fc1..90adcdf73e3 100644
--- a/Resources/Prototypes/Maps/oasis.yml
+++ b/Resources/Prototypes/Maps/oasis.yml
@@ -36,7 +36,7 @@
             TechnicalAssistant: [ 4, 4 ]
             #medical
             ChiefMedicalOfficer: [ 1, 1 ]
-            Chemist: [ 3, 3 ]
+            Chemist: [ 2, 2 ]
             MedicalDoctor: [ 6, 6 ]
             Paramedic: [ 2, 2 ]
             MedicalIntern: [ 4, 4 ]
diff --git a/Resources/Prototypes/Maps/origin.yml b/Resources/Prototypes/Maps/origin.yml
index 2b537bc791e..fa7c6435577 100644
--- a/Resources/Prototypes/Maps/origin.yml
+++ b/Resources/Prototypes/Maps/origin.yml
@@ -35,7 +35,7 @@
             TechnicalAssistant: [ 2, 3 ]
             #medical
             ChiefMedicalOfficer: [ 1, 1 ]
-            Chemist: [ 2, 3 ]
+            Chemist: [ 2, 2 ]
             Paramedic: [ 1, 1 ]
             MedicalDoctor: [ 6, 6 ]
             Psychologist: [ 1, 1 ]
diff --git a/Resources/Prototypes/Reagents/biological.yml b/Resources/Prototypes/Reagents/biological.yml
index 0c53ae10fd1..b4846d931ec 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 00000000000..52a9a817cfd
--- /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 cf2bf9aaf7f..bec98e7310d 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 8cb4c551467..0a8ff18aad8 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 17fa4d96e3f..3c95d7b3561 100644
--- a/Resources/Prototypes/SoundCollections/NukeMusic.yml
+++ b/Resources/Prototypes/SoundCollections/NukeMusic.yml
@@ -4,4 +4,5 @@
     - /Audio/StationEvents/running_out.ogg
     - /Audio/StationEvents/countdown.ogg
     - /Audio/StationEvents/clearly_nuclear.ogg
+    - /Audio/StationEvents/sound_station_14.ogg
     - /Audio/Corvax/StationEvents/level.ogg # Corvax-NukeMusic
diff --git a/Resources/Prototypes/Stacks/floor_tile_stacks.yml b/Resources/Prototypes/Stacks/floor_tile_stacks.yml
index c88786f0dc8..01bd916a672 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 c9bf3fd3304..33f51c982aa 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
@@ -1851,7 +1851,7 @@
   isSubfloor: false
   footstepSounds:
     collection: FootstepHull
-  itemDrop: FloorTileItemReinforced #same case as FloorHull
+  itemDrop: PartRodMetal1 #same case as FloorHull
 
 # Faux sci tiles
 
@@ -1951,4 +1951,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 8d6be674e80..3939655707e 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/lobbyscreens.yml b/Resources/Prototypes/lobbyscreens.yml
index e83cfaf4854..8ffa580bc70 100644
--- a/Resources/Prototypes/lobbyscreens.yml
+++ b/Resources/Prototypes/lobbyscreens.yml
@@ -1,11 +1,3 @@
-- type: lobbyBackground
-  id: Robotics
-  background: /Textures/LobbyScreens/robotics.webp
-
-- type: lobbyBackground
-  id: Supermatter
-  background: /Textures/LobbyScreens/supermatter.webp
-
 - type: lobbyBackground
   id: Warden
   background: /Textures/LobbyScreens/warden.webp
@@ -48,4 +40,9 @@
 
 - type: lobbyBackground
   id: JaniShootout
-  background: /Textures/LobbyScreens/janishootout.webp
\ No newline at end of file
+  background: /Textures/LobbyScreens/janishootout.webp
+
+- type: lobbyBackground
+  id: ReclaimerNuke
+  background: /Textures/LobbyScreens/reclaimer-nuke.webp
+  
\ No newline at end of file
diff --git a/Resources/Textures/Effects/ssd.rsi/default0.png b/Resources/Textures/Effects/ssd.rsi/default0.png
index bfd8c84da99..962a7298cf3 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 6c5e7b24e33..6e9db0d8ded 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 37404e77f76..00000000000
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 f5d94c891a7..00000000000
--- 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 52a3ee77731..1df5da9a2bf 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 00000000000..b169086104b
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 43d32581cfa..00000000000
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 d5fb190ae6c..00000000000
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 dabd6601f78..00000000000
--- 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 01abf17a363..7f37864ba60 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 00000000000..72485a8e566
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 db0ac608ed0..9e1d9a9075d 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 00000000000..e9b8cc143d9
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 00000000000..1f36b3b186b
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 00000000000..fcd9dc077d6
--- /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 00000000000..864df464ccb
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 6633b0b0bd6..b4317b0c76f 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/Misc/module.rsi/cargodisk.png b/Resources/Textures/Objects/Misc/module.rsi/cargodisk.png
index ffdb773aa9f..5633f0f486c 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 4b5e7bf0fde..00000000000
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 5a7801cd466..00000000000
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 a30a7a7853d..00000000000
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 1f01386891d..00000000000
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 9fd4781032b..00000000000
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 1f0ec86f626..00000000000
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 e76bf1784c8..00000000000
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 655475caff0..7ac86185e81 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 7eb0695977e..ce7c2fe134d 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 52faf6b4cc4..1632fc20d67 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 d7b9e7601e5..ba3abaa2dd2 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 8fb09b3651d..00000000000
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 8fb09b3651d..05155b22f5b 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 00000000000..f7034df28b5
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 00000000000..f7034df28b5
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 aeda729c568..22ea9ffd38b 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 9c48deb74b2..00000000000
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 03079a2bfc0..00000000000
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 a54808387d9..00000000000
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 089c064f4be..00000000000
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 459c4e9c3fb..00000000000
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 a0884cc43f8..00000000000
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 cd744243727..00000000000
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 d13b7fde07c..7c8e90460fe 100644
--- a/Resources/Textures/Objects/Misc/stock_parts.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/stock_parts.rsi/meta.json
@@ -57,76 +57,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 d47969aaeb6..8256e40d46e 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 fdf6db8d6e1..1455c0fea1a 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 2b12a2d5c0c..503a4a36480 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 3ed5ae46f91..143b458345b 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 597e2cc9cfb..7e102dbc0d5 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 53905e1e8c7..f41cceb5932 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/migration.yml b/Resources/migration.yml
index 28f12d223f6..961a9ea3657 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -354,4 +354,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 da5416a2da2..860c9af2bfb 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit da5416a2da2745044a1ed4f2aa5d0af294e8b705
+Subproject commit 860c9af2bfbf1477b96519067ef5e62b2525d987